From 263401d40b2d9d2c1b36a24f33d45c5cb7192518 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:51:54 +0800
Subject: [PATCH] 20201223-6
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs | 133 +++++++++++++++++++++++++------------------
1 files changed, 77 insertions(+), 56 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
index 903183a..296a02e 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,19 @@
return;
}
updataTime = DateTime.Now;
- 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";
+ bodyView.arcBar.IsOffline = bodyView.aC.trait_on_off.curValue.ToString() != "on";
+ bodyView.btnTemp.Text = uAc.trait_temp.curValue.ToString();
+ 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";
- if (uAc.refreshTime.AddMilliseconds(1000) < DateTime.Now)
+ bodyView.btnSwitch.IsSelected = uAc.trait_on_off.curValue.ToString() == "on";
+ if (uAc.refreshTime.AddMilliseconds(500) < DateTime.Now)
{
- bodyView.arcBar.Progress = uAc.curTemp;
+ bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uAc.trait_temp.curValue));
}
- 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";
- Console.WriteLine($"dfghjkoijbvfghjk : {uAc.on_off}");
+ 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 +65,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.CollectFunction();
};
}
@@ -77,47 +77,57 @@
{
btnMinus.MouseUpEventHandler = (sender, e) =>
{
- if (aC.curTemp < 17)
+ if (aC.trait_on_off.curValue.ToString() == "off")
{
return;
}
- aC.curTemp--;
- arcBar.Progress = aC.curTemp;
- btnTemp.Text = aC.curTemp.ToString();
+ var temp = Convert.ToInt32(aC.trait_temp.curValue);
+ if (temp < 17)
+ {
+ return;
+ }
+ temp--;
+ arcBar.Progress = temp;
+ btnTemp.Text = temp.ToString();
+ 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("temp", aC.curTemp.ToString());
- Control.SendWriteCommand(aC, d);
+ d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
+ Control.Ins.SendWriteCommand(aC, d);
};
btnPlus.MouseUpEventHandler = (sender, e) =>
{
- if (aC.curTemp > 37)
+ if (aC.trait_on_off.curValue.ToString() == "off")
{
return;
}
- aC.curTemp++;
- arcBar.Progress = aC.curTemp;
- btnTemp.Text = aC.curTemp.ToString();
- //Control.Send(CommandType_A.write, aC);
+ var temp = Convert.ToInt32(aC.trait_temp.curValue);
+ if (temp > 31)
+ {
+ return;
+ }
+ temp++;
+ arcBar.Progress = temp;
+ btnTemp.Text = temp.ToString();
+ aC.trait_temp.curValue = temp.ToString();
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("temp", aC.curTemp.ToString());
- Control.SendWriteCommand(aC, d);
+ d.Add(FunctionAttributeKey.SetTemp, 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);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("temp", aC.curTemp.ToString());
- Control.SendWriteCommand(aC, d);
- };
+ arcBar.OnStopTrackingTouchEvent = (sender, e) =>
+ {
+ aC.trait_temp.curValue = arcBar.Progress.ToString();
+ btnTemp.Text = aC.trait_temp.curValue.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);
+ };
arcBar.OnProgressChangedEvent = (sender, e) =>
{
- aC.curTemp = e;
- btnTemp.Text = aC.curTemp.ToString();
+ aC.trait_temp.curValue = e.ToString();
+ btnTemp.Text = aC.trait_temp.curValue.ToString();
};
}
/// <summary>
@@ -127,36 +137,47 @@
{
btnMode.MouseUpEventHandler = (sender, e) =>
{
+ if (aC.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
LoadDiv_ChangeModeView();
};
btnWindSpeed.MouseUpEventHandler = (sender, e) =>
{
+ if (aC.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
LoadDiv_ChangeFanView();
};
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
- aC.on_off = btnSwitch.IsSelected ? "on" : "off";
- 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);
+ aC.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
+ 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("on_off", aC.on_off.ToString());
- Control.SendWriteCommand(aC, d);
+ d.Add(FunctionAttributeKey.OnOff, 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) =>
{
@@ -165,12 +186,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);
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(FunctionAttributeKey.Mode, curMode);
+ Control.Ins.SendWriteCommand(aC, d);
dialog.Close();
};
btn1.MouseUpEventHandler = eventHandler1;
@@ -180,7 +201,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) =>
{
@@ -189,12 +210,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);
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(FunctionAttributeKey.FanSpeed, curFan);
+ Control.Ins.SendWriteCommand(aC, d);
dialog.Close();
};
btn1.MouseUpEventHandler = eventHandler1;
--
Gitblit v1.8.0