Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

 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,
                    };
                }
@@ -96,7 +94,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",
@@ -135,7 +133,7 @@
                        instance = new DB_ResidenceData { };
                        return instance;
                    }
                    instance.residenceImage = "Classification/Room/Roombg.png";
                    instance.residenceImage = "Classification/Room/HomePagebg.png";
                    //初始化住宅功能数据
                    SpatialInfo.CurrentSpatial.InitRoomListFunctions();

@@ -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,
    }
}