Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL_ON/Common/ApiUtlis.cs

@@ -78,7 +78,10 @@
        public void DownloadData()
        {
            if (MainPage.InternetStatus == 0 || MainPage.NoLoginMode)
            {
                DownloadDataComplete = true;
                return;
            }
            endTime1 = DateTime.Now.AddSeconds(25);
            complateDevice = complateScene = false;

@@ -320,17 +323,22 @@
                                {

#if __IOS__
                                    List<VisitorTempPassword> dataList = new List<VisitorTempPassword>();
                                    Dictionary<string, object> dictionary = new Dictionary<string, object>();
                                    dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
                                    var requestJson = HttpUtil.GetSignRequestJson(dictionary);
                                    ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson);
                                    if(pack!= null)
                                    string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
                                    string errorVersion = "16.2.0";
                                    if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统，不要加载这个先
                                    {
                                        var data = Newtonsoft.Json.JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString());
                                        //登录全视通
                                        Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");
                                        List<VisitorTempPassword> dataList = new List<VisitorTempPassword>();
                                        Dictionary<string, object> dictionary = new Dictionary<string, object>();
                                        dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
                                        var requestJson = HttpUtil.GetSignRequestJson(dictionary);
                                        ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson);
                                        if (pack != null)
                                        {
                                            var data = JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString());
                                            //登录全视通
                                            Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");

                                        }
                                    }
#endif
                                }