~wxr/OnPro.git - Gitblit

			@@ -2,7 +2,7 @@
			using Shared;
			using System.Collections.Generic;
			using HDL_ON.Entity;

			using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;

			namespace HDL_ON.UI.UI2.Intelligence.Automation
			{
			@@ -89,6 +89,7 @@
			//空调
			case SPK.AcStandard:
			case SPK.HvacAC:
			case SPK.AcIr:
			//地热
			case SPK.FloorHeatStandard:
			case SPK.HvacFloorHeat:
			@@ -342,7 +343,7 @@
			}
			break;
			//环境检测传感器
			case SPK.SensorEnvironment:
			case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
			case SPK.SensorEnvironment2:
			case SPK.SensorEnvironment3:
			{
			@@ -618,7 +619,25 @@
			}
			}
			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;

			}
			#region 保存
			///保存View
			@@ -668,6 +687,12 @@
			//condition默认[]
			inputDevice.condition = new List<Dictionary<string, string>>();
			}
			}
			else if (device.spk == SPK.VideoDoorLock)
			{
			////萤石视频门锁
			inputDevice.condition_type = "9";
			inputDevice.identifier = this.identifier;
			}


			@@ -1035,40 +1060,131 @@
			/// <param name="frame">当前界面</param>
			/// <param name="device">当前设备</param>
			/// <param name="btnState">旧状态</param>
			public void FaceAction(FrameLayout frame, Entity.Function device,Button btnState) {
			public void FaceAction(FrameLayout frame, Entity.Function device, Button btnState)
			{
			selectedState = device.spk + "_";
			Loading loading = new Loading();
			frame.AddChidren(loading);
			loading.Start();
			System.Threading.Tasks.Task.Run(() =>

			CommonMethod.Current.SunThread(() =>
			{
			try
			{
			var faceIDList = Send.Current.GetListHomeFace(device.deviceId,true);
			List<string> faceNameList = new List<string>();
			for (int i = 0; i < faceIDList.Count; i++)
			var faceIdList = Send.Current.GetListHomeFace(device.deviceId, true);

			CommonMethod.Current.MainThread(() =>
			{
			var face = faceIDList[i];
			faceNameList.Add(face.userName);
			}
			loading.Hide();
			string stateValue = btnState.Tag == null ? "" : btnState.Tag.ToString();
			PublicInterface publicInterface = new PublicInterface();
			publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
			{
			if (indexeList.Count > 0)
			{
			dicSateteList.Clear();
			string s = string.Empty;
			string tag = string.Empty;
			//数据封装
			AddDictionary("open_type", "1", "integer");
			for (int i = 0; i < indexeList.Count; i++)
			{

			if (i > faceIdList.Count)
			{
			continue;
			}
			var indexe = indexeList[i];
			var face = faceIdList[indexe];
			AddDictionary("user_id", face.userId, "string");
			s += face.userName;
			s += ",";
			tag += face.userId;
			tag += "_";
			}
			//界面显示选中值
			btnState.Text = s;
			btnState.Tag = tag;
			}

			});
			});
			}
			catch { }
			finally
			{
			Application.RunOnMainThread(() =>
			{
			loading.Hide();
			PublicInterface publicInterface = new PublicInterface();
			publicInterface.FrameOrVv(this, faceNameList, new List<string> { btnState.Text }, device.name, (index) =>
			{
			var face = faceIDList[index];
			//界面显示选中值
			btnState.Text = face.userName;
			//数据封装
			AddDictionary("open_type", "1", "integer");
			AddDictionary("user_id", face.userId, "string");
			});
			}

			}, false);
			});

			}

			/// <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 s = string.Empty;
			string tag = string.Empty;
			for (int i = 0; i < indexeList.Count; i++)
			{
			if (i > faceIdList.Count)
			{
			continue;
			}
			var indexe = indexeList[i];
			var face = faceIdList[indexe];
			//数据封装<高胜说萤石那边是推送用户名>
			AddDictionary("open_user", face.userName, "string");
			s += face.userName;
			s += ",";
			tag += face.userId;
			tag += "_";
			}
			//界面显示选中值
			btnState.Text = s;
			btnState.Tag = tag;
			}

			});

			});
			}
			catch { }
			finally
			{
			Application.RunOnMainThread(() =>
			{
			loading.Hide();
			});
			}

			});

			@@ -1183,16 +1299,45 @@
			var dic = dictionaryB[i];
			string key = dic["key"];
			string comparatorValue = dic["comparator"];
			string value = dic["value"];
			if (dictionaryA["key"] == key && dictionaryA["comparator"] == comparatorValue)
			{
			//判断是否存在
			valueInt = i;
			break;
			if (this.checkSpk())
			{
			//有些设备需要增加这个判断
			if (dictionaryA["value"] == value)
			{
			//判断是否存在
			valueInt = i;
			break;
			}
			}
			else
			{
			//判断是否存在
			valueInt = i;
			break;
			}
			}
			}
			return valueInt;
			}
			/// <summary>
			/// 检查是否支持
			/// </summary>
			/// <returns></returns>
			private bool checkSpk()
			{
			if (this.function.spk == SPK.VideoDoorLock \|\|
			this.function.spk == SPK.doorgate
			)
			{
			return true;
			}
			return false;

			}
			/// <summary>
			/// 判断dictionaryB是否完整包含另一个dictionaryA
			/// </summary>
			/// <param name="dictionaryA"></param>