From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01

---
 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index 5f8cf52..d1834f0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -18,14 +18,14 @@
                     {
                         return;
                     }
-                    bodyView.arcBar.ProgressBarColor = bodyView.fh.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
+                    bodyView.arcBar.ProgressBarColor = bodyView.fh.trait_on_off.value.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
                     bodyView.btnTemp.Text = uFh.curTemp.ToString();
                     bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + uFh.indoorTemp + "掳C";
                     bodyView.btnMode.UnSelectedImagePath = uFh.curModeImage;
-                    bodyView.btnSwitch.IsSelected = uFh.on_off == "on";
+                    bodyView.btnSwitch.IsSelected = uFh.trait_on_off.value.ToString() == "on";
                     if (uFh.refreshTime.AddMilliseconds(1000) < DateTime.Now)
                     {
-                        bodyView.arcBar.Progress = uFh.curTemp;
+                        bodyView.arcBar.Progress =  (int)uFh.curTemp;
                     }
                 });
             }
@@ -56,7 +56,7 @@
             btnCollection.MouseUpEventHandler += (sender, e) =>
             {
                 btnCollection.IsSelected = fh.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
-                DB_ResidenceData.residenceData.SaveResidenceData();
+                fh.SaveFunctionData();
             };
         }
 
@@ -72,7 +72,7 @@
                     return;
                 }
                 fh.curTemp--;
-                arcBar.Progress = fh.curTemp;
+                arcBar.Progress = (int)fh.curTemp;
                 btnTemp.Text = fh.curTemp.ToString();
                 //Control.Send(CommandType_A.write, fh);
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -86,7 +86,7 @@
                     return;
                 }
                 fh.curTemp++;
-                arcBar.Progress = fh.curTemp;
+                arcBar.Progress = (int)fh.curTemp;
                 btnTemp.Text = fh.curTemp.ToString();
                 //Control.Send(CommandType_A.write, fh);
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -121,10 +121,10 @@
             btnSwitch.MouseUpEventHandler = (sender, e) =>
             {
                 btnSwitch.IsSelected = !btnSwitch.IsSelected;
-                fh.on_off = btnSwitch.IsSelected ? "on" : "off";
+                fh.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
                 //Control.Send(CommandType_A.write, fh);
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
-                d.Add("on_off", fh.on_off.ToString());
+                d.Add("on_off", fh.trait_on_off.value.ToString());
                 Control.SendWriteCommand(fh, d);
             };
         }
@@ -142,7 +142,7 @@
             EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
             {
                 btn1.IsSelected = btn2.IsSelected = true;
-                fh.curMode = curMode;
+                fh.trait_mode.value = curMode;
                 //Control.Send(CommandType_A.write, fh);
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                 d.Add("mode", fh.curModeIndex.ToString());

--
Gitblit v1.8.0