From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/Entity/DB_ResidenceData.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 3fe97ad..f734255 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -74,10 +74,8 @@
ShowFunction.FreshAir,ShowFunction.DoorLock,
ShowFunction.Panel,
ShowFunction.Sensor,ShowFunction.VideoIntercom,
- ShowFunction.SecurityCenter,ShowFunction.Acst,
+ ShowFunction.SecurityCenter,ShowFunction.Acst,ShowFunction.InverterJinmao,
ShowFunction.MechanicalArm ,
- ShowFunction.SecurityMonitoring,
- ShowFunction.VideoDoorLock,
ShowFunction.Series,
};
}
@@ -158,7 +156,7 @@
FunctionList.List.ClearDatas();
///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
- HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
+ UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
#if IOS
@@ -512,5 +510,17 @@
/// </summary>
public bool CheckGPS_IsFirst = true;
+ /// <summary>
+ /// 鍙瀵硅杩炴帴鏂瑰紡
+ /// TCP/UDP
+ /// </summary>
+ public LinphoneConnectType linphoneConnectType = LinphoneConnectType.UDP;
+
+ }
+
+ public enum LinphoneConnectType
+ {
+ UDP,
+ TCP,
}
}
--
Gitblit v1.8.0