From 67536549b8a07077799f0224af7a39d13c9d3e0d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 21 十二月 2020 21:05:49 +0800
Subject: [PATCH] 2020-12-21 1.IOS去掉bugly。2.修复EixtAccount没断开mqtt问题
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index 75d8f71..eacbce9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -19,15 +19,24 @@
{
return;
}
- bodyView.arcBar.ProgressBarColor = uFh.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
- bodyView.arcBar.ThumbImagePath = uFh.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
bodyView.btnTemp.Text = uFh.trait_temp.curValue.ToString();
- bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + uFh.indoorTemp + "掳C";
+ bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(uFh.trait_IndoorTemp.curValue)) + "掳C";
bodyView.btnMode.UnSelectedImagePath = uFh.curModeImage;
- bodyView.btnSwitch.IsSelected = uFh.trait_on_off.curValue.ToString() == "on";
if (uFh.refreshTime.AddMilliseconds(1000) < DateTime.Now)
{
- bodyView.arcBar.Progress = Convert.ToInt32(uFh.trait_temp.curValue);
+ bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uFh.trait_temp.curValue));
+ }
+ if (uFh.trait_on_off.curValue.ToString() == "on")
+ {
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
+ bodyView.btnSwitch.IsSelected = true;
+ bodyView.arcBar.IsOffline = false;
+ }
+ else
+ {
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
+ bodyView.btnSwitch.IsBold = false;
+ bodyView.arcBar.IsOffline = true;
}
});
}
@@ -47,7 +56,7 @@
{
btnFunctionName.Text = btnFunctionName_Out.Text = fh.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = fh.GetRoomListName();
- fh.SaveFunctionData(true);
+ //fh.SaveFunctionData(true);
};
}
@@ -77,10 +86,10 @@
}
temp--;
arcBar.Progress = temp;
- fh.trait_temp.curValue = temp;
+ fh.trait_temp.curValue = temp.ToString();
btnTemp.Text = temp.ToString();
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(fh, d);
};
btnPlus.MouseUpEventHandler = (sender, e) =>
@@ -93,24 +102,24 @@
temp++;
arcBar.Progress = temp;
btnTemp.Text = temp.ToString();
- fh.trait_temp.curValue = temp;
+ fh.trait_temp.curValue = temp.ToString();
//Control.Send(CommandType_A.write, fh);
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(fh, d);
};
arcBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- fh.trait_temp.curValue = arcBar.Progress;
+ fh.trait_temp.curValue = arcBar.Progress.ToString();
btnTemp.Text = fh.trait_temp.curValue.ToString();
//Control.Send(CommandType_A.write, fh);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("temp", fh.trait_temp.curValue.ToString());
+ d.Add(FunctionAttributeKey.SetTemp, fh.trait_temp.curValue.ToString());
Control.Ins.SendWriteCommand(fh, d);
};
arcBar.OnProgressChangedEvent = (sender, e) =>
{
- fh.trait_temp.curValue = e;
+ fh.trait_temp.curValue = e.ToString();
btnTemp.Text = fh.trait_temp.curValue.ToString();
};
}
@@ -128,10 +137,24 @@
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
fh.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
- //Control.Send(CommandType_A.write, fh);
+ if (fh.trait_on_off.curValue.ToString() == "on")
+ {
+ //arcBar.ProgressBarColor = CSS_Color.MainColor;
+ arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
+ btnSwitch.IsSelected = true;
+ arcBar.IsOffline = false;
+ }
+ else
+ {
+ //arcBar.ProgressBarColor = CSS_Color.PromptingColor2;
+ arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
+ btnSwitch.IsBold = false;
+ arcBar.IsOffline = true;
+ }
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", fh.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, fh.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(fh, d);
+
};
}
@@ -153,7 +176,7 @@
fh.modeTemp.TryGetValue(curMode, out pro);
arcBar.Progress = pro;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("mode", fh.curModeIndex.ToString());
+ d.Add(FunctionAttributeKey.Mode, fh.trait_mode.curValue.ToString());
Control.Ins.SendWriteCommand(fh, d);
dialog.Close();
};
--
Gitblit v1.8.0