From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板:绑定温湿度传感器目标,和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节

---
 ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs
index 4a26274..100b8cb 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs
@@ -11,7 +11,7 @@
         {
             Width = Application.GetRealWidth(1080),
             Height = Application.GetRealHeight(140 + 320 + 70),
-            Y = Application.GetRealHeight(1920 - 530),
+            Y = Application.GetRealHeight(Method.H - 530),
             BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
             // Radius = (uint)Application.GetRealHeight(60),
         };
@@ -26,30 +26,33 @@
             TextID = MyInternationalizationString.cancel,
             TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
             Height = Application.GetRealHeight(140),
-            Width = Application.GetRealWidth(200),
+            Width = Application.GetRealWidth(150),
             X = Application.GetRealWidth(80),
             TextAlignment = TextAlignment.CenterLeft,
             TextSize = 14,
+
         };
         public Button Btntitle = new Button
         {
             //TextID = MyInternationalizationString.type,
             TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
             Height = Application.GetRealHeight(140),
-            Width = Application.GetRealWidth(420),
+            Width = Application.GetRealWidth(580),
             TextAlignment = TextAlignment.Center,
-            X = Application.GetRealWidth(280 + 50),
+            X = Application.GetRealWidth(230+20),
             TextSize = 16,
+
         };
         public Button Btncomplete = new Button
         {
             TextID = MyInternationalizationString.complete,
             TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
             Height = Application.GetRealHeight(140),
-            Width = Application.GetRealWidth(200),
+            Width = Application.GetRealWidth(150),
             TextAlignment = TextAlignment.CenterRight,
-            X = Application.GetRealWidth(750+50),
+            X = Application.GetRealWidth(850),
             TextSize = 14,
+
         };
         #endregion
        
@@ -57,7 +60,7 @@
         {
             //n澶氬皯琛�
             fraView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
-            fraView.Height = Application.GetRealHeight(140 + 70 + 160 * n);
+            fraView.Height = Application.GetRealHeight(1+140 + 70 + 160 * n);//1浣滅敤灏辨槸瑕嗙洊搴曡壊
             fraView.Y = Application.GetRealHeight(1920 - 140 - 70 - 160 * n);
             fraView.AddChidren(titleRow);
             fraView.AddChidren(Btncancel);

--
Gitblit v1.8.0