From d8713d720fe7bc6d5dec99fa238397829b715aff Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 15:18:28 +0800
Subject: [PATCH] 2019-11-18-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index cc03759..c65bb84 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -23,6 +23,7 @@
FrameLayout clickframeLayout = new FrameLayout();
Button clickbutton = new Button();
Button clicktextcolcrbutton = new Button();
+ HorizontalScrolViewLayout devicetypehorizontalScrol1;
public void Show()
{
@@ -39,7 +40,7 @@
var titleName = new Button
{
- TextSize = 16,
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(160),
@@ -89,6 +90,7 @@
Y = Application.GetRealHeight(92),
//TextID = MyInternationalizationString.customroom,
Text = Config.Instance.Home.GetCurrentFloorName,
+ TextSize = 14,
};
topRowLayout.AddChidren(foolrname);
var dropdown = new Button
@@ -108,7 +110,7 @@
///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
if (Common.Room.Lists.Count == 0)
{
- return;
+ return;
}
///鎴块棿婊戝姩鎺т欢
var roomhorizontalScrol = new HorizontalScrolViewLayout()
@@ -120,7 +122,7 @@
};
this.AddChidren(roomhorizontalScrol);
- var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
+ devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
{
Width = Application.GetRealWidth(1080 - 58 - 200),
Height = Application.GetRealHeight(280),
@@ -188,6 +190,7 @@
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
X = Application.GetRealWidth(80),
TextID = MyInternationalizationString.selecfoolr,
+ TextSize = 14,
};
foolrbjicon.AddChidren(btnfoolrtext);
@@ -229,6 +232,7 @@
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
Tag = foolr.Key,
X = btnfoolricon.Right + Application.GetRealWidth(12),
+ TextSize = 14,
};
foolrRowLayout.AddChidren(btnfoolrname);
if (foolrname.Text == foolr.Value)
@@ -345,6 +349,18 @@
}
list.Add(device);
}
+ if (list.Count == 0)
+ {
+ devicetypehorizontalScrol.Height = 0;
+ devicetypehorizontalScrol1.Height = 0;
+ middle.Height = 0;
+ }
+ else
+ {
+ devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
+ devicetypehorizontalScrol1.Height = Application.GetRealHeight(280);
+ middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
+ }
AllDeviceTypeView(list, devicetypehorizontalScrol);
@@ -375,6 +391,19 @@
continue;
}
list.Add(device);
+ }
+
+ if (list.Count == 0)
+ {
+ devicetypehorizontalScrol.Height = 0;
+ devicetypehorizontalScrol1.Height = 0;
+ middle.Height = 0;
+ }
+ else
+ {
+ devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
+ devicetypehorizontalScrol1.Height = Application.GetRealHeight(280);
+ middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
}
AllDeviceTypeView(list, devicetypehorizontalScrol);
@@ -608,6 +637,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
+ TextSize = 14,
};
deviceRow.AddChidren(devicename);
switch (common.CommonDevice.Type)
@@ -742,6 +772,7 @@
Width = Application.GetRealWidth(200),
X = Application.GetRealWidth(80),
TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 14,
};
timetype.AddChidren(Btncancel);
Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -770,6 +801,7 @@
Width = Application.GetRealWidth(200),
TextAlignment = TextAlignment.CenterRight,
X = Btntitle.Right + Application.GetRealWidth(50),
+ TextSize = 14,
};
timetype.AddChidren(Btncomplete);
@@ -830,6 +862,7 @@
TextID = MyInternationalizationString.open,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
openrowlayout.AddChidren(btnopen);
@@ -860,6 +893,7 @@
Width = Application.GetRealWidth(600),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
closerowlayout.AddChidren(btnclose);
@@ -955,6 +989,7 @@
Height = Application.GetRealHeight(180),
//SelectedBackgroundColor = 0xfffe5e00,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 14,
};
openrowlayout.AddChidren(btnopen);
@@ -985,6 +1020,7 @@
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(180),
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 14,
};
closerowlayout.AddChidren(btnclose);
@@ -1081,6 +1117,7 @@
TextID = MyInternationalizationString.open,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
openrowlayout.AddChidren(btnopen);
@@ -1111,6 +1148,7 @@
Width = Application.GetRealWidth(600),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
closerowlayout.AddChidren(btnclose);
@@ -1382,6 +1420,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
+ TextSize = 14,
//SelectedBackgroundColor = 0xfffe5e00,
};
buttonRow.AddChidren(button);
@@ -1411,11 +1450,10 @@
case DeviceType.DoorLock:
{
-
+ flMain.RemoveFromParent();
var memberList = new MemberList();
UserView.HomePage.Instance.AddChidren(memberList);
UserView.HomePage.Instance.PageIndex += 1;
- MemberList.action += () => { flMain.RemoveFromParent(); };
MemberList.edit = false;
memberList.Show(common);
}
@@ -1434,6 +1472,7 @@
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(80),
Y = timetype.Bottom + Application.GetRealHeight(70),
+ TextSize = 14,
};
devicefra.AddChidren(Btntemperaturevalue);
--
Gitblit v1.8.0