From 6c71e8a178d9cb83a178f08e3411090fe8da505d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 五月 2024 15:33:33 +0800
Subject: [PATCH] 删除了萤石功能，埃克斯影音中控，海信电视，
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 134 +-------------------------------------------
1 files changed, 5 insertions(+), 129 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 7d2996e..6dbb73c 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -2,7 +2,6 @@
using Shared;
using System.Collections.Generic;
using HDL_ON.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
namespace HDL_ON.UI.UI2.Intelligence.Automation
@@ -757,24 +756,6 @@
}
}
break;
- //钀ょ煶瑙嗛闂ㄩ攣
- case SPK.VideoDoorLock:
- {
- LogicView.FunTypeView view1 = new LogicView.FunTypeView();
- view1.btnText.TextID=StringId.kaimenrenyuan;
- view1.btnText.Name = Language.StringByID(StringId.shipinmensuo);
- fLayout.AddChidren(view1.FLayoutView());
- view1.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- this.identifier = "open_door";//寮�閿佷簨浠�
- this.VideoDoorLockAction(this, device, view1.btnState);
- };
- if (edit)
- {
- this.GetEditState(device, index, view1.btnState,null, null, null);
- }
- }
- break;
//鐚溂
case SPK.Peephole:
LogicView.FunTypeView viewPeephole = new LogicView.FunTypeView();
@@ -792,24 +773,6 @@
this.GetEditState(device, index, viewPeephole.btnState, null, null, null);
}
break;
- //钀ょ煶鎽勫儚澶�
- case SPK.Ev_Ipcam:
- LogicView.FunTypeView viewEzIpcam = new LogicView.FunTypeView();
- viewEzIpcam.btnText.TextID = StringId.ActivityDetection;
- //viewEzIpcam.btnText.Name = Language.StringByID(StringId.shipinmensuo);
- fLayout.AddChidren(viewEzIpcam.FLayoutView());
- viewEzIpcam.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- this.identifier = Constant.intelligentDetection_event;//浜轰綋鎰熷簲鍛婅
- this.DeviceView(device, viewEzIpcam.btnState, StringId.shi, StringId.offLogic, 1);
-
- };
- if (edit)
- {
- this.GetEditState(device, index, viewEzIpcam.btnState, null, null, null);
- }
- break;
-
}
#region 淇濆瓨
///淇濆瓨View
@@ -866,20 +829,6 @@
inputDevice.condition_type = "9";
inputDevice.identifier = this.identifier;
inputDevice.condition = new List<Dictionary<string, string>>();
- }
- else if(device.spk == SPK.Ev_Ipcam)
- {
- //钀ょ煶鎽勫儚澶�-绉诲姩鐩戞祴鍛婅
- inputDevice.condition_type = "9";
- inputDevice.identifier = this.identifier;
- inputDevice.condition = new List<Dictionary<string, string>>();
- }
- else if (device.spk == SPK.VideoDoorLock)
- {
- ////钀ょ煶瑙嗛闂ㄩ攣
- inputDevice.condition_type = "9";
- inputDevice.identifier = this.identifier;
- //inputDevice.condition = new List<Dictionary<string, string>>();
}
else if (device.spk == SPK.SensorPirHold)
{
@@ -1295,13 +1244,13 @@
frame.AddChidren(loading);
loading.Start();
- CommonMethod.Current.SunThread(() =>
+ new System.Threading.Thread(() =>
{
try
{
var faceIdList = Send.Current.GetListHomeFace(device.deviceId, true);
- CommonMethod.Current.MainThread(() =>
+ Application.RunOnMainThread(() =>
{
loading.Hide();
string stateValue = btnState.Tag == null ? "" : btnState.Tag.ToString();
@@ -1350,78 +1299,11 @@
});
}
- });
+ })
+ { IsBackground = true}.Start();
}
- /// <summary>
- /// 钀ょ煶瑙嗛闂ㄩ攣涓撶敤
- /// </summary>
- /// <param name="frame">褰撳墠鐣岄潰</param>
- /// <param name="device">褰撳墠璁惧</param>
- /// <param name="btnState">鏃х姸鎬�</param>
- public void VideoDoorLockAction(FrameLayout frame, Entity.Function device, Button btnState)
- {
- selectedState = device.spk + "_";
- Loading loading = new Loading();
- frame.AddChidren(loading);
- loading.Start();
- CommonMethod.Current.SunThread(() =>
- {
- try
- {
- var faceIdList = Send.Current.GetVideoDoorLockUserListInfo(device);
- CommonMethod.Current.MainThread(() =>
- {
-
- loading.Hide();
- string stateValue = btnState.Text == null ? "" : btnState.Text.ToString();
- PublicInterface publicInterface = new PublicInterface();
- publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
- {
- if (indexeList.Count > 0)
- {
- dicSateteList.Clear();
- string seleTxet = string.Empty;
- string tag = string.Empty;
- string[] array = new string[indexeList.Count];
-
- for (int i = 0; i < indexeList.Count; i++)
- {
- if (i > faceIdList.Count)
- {
- continue;
- }
- var indexe = indexeList[i];
- var face = faceIdList[indexe];
- tag += face.userId;
- tag += "_";
- array[i] = face.userName;
- }
- seleTxet = Newtonsoft.Json.JsonConvert.SerializeObject(array);
- //鏁版嵁灏佽<楂樿儨璇磋悿鐭抽偅杈规槸鎺ㄩ�佺敤鎴峰悕>
- AddDictionary("open_user",seleTxet, "string", "[]");
- //鐣岄潰鏄剧ず閫変腑鍊�
- btnState.Text = InpOrOutLogicMethod.Current.RemoveLastStr(seleTxet);
- btnState.Tag = tag;
- }
-
- });
-
- });
- }
- catch { }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- loading.Hide();
- });
- }
-
- });
-
- }
/// <summary>
/// 鏃堕棿鏂规硶
@@ -1496,12 +1378,6 @@
if (inputs.identifier == "pir_event")
{
button1.Text = Language.StringByID(StringId.shi );
- }
- break;
- case SPK.Ev_Ipcam:
- if (inputs.identifier == Constant.intelligentDetection_event)
- {
- button1.Text = Language.StringByID(StringId.shi);
}
break;
}
@@ -1627,7 +1503,7 @@
{
return false;
}
- if (this.function.spk == SPK.VideoDoorLock ||
+ if (
this.function.spk == SPK.doorgate
)
{
--
Gitblit v1.8.0