From ecbf9d722cf59efe93cf60ee47e8782eca18eca6 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 19 十二月 2020 13:22:55 +0800
Subject: [PATCH] 20201219-1
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
old mode 100644
new mode 100755
index 7f4daca..de010b1
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
@@ -26,13 +26,13 @@
updataTime = DateTime.Now;
bodyView.arcBar.ProgressBarColor = bodyView.aC.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
bodyView.btnTemp.Text = uAc.trait_temp.curValue.ToString();
- bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + uAc.indoorTemp + "掳C";
+ bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(uAc.trait_IndoorTemp.curValue)) + "掳C";
bodyView.btnMode.UnSelectedImagePath = uAc.curModeImage;
bodyView.btnWindSpeed.UnSelectedImagePath = uAc.curFanImage;
bodyView.btnSwitch.IsSelected = uAc.trait_on_off.curValue.ToString() == "on";
if (uAc.refreshTime.AddMilliseconds(1000) < DateTime.Now)
{
- bodyView.arcBar.Progress = Convert.ToInt32(uAc.trait_temp.curValue);
+ bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uAc.trait_temp.curValue));
}
bodyView.arcBar.ProgressBarColor = uAc.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
@@ -66,8 +66,8 @@
{
btnCollection.MouseUpEventHandler += (sender, e) =>
{
- btnCollection.IsSelected = aC.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- aC.SaveFunctionData();
+ btnCollection.IsSelected = aC.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ aC.SaveFunctionData(true);
};
}
@@ -89,7 +89,7 @@
aC.trait_temp.curValue = temp;
//Control.Send(CommandType_A.write, aC);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("temp", temp.ToString());
+ d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
Control.Ins.SendWriteCommand(aC, d);
};
btnPlus.MouseUpEventHandler = (sender, e) =>
@@ -104,7 +104,7 @@
btnTemp.Text = temp.ToString();
aC.trait_temp.curValue = temp;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("temp", aC.trait_temp.curValue.ToString());
+ d.Add(FunctionAttributeKey.SetTemp, aC.trait_temp.curValue.ToString());
Control.Ins.SendWriteCommand(aC, d);
//aC.GetSendJObject
@@ -115,7 +115,7 @@
btnTemp.Text = aC.trait_temp.curValue.ToString();
//Control.Send(CommandType_A.write, aC);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("temp", aC.trait_temp.curValue.ToString());
+ d.Add(FunctionAttributeKey.SetTemp, aC.trait_temp.curValue.ToString());
Control.Ins.SendWriteCommand(aC, d);
};
arcBar.OnProgressChangedEvent = (sender, e) =>
@@ -152,7 +152,7 @@
//Control.Send(CommandType_A.write, aC);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", aC.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, aC.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(aC, d);
};
}
@@ -173,7 +173,7 @@
btnMode.UnSelectedImagePath = aC.curModeImage;
//Control.Send(CommandType_A.write, aC);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("mode", aC.curModeIndex.ToString());
+ d.Add(FunctionAttributeKey.Mode, curMode);
Control.Ins.SendWriteCommand(aC, d);
dialog.Close();
};
@@ -197,7 +197,7 @@
btnWindSpeed.UnSelectedImagePath = aC.curFanImage;
//Control.Send(CommandType_A.write, aC);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("fan", aC.curFanIndex.ToString());
+ d.Add(FunctionAttributeKey.FanSpeed, curFan);
Control.Ins.SendWriteCommand(aC, d);
dialog.Close();
};
--
Gitblit v1.8.0