From 2ae36ddb40d28c62b64a2fdd4c3033e7d65d5cfb Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 三月 2021 15:20:29 +0800
Subject: [PATCH] 2021-0304-1
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs | 83 ++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
index c652a45..d00e469 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
@@ -13,7 +13,7 @@
{
try
{
- Application.RunOnMainThread(() =>
+ Application.RunOnMainThread((() =>
{
if (bodyView == null)
{
@@ -24,25 +24,17 @@
return;
}
updataTime = DateTime.Now;
- //bodyView.arcBar.IsOffline = bodyView.aC.trait_on_off.curValue.ToString() != "on";
- //bodyView.btnSwitch.IsSelected = uAc.trait_on_off.curValue.ToString() == "on";
- //if (uAc.refreshTime.AddMilliseconds(500) < DateTime.Now)
- //{
- // bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uAc.trait_temp.curValue));
- //}
- //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";
- 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.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uAc.trait_temp.curValue));
+ bodyView.btnTemp.Text = uAc.GetAttrState(FunctionAttributeKey.SetTemp);
+ bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(uAc.GetAttrState((string)FunctionAttributeKey.IndoorTemp))) + "掳C";
+ bodyView.btnMode.UnSelectedImagePath = uAc.GetModeIconPath();
+ bodyView.btnWindSpeed.UnSelectedImagePath = uAc.GetFanIconPath();
+ bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uAc.GetAttrState(FunctionAttributeKey.SetTemp)));
if (uAc.trait_on_off.curValue.ToString() == "on")
{
bodyView.arcBar.IsOffline = false;
bodyView.btnSwitch.IsSelected = true;
bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
- if (uAc.trait_mode.curValue.ToString() == "fan")
+ if (uAc.GetAttrState((string)FunctionAttributeKey.Mode) == "fan")
{
bodyView.arcBar.IsClickable = false;
}
@@ -59,7 +51,7 @@
bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
}
- });
+ }));
}
catch (Exception ex)
{
@@ -99,19 +91,19 @@
{
btnMinus.MouseUpEventHandler = (sender, e) =>
{
- if (aC.trait_on_off.curValue.ToString() == "off" || aC.trait_mode.curValue.ToString() == "fan")
+ if (aC.trait_on_off.curValue.ToString() == "off" || aC.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
return;
}
- var temp = Convert.ToInt32(aC.trait_temp.curValue);
- if (temp <= aC.trait_temp.min)
+ var temp = Convert.ToInt32(aC.GetAttrState(FunctionAttributeKey.SetTemp));
+ if (temp <= aC.GetAttribute(FunctionAttributeKey.Mode).min)
{
return;
}
temp--;
arcBar.Progress = temp;
btnTemp.Text = temp.ToString();
- aC.trait_temp.curValue = temp.ToString();
+ aC.SetAttrState(FunctionAttributeKey.SetTemp,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());
@@ -119,37 +111,37 @@
};
btnPlus.MouseUpEventHandler = (sender, e) =>
{
- if (aC.trait_on_off.curValue.ToString() == "off" || aC.trait_mode.curValue.ToString() == "fan")
+ if (aC.trait_on_off.curValue.ToString() == "off" || aC.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
return;
}
- var temp = Convert.ToInt32(aC.trait_temp.curValue);
- if (temp >= aC.trait_temp.max)
+ var temp = Convert.ToInt32(aC.GetAttrState(FunctionAttributeKey.SetTemp));
+ if (temp >= aC.GetAttribute(FunctionAttributeKey.SetTemp).max)
{
return;
}
temp++;
arcBar.Progress = temp;
btnTemp.Text = temp.ToString();
- aC.trait_temp.curValue = temp.ToString();
+ aC.SetAttrState(FunctionAttributeKey.SetTemp, 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());
+ d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
Control.Ins.SendWriteCommand(aC, d);
//aC.GetSendJObject
};
arcBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- aC.trait_temp.curValue = arcBar.Progress.ToString();
- btnTemp.Text = aC.trait_temp.curValue.ToString();
+ aC.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, aC.trait_temp.curValue.ToString());
+ d.Add(FunctionAttributeKey.SetTemp, arcBar.Progress.ToString());
Control.Ins.SendWriteCommand(aC, d);
};
arcBar.OnProgressChangedEvent = (sender, e) =>
{
- aC.trait_temp.curValue = e.ToString();
- btnTemp.Text = aC.trait_temp.curValue.ToString();
+ aC.SetAttrState(FunctionAttributeKey.SetTemp, e.ToString());
+ btnTemp.Text = e.ToString();
};
}
/// <summary>
@@ -199,7 +191,7 @@
/// <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) =>
{
@@ -207,16 +199,15 @@
};
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
- btn1.IsSelected = btn2.IsSelected = true;
- aC.trait_mode.curValue = curMode;
- btnMode.UnSelectedImagePath = aC.curModeImage;
- //Control.Send(CommandType_A.write, aC);
+ btnModeIcon.IsSelected = btnModeText.IsSelected = true;
+ aC.SetAttrState(FunctionAttributeKey.Mode, curMode);
+ btnMode.UnSelectedImagePath = aC.GetModeIconPath();
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- btnMode.UnSelectedImagePath = btn1.UnSelectedImagePath;
+ btnMode.UnSelectedImagePath = btnModeIcon.UnSelectedImagePath;
d.Add(FunctionAttributeKey.Mode, curMode);
Control.Ins.SendWriteCommand(aC, d);
dialog.Close();
- if (aC.trait_mode.curValue.ToString() == "fan")
+ if (aC.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
bodyView.arcBar.IsClickable = false;
}
@@ -225,14 +216,14 @@
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> closeDialogEvent = (sender, e) =>
{
@@ -240,17 +231,17 @@
};
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
- btn1.IsSelected = btn2.IsSelected = true;
- aC.trait_fan.curValue = curFan;
- btnWindSpeed.UnSelectedImagePath = aC.curFanImage;
+ btnFanIcon.IsSelected = btnFanText.IsSelected = true;
+ aC.SetAttrState(FunctionAttributeKey.FanSpeed, curFan);
+ btnWindSpeed.UnSelectedImagePath = aC.GetFanIconPath();
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.FanSpeed, curFan);
Control.Ins.SendWriteCommand(aC, d);
- btnWindSpeed.UnSelectedImagePath = btn1.UnSelectedImagePath;
+ btnWindSpeed.UnSelectedImagePath = btnFanIcon.UnSelectedImagePath;
dialog.Close();
};
- btn1.MouseUpEventHandler = eventHandler1;
- btn2.MouseUpEventHandler = eventHandler1;
+ btnFanIcon.MouseUpEventHandler = eventHandler1;
+ btnFanText.MouseUpEventHandler = eventHandler1;
dialogView.MouseUpEventHandler = closeDialogEvent;
}
}
--
Gitblit v1.8.0