Merge branch 'wxr1215' into dev

wxr

2022-05-18 b1b3f47f3eeff8536b1a2851781da0b04f346fef

 HDL_ON/Common/ApiUtlis.cs

@@ -330,6 +330,8 @@
                            Utlis.WriteLine("当前住宅不支持HDL可视对讲,退出登录所有账号");
                            //当前住宅不支持HDL可视对讲
                            HDLLinphone.Current.LogoutAllAccount();
                            //登录全视通（全视通不根据住宅id变化，退出登录会退出所有sip账号，所以此处需要重新登录全视通）
                            //Shared.IOS.HDLFVSDK.Video.Init("", UserInfo.Current.ID);

                        }
                    }
@@ -337,8 +339,26 @@
                    //======================登录全视通====================
                    if (isInterphoneType_FREEVIEW)
                    {
                        //登录全视通
                        Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
#if __IOS__
                        //获取全视通账户信息
                        string FVUserId = Ins.HttpRequest.GetVideoThirdPartUserInfo();
                        if (FVUserId!=null)
                        {

                            //登录全视通
                            Shared.IOS.HDLFVSDK.Video.Init("", FVUserId);

                        }


#endif
                    }
                    else {
#if __IOS__
                        //不支持全视通（用于在ios app生命周期判断是否调用全视通方法）
                        Entity.DB_ResidenceData.Instance.SupportFVDevice = false;

#endif
                    }


@@ -408,12 +428,12 @@
                {
                    if (DB_ResidenceData.Instance.CurrentRegion != null)
                    {
                        #region 读取本地数据
#region 读取本地数据
                        //搜索网关
                        DriverLayer.Control.Ins.SearchLoaclGateway();
                        //重新连接mqtt
                        DAL.Mqtt.MqttClient.DisConnectRemote("刷新数据，重连mqtt",false);
                        #endregion
#endregion

                    }
                }
@@ -487,7 +507,6 @@
        {
            var pack = Ins.HttpRequest.GetSecurityList();
        }


    }
}