From cb1476f1197b8730038b4ef485f8f036e1d93422 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 16:49:32 +0800
Subject: [PATCH] 合并文本缺漏

---
 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index 7cdf979..9aa7f00 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -111,7 +111,7 @@
             arcBar.IsOffline = device.GetAttrState(FunctionAttributeKey.OnOff) == "off";
             arcBar.MinValue = device.GetAttribute(FunctionAttributeKey.SetTemp).min;
             arcBar.MaxValue = device.GetAttribute(FunctionAttributeKey.SetTemp).max;
-            arcBar.Progress = Convert.ToInt32(device.GetAttrState(FunctionAttributeKey.SetTemp));
+            arcBar.Progress = (int)Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp));
 
             btnTemp = new Button()
             {
@@ -122,7 +122,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = 50,
                 IsBold = true,
-                Text = device.GetAttrState(FunctionAttributeKey.SetTemp),
+                Text = Convert.ToDouble( device.GetAttrState(FunctionAttributeKey.SetTemp)).ToString(),
                 TextAlignment = TextAlignment.Center,
             };
             FrameWhiteCentet1.AddChidren(btnTemp);
@@ -311,16 +311,18 @@
                     device.SetAttrState(FunctionAttributeKey.Mode, m);
                     btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(m);
                     System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
-                    btnMode.UnSelectedImagePath = btnModeIcon.UnSelectedImagePath;
+                    //btnMode.UnSelectedImagePath = btnModeIcon.UnSelectedImagePath;
                     d.Add(FunctionAttributeKey.Mode, m);
                     Control.Ins.SendWriteCommand(device, d);
                     dialog.Close();
                     if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
                     {
                         arcBar.IsClickable = false;
+                        arcBar.IsOffline = true;
                     }
                     else
                     {
+                        arcBar.IsOffline = false;
                         arcBar.IsClickable = true;
                     }
                 };
@@ -437,7 +439,7 @@
                     System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                     d.Add(FunctionAttributeKey.FanSpeed, m);
                     Control.Ins.SendWriteCommand(device, d);
-                    btnWindSpeed.UnSelectedImagePath = btnFanIcon.UnSelectedImagePath;
+                    //btnWindSpeed.UnSelectedImagePath = btnFanIcon.UnSelectedImagePath;
                     dialog.Close();
                 };
                 btnFanIcon.MouseUpEventHandler = eventHandler1;
@@ -470,6 +472,7 @@
                 };
             }
         }
+
         /// <summary>
         /// 鍔犺浇棰濆瀵圭孩澶栨寜閽晫闈�
         /// </summary>
@@ -675,7 +678,7 @@
                 {
                     return;
                 }
-                var temp = Convert.ToInt32(device.GetAttrState(FunctionAttributeKey.SetTemp));
+                var temp = (int)Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp));
                 if (temp <= device.GetAttribute(FunctionAttributeKey.Mode).min)
                 {
                     return;
@@ -694,7 +697,7 @@
                 {
                     return;
                 }
-                var temp = Convert.ToInt32(device.GetAttrState(FunctionAttributeKey.SetTemp));
+                var temp = (int)Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp));
                 if (temp >= device.GetAttribute(FunctionAttributeKey.SetTemp).max)
                 {
                     return;
@@ -720,14 +723,14 @@
                 device.SetAttrState(FunctionAttributeKey.SetTemp, e.ToString());
                 btnTemp.Text = e.ToString();
             };
-            arcBar.MouseDownEventHandler = (sender, e) => {
-                Console.WriteLine("ddd");
-                MainPage.BasePageView.ScrollEnabled =false;
-            };
-            arcBar.MouseUpEventHandler = (sender, e) => {
-                Console.WriteLine("ddd2");
-                MainPage.BasePageView.ScrollEnabled = true;
-            };
+            //arcBar.MouseDownEventHandler = (sender, e) => {
+            //    Console.WriteLine("ddd");
+            //    MainPage.BasePageView.ScrollEnabled =false;
+            //};
+            //arcBar.MouseUpEventHandler = (sender, e) => {
+            //    Console.WriteLine("ddd2");
+            //    MainPage.BasePageView.ScrollEnabled = true;
+            //};
         }
         /// <summary>
         /// 鎺у埗妯″紡浜嬩欢
@@ -784,7 +787,7 @@
         {
             Application.RunOnMainThread(() =>
             {
-                btnTemp.Text = device.GetAttrState(FunctionAttributeKey.SetTemp);
+                btnTemp.Text = Convert.ToDouble( device.GetAttrState(FunctionAttributeKey.SetTemp)).ToString();
                 btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp))) + "掳C";
                 btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode));
                 btnWindSpeed.UnSelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed));

--
Gitblit v1.8.0