From 3911b57a6e510f1e642beaa499d28465f028934a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 12 七月 2024 16:11:19 +0800
Subject: [PATCH] Update HDL-ON_Android.csproj
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 342 ++++++++++++++++++++++-----------------------------------
1 files changed, 132 insertions(+), 210 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index ff12c6b..486fd90 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -218,9 +218,9 @@
case SPK.SensorDryContact2:
{
- string value = this.GetKeyValue("on_off", dicList);
+ string value = this.GetKeyValue("contact_status", dicList);
inputView.btnState.Text = Language.StringByID(StringId.offLogic);
- if (value == "on")
+ if (value == "open")
{
inputView.btnState.Text = Language.StringByID(StringId.onLogic);
}
@@ -416,50 +416,45 @@
}
}
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:
{
- string s = string.Empty;
- if (inputCondition.identifier == "door_call_cloud_event")
- {
- s = Language.StringByID(StringId.shipintonghuahujiao);
- }
- else
- {
- for (int b = 0; b < dicList.Count; b++)
- {
- var dic = dicList[b];
- var key = dic["key"].ToString();
- if (key != "user_id")
- {
- continue;
- }
- var userId = dic["value"].ToString();
- var FaceItem = this.GetFaceItem(userId, device.deviceId);
- s += FaceItem.userName;
- s += ",";
+ string s = string.Empty;
+ try
+ {
+ if (inputCondition.identifier == "door_call_cloud_event")
+ {
+ s = Language.StringByID(StringId.shipintonghuahujiao);
+ }
+ else
+ {
+ for (int b = 0; b < dicList.Count; b++)
+ {
+ var dic = dicList[b];
+ var key = dic["key"].ToString();
+ if (key != "user_id")
+ {
+ continue;
+ }
+ var value = dic["value"].ToString();
+ if (!string.IsNullOrEmpty(value))
+ {
+ var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(value);
+ for (int a = 0; a < list.Count; a++)
+ {
+
+ var FaceItem = this.GetFaceItem(list[a], device.deviceId);
+ s += FaceItem.userName;
+ s += ",";
+
+ }
+ }
+
+ }
}
-
}
+ catch { }
inputView.btnState.Text = s;
}
break;
@@ -470,12 +465,6 @@
inputView.btnState.Text = Language.StringByID(StringId.quyuruqingaojing);
}
- }
- break;
- case SPK.Ev_Ipcam:
- if (inputCondition.identifier == "motiondetect_event")
- {
- inputView.btnState.Text = Language.StringByID(StringId.shi);
}
break;
case SPK.Peephole:
@@ -489,7 +478,7 @@
string value = this.GetKeyValue("people_status", dicList);
if (string.IsNullOrEmpty(value))
{
- inputView.btnState.Text = inputCondition.hold_time + "s";
+ inputView.btnState.Text = LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", "");
break;
}
@@ -502,8 +491,19 @@
}
if (!string.IsNullOrEmpty(inputCondition.hold_time) && int.Parse(inputCondition.hold_time) > 0)
{
-
- inputView.btnState.Text += "鎸佺画" + inputCondition.hold_time + "s";
+ int time = int.Parse(inputCondition.hold_time);
+ inputView.btnState.Text += "鎸佺画" + LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", "");
+ }
+ if (!string.IsNullOrEmpty(inputCondition.detect_type))
+ {
+ if (inputCondition.detect_type == "1")
+ {
+ inputView.btnState.Text += "," + Language.StringByID(StringId.gaibiancaizhixing);
+ }
+ else
+ {
+ inputView.btnState.Text += "," + Language.StringByID(StringId.shoudaojiuzhixing);
+ }
}
@@ -1495,57 +1495,32 @@
case SPK.MusicStandard:
case SPK.AvMusic:
{
+ string on_off = GetKeyValue("on_off", dicList);
string song_name = GetKeyValue("song_name", dicList);
string volume = GetKeyValue("volume", dicList);
- stateStr = song_name + ";" + Language.StringByID(StringId.volumeMusic) + volume;
- if (stateStr.StartsWith(";"))
- {
- stateStr = stateStr.Substring(1, stateStr.Length - 1);
- }
- else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
- {
- stateStr = stateStr.Substring(0, stateStr.Length - 3);
- }
- }
- 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))
+ if (!string.IsNullOrEmpty(on_off))
{
- stateStr = Language.StringByID(StringId.offLogic);
- //濡傛灉鍏充簡锛屽叾瀹冨睘鎬т笉鏄剧ず
- break;
+ if (on_off == "on")
+ {
+ stateStr = Language.StringByID(StringId.onLogic);
+ }
+ else
+ {
+ stateStr = Language.StringByID(StringId.offLogic);
+ }
}
- if (!string.IsNullOrEmpty(on))
+ if (!string.IsNullOrEmpty(song_name))
{
- stateStr = Language.StringByID(StringId.onLogic);
- }
- if (!string.IsNullOrEmpty(stateStr))
- {
- stateStr += ",";
- }
- if (!string.IsNullOrEmpty(volumet))
- {
- stateStr += Language.StringByID(StringId.yinliang) + volumet;
+ stateStr += "," + song_name;
}
- if (!string.IsNullOrEmpty(stateStr))
+ if (!string.IsNullOrEmpty(volume))
{
- stateStr += ",";
+ stateStr += "," + volume;
}
- if (!string.IsNullOrEmpty(signal))
- {
- var p = new PublicInterface();
- string key = p.GetKey(p.GetHisenseSignalSourceDic(), signal);
- stateStr += key;
- }
- stateStr = stateStr.TrimEnd(',');
+
}
break;
}
@@ -2292,7 +2267,7 @@
foreach (var dic in dicList)
{
string value = dic["value"];
- if (value == "on")
+ if (value == "on" || value == "open")
{
button1.Text = Language.StringByID(StringId.onLogic);
}
@@ -2458,122 +2433,68 @@
}
}
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:
{
foreach (var dic in dicList)
{
- if (dic["key"] == "song_name")
+ if (dic["key"] == "on_off")
{
- button1.Text = dic["value"]?.ToString();
+ if (dic["value"] == "on")
+ {
+ button1.Text = Language.StringByID(StringId.onLogic);
+ }
+ else
+ {
+ button1.Text = Language.StringByID(StringId.offLogic);
+ }
+ }
+ else if (dic["key"] == "song_name")
+ {
+ button2.Text = dic["value"]?.ToString();
}
else if (dic["key"] == "volume")
{
- button2.Text = dic["value"]?.ToString();
+ button3.Text = dic["value"]?.ToString();
}
}
}
break;
case SPK.doorgate:
{
- string s = string.Empty;
- string tag = string.Empty;
- for (int b = 0; b < dicList.Count; b++)
+ try
{
- var dic = dicList[b];
- var key = dic["key"].ToString();
- if (key != "user_id")
+ string userNameStr = string.Empty;
+ string tag = string.Empty;
+ for (int b = 0; b < dicList.Count; b++)
{
- continue;
+ var dic = dicList[b];
+ var key = dic["key"].ToString();
+ if (key != "user_id")
+ {
+ continue;
+ }
+ var value = dic["value"].ToString();
+ if (!string.IsNullOrEmpty(value))
+ {
+ var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(value);
+ for (int i = 0; i < list.Count; i++)
+ {
+
+ var FaceItem = this.GetFaceItem(list[i], device.deviceId);
+ userNameStr += FaceItem.userName;
+ userNameStr += ",";
+ tag += FaceItem.userId;
+ tag += "_";
+ }
+ }
}
- var userId = dic["value"].ToString();
- var FaceItem = this.GetFaceItem(userId, device.deviceId);
- s += FaceItem.userName;
- s += ",";
- tag += FaceItem.userId;
- tag += "_";
+ button2.Text = RemoveLastStr(userNameStr);
+ button2.Tag = tag;
}
- button2.Text = s;
- button2.Tag = tag;
+ 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>
@@ -2889,33 +2810,35 @@
{
//鍥犱负璋冭瘯杞欢涓婁紶涓虹┖杩�;
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;
- if (minutes != 0)
- {
- if (seconds == 0)
- {
- state = minutes.ToString() + Language.StringByID(StringId.minute);
- }
- else
- {
- state = minutes.ToString() + Language.StringByID(StringId.minute) + seconds.ToString() + Language.StringByID(StringId.s);
- }
- }
- else
- {
- if (seconds != 0)
- {
- state = seconds.ToString() + Language.StringByID(StringId.s);
- }
- }
- if (!string.IsNullOrEmpty(state))
- {
- state = Language.StringByID(StringId.delayLogic) + state;
- }
- return state;
+ return LogicMethod.Current.getTimeStr(strTimeValue).Replace("0s","");
+ //if (minutes != 0)
+ //{
+ // if (seconds == 0)
+ // {
+ // state = minutes.ToString() + Language.StringByID(StringId.minute);
+ // }
+ // else
+ // {
+ // state = minutes.ToString() + Language.StringByID(StringId.minute) + seconds.ToString() + Language.StringByID(StringId.s);
+ // }
+ //}
+ //else
+ //{
+ // if (seconds != 0)
+ // {
+ // state = seconds.ToString() + Language.StringByID(StringId.s);
+ // }
+ //}
+ //if (!string.IsNullOrEmpty(state))
+ //{
+ // state = Language.StringByID(StringId.delayLogic) + state;
+ //}
+ //return state;
}
/// <summary>
/// 鑾峰彇鏄剧ず闈㈢啛鏂囨湰
@@ -3098,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