From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25
---
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 81 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index cc03759..092dc54 100755
--- 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();
+
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,15 +122,6 @@
};
this.AddChidren(roomhorizontalScrol);
- var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
- {
- Width = Application.GetRealWidth(1080 - 58 - 200),
- Height = Application.GetRealHeight(280),
- Y = roomhorizontalScrol.Bottom,
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- X = Application.GetRealWidth(58 + 200),
- };
- this.AddChidren(devicetypehorizontalScrol1);
///璁惧绫诲瀷婊戝姩鎺т欢
var devicetypehorizontalScrol = new HorizontalScrolViewLayout()
{
@@ -137,19 +130,20 @@
Y = roomhorizontalScrol.Bottom,
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
X = Application.GetRealWidth(58),
- Radius = (uint)Application.GetRealHeight(50),
+ // Radius = (uint)Application.GetRealHeight(50),
};
this.AddChidren(devicetypehorizontalScrol);
+ devicetypehorizontalScrol.SetCornerWithSameRadius(20,HDLUtils.RectCornerBottomLeft);
middle = new VerticalScrolViewLayout();
middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
middle.X = Application.GetRealWidth(58);
- middle.Radius = (uint)Application.GetRealHeight(50);
+ //middle.Radius = (uint)Application.GetRealHeight(50);
this.AddChidren(middle);
-
+ middle.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft);
///鐩墠鏀寔鐨勮澶�
var deviceTypeList = new List<DeviceType> {
DeviceType.IASZone,
@@ -188,6 +182,7 @@
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
X = Application.GetRealWidth(80),
TextID = MyInternationalizationString.selecfoolr,
+ TextSize = 14,
};
foolrbjicon.AddChidren(btnfoolrtext);
@@ -229,6 +224,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 +341,16 @@
}
list.Add(device);
}
+ if (list.Count == 0)
+ {
+ devicetypehorizontalScrol.Height = 0;
+ middle.Height = 0;
+ }
+ else
+ {
+ devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
+ middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
+ }
AllDeviceTypeView(list, devicetypehorizontalScrol);
@@ -375,6 +381,17 @@
continue;
}
list.Add(device);
+ }
+
+ if (list.Count == 0)
+ {
+ devicetypehorizontalScrol.Height = 0;
+ middle.Height = 0;
+ }
+ else
+ {
+ devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
+ middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
}
AllDeviceTypeView(list, devicetypehorizontalScrol);
@@ -577,7 +594,7 @@
Height = Application.GetRealHeight(112),
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(30 + 9),
- Radius = (uint)Application.GetRealHeight(56),
+ // Radius = (uint)Application.GetRealHeight(56),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
deviceFramelayout.AddChidren(bjFramelayout);
@@ -608,6 +625,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
+ TextSize = 14,
};
deviceRow.AddChidren(devicename);
switch (common.CommonDevice.Type)
@@ -703,18 +721,7 @@
flMain.MouseUpEventHandler += (sender, e) =>
{
flMain.RemoveFromParent();
-
-
};
-
- var devicefra1 = new FrameLayout
- {
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(100),
- Y = Application.GetRealHeight(1920 - 100),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- flMain.AddChidren(devicefra1);
var devicefra = new FrameLayout
{
@@ -723,9 +730,10 @@
Height = Application.GetRealHeight(530),
Y = Application.GetRealHeight(1920 - 530),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- Radius = (uint)Application.GetRealHeight(60),
+ // Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(devicefra);
+ devicefra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
@@ -742,6 +750,7 @@
Width = Application.GetRealWidth(200),
X = Application.GetRealWidth(80),
TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 14,
};
timetype.AddChidren(Btncancel);
Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -770,6 +779,7 @@
Width = Application.GetRealWidth(200),
TextAlignment = TextAlignment.CenterRight,
X = Btntitle.Right + Application.GetRealWidth(50),
+ TextSize = 14,
};
timetype.AddChidren(Btncomplete);
@@ -830,6 +840,7 @@
TextID = MyInternationalizationString.open,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
openrowlayout.AddChidren(btnopen);
@@ -860,6 +871,7 @@
Width = Application.GetRealWidth(600),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
closerowlayout.AddChidren(btnclose);
@@ -955,6 +967,7 @@
Height = Application.GetRealHeight(180),
//SelectedBackgroundColor = 0xfffe5e00,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 14,
};
openrowlayout.AddChidren(btnopen);
@@ -985,6 +998,7 @@
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(180),
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 14,
};
closerowlayout.AddChidren(btnclose);
@@ -1081,6 +1095,7 @@
TextID = MyInternationalizationString.open,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
openrowlayout.AddChidren(btnopen);
@@ -1111,6 +1126,7 @@
Width = Application.GetRealWidth(600),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
closerowlayout.AddChidren(btnclose);
@@ -1154,7 +1170,7 @@
dictionary(deviceConditionsInfo, "AttriButeData1", "0");
if (iASZonedevice.IasDeviceType == 13)
{
- SelectedDeviceStatuscondition = "no";
+ SelectedDeviceStatuscondition = "";
btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
openBtnSelected.Visible = false;
@@ -1236,7 +1252,7 @@
timeoutrowlayout.AddChidren(timeoutBtnSelected);
EventHandler<MouseEventArgs> timeoutclick = (sender, e) =>
{
- SelectedDeviceStatuscondition = "no";
+ SelectedDeviceStatuscondition = "";
btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
openBtnSelected.Visible = false;
@@ -1255,7 +1271,6 @@
#endregion
}
break;
-
case 40:
{
devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
@@ -1295,7 +1310,6 @@
openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
}
break;
-
case 277:
{
devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
@@ -1382,6 +1396,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 +1426,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 +1448,7 @@
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(80),
Y = timetype.Bottom + Application.GetRealHeight(70),
+ TextSize = 14,
};
devicefra.AddChidren(Btntemperaturevalue);
--
Gitblit v1.8.0