From c5cb6840bd986bbd71a9ebc232bbf44ed0e1fc3d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 五月 2024 17:43:11 +0800
Subject: [PATCH] jpush更新完成
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 145 -----------------------------------------------
1 files changed, 2 insertions(+), 143 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index d1fc564..486fd90 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -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:
@@ -1547,46 +1523,6 @@
}
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;
}
}
break;
@@ -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>
@@ -2951,7 +2810,8 @@
{
//鍥犱负璋冭瘯杞欢涓婁紶涓虹┖杩�;
string intTimeValue = string.IsNullOrEmpty(strTimeValue) ? "0" : strTimeValue;
- var timeValue = int.Parse(intTimeValue);
+ int timeValue = 0;
+ int.TryParse(intTimeValue,out timeValue);
string state = "";
var minutes = timeValue / 60;
var seconds = timeValue % 60;
@@ -3161,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