From c00da77d00a479fa5d022346a6d9075f90a5c087 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期六, 14 九月 2024 10:05:34 +0800
Subject: [PATCH] 退出登录时间调整,新风,音乐

---
 HDL_ON/Entity/DB_ResidenceData.cs |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 887d4a1..67b7adf 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -74,10 +74,12 @@
                                     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,
+                                    ShowFunction.Aks,
                     };
                 }
                 return dddd;
@@ -95,7 +97,7 @@
                     {
                         instance = new DB_ResidenceData();
                         instance.SaveResidenceData();
-                        instance.residenceImage = "Classification/Room/Roombg.png";
+                        instance.residenceImage = "Classification/Room/HomePagebg.png";
                         instance.HomeGateway = new HomeGatewayInfo()
                         {
                             homeId = "1396717478877241345",
@@ -134,7 +136,7 @@
                         instance = new DB_ResidenceData { };
                         return instance;
                     }
-                    instance.residenceImage = "Classification/Room/Roombg.png";
+                    instance.residenceImage = "Classification/Room/HomePagebg.png";
                     //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
                     SpatialInfo.CurrentSpatial.InitRoomListFunctions();
 
@@ -161,10 +163,10 @@
             DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
 
 #if IOS
-            //閫�鍑哄叏瑙嗛�氱櫥褰�
-            Shared.IOS.HDLFVSDK.Video.Logout();
-            //閲嶇疆榛樿涓嶆敮鎸佸叏瑙嗛��
-            Entity.DB_ResidenceData.Instance.SupportFVDevice = false;
+            ////閫�鍑哄叏瑙嗛�氱櫥褰�
+            //Shared.IOS.HDLFVSDK.Video.Logout();
+            ////閲嶇疆榛樿涓嶆敮鎸佸叏瑙嗛��
+            //Entity.DB_ResidenceData.Instance.SupportFVDevice = false;
 #endif
         }
         /// <summary>
@@ -511,5 +513,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