IOS去掉全视通加载，sdk会造成闪退

wxr

2023-06-06 c90199162c60b89d0554c11de36818a85ea80ac6

IOS去掉全视通加载，sdk会造成闪退

 DLL/Shared.Droid.JPush223.dll

Binary files differ

 DLL/Shared.Droid.dll

Binary files differ

 DLL/Shared.Droid0512.dll

Binary files differ

 DLL/Shared.Droid0524.dll

Binary files differ

 DLL/Shared.Droid1.dll

Binary files differ

 DLL/Shared.Droid230508.dll

Binary files differ

 DLL/Shared.IOS.dll

Binary files differ

 DLL/Shared.IOS0524.dll

Binary files differ

 DLL/Shared.IOS1.dll

Binary files differ

 HDL-ON_Android/Resources/Resource.designer.cs

@@ -14,7 +14,7 @@
{
    
    
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.8.165")]
    public partial class Resource
    {
        

 HDL-ON_Android/mono_crash.824c6d50c.0.json

New file
Diff too large

 HDL-ON_iOS/AppDelegate.cs

@@ -186,12 +186,12 @@
        public override void OnResignActivation(UIApplication application)
        {
            //设置全视通状态
            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统，不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
            }
            //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            //string errorVersion = "16.2.0";
            //if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统，不要加载这个先
            //{
            //    Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
            //}
            Console.WriteLine("OnResignActivation");
            UserInfo.Current.unlockTime = DateTime.Now;
        }

 HDL-ON_iOS/mono_crash.824c6d50c.1.json

New file
Diff too large

 HDL_ON/Common/ApiUtlis.cs

@@ -268,19 +268,15 @@
                                            isInterphoneType_HDL = true;
                                            DB_ResidenceData.Instance.SupportFacePass = true;
                                            DB_ResidenceData.Instance.SaveResidenceData();

                                            Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
                                            DB_ResidenceData.Instance.SupportFVDevice = true;
                                        }
                                        else if (video.interphoneType == InterphoneType.FREEVIEW.ToString())
                                        {
                                            //为全视通可视对讲
                                            DB_ResidenceData.Instance.SupportFacePass = true;
                                            Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
                                            Entity.DB_ResidenceData.Instance.SupportFVDevice = true;

                                            //isInterphoneType_HDL = true;
                                            isInterphoneType_FREEVIEW = true;

                                            //DB_ResidenceData.Instance.SupportFacePass = true;
                                            //Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
                                            //Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
                                            //isInterphoneType_FREEVIEW = true;
                                        }
                                    }
                                }
@@ -301,7 +297,6 @@
                                    }
                                    else if (isInterphoneType_FREEVIEW)
                                    {

                                        //HDLLinphone可视对讲,获取Sip账号并初始化SDK
                                        HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
                                        callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
@@ -323,23 +318,22 @@
                                {

#if __IOS__
                                    string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
                                    string errorVersion = "16.2.0";
                                    if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统，不要加载这个先
                                    {
                                        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");

                                        }
                                    }
                                    //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
                                    //string errorVersion = "16.2.0";
                                    //if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统，不要加载这个先
                                    //{
                                    //    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
                                }


 HDL_ON/Common/HDLCommon.cs

@@ -496,7 +496,7 @@

#if __IOS__
                    //5.全视通登出
                    Shared.IOS.HDLFVSDK.Video.Logout();
                    //Shared.IOS.HDLFVSDK.Video.Logout();
                    //6.清空Siri共享数据信息
                    new Other.SkipControl().SetData(false, "", "", "", "");
                    var sDM = new SiriKit.SceneDateManager();

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -941,6 +941,10 @@
        /// <returns></returns>
        public void ConvertReceiveData(byte[] receiveBytes, string ip)
        {
            if (!UserInfo.Current.IsLogin)
            {
                return;
            }
            var reString = Encoding.UTF8.GetString(receiveBytes);
            AnalysisReceiveData(reString, receiveBytes, ip);
        }
@@ -952,6 +956,7 @@
        /// <returns></returns>
        public LocalCommunicationData AnalysisReceiveData(string receiveString, byte[] originalReceiveBytes, string sIp = null)
        {
           
            LocalCommunicationData receiveObj = new LocalCommunicationData();



 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs

@@ -112,9 +112,8 @@
            } else if (interphoneType == InterphoneType.FREEVIEW.ToString())
            {
                //全视通监视
                NSDictionary deviceInfo = new NSDictionary("deviceCode",mESVideoInfo.deviceCode, "deviceName", mESVideoInfo.DeviceName);
                Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
                //HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
                //NSDictionary deviceInfo = new NSDictionary("deviceCode",mESVideoInfo.deviceCode, "deviceName", mESVideoInfo.DeviceName);
                //Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
            }
            else
            {

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -161,10 +161,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>

 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs

@@ -215,12 +215,12 @@
                        view2.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            //主界面控件
                            FrameLayout fLayout = new FrameLayout
                            FrameLayout fLayout2 = new FrameLayout
                            {
                                BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
                            };
                            this.AddChidren(fLayout);
                            TimeView(fLayout, device, view2.btnState);
                            this.AddChidren(fLayout2);
                            TimeView(fLayout2, device, view2.btnState);

                        };


 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs

@@ -741,11 +741,11 @@


#if __IOS__
                    //刷新接口请求所需要的参数
                    Foundation.NSDictionary info = new Foundation.NSDictionary("regionUrl", HttpUtil.GlobalRequestHttpsHost, "token", UserInfo.Current.LoginTokenString, "appkey", "HDL-HOME-APP-TEST", "secret", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "refreshToken", UserInfo.Current.RefreshToken);
                    Shared.IOS.HDLFVSDK.Video.RefreshInfo(info);
                    ////跳转访客管理界面
                    Shared.IOS.HDLFVSDK.Video.ShowVisitorManager();
                    ////刷新接口请求所需要的参数
                    //Foundation.NSDictionary info = new Foundation.NSDictionary("regionUrl", HttpUtil.GlobalRequestHttpsHost, "token", UserInfo.Current.LoginTokenString, "appkey", "HDL-HOME-APP-TEST", "secret", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "refreshToken", UserInfo.Current.RefreshToken);
                    //Shared.IOS.HDLFVSDK.Video.RefreshInfo(info);
                    //////跳转访客管理界面
                    //Shared.IOS.HDLFVSDK.Video.ShowVisitorManager();
#else
                    var page = new VisitorQRCodePage();
                    MainPage.BasePageView.AddChidren(page);