From deac30b7071f3512d841b6eabf73bec9baa81077 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 16 十二月 2020 13:08:13 +0800
Subject: [PATCH] 2020-12-16 1.主页和信息中心增加收到通知事件处理。2.主页时间格式显示优化处理
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs | 113 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 73 insertions(+), 40 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
index 56e3053..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;
@@ -7,6 +8,7 @@
{
public partial class ACPage
{
+ static DateTime updataTime = DateTime.MinValue;
public static void UpdataStates(AC uAc)
{
try
@@ -17,20 +19,25 @@
{
return;
}
- bodyView.arcBar.ProgressBarColor = bodyView.aC.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
- bodyView.btnTemp.Text = uAc.curTemp.ToString();
- bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + uAc.indoorTemp + "掳C";
+ if (updataTime.AddMilliseconds(300) > DateTime.Now)
+ {
+ return;
+ }
+ 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().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.on_off == "on";
+ bodyView.btnSwitch.IsSelected = uAc.trait_on_off.curValue.ToString() == "on";
if (uAc.refreshTime.AddMilliseconds(1000) < DateTime.Now)
{
- bodyView.arcBar.Progress = uAc.curTemp;
- }
- bodyView.arcBar.ProgressBarColor = uAc.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
- bodyView.arcBar.ThumbImagePath = uAc.on_off == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
- bodyView.arcBar.IsClickable = uAc.on_off == "on";
+ 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)
@@ -59,8 +66,8 @@
{
btnCollection.MouseUpEventHandler += (sender, e) =>
{
- btnCollection.IsSelected = aC.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = aC.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ aC.SaveFunctionData(true);
};
}
@@ -71,36 +78,50 @@
{
btnMinus.MouseUpEventHandler = (sender, e) =>
{
- if (aC.curTemp < 17)
+ var temp = Convert.ToInt32(aC.trait_temp.curValue);
+ if (temp < 17)
{
return;
}
- aC.curTemp--;
- arcBar.Progress = aC.curTemp;
- btnTemp.Text = aC.curTemp.ToString();
- Control.Send(CommandType_A.write, aC);
+ temp--;
+ arcBar.Progress = temp;
+ btnTemp.Text = temp.ToString();
+ 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.Ins.SendWriteCommand(aC, d);
};
btnPlus.MouseUpEventHandler = (sender, e) =>
{
- if (aC.curTemp > 37)
+ var temp = Convert.ToInt32(aC.trait_temp.curValue);
+ if (temp > 37)
{
return;
}
- aC.curTemp++;
- arcBar.Progress = aC.curTemp;
- btnTemp.Text = aC.curTemp.ToString();
- Control.Send(CommandType_A.write, aC);
+ temp++;
+ arcBar.Progress = temp;
+ 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("set_temp", aC.trait_temp.curValue.ToString());
+ Control.Ins.SendWriteCommand(aC, d);
+ //aC.GetSendJObject
+
};
- arcBar.OnStopTrackingTouchEvent = (sender,e) =>
- {
- aC.curTemp = arcBar.Progress;
- btnTemp.Text = aC.curTemp.ToString();
- Control.Send(CommandType_A.write, aC);
- };
+ arcBar.OnStopTrackingTouchEvent = (sender, e) =>
+ {
+ 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("set_temp", aC.trait_temp.curValue.ToString());
+ Control.Ins.SendWriteCommand(aC, d);
+ };
arcBar.OnProgressChangedEvent = (sender, e) =>
{
- aC.curTemp = e;
- btnTemp.Text = aC.curTemp.ToString();
+ aC.trait_temp.curValue = e;
+ btnTemp.Text = aC.trait_temp.curValue.ToString();
};
}
/// <summary>
@@ -120,20 +141,26 @@
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
- aC.on_off = btnSwitch.IsSelected ? "on" : "off";
+ 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";
+ //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);
+ //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());
+ Control.Ins.SendWriteCommand(aC, d);
};
}
/// <summary>
/// 鍔犺浇妯″紡鏀瑰彉浜嬩欢
/// </summary>
- void LoadEvent_ChangeMode(Dialog dialog, FrameLayout dialogView, Button btn1, Button btn2,string curMode)
+ void LoadEvent_ChangeMode(Dialog dialog, FrameLayout dialogView, Button btn1, Button btn2, string curMode)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
@@ -142,9 +169,12 @@
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
btn1.IsSelected = btn2.IsSelected = true;
- aC.trait_mode.curValues = curMode;
+ aC.trait_mode.curValue = curMode;
btnMode.UnSelectedImagePath = aC.curModeImage;
- Control.Send(CommandType_A.write, aC);
+ //Control.Send(CommandType_A.write, aC);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("mode", curMode);
+ Control.Ins.SendWriteCommand(aC, d);
dialog.Close();
};
btn1.MouseUpEventHandler = eventHandler1;
@@ -154,7 +184,7 @@
/// <summary>
/// 鍔犺浇椋庨�熸敼鍙樹簨浠�
/// </summary>
- void LoadEvent_ChangeFan(Dialog dialog, FrameLayout dialogView, Button btn1, Button btn2,string curFan)
+ void LoadEvent_ChangeFan(Dialog dialog, FrameLayout dialogView, Button btn1, Button btn2, string curFan)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
@@ -163,9 +193,12 @@
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
btn1.IsSelected = btn2.IsSelected = true;
- aC.trait_fan.curValues = curFan;
+ aC.trait_fan.curValue = curFan;
btnWindSpeed.UnSelectedImagePath = aC.curFanImage;
- Control.Send(CommandType_A.write, aC);
+ //Control.Send(CommandType_A.write, aC);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("fan", curFan);
+ Control.Ins.SendWriteCommand(aC, d);
dialog.Close();
};
btn1.MouseUpEventHandler = eventHandler1;
--
Gitblit v1.8.0