From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 01 九月 2020 15:22:09 +0800 Subject: [PATCH] 2020-09-01 --- HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs | 79 ++++++++++++++++++++------------------- 1 files changed, 41 insertions(+), 38 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs index 903183a..85f1e69 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs @@ -23,20 +23,20 @@ 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.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.btnMode.UnSelectedImagePath = uAc.curModeImage; bodyView.btnWindSpeed.UnSelectedImagePath = uAc.curFanImage; - bodyView.btnSwitch.IsSelected = uAc.on_off == "on"; + bodyView.btnSwitch.IsSelected = uAc.trait_on_off.value.ToString() == "on"; if (uAc.refreshTime.AddMilliseconds(1000) < DateTime.Now) { - bodyView.arcBar.Progress = uAc.curTemp; + bodyView.arcBar.Progress = Convert.ToInt32(uAc.trait_temp.value); + } - 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.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"; }); } catch (Exception ex) @@ -66,7 +66,7 @@ btnCollection.MouseUpEventHandler += (sender, e) => { btnCollection.IsSelected = aC.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected; - DB_ResidenceData.residenceData.SaveResidenceData(); + aC.SaveFunctionData(); }; } @@ -77,47 +77,50 @@ { btnMinus.MouseUpEventHandler = (sender, e) => { - if (aC.curTemp < 17) + var temp = Convert.ToInt32(aC.trait_temp.value); + if (temp < 17) { return; } - aC.curTemp--; - arcBar.Progress = aC.curTemp; - btnTemp.Text = aC.curTemp.ToString(); + temp--; + arcBar.Progress = temp; + btnTemp.Text = temp.ToString(); + aC.trait_temp.value = temp; //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()); + d.Add("temp", temp.ToString()); Control.SendWriteCommand(aC, d); }; btnPlus.MouseUpEventHandler = (sender, e) => { - if (aC.curTemp > 37) + var temp = Convert.ToInt32(aC.trait_temp.value); + 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.value = temp; System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); - d.Add("temp", aC.curTemp.ToString()); + d.Add("temp", aC.trait_temp.value.ToString()); Control.SendWriteCommand(aC, d); //aC.GetSendJObject }; - arcBar.OnStopTrackingTouchEvent = (sender,e) => - { - aC.curTemp = arcBar.Progress; - btnTemp.Text = aC.curTemp.ToString(); + arcBar.OnStopTrackingTouchEvent = (sender, e) => + { + aC.trait_temp.value = arcBar.Progress; + btnTemp.Text = aC.trait_temp.value.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("temp", aC.trait_temp.value.ToString()); + Control.SendWriteCommand(aC, d); + }; arcBar.OnProgressChangedEvent = (sender, e) => { - aC.curTemp = e; - btnTemp.Text = aC.curTemp.ToString(); + aC.trait_temp.value = e; + btnTemp.Text = aC.trait_temp.value.ToString(); }; } /// <summary> @@ -137,10 +140,10 @@ 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"; + 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"; //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"; @@ -148,7 +151,7 @@ //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.on_off.ToString()); + d.Add("on_off", aC.trait_on_off.value.ToString()); Control.SendWriteCommand(aC, d); }; } @@ -156,7 +159,7 @@ /// <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,7 +168,7 @@ EventHandler<MouseEventArgs> eventHandler1 = (sender, e) => { btn1.IsSelected = btn2.IsSelected = true; - aC.trait_mode.curValues = curMode; + aC.trait_mode.value = 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>(); @@ -180,7 +183,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,7 +192,7 @@ EventHandler<MouseEventArgs> eventHandler1 = (sender, e) => { btn1.IsSelected = btn2.IsSelected = true; - aC.trait_fan.curValues = curFan; + aC.trait_fan.value = 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>(); -- Gitblit v1.8.0