From 8301df084faa8f43f4b9cb7f92088e5fd9e64524 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 十二月 2022 15:41:53 +0800 Subject: [PATCH] 大华摄像头更新 --- HDL_ON/Entity/Function/Function.cs | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs index 0096799..e7a7da8 100644 --- a/HDL_ON/Entity/Function/Function.cs +++ b/HDL_ON/Entity/Function/Function.cs @@ -273,6 +273,10 @@ /// </summary> public string deviceId = "0"; /// <summary> + /// 绗笁鏂硅澶囨墿灞昳d + /// </summary> + public string extDevId = string.Empty; + /// <summary> /// 璁惧spk /// </summary> public string spk = ""; @@ -400,16 +404,20 @@ /// 鏄惁鏀惰棌 /// </summary> public bool collect = false; + + private bool _online = false; /// <summary> /// 鏄惁鍦ㄧ嚎 /// </summary> - public bool online { + public bool online + { get { return true; } - set { - + set + { + _online = value; } } @@ -1009,6 +1017,7 @@ /// 棰滆壊 /// </summary> public const string RGB = "rgb"; + public const string RGBW = "rgbw"; /// <summary> /// 娓愬彉鏃堕棿 /// </summary> @@ -1316,7 +1325,14 @@ /// 閫氱敤寮�鍏� /// </summary> public const string OtherCommon = "other.common"; - + /// <summary> + /// 澶у崕鎽勫儚澶� + /// </summary> + public const string IpCam_Imou = "security.ipcam.imou"; + /// <summary> + /// 鏈烘鎵� + /// </summary> + public const string MechanicalArm = "electrical.mechanical_arm"; /// <summary> /// 绌鸿皟绉戞妧绯荤粺锛堢豢寤猴級 /// 鎬绘帶 @@ -1609,6 +1625,10 @@ public const string SenesorMegahealth = "sensor.megahealth"; public const string SenesorMegahealth2 = "sensor.megahealth.zg"; /// <summary> + /// 姣背娉紶鎰熷櫒锛堝Э鎬佺増锛� + /// </summary> + public const string SensorMmvPose = "sensor.mmv_pose"; + /// <summary> /// 绱ф�ュ懠鍙� /// </summary> public const string SensorHelp = "sensor.help"; @@ -1633,6 +1653,7 @@ spkList.Add(SensorDryContact2); spkList.Add(SenesorMegahealth); spkList.Add(SenesorMegahealth2); + spkList.Add(SensorMmvPose); return spkList; } #endregion @@ -1904,6 +1925,7 @@ spkList.Add(ElectricTuyaWaterValve2); spkList.Add(ElectricTuyaWeepRobot); spkList.Add(ElectricTuyaWeepRobot2); + spkList.Add(SensorMmvPose); spkList.Add(SenesorMegahealth); spkList.Add(SenesorMegahealth2); return spkList; @@ -1929,7 +1951,7 @@ list.Add(ElectricTuyaWeepRobot2); break; case BrandType.All3tyBrand: - list.Add(SenesorMegahealth);//鍏嗚 + list.Add(SenesorMegahealth2);//鍏嗚 break; } return list; -- Gitblit v1.8.0