Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -78,7 +78,7 @@
                                    ShowFunction.FreshAir,ShowFunction.DoorLock,
                                    ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                    ShowFunction.Sensor,ShowFunction.VideoIntercom,
                                    ShowFunction.SecurityCenter
                                    ShowFunction.SecurityCenter,ShowFunction.Acst,
                                });
                        instance.SaveResidenceData();
                        instance.residenceImage = "Classification/Room/Roombg.png";
@@ -119,7 +119,7 @@
                                    ShowFunction.FreshAir,ShowFunction.DoorLock,
                                    ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                    ShowFunction.Sensor,ShowFunction.VideoIntercom,
                                    ShowFunction.SecurityCenter
                                    ShowFunction.SecurityCenter,ShowFunction.Acst,
                                });
                        instance.SupportFacePass = false;
                        instance.SaveResidenceData();
@@ -156,11 +156,12 @@
            HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
            DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");

#if IOS
            //退出全视通登录
            Shared.IOS.HDLFVSDK.Video.Logout();
            //重置默认不支持全视通
            Entity.DB_ResidenceData.Instance.SupportFVDevice = false;

#endif
        }
        /// <summary>
        /// 是否支持人脸通行
@@ -415,7 +416,7 @@
        }


        #region oid列表 a协议转bus协议控制使用
#region oid列表 a协议转bus协议控制使用
        /// <summary>
        /// oid数据保存的文件名
        /// </summary>
@@ -467,8 +468,12 @@
            Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
        }

        #endregion
#endregion

        /// <summary>
        /// 场景筛选时，选择的房间
        /// </summary>
        public string sceneChooseRoomId = "";


        /// <summary>