From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs | 71 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
index 85f1e69..0a7a4af 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -23,20 +24,20 @@
return;
}
updataTime = DateTime.Now;
- bodyView.arcBar.ProgressBarColor = bodyView.aC.trait_on_off.value.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
- bodyView.btnTemp.Text = uAc.trait_temp.value.ToString();
- bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + uAc.indoorTemp + "掳C";
+ 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().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.value.ToString() == "on";
+ 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.value);
+ bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uAc.trait_temp.curValue));
}
- bodyView.arcBar.ProgressBarColor = uAc.trait_on_off.value.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
- bodyView.arcBar.ThumbImagePath = uAc.trait_on_off.value.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
- bodyView.arcBar.IsClickable = uAc.trait_on_off.value.ToString() == "on";
+ 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)
@@ -65,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);
};
}
@@ -77,7 +78,7 @@
{
btnMinus.MouseUpEventHandler = (sender, e) =>
{
- var temp = Convert.ToInt32(aC.trait_temp.value);
+ var temp = Convert.ToInt32(aC.trait_temp.curValue);
if (temp < 17)
{
return;
@@ -85,15 +86,15 @@
temp--;
arcBar.Progress = temp;
btnTemp.Text = temp.ToString();
- aC.trait_temp.value = temp;
+ 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());
- Control.SendWriteCommand(aC, d);
+ Control.Ins.SendWriteCommand(aC, d);
};
btnPlus.MouseUpEventHandler = (sender, e) =>
{
- var temp = Convert.ToInt32(aC.trait_temp.value);
+ var temp = Convert.ToInt32(aC.trait_temp.curValue);
if (temp > 37)
{
return;
@@ -101,26 +102,26 @@
temp++;
arcBar.Progress = temp;
btnTemp.Text = temp.ToString();
- aC.trait_temp.value = temp;
+ 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.value.ToString());
- Control.SendWriteCommand(aC, d);
+ d.Add("set_temp", aC.trait_temp.curValue.ToString());
+ Control.Ins.SendWriteCommand(aC, d);
//aC.GetSendJObject
};
arcBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- aC.trait_temp.value = arcBar.Progress;
- btnTemp.Text = aC.trait_temp.value.ToString();
+ aC.trait_temp.curValue = arcBar.Progress;
+ 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.value.ToString());
- Control.SendWriteCommand(aC, d);
+ d.Add("set_temp", aC.trait_temp.curValue.ToString());
+ Control.Ins.SendWriteCommand(aC, d);
};
arcBar.OnProgressChangedEvent = (sender, e) =>
{
- aC.trait_temp.value = e;
- btnTemp.Text = aC.trait_temp.value.ToString();
+ aC.trait_temp.curValue = e;
+ btnTemp.Text = aC.trait_temp.curValue.ToString();
};
}
/// <summary>
@@ -140,10 +141,10 @@
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
- aC.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
- bodyView.arcBar.ProgressBarColor = aC.trait_on_off.value.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
- bodyView.arcBar.ThumbImagePath = aC.trait_on_off.value.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
- bodyView.arcBar.IsClickable = aC.trait_on_off.value.ToString() == "on";
+ 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";
@@ -151,8 +152,8 @@
//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.value.ToString());
- Control.SendWriteCommand(aC, d);
+ d.Add("on_off", aC.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(aC, d);
};
}
@@ -168,12 +169,12 @@
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
btn1.IsSelected = btn2.IsSelected = true;
- aC.trait_mode.value = curMode;
+ aC.trait_mode.curValue = curMode;
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());
- Control.SendWriteCommand(aC, d);
+ d.Add("mode", curMode);
+ Control.Ins.SendWriteCommand(aC, d);
dialog.Close();
};
btn1.MouseUpEventHandler = eventHandler1;
@@ -192,12 +193,12 @@
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
btn1.IsSelected = btn2.IsSelected = true;
- aC.trait_fan.value = curFan;
+ aC.trait_fan.curValue = curFan;
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());
- Control.SendWriteCommand(aC, d);
+ d.Add("fan", curFan);
+ Control.Ins.SendWriteCommand(aC, d);
dialog.Close();
};
btn1.MouseUpEventHandler = eventHandler1;
--
Gitblit v1.8.0