From da22725d616af0f3081670c76195eaf57794bc29 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 18 五月 2022 16:03:33 +0800
Subject: [PATCH] Merge branch 'dev-CQY' into dev 1.调整全视通与自研的逻辑 2.增加获取可视对讲第三方账号接口
---
HDL-ON_iOS/AppDelegate.cs | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index d41c1ac..3409c69 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/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();
--
Gitblit v1.8.0