Merge branch 'dev-CQY' into dev 1.调整全视通与自研的逻辑 2.增加获取可视对讲第三方账号接口

chenqiyang

2022-05-18 da22725d616af0f3081670c76195eaf57794bc29

 HDL-ON_iOS/AppDelegate.cs

@@ -10,7 +10,7 @@
using HDL_ON.UI;
using HDL_ON.DAL.Server;
using Intents;

using HDL_ON.Entity;
namespace SharedMethod
{
    public static class SharedMethod
@@ -92,7 +92,7 @@

            // Get previous device token
            var oldDeviceToken = NSUserDefaults.StandardUserDefaults.StringForKey("PushDeviceToken");
            new Alert("", DeviceToken, "取消", "确定").Show();
            //new Alert("", DeviceToken, "取消", "确定").Show();

            //NSDictionary test = new NSDictionary(new NSString("123"), new NSString("test"));
            //NSError error;
@@ -135,10 +135,10 @@
            Console.WriteLine("推送消息："+userInfo);
            //var test = new NSDictionary();
            //test.SetNilValueForKey(new NSString("test"));
            NSError error;
            NSData dicD = NSJsonSerialization.Serialize(userInfo, NSJsonWritingOptions.PrettyPrinted, out error); ;
            NSString str = new NSString(dicD, NSStringEncoding.UTF8);
            new Alert("", str, "取消", "确定").Show();
            //NSError error;
            //NSData dicD = NSJsonSerialization.Serialize(userInfo, NSJsonWritingOptions.PrettyPrinted, out error); ;
            //NSString str = new NSString(dicD, NSStringEncoding.UTF8);
            //new Alert("", str, "取消", "确定").Show();

            //读取推送信息
            UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
@@ -188,8 +188,12 @@

        public override void OnResignActivation(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
            if (DB_ResidenceData.Instance.SupportFVDevice)
            {
                //设置全视通状态
                Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
            }


            Console.WriteLine("OnResignActivation");
            UserInfo.Current.unlockTime = DateTime.Now;
@@ -197,8 +201,12 @@

        public override void DidEnterBackground(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
            if (DB_ResidenceData.Instance.SupportFVDevice)
            {
                //设置全视通状态
                Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
            }


            //SharedMethod.SharedMethod.IsBackground = true;
            //MainPage.IsEnterBackground = true;
@@ -225,8 +233,12 @@

        public override void OnActivated(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
            if (DB_ResidenceData.Instance.SupportFVDevice)
            {
                //设置全视通状态
                Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
            }


            Console.WriteLine("OnActivated");
            base.OnActivated(application);
@@ -279,9 +291,12 @@

        public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
        {
         
            if (DB_ResidenceData.Instance.SupportFVDevice) {
                //设置全视通状态
                Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
            }

            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());

            Console.WriteLine("111111111111");
            SetCurrentLanguage();