From 263401d40b2d9d2c1b36a24f33d45c5cb7192518 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:51:54 +0800
Subject: [PATCH] 20201223-6
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 710 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 464 insertions(+), 246 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 1880dad..11fe439 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -17,10 +17,6 @@
/// 瀹氫箟涓�涓彉閲忥紝璁板綍閫変腑鐘舵��
/// </summary>
private string selectedState = "unknown";
- /// <summary>
- /// 瀹氫箟涓�涓彉閲忥紝璁板綍閫変腑鐘舵�佽褰曞睘鎬�
- /// </summary>
- private string keyVlaue = "";
public void Show(Entity.Function device, int index, bool edit)
{
#region 鐣岄潰甯冨眬
@@ -39,152 +35,240 @@
Height = Application.GetRealHeight(667 - 64),
};
this.AddChidren(fLayout);
- #endregion
- switch (device.functionType)
- {
- //寮�鍏崇伅鍏� light.Switch
- case FunctionType.Dimmer:
- {
- LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
- lightSwitchView.btnText.TextID = StringId.switchLogic;
- lightSwitchView.btnState.Text = "";
- fLayout.AddChidren(lightSwitchView.FLayoutView());
- lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- FrameLayout frame = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- this.AddChidren(frame);
- SwitchViewMethod(frame, device, lightSwitchView.btnState, 2);
- };
- if (edit)
- {
- GetEditState(device, edit, index, lightSwitchView.btnState, null, null, null);
- }
- }
- break;
- case FunctionType.RGB:
- {
- LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
- lightSwitchView.btnText.TextID = StringId.switchLogic;
- lightSwitchView.btnState.Text = "";
- fLayout.AddChidren(lightSwitchView.FLayoutView());
- lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- FrameLayout frame = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- this.AddChidren(frame);
- SwitchViewMethod(frame, device, lightSwitchView.btnState, 2);
- };
- if (edit)
- {
- GetEditState(device, edit, index, lightSwitchView.btnState, null, null, null);
- }
-
- }
- break;
- case FunctionType.RGBW:
- {
- LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
- lightSwitchView.btnText.TextID = StringId.switchLogic;
- lightSwitchView.btnState.Text = "";
- fLayout.AddChidren(lightSwitchView.FLayoutView());
- lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- FrameLayout frame = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- this.AddChidren(frame);
- SwitchViewMethod(frame, device, lightSwitchView.btnState, 2);
- };
- if (edit)
- {
- GetEditState(device, edit, index, lightSwitchView.btnState, null, null, null);
- }
-
- }
- break;
- case FunctionType.CCT:
- {
- LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
- lightSwitchView.btnText.TextID = StringId.switchLogic;
- lightSwitchView.btnState.Text = "";
- fLayout.AddChidren(lightSwitchView.FLayoutView());
- lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- FrameLayout frame = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- this.AddChidren(frame);
- SwitchViewMethod(frame, device, lightSwitchView.btnState, 2);
- };
- if (edit)
- {
- GetEditState(device, edit, index, lightSwitchView.btnState, null, null, null);
- }
-
- }
- break;
- case FunctionType.Relay:
- {
- LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
- lightSwitchView.btnText.TextID = StringId.switchLogic;
- lightSwitchView.btnState.Text = "";
- fLayout.AddChidren(lightSwitchView.FLayoutView());
- lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- FrameLayout frame = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- this.AddChidren(frame);
- SwitchViewMethod(frame, device, lightSwitchView.btnState, 2);
- };
- if (edit)
- {
- GetEditState(device, edit, index, lightSwitchView.btnState, null, null, null);
- }
-
- }
- break;
- //绐楀笜
- case FunctionType.Curtain:
- {
- LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
- lightSwitchView.btnText.TextID = StringId.switchLogic;
- lightSwitchView.btnState.Text = "";
- fLayout.AddChidren(lightSwitchView.FLayoutView());
- lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- FrameLayout frame = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- this.AddChidren(frame);
- SwitchViewMethod(frame, device, lightSwitchView.btnState, 2);
- };
- if (edit)
- {
- GetEditState(device, edit, index, lightSwitchView.btnState, null, null, null);
- }
-
- }
- break;
- }
-
-
- #region 淇濆瓨
///淇濆瓨View
LogicView.SaveView saveView = new LogicView.SaveView();
saveView.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(24), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
saveView.btnSave.TextID = StringId.completeLogic;
this.AddChidren(saveView.FLayoutView());
+ #endregion
+ #region 缂栬緫璁惧鐘舵��
+ switch (device.functionType)
+ {
+ //寮�鍏崇伅鍏� light.Switch
+ case FunctionType.Dimmer:
+ case FunctionType.RGB:
+ case FunctionType.RGBW:
+ case FunctionType.ColorTemperature:
+ {
+ //2琛ㄧず(寮�锛屽叧)鍔熻兘
+ SwitchBrightnessView(fLayout, device, index, edit, 2);
+ }
+ break;
+ case FunctionType.Relay:
+ {
+ //2琛ㄧず(寮�锛屽叧)鍔熻兘
+ SwitchView(fLayout, device, index, edit, 2);
+ }
+ break;
+ //绐楀笜
+ case FunctionType.Curtain:
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
+ {
+ //3琛ㄧず(寮�锛屽叧锛屾殏鍋�)鍔熻兘
+ SwitchView(fLayout, device, index, edit, 3);
+ }
+ break;
+ case FunctionType.AC:
+ {
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView acSwitchVie = new LogicView.FunTypeView();
+ acSwitchVie.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(acSwitchVie.FLayoutView());
+
+ ///娓╁害
+ LogicView.FunTypeView temperatureView = new LogicView.FunTypeView();
+ temperatureView.frameLayout.Y = acSwitchVie.frameLayout.Bottom;
+ temperatureView.btnText.TextID = StringId.temperatureLogic;
+ fLayout.AddChidren(temperatureView.FLayoutView());
+
+ ///妯″紡
+ LogicView.FunTypeView acModehView = new LogicView.FunTypeView();
+ acModehView.frameLayout.Y = temperatureView.frameLayout.Bottom;
+ acModehView.btnText.TextID = StringId.modeLogic;
+ fLayout.AddChidren(acModehView.FLayoutView());
+
+ ///椋庨��
+ LogicView.FunTypeView acSpeedView = new LogicView.FunTypeView();
+ acSpeedView.frameLayout.Y = acModehView.frameLayout.Bottom;
+ acSpeedView.btnText.TextID = StringId.speedLogic;
+ fLayout.AddChidren(acSpeedView.FLayoutView());
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ acSwitchVie.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, acSwitchVie.btnState, 2);
+ };
+ ///娓╁害鐐瑰嚮浜嬩欢
+ temperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ ///涔嬪墠鐨勭姸鎬佹枃鏈�
+ string tempValue = temperatureView.btnState.Text;
+ LogicView.TemperatureView tempView= new LogicView.TemperatureView();
+ tempView.FLayoutView(this, tempValue,(stateStr)=> {
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ temperatureView.btnState.Text = stateStr;
+ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
+ string keyVlaue = "set_temp";
+ selectedState = device.functionType + "_"+ keyVlaue;
+ string set_temp_value = stateStr.Replace("鈩�", "");
+ //鏁版嵁灏佽
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ LogicMethod.dictionary(dic, "key", keyVlaue);
+ LogicMethod.dictionary(dic, "value", set_temp_value);
+ AddDictionaryData(dicSateteList, keyVlaue, dic);
+ });
+
+
+ };
+ ///妯″紡鐐瑰嚮浜嬩欢
+ acModehView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ ///涔嬪墠鐨勭姸鎬佹枃鏈�
+ string currText = acModehView.btnState.Text;
+ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
+ string keyVlaue = "mode";
+ selectedState = device.functionType + "_"+keyVlaue;
+ PublicInterface modeView = new PublicInterface();
+ var modeListStr= modeView.GetViewList(keyVlaue);
+ modeView.SingleSelectionShow(this, modeListStr, Language.StringByID(StringId.modeLogic), currText
+ , (stateValue) =>
+ {
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ acModehView.btnState.Text = stateValue;
+ //鏁版嵁灏佽
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ LogicMethod.dictionary(dic, "key", keyVlaue);
+ LogicMethod.dictionary(dic, "value", modeView.GetModeValueString(stateValue, keyVlaue));
+ AddDictionaryData(dicSateteList, keyVlaue, dic);
+
+ });
+
+ };
+ ///椋庨�熺偣鍑讳簨浠�
+ acSpeedView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+
+ ///涔嬪墠鐨勭姸鎬佹枃鏈�
+ string currText = acSpeedView.btnState.Text;
+ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
+ string keyVlaue = "fan";
+ selectedState = device.functionType + "_" + keyVlaue;
+ PublicInterface speedView = new PublicInterface();
+ var speedListStr = speedView.GetViewList(keyVlaue);
+ speedView.SingleSelectionShow(this, speedListStr, Language.StringByID(StringId.speedLogic), currText
+ , (stateValue) =>
+ {
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ acSpeedView.btnState.Text = stateValue;
+ //鏁版嵁灏佽
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ LogicMethod.dictionary(dic, "key", keyVlaue);
+ LogicMethod.dictionary(dic, "value", speedView.GetModeValueString(stateValue, keyVlaue));
+ AddDictionaryData(dicSateteList, keyVlaue, dic);
+
+ });
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditState(device, index, acSwitchVie.btnState, temperatureView.btnState, acModehView.btnState, acSpeedView.btnState);
+ }
+
+ #endregion
+ }
+ break;
+ case FunctionType.FloorHeating:
+ {
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView floorHeatingSwitchVie = new LogicView.FunTypeView();
+ floorHeatingSwitchVie.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(floorHeatingSwitchVie.FLayoutView());
+
+ ///娓╁害
+ LogicView.FunTypeView temperatureView = new LogicView.FunTypeView();
+ temperatureView.frameLayout.Y = floorHeatingSwitchVie.frameLayout.Bottom;
+ temperatureView.btnText.TextID = StringId.temperatureLogic;
+ fLayout.AddChidren(temperatureView.FLayoutView());
+
+ ///妯″紡
+ LogicView.FunTypeView floorHeatingModehView = new LogicView.FunTypeView();
+ floorHeatingModehView.frameLayout.Y = temperatureView.frameLayout.Bottom;
+ floorHeatingModehView.btnText.TextID = StringId.modeLogic;
+ fLayout.AddChidren(floorHeatingModehView.FLayoutView());
+
+
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ floorHeatingSwitchVie.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, floorHeatingSwitchVie.btnState, 2);
+ };
+ ///娓╁害鐐瑰嚮浜嬩欢
+ temperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ string tempValue = temperatureView.btnState.Text;
+ LogicView.TemperatureView tempView = new LogicView.TemperatureView();
+ tempView.FLayoutView(this, tempValue, (stateStr) => {
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ temperatureView.btnState.Text = stateStr;
+ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
+ string keyVlaue = "set_temp";
+ selectedState = device.functionType + "_"+ keyVlaue;
+ string set_temp_value = stateStr.Replace("鈩�", "");
+ //鏁版嵁灏佽
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ LogicMethod.dictionary(dic, "key", keyVlaue);
+ LogicMethod.dictionary(dic, "value", set_temp_value);
+ AddDictionaryData(dicSateteList, keyVlaue, dic);
+
+ });
+
+ };
+ ///妯″紡鐐瑰嚮浜嬩欢
+ floorHeatingModehView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+
+
+ ///涔嬪墠鐨勭姸鎬佹枃鏈�
+ string currText= floorHeatingModehView.btnState.Text;
+ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
+ string keyVlaue = "mode";
+ selectedState = device.functionType + "_"+ keyVlaue;
+
+ PublicInterface modeView = new PublicInterface();
+ var modeListStr = modeView.GetViewList("floorheatingmode");
+ modeView.SingleSelectionShow(this, modeListStr, Language.StringByID(StringId.modeLogic), currText
+ , (stateValue) =>
+ {
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ floorHeatingModehView.btnState.Text = stateValue;
+ //鏁版嵁灏佽
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ LogicMethod.dictionary(dic, "key", keyVlaue);
+ LogicMethod.dictionary(dic, "value", modeView.GetModeValueString(stateValue, "floorheatingmode"));
+ AddDictionaryData(dicSateteList, keyVlaue, dic);
+ });
+
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditState(device, index, floorHeatingSwitchVie.btnState, temperatureView.btnState, floorHeatingModehView.btnState, null);
+ }
+
+ #endregion
+ }
+ break;
+
+ }
+ #endregion
+ #region 淇濆瓨鐐瑰嚮浜嬩欢
saveView.btnClick.MouseUpEventHandler += (sen, e) =>
{
@@ -194,7 +278,68 @@
Output outputDevice = new Output();
outputDevice.target_type = "1";
outputDevice.sid = device.sid;
+ switch (device.functionType)
+ {
+ case FunctionType.Dimmer:
+ case FunctionType.RGB:
+ case FunctionType.RGBW:
+ case FunctionType.ColorTemperature:
+ {
+ //璋冨厜鍋氫簡涓�涓壒娈婂鐞嗭紱
+ if (dicSateteList.Count > 1)
+ {
+ foreach (var dictionary in dicSateteList)
+ {
+ 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", "off");
+ dicSateteList.Add(diction);
+ break;
+ }
+ }
+ }
+ }
+ 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;
+
if (edit)
{
//绉婚櫎鏃ф暟鎹�
@@ -224,58 +369,204 @@
addLogic.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
+ #endregion
+ }
+
+ /// <summary>
+ ///寮�鍏�=鐣岄潰
+ /// </summary>
+ /// <param name="fLayout"></param>
+ /// <param name="device"></param>
+ /// <param name="index"></param>
+ /// <param name="edit"></param>
+ /// <param name="intView">閫変腑View鐨勬暟閲�</param>
+ private void SwitchView(FrameLayout fLayout, Entity.Function device, int index, bool edit, int intView)
+ {
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
+ curtainSwitchView.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(curtainSwitchView.FLayoutView());
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ curtainSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, curtainSwitchView.btnState, intView);
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditState(device, index, curtainSwitchView.btnState, null, null, null);
+ }
#endregion
}
/// <summary>
- /// 绉婚櫎鎺т欢
+ ///锛堝紑鍏�+浜害/鐧惧垎姣�)鐣岄潰
/// </summary>
- /// <param name="frame"></param>
- private void RemView(FrameLayout frame)
+ /// <param name="fLayout"></param>
+ /// <param name="device"></param>
+ /// <param name="index"></param>
+ /// <param name="edit"></param>
+ /// <param name="intView">閫変腑View鐨勬暟閲�</param>
+ private void SwitchBrightnessView(FrameLayout fLayout, Entity.Function device, int index, bool edit, int intView)
{
- frame.RemoveFromParent();
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
+ lightSwitchView.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(lightSwitchView.FLayoutView());
+ ///浜害
+ LogicView.FunTypeView brightnessView = new LogicView.FunTypeView();
+ brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
+ if (device.functionType == FunctionType.MotorCurtain || device.functionType == FunctionType.RollingShutter)
+ {
+
+ brightnessView.btnText.TextID = StringId.percentum;
+ }
+ else
+ {
+ brightnessView.btnText.TextID = StringId.brightnesLogic;
+ }
+ fLayout.AddChidren(brightnessView.FLayoutView());
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, lightSwitchView.btnState, intView);
+ };
+ ///浜害鐐瑰嚮浜嬩欢
+ brightnessView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ BrightnessMethod(device, brightnessView.btnState, brightnessView.btnText.Text);
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditState(device, index, lightSwitchView.btnState, brightnessView.btnState, null, null);
+ }
+ #endregion
+
+ }
+ /// <summary>
+ /// 寮�鍏�=鍔熻兘涓嬩竴绾х晫闈�
+ /// </summary>
+ /// <param name="device"></param>
+ /// <param name="button"></param>
+ /// <param name="len">鏄剧ず閫夋嫨View鏁伴噺</param>
+ private void SwitchViewMethod(Entity.Function device, Button button, int len)
+ {
+ #region 鐣岄潰
+ FrameLayout frame = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ this.AddChidren(frame);
+ LogicView.SwitchView switchView = new LogicView.SwitchView();
+ switchView.FLayoutView(frame, len, button.Text, (strValue) =>
+ {
+ int id = 0;
+ switch (strValue) {
+ case "on": {
+ id = StringId.onLogic;
+ }
+ break;
+ case "off": {
+ id = StringId.offLogic;
+ } break;
+ case "stop": {
+ id = StringId.stop;
+ } break;
+ }
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ button.TextID = id;
+ selectedState = device.functionType + "_" + strValue;
+ string keyVlaue = "on_off";
+ //鏁版嵁灏佽
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ LogicMethod.dictionary(dic, "key", "on_off");
+ LogicMethod.dictionary(dic, "value", strValue);
+ AddDictionaryData(dicSateteList, keyVlaue, dic);
+
+ });
+ #endregion
+ }
+ /// <summary>
+ /// 浜害/鐧惧垎姣�=鍔熻兘涓嬩竴绾х晫闈�
+ /// </summary>
+ /// <param name="device"></param>
+ /// <param name="button"></param>
+ private void BrightnessMethod(Entity.Function device, Button button, string titleName)
+ {
+ #region 鐣岄潰
+ FrameLayout frame = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ this.AddChidren(frame);
+ string stateVlaue = button.Text;
+ LogicView.BrightnessView brightness = new LogicView.BrightnessView();
+ brightness.FLayoutView(frame, titleName, stateVlaue, (brightnesValue) =>
+ {
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ button.Text = brightnesValue+"%";
+ string keyVlaue = "";
+ selectedState = device.functionType + brightnesValue.ToString();
+ //鏁版嵁灏佽
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ switch (device.functionType)
+ {
+ //寮�鍏崇伅鍏� light.Switch
+ case FunctionType.Dimmer:
+ case FunctionType.RGB:
+ case FunctionType.RGBW:
+ case FunctionType.ColorTemperature:
+ {
+ LogicMethod.dictionary(dic, "key", "brightness");
+ keyVlaue = "brightness";
+ }
+ break;
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
+ {
+ LogicMethod.dictionary(dic, "key", "percent");
+ keyVlaue = "percent";
+ }
+ break;
+ }
+ LogicMethod.dictionary(dic, "value", brightnesValue.ToString());
+ AddDictionaryData(dicSateteList, keyVlaue, dic);
+ });
+ #endregion
+
}
/// <summary>
/// 鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
/// </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)
{
Output outputs = Logic.currlogic.output[index];
var dicList = outputs.status as List<Dictionary<string, string>>;
-
- switch (device.functionType)
+ //娓呴櫎涔嬪墠鏃ф暟鎹�
+ dicSateteList.Clear();
+ if (dicList.Count != 0)
{
- //寮�鍏崇伅鍏�
- case FunctionType.Relay:
- {
- foreach (var dic in dicList)
- {
- string value = dic["value"];
- if (value == "on")
- {
- button1.Text = Language.StringByID(StringId.onLogic);
- }
- else
- {
- button1.Text = Language.StringByID(StringId.offLogic);
- }
- }
- }
- break;
-
+ //鏈夋暟鎹噸鏂拌祴鍊�
+ dicSateteList = dicList;
}
-
+ InpOrOutLogicMethod.EditState(device, dicList, button1, button2, button3, button4);
}
/// <summary>
- /// 娣诲姞閫変腑鏁版嵁
+ /// 娣诲姞澶勭悊閫変腑鏁版嵁
/// </summary>
/// <param name="dicList">瀛樺偍鏁版嵁鍒楄〃</param>
/// <param name="keyValue">璇嗗埆璁惧</param>
@@ -309,7 +600,6 @@
}
}
-
/// <summary>
/// 娣诲姞鐩爣
/// </summary>
@@ -337,80 +627,8 @@
}
}
- /// <summary>
- /// 寮�鍏冲姛鑳藉睍寮�鐣岄潰
- /// </summary>
- /// <param name="frame"></param>
- /// <param name="device"></param>
- /// <param name="button"></param>
- /// <param name="len"></param>
- public void SwitchViewMethod(FrameLayout frame, Entity.Function device, Button button, int len)
- {
+
- 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");
- keyVlaue = "on_off";
-
- btnOn.MouseUpEventHandler += (sender2, e2) =>
- {
- LogicMethod.dictionary(dic, "value", "on");
- RemView(frame);
- button.TextID = StringId.onLogic;
- selectedState = device.functionType + "_on";
- AddDictionaryData(dicSateteList, keyVlaue, dic);
- };
- btnOff.MouseUpEventHandler += (sender3, e3) =>
- {
- LogicMethod.dictionary(dic, "value", "off");
- RemView(frame);
- button.TextID = StringId.offLogic;
- selectedState = device.functionType + "_off";
- AddDictionaryData(dicSateteList, keyVlaue, dic);
- };
- if (button.Text != "")
- {
- if (button.Text == btnOn.Text)
- {
- btnOn.TextColor = CSS.CSS_Color.textConfirmColor;
- }
- else
- {
- btnOff.TextColor = CSS.CSS_Color.textConfirmColor;
- }
- }
- }
}
}
--
Gitblit v1.8.0