From 5cff5c00c2870ebcb35293560b77355b819e0d5e Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 16:33:51 +0800
Subject: [PATCH] 2020-12-22 1.登录页面关闭监听事件修复。
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 167 ++++++++++++++++++-------------------------------------
1 files changed, 56 insertions(+), 111 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index eb2cd76..efd0aab 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -63,16 +63,11 @@
break;
//绐楀笜
case FunctionType.Curtain:
- {
- //3琛ㄧず(寮�锛屽叧锛屾殏鍋�)鍔熻兘
- SwitchView(fLayout, device, index, edit, 3);
- }
- break;
case FunctionType.MotorCurtain:
case FunctionType.RollingShutter:
{
//3琛ㄧず(寮�锛屽叧锛屾殏鍋�)鍔熻兘
- SwitchBrightnessView(fLayout, device, index, edit, 3);
+ SwitchView(fLayout, device, index, edit, 3);
}
break;
case FunctionType.AC:
@@ -418,6 +413,11 @@
///妯″紡鐐瑰嚮浜嬩欢
floorHeatingModehView.btnClick.MouseUpEventHandler += (sender, e) =>
{
+ FrameLayout frame = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ this.AddChidren(frame);
List<string> modeStr = new List<string> {
Language.StringByID(StringId.dayMode),
Language.StringByID(StringId.nightMode),
@@ -425,65 +425,21 @@
Language.StringByID(StringId.ordinaryMode),
Language.StringByID(StringId.timeMode),
};
- FrameLayout frame = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- this.AddChidren(frame);
- LogicView.DateView modeView = new LogicView.DateView();
- modeView.btnTitle.TextID = StringId.modeLogic;
- modeView.FLayoutView(frame, modeStr.Count);
- modeView.btnCancel.MouseUpEventHandler += (sender2, e2) =>
- {
- frame.RemoveFromParent();
- };
- ///瀹氫箟涓�涓狟tn璁板綍閫変腑鐘舵��
- Button checkBtn = new Button
- {
- Tag = "unknown",
- };
- for (int i = 0; i < modeStr.Count; i++)
- {
- LogicView.CheckView modeTypeView = new LogicView.CheckView();
- modeTypeView.frameLayout.Y = Application.GetRealHeight(56 + 50 * i);
- modeView.frameLayout.AddChidren(modeTypeView.FLayoutView());
- modeTypeView.btnText.Text = modeStr[i];
- modeTypeView.btnClick.Tag = modeStr[i];//鏍囪
+ ///涔嬪墠鐨勭姸鎬佹枃鏈�
+ string currText= floorHeatingModehView.btnState.Text;
+ PublicInterface modeView = new PublicInterface();
+ modeView.SingleSelectionShow(frame, modeStr, Language.StringByID(StringId.modeLogic), currText
+ , (stateValue) =>
+ {
+ string keyVlaue = "mode";
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ LogicMethod.dictionary(dic, "key", "mode");
+ LogicMethod.dictionary(dic, "value", GetModeValueString(stateValue, "FloorHeating"));
+ AddDictionaryData(dicSateteList, keyVlaue, dic);
+ floorHeatingModehView.btnState.Text = stateValue;
+ selectedState = device.functionType + "_mode";
+ });
- if (floorHeatingModehView.btnState.Text == modeStr[i])
- {
- //鏄剧ず涔嬪墠鐨勯�変腑鐘舵��
- checkBtn.IsSelected = false;
- modeTypeView.btnCheckIcon.IsSelected = true;
- checkBtn = modeTypeView.btnCheckIcon;
- checkBtn.Tag = modeTypeView.btnClick.Tag.ToString();
- }
- //鏄熸湡鐨勭偣鍑讳簨浠�
- modeTypeView.btnClick.MouseUpEventHandler += (sender1, e1) =>
- {
- checkBtn.IsSelected = false;
- modeTypeView.btnCheckIcon.IsSelected = true;
- checkBtn = modeTypeView.btnCheckIcon;
- checkBtn.Tag = modeTypeView.btnClick.Tag.ToString();
- };
-
- }
- modeView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
- {
- if (checkBtn.Tag.ToString() == "unknown")
- {
- return;
- }
-
- Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", "mode");
- string keyVlaue = "mode";
- LogicMethod.dictionary(dic, "value", GetModeValueString(checkBtn.Tag.ToString(), "FloorHeating"));
- floorHeatingModehView.btnState.Text = checkBtn.Tag.ToString();
- selectedState = device.functionType + "_mode";
- AddDictionaryData(dicSateteList, keyVlaue, dic);
- RemView(frame);
- };
};
if (edit)
{
@@ -519,16 +475,17 @@
{
foreach (var dictionary in dicSateteList)
{
- if (dictionary["key"] == "on_off")
+ string keyValue = dictionary["key"];
+ if (keyValue == "on_off")
{
if (dictionary["value"] == "off")
{
//绉婚櫎鍒楄〃鎵�鏈夋暟鎹�
dicSateteList.Clear();
- //閲嶆柊娣诲姞寮�鍏夊睘鎬ф暟鎹�
+ //閲嶆柊娣诲姞-鍏�-灞炴�ф暟鎹�
Dictionary<string, string> diction = new Dictionary<string, string>();
diction.Add("key", "on_off");
- diction.Add("value", "on_off");
+ diction.Add("value", "off");
dicSateteList.Add(diction);
break;
}
@@ -537,6 +494,34 @@
}
break;
}
+ case FunctionType.AC:
+ case FunctionType.FloorHeating:
+ {
+
+ //(绌鸿皟/鍦扮儹)鍋氫簡涓�涓壒娈婂鐞嗭紱
+ bool _bool = false;
+ for (int i = 0; i < dicSateteList.Count; i++)
+ {
+ var dic = dicSateteList[i];
+ if (dic.ContainsValue("on_off"))
+ {
+ //鍒ゆ柇鏄惁瀛樺湪
+ _bool = true;
+ break;
+ }
+ }
+ if (!_bool)
+ {
+ //娌℃湁寮�鍏冲氨榛樿娣诲姞-寮�-灞炴��
+ Dictionary<string, string> diction = new Dictionary<string, string>();
+ diction.Add("key", "on_off");
+ diction.Add("value", "on");
+ dicSateteList.Add(diction);
+ }
+
+
+ }
+ break;
}
outputDevice.status = dicSateteList;
@@ -783,7 +768,7 @@
LogicView.BrightnessView brightness = new LogicView.BrightnessView();
brightness.FLayoutView(frame, titleName, button.Text, (brightnesValue) =>
{
- button.Text = brightnesValue;
+ button.Text = brightnesValue+"%";
Dictionary<string, string> dic = new Dictionary<string, string>();
string keyVlaue = "";
switch (device.functionType)
@@ -885,7 +870,7 @@
case "brightness":
{
- button2.Text = value;
+ button2.Text = value+"%";
}
break;
}
@@ -894,6 +879,8 @@
}
break;
case FunctionType.Curtain:
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
{
foreach (var dic in dicList)
{
@@ -916,48 +903,6 @@
}
break;
}
- }
- }
- break;
- case FunctionType.MotorCurtain:
- case FunctionType.RollingShutter:
- {
-
- foreach (var dic in dicList)
- {
- string value = dic["value"];
- switch (dic["key"])
- {
- case "on_off":
- {
- switch (value)
- {
- case "on":
- {
- button1.Text = Language.StringByID(StringId.onLogic);
- }
- break;
- case "off":
- {
- button1.Text = Language.StringByID(StringId.offLogic);
- }
- break;
- case "stop":
- {
- button1.Text = Language.StringByID(StringId.stop);
- }
- break;
- }
- }
- break;
- case "percent":
- {
-
- button2.Text = value;
- }
- break;
- }
-
}
}
break;
--
Gitblit v1.8.0