~wxr/OnPro.git - Gitblit

			@@ -131,7 +131,7 @@
			/// <param name="dic">Dictionary类</param>
			/// <param name="key">健</param>
			/// <param name="value">值</param>
			public void dictionary(Dictionary<string, string> dic, string key, string value)
			public void dictionary(Dictionary<string, string> dic, string key, string value)
			{
			if (dic.ContainsKey(key)) //判断是否存在键值
			{
			@@ -206,7 +206,7 @@
			function.spk = videoDevice.spk;
			function.name = videoDevice.deviceName;
			function.deviceId = videoDevice.deviceId;
			function.online = videoDevice.status == "online";
			function.setOnine( videoDevice.status == "online");
			function.sid = videoDevice.sid;
			var video = functionList.Find((o) => o.deviceId == function.deviceId);
			if (video == null)
			@@ -586,6 +586,7 @@
			device.spk == SPK.AirSwitch
			\|\| device.spk == SPK.PanelSocket
			\|\| device.spk == SPK.ElectricSocket
			\|\| device.spk == SPK.ElectricalTvHisense
			);
			if (electric != null)
			{
			@@ -715,6 +716,7 @@
			functionTypeList.Add(SPK.AirSwitch);
			functionTypeList.Add(SPK.PanelSocket);
			functionTypeList.Add(SPK.ElectricSocket);
			functionTypeList.Add(SPK.ElectricalTvHisense);
			}
			///门锁类
			else if (deviceType == Language.StringByID(StringId.DoorLock))
			@@ -807,6 +809,7 @@
			functionTypeList.Add(SPK.VideoDoorLock);
			functionTypeList.Add(SPK.AcIr);
			functionTypeList.Add(SPK.SensorPirHold);
			functionTypeList.Add(SPK.ElectricalTvHisense);

			}

			@@ -896,6 +899,7 @@
			deviceTypeList.Add(SPK.AvMusic);
			deviceTypeList.Add(SPK.MechanicalArm);
			deviceTypeList.Add(SPK.AcIr);
			deviceTypeList.Add(SPK.ElectricalTvHisense);
			}
			break;
			}
			@@ -1226,6 +1230,7 @@
			new Entity.Function { sid = "12345678991234566844", name = "大华摄像头", spk = Entity.SPK.IpCam_Imou },
			new Entity.Function { sid = "12345678991234567", name = "RGB", spk = Entity.SPK.LightRGB },
			new Entity.Function { sid = "123456789912345678", name = "RGBW", spk = Entity.SPK.LightRGBW },
			new Function { spk = SPK.ElectricalTvHisense, name = "海信电视1",sid="123456789"},
			};
			foreach (var function in functions)
			{