From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs | 186 +++++++++++++++++++++++++++++++++-------------
1 files changed, 134 insertions(+), 52 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
index f8a9d86..805a2ac 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,28 +8,51 @@
{
public partial class ACPage
{
- public static void UpdataStates(AC uAc)
+ static DateTime updataTime = DateTime.MinValue;
+ public static void UpdataStates(Function updateTemp)
{
try
{
-
- Application.RunOnMainThread(() =>
+ Application.RunOnMainThread((() =>
{
if (bodyView == null)
{
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";
- bodyView.btnMode.UnSelectedImagePath = uAc.curModeImage;
- bodyView.btnWindSpeed.UnSelectedImagePath = uAc.curFanImage;
- bodyView.btnSwitch.IsSelected = uAc.on_off == "on";
- if (uAc.refreshTime.AddMilliseconds(1000) < DateTime.Now)
+ if (updataTime.AddMilliseconds(300) > DateTime.Now)
{
- bodyView.arcBar.Progress = uAc.curTemp;
+ return;
}
- });
+ AC temp = new AC();
+ updataTime = DateTime.Now;
+ bodyView.btnTemp.Text = Convert.ToDouble( updateTemp.GetAttrState(FunctionAttributeKey.SetTemp)).ToString();
+ bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState((string)FunctionAttributeKey.RoomTemp))) + "掳C";
+ bodyView.btnMode.UnSelectedImagePath = temp.GetModeIconPath(updateTemp.GetAttrState(FunctionAttributeKey.Mode));
+ bodyView.btnWindSpeed.UnSelectedImagePath = temp.GetFanIconPath(updateTemp.GetAttrState(FunctionAttributeKey.FanSpeed));
+ bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.SetTemp)));
+ if (updateTemp.trait_on_off.curValue.ToString() == "on")
+ {
+ bodyView.arcBar.IsOffline = false;
+ bodyView.btnSwitch.IsSelected = true;
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
+ if (updateTemp.GetAttrState((string)FunctionAttributeKey.Mode) == "fan")
+ {
+ bodyView.arcBar.IsClickable = false;
+ }
+ else
+ {
+ bodyView.arcBar.IsClickable = true;
+ }
+ }
+ else
+ {
+ bodyView.arcBar.IsOffline = true;
+ bodyView.btnSwitch.IsSelected = false;
+ bodyView.arcBar.IsClickable = false;
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
+ }
+
+ }));
}
catch (Exception ex)
{
@@ -44,8 +68,8 @@
//鍥為��鍒锋柊淇℃伅浜嬩欢
actionRefresh = () =>
{
- btnFunctionName.Text = btnFunctionName_Out.Text = aC.name;
- btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = aC.GetRoomListName();
+ btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
+ btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
};
}
@@ -56,8 +80,8 @@
{
btnCollection.MouseUpEventHandler += (sender, e) =>
{
- btnCollection.IsSelected = aC.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ function.CollectFunction();
};
}
@@ -68,36 +92,57 @@
{
btnMinus.MouseUpEventHandler = (sender, e) =>
{
- if (aC.curTemp < 17)
+ if (function.trait_on_off.curValue.ToString() == "off" || function.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
return;
}
- aC.curTemp--;
- arcBar.Progress = aC.curTemp;
- btnTemp.Text = aC.curTemp.ToString();
- Control.Send(CommandType_A.write, aC);
+ var temp = (int)Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp));
+ if (temp <= function.GetAttribute(FunctionAttributeKey.Mode).min)
+ {
+ return;
+ }
+ temp--;
+ arcBar.Progress = temp;
+ btnTemp.Text = temp.ToString();
+ function.SetAttrState(FunctionAttributeKey.SetTemp,temp.ToString());
+ //Control.Send(CommandType_A.write, function);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
btnPlus.MouseUpEventHandler = (sender, e) =>
{
- if (aC.curTemp > 37)
+ if (function.trait_on_off.curValue.ToString() == "off" || function.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
return;
}
- aC.curTemp++;
- arcBar.Progress = aC.curTemp;
- btnTemp.Text = aC.curTemp.ToString();
- Control.Send(CommandType_A.write, aC);
+ var temp = (int)Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp));
+ if (temp >= function.GetAttribute(FunctionAttributeKey.SetTemp).max)
+ {
+ return;
+ }
+ temp++;
+ arcBar.Progress = temp;
+ btnTemp.Text = temp.ToString();
+ function.SetAttrState(FunctionAttributeKey.SetTemp, temp.ToString());
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ //function.GetSendJObject
+
};
- arcBar.OnStopTrackingTouchEvent = (sender,e) =>
- {
- aC.curTemp = arcBar.Progress;
- btnTemp.Text = aC.curTemp.ToString();
- Control.Send(CommandType_A.write, aC);
- };
+ arcBar.OnStopTrackingTouchEvent = (sender, e) =>
+ {
+ function.SetAttrState(FunctionAttributeKey.SetTemp, arcBar.Progress.ToString());
+ btnTemp.Text = arcBar.Progress.ToString();
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.SetTemp, arcBar.Progress.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ };
arcBar.OnProgressChangedEvent = (sender, e) =>
{
- aC.curTemp = e;
- btnTemp.Text = aC.curTemp.ToString();
+ function.SetAttrState(FunctionAttributeKey.SetTemp, e.ToString());
+ btnTemp.Text = e.ToString();
};
}
/// <summary>
@@ -107,26 +152,47 @@
{
btnMode.MouseUpEventHandler = (sender, e) =>
{
+ if (function.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
LoadDiv_ChangeModeView();
};
btnWindSpeed.MouseUpEventHandler = (sender, e) =>
{
+ if (function.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
LoadDiv_ChangeFanView();
};
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
- aC.on_off = btnSwitch.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, aC);
+ function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
+ if (function.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, function.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
}
-
/// <summary>
/// 鍔犺浇妯″紡鏀瑰彉浜嬩欢
/// </summary>
- void LoadEvent_ChangeMode(Dialog dialog, FrameLayout dialogView, Button btn1, Button btn2,string curMode)
+ void LoadEvent_ChangeMode(Dialog dialog, FrameLayout dialogView, Button btnModeIcon, Button btnModeText, string curMode)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
@@ -134,34 +200,50 @@
};
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
- btn1.IsSelected = btn2.IsSelected = true;
- aC.curMode = curMode;
- Control.Send(CommandType_A.write, aC);
+ btnModeIcon.IsSelected = btnModeText.IsSelected = true;
+ function.SetAttrState(FunctionAttributeKey.Mode, curMode);
+ btnMode.UnSelectedImagePath = acTemp.GetModeIconPath(function.GetAttrState(FunctionAttributeKey.Mode));
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ btnMode.UnSelectedImagePath = btnModeIcon.UnSelectedImagePath;
+ d.Add(FunctionAttributeKey.Mode, curMode);
+ Control.Ins.SendWriteCommand(function, d);
dialog.Close();
+ if (function.GetAttrState(FunctionAttributeKey.Mode) == "fan")
+ {
+ bodyView.arcBar.IsClickable = false;
+ }
+ else
+ {
+ bodyView.arcBar.IsClickable = true;
+ }
};
- btn1.MouseUpEventHandler = eventHandler1;
- btn2.MouseUpEventHandler = eventHandler1;
+ btnModeIcon.MouseUpEventHandler = eventHandler1;
+ btnModeText.MouseUpEventHandler = eventHandler1;
dialogView.MouseUpEventHandler = eventHandler;
}
/// <summary>
- /// 鍔犺浇妯″紡鏀瑰彉浜嬩欢
+ /// 鍔犺浇椋庨�熸敼鍙樹簨浠�
/// </summary>
- void LoadEvent_ChangeFan(Dialog dialog, FrameLayout dialogView, Button btn1, Button btn2,string curFan)
+ void LoadEvent_ChangeFan(Dialog dialog, FrameLayout dialogView, Button btnFanIcon, Button btnFanText, string curFan)
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ EventHandler<MouseEventArgs> closeDialogEvent = (sender, e) =>
{
dialog.Close();
};
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
- btn1.IsSelected = btn2.IsSelected = true;
- aC.curFan = curFan;
- Control.Send(CommandType_A.write, aC);
+ btnFanIcon.IsSelected = btnFanText.IsSelected = true;
+ function.SetAttrState(FunctionAttributeKey.FanSpeed, curFan);
+ btnWindSpeed.UnSelectedImagePath = acTemp.GetFanIconPath(function.GetAttrState(FunctionAttributeKey.FanSpeed));
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.FanSpeed, curFan);
+ Control.Ins.SendWriteCommand(function, d);
+ btnWindSpeed.UnSelectedImagePath = btnFanIcon.UnSelectedImagePath;
dialog.Close();
};
- btn1.MouseUpEventHandler = eventHandler1;
- btn2.MouseUpEventHandler = eventHandler1;
- dialogView.MouseUpEventHandler = eventHandler;
+ btnFanIcon.MouseUpEventHandler = eventHandler1;
+ btnFanText.MouseUpEventHandler = eventHandler1;
+ dialogView.MouseUpEventHandler = closeDialogEvent;
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0