From 4ce5177289b1d34e467de9d8790836559cc5a09e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 18:06:28 +0800
Subject: [PATCH] 合并了全部的代码

---
 ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
index 3ca4d22..e7062c3 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
@@ -20,6 +20,7 @@
         Button roomTextButton = new Button();
         Button devicetypeButton = new Button();
         VerticalScrolViewLayout middle;
+        HorizontalScrolViewLayout devicetypehorizontalScrol1;
         FrameLayout clickframeLayout = new FrameLayout();
         Button clickbutton = new Button();
         Button clicktextcolcrbutton = new Button();
@@ -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
@@ -121,7 +123,7 @@
             this.AddChidren(roomhorizontalScrol);
 
 
-            var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
+             devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
             {
                 Width = Application.GetRealWidth(1080 - 58-200),
                 Height = Application.GetRealHeight(280),
@@ -191,6 +193,7 @@
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                     X = Application.GetRealWidth(80),
                     TextID = MyInternationalizationString.selecfoolr,
+                    TextSize = 14,
                 };
                 foolrbjicon.AddChidren(btnfoolrtext);
 
@@ -232,6 +235,7 @@
                         TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                         Tag = foolr.Key,
                         X = btnfoolricon.Right + Application.GetRealWidth(12),
+                        TextSize = 14,
                     };
                     foolrRowLayout.AddChidren(btnfoolrname);
                     if (foolrname.Text == foolr.Value)
@@ -347,6 +351,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);
 
                 }
@@ -373,6 +389,18 @@
                             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);
 
@@ -586,6 +614,7 @@
                     TextAlignment = TextAlignment.CenterLeft,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                     SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
+                    TextSize = 14,
                 };
                 deviceRow.AddChidren(devicename);
                 switch (common.CommonDevice.Type)
@@ -699,6 +728,8 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
+
             };
             timetype.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -727,6 +758,7 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(50),
+                TextSize = 14,
 
             };
             timetype.AddChidren(Btncomplete);
@@ -811,6 +843,7 @@
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         openrowlayout.AddChidren(btnopen);
 
@@ -841,6 +874,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         closerowlayout.AddChidren(btnclose);
 
@@ -871,6 +905,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         takebackrowlayout.AddChidren(btntakeback);
 
@@ -1021,6 +1056,7 @@
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         openrowlayout.AddChidren(btnopen);
 
@@ -1077,6 +1113,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         closerowlayout.AddChidren(btnclose);
 
@@ -1108,6 +1145,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         takebackrowlayout.AddChidren(btntakeback);
 
@@ -1315,6 +1353,7 @@
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         openrowlayout.AddChidren(btnopen);
 
@@ -1372,6 +1411,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         closerowlayout.AddChidren(btnclose);
 
@@ -1548,6 +1588,7 @@
                                 TextID = MyInternationalizationString.open,
                                 TextAlignment = TextAlignment.CenterLeft,
                                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                                TextSize = 14,
                             };
                             openrowlayout.AddChidren(btnopen);
 
@@ -1578,6 +1619,7 @@
                                 Width = Application.GetRealWidth(600),
                                 TextAlignment = TextAlignment.CenterLeft,
                                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                                TextSize = 14,
                             };
                             closerowlayout.AddChidren(btnclose);
 
@@ -1608,6 +1650,7 @@
                                 Width = Application.GetRealWidth(600),
                                 TextAlignment = TextAlignment.CenterLeft,
                                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                                TextSize = 14,
                             };
                             takebackrowlayout.AddChidren(btntakeback);
 
@@ -1767,6 +1810,7 @@
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         openrowlayout.AddChidren(btnopen);
 
@@ -1854,6 +1898,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         closerowlayout.AddChidren(btnclose);
 

--
Gitblit v1.8.0