From 67ab9b89a19b117800424c253427b0dd961b2574 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 11 十一月 2022 13:51:00 +0800 Subject: [PATCH] Merge branch 'dev--wxr' --- HDL_ON/Entity/Function/Function.cs | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs index b23b328..c281816 100644 --- a/HDL_ON/Entity/Function/Function.cs +++ b/HDL_ON/Entity/Function/Function.cs @@ -400,10 +400,22 @@ /// 鏄惁鏀惰棌 /// </summary> public bool collect = false; + + private bool _online = false; /// <summary> /// 鏄惁鍦ㄧ嚎 /// </summary> - public bool online = true; + public bool online + { + get + { + return true; + } + set + { + _online = value; + } + } /// <summary> /// 鐜闈㈡澘 缁戝畾鐨� 璁惧鐩爣sid鍒楄〃 @@ -1309,6 +1321,20 @@ /// 閫氱敤寮�鍏� /// </summary> public const string OtherCommon = "other.common"; + /// <summary> + /// 鏈烘鎵嬨�佹満姊拌噦 + /// </summary> + public const string MechanicalArm = "electrical.mechanical_arm"; + /// <summary> + /// 鏈烘鎵媠pk鍒楄〃 + /// </summary> + /// <returns></returns> + public static List<string> GetMechanicalArmList() + { + var list = new List<string>(); + list.Add(MechanicalArm); + return list; + } /// <summary> /// 绌鸿皟绉戞妧绯荤粺锛堢豢寤猴級 @@ -1602,6 +1628,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"; @@ -1626,6 +1656,7 @@ spkList.Add(SensorDryContact2); spkList.Add(SenesorMegahealth); spkList.Add(SenesorMegahealth2); + spkList.Add(SensorMmvPose); return spkList; } #endregion @@ -1897,6 +1928,7 @@ spkList.Add(ElectricTuyaWaterValve2); spkList.Add(ElectricTuyaWeepRobot); spkList.Add(ElectricTuyaWeepRobot2); + spkList.Add(SensorMmvPose); spkList.Add(SenesorMegahealth); spkList.Add(SenesorMegahealth2); return spkList; @@ -1922,7 +1954,7 @@ list.Add(ElectricTuyaWeepRobot2); break; case BrandType.All3tyBrand: - list.Add(SenesorMegahealth);//鍏嗚 + list.Add(SenesorMegahealth2);//鍏嗚 break; } return list; -- Gitblit v1.8.0