Merge branch 'Dev-Branch' into wjc

wjc

2023-07-19 1b56157e8edc3f502810820d99b607e3629c7171

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -78,6 +78,7 @@
                                    ShowFunction.MechanicalArm ,
                                    ShowFunction.SecurityMonitoring,
                                    ShowFunction.VideoDoorLock,
                                    ShowFunction.Series,
                    };
                }
                return dddd;
@@ -161,10 +162,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>