From 505effa88b17ce8c3c7ac5403b76d9e5d0cfc2a5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 28 十月 2024 11:58:31 +0800
Subject: [PATCH] 谷歌版本问题修复
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 158 ++--------------------------------------------------
1 files changed, 8 insertions(+), 150 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index b2ebfb6..d56eb68 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -161,10 +161,10 @@
case SPK.CurtainTrietex:
//绌鸿皟
case SPK.AcStandard:
- case SPK.HvacAC:
+ case SPK.HvacAC:case SPK.HvacAcPanel:
case SPK.AcIr:
//鍦扮儹
- case SPK.HvacFloorHeat:
+ case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
case SPK.FloorHeatStandard:
//鏂伴
case SPK.AirFreshStandard:
@@ -416,24 +416,6 @@
}
}
break;
- case SPK.VideoDoorLock:
- {
- string userName = string.Empty;
- string tag = string.Empty;
- for (int b = 0; b < dicList.Count; b++)
- {
- var dic = dicList[b];
- //var userId = dic["value"].ToString();
- //var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
- //s += FaceItem.userName;
- //s += ",";
- //tag += FaceItem.userId;
- //tag += "_";
- userName = dic["value"].ToString();
- }
- inputView.btnState.Text = RemoveLastStr(userName);
- }
- break;
case SPK.doorgate:
{
@@ -483,12 +465,6 @@
inputView.btnState.Text = Language.StringByID(StringId.quyuruqingaojing);
}
- }
- break;
- case SPK.Ev_Ipcam:
- if (inputCondition.identifier == Constant.intelligentDetection_event)
- {
- inputView.btnState.Text = Language.StringByID(StringId.shi);
}
break;
case SPK.Peephole:
@@ -1283,7 +1259,7 @@
}
break;
case SPK.AcStandard:
- case SPK.HvacAC:
+ case SPK.HvacAC:case SPK.HvacAcPanel:
case SPK.AcIr:
{
string on_off = GetKeyValue("on_off", dicList);
@@ -1384,7 +1360,7 @@
}
break;
case SPK.FloorHeatStandard:
- case SPK.HvacFloorHeat:
+ case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
{
string on_off = GetKeyValue("on_off", dicList);
string set_temp = GetKeyValue("set_temp", dicList);
@@ -1545,46 +1521,6 @@
stateStr += "," + volume;
}
- }
- break;
- case SPK.ElectricalTvHisense:
- {
- string on = GetKeyValue("wol", dicList);
- string off = GetKeyValue("on_off", dicList);
- string volumet = GetKeyValue("set_volume", dicList);
- string signal = GetKeyValue("signal", dicList);
-
- if (!string.IsNullOrEmpty(off))
- {
- stateStr = Language.StringByID(StringId.offLogic);
- //濡傛灉鍏充簡锛屽叾瀹冨睘鎬т笉鏄剧ず
- break;
- }
-
- if (!string.IsNullOrEmpty(on))
- {
- stateStr = Language.StringByID(StringId.onLogic);
- }
- if (!string.IsNullOrEmpty(stateStr))
- {
- stateStr += ",";
- }
- if (!string.IsNullOrEmpty(volumet))
- {
- stateStr += Language.StringByID(StringId.yinliang) + volumet;
- }
-
- if (!string.IsNullOrEmpty(stateStr))
- {
- stateStr += ",";
- }
- if (!string.IsNullOrEmpty(signal))
- {
- var p = new PublicInterface();
- string key = p.GetKey(p.GetHisenseSignalSourceDic(), signal);
- stateStr += key;
- }
- stateStr = stateStr.TrimEnd(',');
}
break;
}
@@ -2010,7 +1946,7 @@
}
break;
- case SPK.AcStandard:
+ case SPK.AcStandard:case SPK.HvacAcPanel:
case SPK.HvacAC:
case SPK.AcIr:
{
@@ -2123,7 +2059,7 @@
}
break;
- case SPK.FloorHeatStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
case SPK.HvacFloorHeat:
{
@@ -2497,26 +2433,6 @@
}
}
break;
- case SPK.VideoDoorLock:
- {
- string userName = string.Empty;
- string tag = string.Empty;
- for (int b = 0; b < dicList.Count; b++)
- {
- var dic = dicList[b];
- //var userId = dic["value"].ToString();
- //var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
- //s += FaceItem.userName;
- //s += ",";
- //tag += FaceItem.userId;
- //tag += "_";
- userName = dic["value"].ToString();
-
- }
- button1.Text = RemoveLastStr(userName);
- button1.Tag = tag;
- }
- break;
case SPK.MusicStandard:
case SPK.AvMusic:
{
@@ -2579,63 +2495,6 @@
catch { }
}
break;
- case SPK.ElectricalTvHisense:
- {
- foreach (var dic in dicList)
- {
- string value = dic["value"];
- switch (dic["key"])
- {
- case "on_off":
- {
- if (value == "off")
- {
- button1.Text = Language.StringByID(StringId.offLogic);
-
- }
-
- }
- break;
- case "wol":
- {
- if (value == "on")
- {
- button1.Text = Language.StringByID(StringId.onLogic);
-
- }
-
- }
- break;
-
- case "set_volume":
- {
- if (button2 == null)
- {
- //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
- break;
- }
- button2.Text = value;
- }
- break;
- case "signal":
- {
- if (button3 == null)
- {
- //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
- break;
- }
- var p = new PublicInterface();
- string key = p.GetKey(p.GetHisenseSignalSourceDic(), value);
- button3.Text = key;
- }
- break;
- }
-
- }
- }
- break;
-
-
}
}
/// <summary>
@@ -2829,10 +2688,10 @@
}
}
break;
- case SPK.AcStandard:
+ case SPK.AcStandard:case SPK.HvacAcPanel:
case SPK.HvacAC:
case SPK.AcIr:
- case SPK.FloorHeatStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
case SPK.HvacFloorHeat:
{
string value = this.GetValue(dicList);
@@ -3162,7 +3021,6 @@
{
if (Send.Current.VideoDoorLockUserListInfo.Count == 0)
{
- Send.Current.GetVideoDoorLockUserListInfo(device);
}
var face = Send.Current.VideoDoorLockUserListInfo.Find((o) => { return o.userId == userId; });
if (face == null)
--
Gitblit v1.8.0