From 64dbbfe1d6488635e160189a704afccffc7d34d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 07 十二月 2020 11:33:06 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 91 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index c706c8c..fe144d9 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -81,12 +81,84 @@
LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
curtainSwitchView.btnText.TextID = StringId.switchLogic;
fLayout.AddChidren(curtainSwitchView.FLayoutView());
+
+ ///妯″紡
+ LogicView.FunTypeView acModehView = new LogicView.FunTypeView();
+ acModehView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
+ acModehView.btnText.TextID = StringId.modeLogic;
+ fLayout.AddChidren(acModehView.FLayoutView());
#endregion
#region 鐐瑰嚮浜嬩欢
///寮�鍏崇偣鍑讳簨浠�
curtainSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
{
SwitchViewMethod(device, curtainSwitchView.btnState, 2);
+ };
+ acModehView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+
+ List<string> modeStr = new List<string> {
+ Language.StringByID(StringId.coolLogic),
+ Language.StringByID(StringId.heatingLogic),
+ Language.StringByID(StringId.autoLogic),
+ Language.StringByID(StringId.dehumidifyLogic),
+ };
+ 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];//鏍囪
+
+ if (acModehView.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()));
+ acModehView.btnState.Text = checkBtn.Tag.ToString();
+ selectedState = device.functionType + "_mode";
+ AddDictionaryData(dicSateteList, keyVlaue, dic);
+ RemView(frame);
+ };
};
if (edit)
{
@@ -140,6 +212,24 @@
};
#endregion
+ }
+ private string GetModeValueString(string text)
+ {
+ string modeStr = "";
+ if (text == Language.StringByID(StringId.coolLogic))
+ {
+ modeStr = "cool";
+ }
+ else if (text == Language.StringByID(StringId.heatingLogic)) {
+ modeStr = "heat";
+ }
+ else if (text == Language.StringByID(StringId.autoLogic)) {
+ modeStr = "auto";
+ }
+ else if (text == Language.StringByID(StringId.dehumidifyLogic)) {
+ modeStr = "dry";
+ }
+ return modeStr;
}
/// <summary>
///寮�鍏�=鐣岄潰
@@ -575,5 +665,6 @@
}
+
}
}
--
Gitblit v1.8.0