From f25c6122eb7e26be5e7f036cf29b9019c4953be2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 21 十二月 2020 19:44:02 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
old mode 100755
new mode 100644
index de010b1..7779f67
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
@@ -33,11 +33,10 @@
if (uAc.refreshTime.AddMilliseconds(1000) < DateTime.Now)
{
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;
bodyView.arcBar.ThumbImagePath = uAc.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
bodyView.arcBar.IsClickable = uAc.trait_on_off.curValue.ToString() == "on";
+
});
}
catch (Exception ex)
@@ -86,7 +85,7 @@
temp--;
arcBar.Progress = temp;
btnTemp.Text = temp.ToString();
- aC.trait_temp.curValue = temp;
+ aC.trait_temp.curValue = temp.ToString();
//Control.Send(CommandType_A.write, aC);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
@@ -102,7 +101,7 @@
temp++;
arcBar.Progress = temp;
btnTemp.Text = temp.ToString();
- aC.trait_temp.curValue = temp;
+ aC.trait_temp.curValue = temp.ToString();
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.SetTemp, aC.trait_temp.curValue.ToString());
Control.Ins.SendWriteCommand(aC, d);
@@ -111,16 +110,15 @@
};
arcBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- aC.trait_temp.curValue = arcBar.Progress;
+ aC.trait_temp.curValue = arcBar.Progress.ToString();
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(FunctionAttributeKey.SetTemp, aC.trait_temp.curValue.ToString());
Control.Ins.SendWriteCommand(aC, d);
};
arcBar.OnProgressChangedEvent = (sender, e) =>
{
- aC.trait_temp.curValue = e;
+ aC.trait_temp.curValue = e.ToString();
btnTemp.Text = aC.trait_temp.curValue.ToString();
};
}
@@ -142,15 +140,18 @@
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
aC.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
- bodyView.arcBar.ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
- bodyView.arcBar.ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
- bodyView.arcBar.IsClickable = aC.trait_on_off.curValue.ToString() == "on";
-
- //bodyView.arcBar.ProgressBarColor = aC.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
- //bodyView.arcBar.ThumbImagePath = aC.on_off == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
- //bodyView.arcBar.IsClickable = aC.on_off == "on";
-
- //Control.Send(CommandType_A.write, aC);
+ if (aC.trait_on_off.curValue.ToString() == "on")
+ {
+ arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
+ btnSwitch.IsSelected = true;
+ arcBar.IsOffline = false;
+ }
+ else
+ {
+ 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(FunctionAttributeKey.OnOff, aC.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(aC, d);
--
Gitblit v1.8.0