From 64b84c33e8733228c624d07229026470497eb417 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 22 十二月 2020 10:41:16 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs | 1
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 32 ----------
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 128 +++++++-----------------------------------
3 files changed, 25 insertions(+), 136 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 606fa03..2968b81 100755
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -260,6 +260,8 @@
}
break;
case FunctionType.Curtain:
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
{
foreach (var dic in dicList)
{
@@ -282,36 +284,6 @@
}
break;
}
- }
- targetView.btnState.Text = stateStr;
- }
- break;
- case FunctionType.MotorCurtain:
- case FunctionType.RollingShutter:
- {
- string on_off = GetKeyValue("on_off", dicList);
- string percent = GetKeyValue("percent", dicList);
-
- if (on_off == "off")
- {
- stateStr = Language.StringByID(StringId.offLogic);
- }
- else if (on_off == "stop")
- {
- stateStr = Language.StringByID(StringId.stop);
- }
- else if (on_off == "on" && percent != "")
- {
- stateStr = Language.StringByID(StringId.onLogic) + percent + "%";
-
- }
- else if (on_off == "on")
- {
- stateStr = Language.StringByID(StringId.onLogic);
- }
- else if (percent != "")
- {
- stateStr = percent + "%";
}
targetView.btnState.Text = stateStr;
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs
index ef6ceed..a406a77 100755
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs
@@ -137,6 +137,7 @@
frameLayout.AddChidren(seekBarVol);
frameLayout.AddChidren(btn_add);
frameLayout.AddChidren(btn_add_click);
+ btnTitle.Text = titleName;
//绗竴涓彉鍖栬褰曢�変腑鍊�
int brightnesValue = 0;
if (stateValue != "")
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 1911be7..b2dea7f 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)
{
@@ -895,6 +851,8 @@
}
break;
case FunctionType.Curtain:
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
{
foreach (var dic in dicList)
{
@@ -917,48 +875,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