From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）

---
 ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs |   36 ++++++++----------------------------
 1 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index 62e6cc9..092dc54 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -23,7 +23,7 @@
         FrameLayout clickframeLayout = new FrameLayout();
         Button clickbutton = new Button();
         Button clicktextcolcrbutton = new Button();
-        HorizontalScrolViewLayout devicetypehorizontalScrol1;
+       
         public void Show()
         {
 
@@ -122,15 +122,6 @@
             };
             this.AddChidren(roomhorizontalScrol);
 
-            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()
             {
@@ -139,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,
@@ -352,13 +344,11 @@
                     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;
                     }
 
@@ -396,13 +386,11 @@
                     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;
                     }
 
@@ -606,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);
@@ -735,15 +723,6 @@
                 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
             {
 
@@ -751,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

--
Gitblit v1.8.0