From da9905ebb2794d276f37d798f1624c8c59dc074e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 20 七月 2020 17:37:24 +0800
Subject: [PATCH] 2020-07-20-2
---
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index 875c64b..8bfa320 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -23,7 +23,11 @@
/// <summary>
/// 璁板綍鐐瑰嚮璁惧
/// </summary>
- Button devicetypeButton = new Button();
+ Button deviceTypeBjButton = new Button();
+ /// <summary>
+ /// 璁板綍鐐瑰嚮璁惧绫诲瀷
+ /// </summary>
+ Button deviceTypeTextButton = new Button();
FrameLayout clickframeLayout = new FrameLayout();
Button clickbutton = new Button();
Button clicktextcolcrbutton = new Button();
@@ -40,6 +44,18 @@
Height = Application.GetRealHeight(204),
X = Application.GetRealWidth(29),
Y = Application.GetRealHeight(184),
+ };
+ /// <summary>
+ /// 鍦嗚17
+ /// </summary>
+ public HorizontalScrolViewLayout devicetypehorizontalScrol1 = new HorizontalScrolViewLayout
+ {
+ Width = Application.GetRealWidth(1080 - 52),
+ Height = Application.GetRealHeight(50),
+ Y = Application.GetRealHeight(184 + 204),
+ BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+ X = Application.GetRealWidth(52),
+
};
/// <summary>
/// 璁惧绫诲瀷婊戝姩鐨勬帶浠�
@@ -97,15 +113,18 @@
if (roomlists.Count == 0)
{
//杩斿洖娌℃湁鎴块棿闅愯棌涓嬮潰鏁村潡;
+ devicetypehorizontalScrol1.Height = 0;
devicetypehorizontalScrol.Height = 0;
middle.Height = 0;
}
/// 璁惧绫诲瀷鍒楄〃
var deviceTypeList = Method.GetDevice(IfType);
this.AddChidren(roomhorizontalScrol);
+ this.AddChidren(devicetypehorizontalScrol1);
this.AddChidren(devicetypehorizontalScrol);
this.AddChidren(middle);
- devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft);
+ devicetypehorizontalScrol1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
+ devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft|HDLUtils.RectCornerTopLeft);
middle.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft);
///妤煎眰鐐瑰嚮浜嬩欢
view.foolrclickBtn.MouseUpEventHandler += (sender, e) =>
@@ -196,11 +215,13 @@
var list = Method.GetRoomList(IfType, btnfoolrname.Tag.ToString());
if (list.Count == 0)
{
+ devicetypehorizontalScrol1.Height = 0;
devicetypehorizontalScrol.Height = 0;
middle.Height = 0;
}
else
{
+ devicetypehorizontalScrol1.Height = 50;
devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
middle.Height = Application.GetRealHeight(1920 - 40 - 184 - 280 - 200);
}
@@ -242,10 +263,6 @@
roomClickView.roomnameBtn.X = Application.GetRealWidth(60);
roomTextButton = roomClickView.roomnameBtn;
roomClickView.roomnameBtn.IsSelected = true;
-
- roomClickView.roombjBtn.IsSelected = true;
- roomClickView.roomnameBtn.IsSelected = true;
-
var list = Method.GetDeviceUIList(room, deviceTypeList);
AllDeviceTypeView(list);
@@ -343,8 +360,9 @@
Text = devicetype,
TextAlignment = TextAlignment.Center,
Y = backgroundColor.Bottom,
- TextColor = ZigbeeColor.Current.LogicAddColor,
TextSize = 10,
+ TextColor =ZigbeeColor.Current.LogicBtnSelectedColor,
+ SelectedTextColor =ZigbeeColor.Current.LogicAddColor,
};
deviceRowLayout.AddChidren(devicetypename);
@@ -360,9 +378,15 @@
EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) =>
{
- devicetypeButton.IsSelected = false;
- devicetypeButton = backgroundColor;
+ deviceTypeBjButton.IsSelected = false;
+ deviceTypeBjButton = backgroundColor;
backgroundColor.IsSelected = true;
+
+ deviceTypeTextButton.IsSelected = false;
+ deviceTypeTextButton = devicetypename;
+ devicetypename.IsSelected = true;
+
+
var list = Method.GetDeviceType(devicetypename.Text);
ConditionDeviceView(list, devicelist);
};
--
Gitblit v1.8.0