From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 81 ++++++++++++++--------------------------
1 files changed, 28 insertions(+), 53 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 909a6ba..ce1e8f8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -46,12 +46,12 @@
case FunctionType.Dimmer:
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
case FunctionType.Relay:
//绐楀笜
case FunctionType.Curtain:
- case FunctionType.RollerCurtain:
- case FunctionType.TrietexCurtain:
+ case FunctionType.RollingShutter:
+ case FunctionType.MotorCurtain:
//绌鸿皟
case FunctionType.AC:
//鍦扮儹
@@ -72,16 +72,16 @@
};
if (edit)
{
- GetEditState(device, edit, index, lightSwitchView.btnState, null, null, null);
+ GetEditState(device, index, lightSwitchView.btnState, null, null, null);
}
}
break;
-
-
-
-
-
+
+
+
+
+
}
#region 淇濆瓨
///淇濆瓨View
@@ -144,28 +144,34 @@
/// 鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
/// </summary>
/// <param name="device">缂栬緫璁惧</param>
- /// <param name="edit">缂栬緫鐘舵��</param>
/// <param name="index">缂栬緫鏁版嵁鐨勭储寮�</param>
/// <param name="button1">鏄剧ずBtn</param>
/// <param name="button2">鏄剧ずBtn</param>
/// <param name="button3">鏄剧ずBtn</param>
/// <param name="button4">鏄剧ずBtn</param>
- private void GetEditState(Entity.Function device, bool edit, int index, Button button1, Button button2, Button button3, Button button4)
+ private void GetEditState(Entity.Function device , int index, Button button1, Button button2, Button button3, Button button4)
{
Input inputs = Logic.currlogic.input[index];
var dicList = inputs.condition as List<Dictionary<string, string>>;
+ //娓呴櫎涔嬪墠鏃ф暟鎹�
+ dicSateteList.Clear();
+ if (dicList.Count != 0)
+ {
+ //鏈夋暟鎹噸鏂拌祴鍊�
+ dicSateteList = dicList;
+ }
switch (device.functionType)
{
//寮�鍏崇伅鍏� light.Switch
case FunctionType.Dimmer:
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
case FunctionType.Relay:
//绐楀笜
case FunctionType.Curtain:
- case FunctionType.RollerCurtain:
- case FunctionType.TrietexCurtain:
+ case FunctionType.RollingShutter:
+ case FunctionType.MotorCurtain:
//绌鸿皟
case FunctionType.AC:
//鍦扮儹
@@ -262,67 +268,36 @@
LogicView.SwitchView switchView = new LogicView.SwitchView();
switchView.FLayoutView(frame, len);
-
- Button btnOn = new Button
- {
- TextAlignment = TextAlignment.Center,
- TextSize = LogicView.TextSize.text16,
- TextColor = CSS.CSS_Color.textCancelColor,
- TextID = StringId.onLogic,
- Height = Application.GetRealHeight(44),
- Width = Application.GetRealWidth(343),
-
- };
- switchView.frameLayout.AddChidren(btnOn);
- Button btnLine = new Button
- {
- Height = 1,
- BackgroundColor = CSS.CSS_Color.viewLine,
- Y = btnOn.Bottom,
- };
- switchView.frameLayout.AddChidren(btnLine);
- Button btnOff = new Button
- {
- Y = btnLine.Bottom,
- TextAlignment = TextAlignment.Center,
- TextSize = LogicView.TextSize.text16,
- TextColor = CSS.CSS_Color.textCancelColor,
- TextID = StringId.offLogic,
- Height = Application.GetRealHeight(44),
- Width = Application.GetRealWidth(343),
- };
- switchView.frameLayout.AddChidren(btnOff);
-
Dictionary<string, string> dic = new Dictionary<string, string>();
LogicMethod.dictionary(dic, "key", "on_off");
LogicMethod.dictionary(dic, "comparator", "=");
LogicMethod.dictionary(dic, "data_type", "string");
keyVlaue = "on_off";
- btnOn.MouseUpEventHandler += (sender2, e2) =>
+ switchView.btnOn.MouseUpEventHandler += (sender2, e2) =>
{
LogicMethod.dictionary(dic, "value", "on");
- RemView(frame);
button.TextID = StringId.onLogic;
selectedState = device.functionType + "_on";
AddDictionaryData(dicSateteList, keyVlaue, dic);
+ RemView(frame);
};
- btnOff.MouseUpEventHandler += (sender3, e3) =>
+ switchView.btnOff.MouseUpEventHandler += (sender3, e3) =>
{
LogicMethod.dictionary(dic, "value", "off");
- RemView(frame);
button.TextID = StringId.offLogic;
selectedState = device.functionType + "_off";
AddDictionaryData(dicSateteList, keyVlaue, dic);
+ RemView(frame);
};
if (button.Text != "")
{
- if (button.Text == btnOn.Text)
+ if (button.Text == switchView.btnOn.Text)
{
- btnOn.TextColor = CSS.CSS_Color.textConfirmColor;
+ switchView.btnOn.TextColor = CSS.CSS_Color.textConfirmColor;
}
- else
+ else if (button.Text == switchView.btnOff.Text)
{
- btnOff.TextColor = CSS.CSS_Color.textConfirmColor;
+ switchView.btnOff.TextColor = CSS.CSS_Color.textConfirmColor;
}
}
}
--
Gitblit v1.8.0