From 163777d8a2cb7cfa469f54a7042528870ebc10a3 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 09 十二月 2019 17:46:20 +0800
Subject: [PATCH] 一个新版本
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs | 120 ++++++++++-------------------------------------------------
1 files changed, 21 insertions(+), 99 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
index 299fbba..20a5eea 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
@@ -17,10 +17,6 @@
/// </summary>
private Common.Room lookRoom = null;
/// <summary>
- /// 褰撳墠閫夋嫨鐨勫垎鏀紝1锛氬満鏅� 2锛氬姛鑳�
- /// </summary>
- private int nowSelectIndex = 1;
- /// <summary>
/// 妗屽竷鎺т欢
/// </summary>
private FrameLayout frameTable = null;
@@ -52,17 +48,14 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- //鍒濆鍖栧垎鏀帶浠�
- this.InitSwitchControl();
-
//鍒濆鍖栨甯冩帶浠�
this.frameTable = new FrameLayout();
frameTable.Y = Application.GetRealHeight(187);
frameTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);
bodyFrameLayout.AddChidren(frameTable);
- //鏄剧ず鍦烘櫙鍒楄〃
- this.ShowSceneList();
+ //鍒濆鍖栧垎鏀帶浠�
+ this.InitSwitchControl();
}
/// <summary>
@@ -70,93 +63,23 @@
/// </summary>
private void InitSwitchControl()
{
- var btnTemp = new NormalViewControl(10, 10, false);
- btnTemp.TextID = R.MyInternationalizationString.uScence;
-
- //鍦烘櫙妗�(鐐瑰嚮鑼冨洿鏈夌偣灏忥紝闇�瑕佹墿澶у畠鐨勭偣鍑昏寖鍥�)
- var frameScene = new FrameLayoutControl();
- frameScene.UseClickStatu = false;
- frameScene.Height = Application.GetRealHeight(90);
- frameScene.Width = btnTemp.GetRealWidthByText(16);
- frameScene.X = ControlCommonResourse.XXLeft;
- frameScene.Y = Application.GetRealHeight(40);
- bodyFrameLayout.AddChidren(frameScene);
- //鍦烘櫙
- var btnScene = new NormalViewControl(frameScene.Width, Application.GetRealHeight(63), false);
- btnScene.Text = btnTemp.Text;
- btnScene.TextSize = 16;
- btnScene.TextColor = UserCenterColor.Current.TextColor2;
- frameScene.AddChidren(btnScene, ChidrenBindMode.BindEventOnly);
- //搴曠嚎
- var btnSceneLine = new NormalViewControl(40, 10, true);
- btnSceneLine.Y = btnScene.Bottom + Application.GetRealHeight(14);
- btnSceneLine.X = btnScene.X + btnScene.Width / 2 - Application.GetRealWidth(40) / 2;
- btnSceneLine.Radius = (uint)Application.GetRealHeight(10) / 2;
- btnSceneLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- frameScene.AddChidren(btnSceneLine, ChidrenBindMode.BindEventOnly);
-
- btnTemp.TextID = R.MyInternationalizationString.uFunction;
- //鍔熻兘妗�(鐐瑰嚮鑼冨洿鏈夌偣灏忥紝闇�瑕佹墿澶у畠鐨勭偣鍑昏寖鍥�)
- var frameFunc = new FrameLayoutControl();
- frameFunc.UseClickStatu = false;
- frameFunc.Height = Application.GetRealHeight(90);
- frameFunc.Width = btnTemp.GetRealWidthByText(16);
- frameFunc.X = frameScene.Right + Application.GetRealWidth(58);
- frameFunc.Y = Application.GetRealHeight(40);
- bodyFrameLayout.AddChidren(frameFunc);
- //鍔熻兘
- var btnFunc = new NormalViewControl(frameFunc.Width, Application.GetRealHeight(63), false);
- btnFunc.Text = btnTemp.Text;
- btnFunc.TextColor = UserCenterColor.Current.TextGrayColor3;
- frameFunc.AddChidren(btnFunc, ChidrenBindMode.BindEventOnly);
- //搴曠嚎
- var btnFuncLine = new NormalViewControl(40, 10, true);
- btnFuncLine.Y = btnFunc.Bottom + Application.GetRealHeight(14);
- btnFuncLine.X = btnFunc.X + btnFunc.Width / 2 - Application.GetRealWidth(40) / 2;
- btnFuncLine.Radius = (uint)Application.GetRealHeight(10) / 2;
- btnFuncLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- frameFunc.AddChidren(btnFuncLine, ChidrenBindMode.BindEventOnly);
- btnFuncLine.Visible = false;
-
- frameScene.ButtonClickEvent += (sender, e) =>
+ var tabControl = new SceneFunctionSwitchControl();
+ tabControl.Y = Application.GetRealHeight(40);
+ bodyFrameLayout.AddChidren(tabControl);
+ tabControl.SelectTabEvent += (tabIndex) =>
{
- //鍦烘櫙鍒嗘敮閫夋嫨
- if (this.nowSelectIndex == 1)
+ if (tabIndex == 1)
{
- return;
+ //鏄剧ず鍦烘櫙鍒楄〃
+ this.ShowSceneList();
}
- this.nowSelectIndex = 1;
-
- btnScene.TextSize = 16;
- btnScene.TextColor = UserCenterColor.Current.TextColor2;
- btnFunc.TextSize = 14;
- btnFunc.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnSceneLine.Visible = true;
- btnFuncLine.Visible = false;
-
- //鏄剧ず鍦烘櫙鍒楄〃
- this.ShowSceneList();
- };
-
- frameFunc.ButtonClickEvent += (sender, e) =>
- {
- //鍔熻兘鍒嗘敮閫夋嫨
- if (this.nowSelectIndex == 2)
+ else
{
- return;
+ //鏄剧ず鍔熻兘鍒楄〃
+ this.ShowFunctionList();
}
- this.nowSelectIndex = 2;
-
- btnScene.TextSize = 14;
- btnScene.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnFunc.TextSize = 16;
- btnFunc.TextColor = UserCenterColor.Current.TextColor2;
- btnFuncLine.Visible = true;
- btnSceneLine.Visible = false;
-
- //鏄剧ず鍔熻兘鍒楄〃
- this.ShowFunctionList();
};
+ tabControl.InitControl();
}
#endregion
@@ -195,14 +118,14 @@
btnPic.Width = Application.GetRealWidth(844);
btnPic.Height = Application.GetRealHeight(420);
btnPic.ImagePath = data.IconPath;
- btnPic.Radius = 8;
+ btnPic.Radius = (uint)Application.GetRealHeight(17);
frameContr.AddChidren(btnPic);
var btnName = new NormalViewControl(251, 282, true);
btnName.X = ControlCommonResourse.XXLeft;
btnName.Y = Application.GetRealHeight(58);
btnName.BackgroundColor = 0xff333333;
- btnName.Radius = 8;
+ btnName.RadiusEx = 17;
btnName.Text = data.Name;
btnName.TextSize = 15;
btnName.TextColor = UserCenterColor.Current.White;
@@ -240,7 +163,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Width = bodyFrameLayout.Width;
frameBack.Height = Application.GetRealHeight(1650);
- frameBack.Radius = 20;
+ frameBack.Radius = (uint)Application.GetRealHeight(58);
frameTable.AddChidren(frameBack);
var listView = new VerticalListControl(23);
@@ -392,9 +315,10 @@
{
HdlThreadLogic.Current.RunThread(() =>
{
+ var listCheck = new HashSet<string>();
for (int i = 0; i < listGwId.Count; i++)
{
- if (listView == null)
+ if (listView.Parent == null)
{
return;
}
@@ -403,14 +327,12 @@
var result = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, (device) =>
{
string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- if (listView.Parent == null)
+ if (listView.Parent == null || dicData.ContainsKey(mainkeys) == false || listCheck.Contains(mainkeys) == true)
{
return;
}
- if (listView == null || dicData.ContainsKey(mainkeys) == false)
- {
- return;
- }
+ listCheck.Add(mainkeys);
+
var localDevice = Common.LocalDevice.Current.GetDevice(mainkeys);
if (localDevice != null && localDevice.IsOnline != device.IsOnline)
{
--
Gitblit v1.8.0