From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
index eb16fe4..0a7a4af 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
@@ -25,14 +25,14 @@
}
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.btnTemp.Text = uAc.trait_temp.curValue.ToString().Substring(0, 2);
+ 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;
@@ -56,7 +56,6 @@
{
btnFunctionName.Text = btnFunctionName_Out.Text = aC.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = aC.GetRoomListName();
- aC.SaveFunctionData(true);
};
}
@@ -105,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("set_temp", aC.trait_temp.curValue.ToString());
Control.Ins.SendWriteCommand(aC, d);
//aC.GetSendJObject
@@ -116,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("set_temp", aC.trait_temp.curValue.ToString());
Control.Ins.SendWriteCommand(aC, d);
};
arcBar.OnProgressChangedEvent = (sender, e) =>
@@ -174,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("mode", curMode);
Control.Ins.SendWriteCommand(aC, d);
dialog.Close();
};
@@ -198,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("fan", curFan);
Control.Ins.SendWriteCommand(aC, d);
dialog.Close();
};
--
Gitblit v1.8.0