From 47fd8d410a0a85832758751b1f25b77e02ae3d58 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 25 十一月 2022 18:20:21 +0800
Subject: [PATCH] 2022年11月25日18:19:37
---
HDL-ON_iOS/Resources/Language.ini | 4 +
HDL-ON_Android/Assets/Language.ini | 5 ++
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 4 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 34 +++++++++++++++-
HDL_ON/Common/R.cs | 5 ++
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 40 ++++++++++++++++++-
6 files changed, 82 insertions(+), 10 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 88932f8..18486ef 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -1116,7 +1116,9 @@
7163=Video call
7164=Manipulator
7165=Area intrusion alarm
-7166=camera
+7166=camera
+7167=main switch
+
@@ -2337,6 +2339,7 @@
7164=鏈烘鎵�
7165=鍖哄煙鍏ヤ镜鍛婅
7166=鎽勫儚澶�
+7167=鎬绘帶寮�鍏�
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 787e3c2..23ba050 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -1116,7 +1116,8 @@
7163=Video call
7164=Manipulator
7165=Area intrusion alarm
-7166=camera
+7166=camera
+7167=main switch
@@ -2337,6 +2338,7 @@
7164=鏈烘鎵�
7165=鍖哄煙鍏ヤ镜鍛婅
7166=鎽勫儚澶�
+7167=鎬绘帶寮�鍏�
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index a3e205a..136f9a9 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -3046,6 +3046,11 @@
/// 鎽勫儚澶�
/// </summary>
public const int shexiangtou = 7166;
+ /// <summary>
+ /// 鎬绘帶寮�鍏�
+ /// </summary>
+ public const int zongkogkaiguan = 7167;
+
#region LE鏂板
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index fdb5883..4d994e1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -932,11 +932,24 @@
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
switch (device.spk)
{
-
+
+ //鎻掑骇(鏈塙SB)
+ case SPK.PanelSocket:
+ {
+ string on_off = GetKeyValue("on_off_master", dicList);
+ if (on_off == "on")
+ {
+ stateStr = Language.StringByID(StringId.onLogic);
+ }
+ else
+ {
+ stateStr = stateStr = Language.StringByID(StringId.offLogic);
+ }
+ }
+ break;
case SPK.AirSwitch:
case SPK.LightSwitch:
//鎻掑骇
- case SPK.PanelSocket:
case SPK.ElectricSocket:
//鏈烘鎵�
case SPK.MechanicalArm:
@@ -1450,8 +1463,23 @@
{
switch (device.spk)
{
- //鎻掑骇
+ //鎻掑骇(鏈塙SB)
case SPK.PanelSocket:
+ {
+ 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;
case SPK.ElectricSocket:
//寮�鍏崇伅鍏�
case SPK.AirSwitch:
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 796dd22..c4db742 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -187,7 +187,7 @@
var list2 = this.GetVideoDeviceList();
list.AddRange(list1);
list.AddRange(list2);
- GetTestDevice(ref list, false);
+ GetTestDevice(ref list, true);
return list;
}
/// <summary>
@@ -1163,7 +1163,7 @@
// new Entity.Function { sid = "1234567891", name = "娓╁害浼犳劅鍣�", spk = Entity.SPK.SensorTemperature },
// new Entity.Function { sid = "1234567892", name = "婀垮害浼犳劅鍣�", spk = Entity.SPK.SensorHumidity },
new Entity.Function { sid = "12345678933456", name = "璋冨厜鐏�", spk = Entity.SPK.LightDimming },
- new Entity.Function { sid = "1234567895444", name = "cct", spk = Entity.SPK.LightCCT },
+ new Entity.Function { sid = "1234567895444", name = "闈㈡澘", spk = Entity.SPK.PanelSocket },
//new Entity.Function { sid = "1234567896", name = "姣背娉紶鎰熷櫒", spk = Entity.SPK.SenesorMegahealth },
// new Entity.Function { sid = "1234567897", name = "姣背娉紶鎰熷櫒1", spk = Entity.SPK.SenesorMegahealth2 },
// new Entity.Function { sid = "1234567899", name = "闂ㄧ浼犳劅鍣�", spk = Entity.SPK.SensorDoorWindow },
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 0cb5dd3..d9b1b60 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -55,12 +55,35 @@
#region 缂栬緫璁惧鐘舵��
switch (device.spk)
{
-
+ //鎻掑骇(鏈塙SB)
+ case SPK.PanelSocket:
+ {
+ #region 鐣岄潰
+ ///鎬绘帶寮�鍏�
+ LogicView.FunTypeView view1 = new LogicView.FunTypeView();
+ view1.btnText.TextID = StringId.zongkogkaiguan;
+ view1.btnState.Name = "鎬绘帶寮�鍏�";
+ fLayout.AddChidren(view1.FLayoutView());
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, view1.frameLayout.Bottom);
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///鎬绘帶寮�鍏崇偣鍑讳簨浠�
+ view1.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, view1.btnState, 2);
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditDeviceState(device, index, view1.btnState, null, null, null);
+ }
+ #endregion
+ }
+ break;
//寮�鍏崇伅鍏�
case SPK.AirSwitch:
case SPK.LightSwitch:
- //鎻掑骇
- case SPK.PanelSocket:
case SPK.ElectricSocket:
//鏈烘鎵�
case SPK.MechanicalArm:
@@ -820,6 +843,17 @@
selectedState = device.spk + "_" + strValue;
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
string keyVlaue = "on_off";
+ switch (device.spk)
+ {
+ case SPK.PanelSocket:
+ {
+ if (button.Name == "鎬绘帶寮�鍏�")
+ {
+ keyVlaue = "on_off_master";
+ }
+ }
+ break;
+ }
//鏁版嵁灏佽
AddDictionary(keyVlaue, strValue);
});
--
Gitblit v1.8.0