From e238b9cc3caef879fd907ceab8997d08ae891ea3 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 十一月 2021 09:22:08 +0800
Subject: [PATCH] BUG修复
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs | 99 +++++++++++--------------------------------------
1 files changed, 23 insertions(+), 76 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
index e6f08bd..3f665d1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
@@ -66,21 +66,10 @@
fanSpeedList = device.GetAttribute(FunctionAttributeKey.FanSpeed).value;
btnFan.MouseUpEventHandler += (sender, e) =>
{
- ShowFanSelectView();
- //return;
- //if ( !btnSwitch.IsSelected){return;}
- //var curFanSpeedIndex = fanSpeedList.IndexOf(device.GetAttrState(FunctionAttributeKey.FanSpeed));
- //var sendFanSpeedIndex = curFanSpeedIndex == fanSpeedList.Count - 1 ? 0 : 1+curFanSpeedIndex;
-
- //device.SetAttrState(FunctionAttributeKey.FanSpeed, fanSpeedList[sendFanSpeedIndex]);
- //new System.Threading.Thread(() =>
- //{
- // Dictionary<string, string> d = new Dictionary<string, string>();
- // d.Add(FunctionAttributeKey.FanSpeed, fanSpeedList[sendFanSpeedIndex]);
- // Control.Ins.SendWriteCommand(device, d);
- //})
- //{ IsBackground = true }.Start();
- //RefreshFanSpeed();
+ if (btnSwitch.IsSelected)
+ {
+ ShowFanSelectView();
+ }
};
//椋庨�熸枃鏈�
this.btnFanView = new NormalViewControl(this.FrameWhiteCentet1.Width / 3, Application.GetRealHeight(18), false);
@@ -153,18 +142,10 @@
var menuContr = new DialogTitleMenuControl(valueCount, Language.StringByID(StringId.FanSpeed));
//menuContr.X = Application.GetRealWidth(209);
menuContr.Gravity = Gravity.CenterHorizontal;
- menuContr.Y = Application.GetRealHeight(231);
menuContr.Width = Application.GetRealWidth(160);
- if (valueCount > 2)
- {
- menuContr.Height = Application.GetRealHeight(199);
- }
- else
- {
- menuContr.Height = Application.GetRealHeight(154);
- }
dialogBody.AddChidren(menuContr);
+ int count = 0;
foreach(var fanAttrValue in fanAttr.value)
{
bool isSelecte = false;
@@ -199,7 +180,22 @@
isSelecte = true;
}
}
+ else if(fanAttrValue == "auto")
+ {
+ text = Language.StringByID(StringId.Auto);
+ iconPath = "FunctionIcon/AirFresh/Fan2.png";
+ if (this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "auto" )
+ {
+ iconPath = "FunctionIcon/AirFresh/Fan2Select.png";
+ isSelecte = true;
+ }
+ }
+ else
+ {
+ continue;
+ }
+ count++;
menuContr.AddRowMenu(text, iconPath, isSelecte, () =>
{
frameBack.Close();
@@ -207,42 +203,8 @@
this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, fanAttrValue);
});
}
+ menuContr.Y = Application.GetRealHeight(231 - (46 * (count-3)));
- //if (fanAttr.value.Contains("low"))
- //{
- // //1妗�
- // var iconPath = this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "low" ? "FunctionIcon/AirFresh/Fan1Select.png" : "FunctionIcon/AirFresh/Fan1.png";
- // menuContr.AddRowMenu(Language.StringByID(StringId.FanOneGear), iconPath, this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "low", () =>
- // {
- // frameBack.Close();
- // //鍙戦�佹。浣嶅懡浠�
- // this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, "low");
- // });
- //}
-
- //if (fanAttr.value.Contains("medium"))
- //{
- // //2妗�
- // var iconPath = this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "medium" ? "FunctionIcon/AirFresh/Fan2Select.png" : "FunctionIcon/AirFresh/Fan2.png";
- // menuContr.AddRowMenu(Language.StringByID(StringId.FanTwoGear), iconPath, this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "medium", () =>
- // {
- // frameBack.Close();
- // //鍙戦�佹。浣嶅懡浠�
- // this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, "medium");
- // });
- //}
-
- //if (fanAttr.value.Contains("high"))
- //{
- // //3妗�
- // var iconPath = this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "high" ? "FunctionIcon/AirFresh/Fan3Select.png" : "FunctionIcon/AirFresh/Fan3.png";
- // menuContr.AddRowMenu(Language.StringByID(StringId.FanThreeGear), iconPath, this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "high", () =>
- // {
- // frameBack.Close();
- // //鍙戦�佹。浣嶅懡浠�
- // this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, "high");
- // });
- //}
}
#endregion
@@ -323,29 +285,14 @@
HdlThreadLogic.Current.RunThread(() =>
{
//鑾峰彇鍙戦�佸懡浠ょ殑鏍锋澘(bus鍗忚鏄渶瑕佷竴娆℃�ф妸鍏ㄩ儴鍛戒护涓�璧峰彂閫佺殑)
- var dic = this.GetSendComandSample();
- dic[comadKey] = comadValue;
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ dic.Add(comadKey, comadValue);
Control.Ins.SendWriteCommand(this.device, dic);
HdlThreadLogic.Current.RunMain(() =>
{
btnIcon.CanClick = true;
});
});
- }
-
- /// <summary>
- /// 鑾峰彇鍙戦�佸懡浠ょ殑鏍锋澘(bus鍗忚鏄渶瑕佷竴娆℃�ф妸鍏ㄩ儴鍛戒护涓�璧峰彂閫佺殑)
- /// </summary>
- /// <returns></returns>
- private Dictionary<string, string> GetSendComandSample()
- {
- var dic = new Dictionary<string, string>();
- //寮�鍏�
- dic[FunctionAttributeKey.OnOff] = this.device.GetAttrState(FunctionAttributeKey.OnOff);
- //椋庨��
- dic[FunctionAttributeKey.FanSpeed] = this.device.GetAttrState(FunctionAttributeKey.FanSpeed);
-
- return dic;
}
#endregion
--
Gitblit v1.8.0