From b562a582ac3a288193e6e4f57c5eff8a344305a4 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 13:52:17 +0800
Subject: [PATCH] Update AndroidManifest.xml

---
 HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs |   47 +++++++++++++++++++++++++++++------------------
 1 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
index 446bda8..deace59 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
@@ -27,7 +27,7 @@
 
         public static void UpdateStatus(Function temp)
         {
-            if(bodyView == null)
+            if(bodyView == null || bodyView.function.sid != temp.sid)
             {
                 return;
             }
@@ -43,7 +43,7 @@
                 if (setTempValue != 0)
                     bodyView.btnSetTempValues.Text = setTempValue.ToString();
 
-                bodyView.btnSetTempValues.Width = bodyView.btnSetTempValues.GetTextWidth() + Application.GetRealWidth(10);
+                //bodyView.btnSetTempValues.Width = bodyView.btnSetTempValues.GetTextWidth() + Application.GetRealWidth(10);
 
                 //int progress = 0;
                 //int.TryParse(temp.GetAttrState(AcstSub_AttrEnum.set_temp.ToString()), out progress);
@@ -119,68 +119,76 @@
             var tempValuesView = new FrameLayout()
             {
                 X = Application.GetRealWidth(21),
-                Y = Application.GetRealWidth(17),
+                Y = Application.GetRealWidth(22),
                 Width = Application.GetRealWidth(130),
                 Height = Application.GetRealWidth(132),
             };
             tempHumiView.AddChidren(tempValuesView);
             btnTempValues = new Button()
             {
-                Y = Application.GetRealWidth(45),
-                Height = Application.GetRealWidth(35),
+                Y = Application.GetRealWidth(38),
+                Height = Application.GetRealWidth(66),
                 IsBold = true,
                 TextSize = 30,
                 TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                 TextAlignment = TextAlignment.TopRight,
                 Text = function.GetAttrState(AcstSub_AttrEnum.room_temp.ToString(),"---"),
             };
-            //btnTempValues.Text = function.GetAttrState(AcstSub_AttrEnum.room_temp.ToString());
+#if __IOS__
+            btnTempValues.Width = btnTempValues.GetTextWidth() + Application.GetRealWidth(10);
+#else
             btnTempValues.Width = btnTempValues.GetTextWidth();
+#endif
             btnTempValues.Gravity = Gravity.CenterHorizontal;
             tempValuesView.AddChidren(btnTempValues);
             var btnTempValuesUint = new Button()
             {
                 X = btnTempValues.Right,
-                Y = Application.GetRealWidth(48),
+                //Y = Application.GetRealWidth(48),
+                Y = Application.GetRealWidth(45),
+                Height = Application.GetRealWidth(66),
                 TextAlignment = TextAlignment.TopLeft,
                 Width = Application.GetRealWidth(30),
-                Height = Application.GetRealWidth(30),
+                //Height = Application.GetRealWidth(30),
                 TextSize = 10,
                 TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                 Text = "掳C"
             };
             tempValuesView.AddChidren(btnTempValuesUint);
 
-
-
             var humiValuesView = new FrameLayout()
             {
                 X = Application.GetRealWidth(130+21),
-                Y = Application.GetRealWidth(17),
+                Y = Application.GetRealWidth(22),
                 Width = Application.GetRealWidth(130),
                 Height = Application.GetRealWidth(132),
             };
             tempHumiView.AddChidren(humiValuesView);
             btnHumiValues = new Button()
             {
-                Y = Application.GetRealWidth(45),
-                Height = Application.GetRealWidth(35),
+                Y = Application.GetRealWidth(39),
+                Height = Application.GetRealWidth(66),
                 IsBold = true,
                 TextSize = 30,
                 TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                 Text = function.GetAttrState(AcstSub_AttrEnum.room_humidity.ToString(),"---"),
                 TextAlignment = TextAlignment.TopRight,
             };
+
+#if __IOS__
+            btnHumiValues.Width = btnTempValues.GetTextWidth() + Application.GetRealWidth(10);
+#else
             btnHumiValues.Width = btnTempValues.GetTextWidth();
+#endif
             btnHumiValues.Gravity = Gravity.CenterHorizontal;
             humiValuesView.AddChidren(btnHumiValues);
             var btnHumiValuesUint = new Button()
             {
                 X = btnTempValues.Right,
-                Y = Application.GetRealWidth(48),
+                Y = Application.GetRealWidth(45),
                 TextAlignment = TextAlignment.TopLeft,
                 Width = Application.GetRealWidth(30),
-                Height = Application.GetRealWidth(30),
+                Height = Application.GetRealWidth(66),
                 TextSize = 10,
                 TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                 Text = "%"
@@ -221,15 +229,18 @@
                 Text = setTempStr
             };
             contentView.AddChidren(btnSetTempValues);
-            //bodyView.btnSetTempValues.Width = bodyView.btnSetTempValues.GetTextWidth() + Application.GetRealWidth(10);
-
+#if __IOS__
+            bodyView.btnSetTempValues.Width = bodyView.btnSetTempValues.GetTextWidth() + Application.GetRealWidth(10);
+#else
+            bodyView.btnSetTempValues.Width = bodyView.btnSetTempValues.GetTextWidth() + Application.GetRealWidth(5);
+#endif
 
 
             var btnSetTempUnit = new Button()
             {
                 X = btnSetTempValues.Right + Application.GetRealWidth(3),
                 Y = Application.GetRealHeight(267),
-                Width = Application.GetRealWidth(30),
+                Width = Application.GetRealWidth(50),
                 Height = Application.GetRealHeight(50),
                 TextSize = 23,
                 TextColor = CSS.CSS_Color.FirstLevelTitleColor,

--
Gitblit v1.8.0