From b1b3f47f3eeff8536b1a2851781da0b04f346fef Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 18 五月 2022 16:04:14 +0800
Subject: [PATCH] Merge branch 'wxr1215' into dev
---
HDL-ON_iOS/AppDelegate.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 4dba627..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,6 +92,14 @@
// Get previous device token
var oldDeviceToken = NSUserDefaults.StandardUserDefaults.StringForKey("PushDeviceToken");
+ //new Alert("", DeviceToken, "鍙栨秷", "纭畾").Show();
+
+ //NSDictionary test = new NSDictionary(new NSString("123"), new NSString("test"));
+ //NSError error;
+ //NSData dicD = NSJsonSerialization.Serialize(test, NSJsonWritingOptions.PrettyPrinted,out error); ;
+ //NSString str = new NSString(dicD,NSStringEncoding.UTF8);
+
+ //new Alert("", str, "鍙栨秷", "纭畾").Show();
// Has the token changed?
if (string.IsNullOrEmpty(oldDeviceToken) || !oldDeviceToken.Equals(DeviceToken))
@@ -123,6 +131,14 @@
public override void DidReceiveRemoteNotification(UIApplication application, NSDictionary userInfo, Action<UIBackgroundFetchResult> completionHandler)
{
Console.WriteLine("DidReceiveRemoteNotification:" + application.ApplicationState.ToString());
+
+ 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();
//璇诲彇鎺ㄩ�佷俊鎭�
UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
@@ -172,12 +188,26 @@
public override void OnResignActivation(UIApplication application)
{
+ if (DB_ResidenceData.Instance.SupportFVDevice)
+ {
+ //璁剧疆鍏ㄨ閫氱姸鎬�
+ Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
+ }
+
+
Console.WriteLine("OnResignActivation");
UserInfo.Current.unlockTime = DateTime.Now;
}
public override void DidEnterBackground(UIApplication application)
{
+ if (DB_ResidenceData.Instance.SupportFVDevice)
+ {
+ //璁剧疆鍏ㄨ閫氱姸鎬�
+ Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
+ }
+
+
//SharedMethod.SharedMethod.IsBackground = true;
//MainPage.IsEnterBackground = true;
////杩涘叆鍚庡彴mqtt姝ｅ湪杩炴帴閲嶇疆鐘舵��
@@ -203,6 +233,13 @@
public override void OnActivated(UIApplication application)
{
+ if (DB_ResidenceData.Instance.SupportFVDevice)
+ {
+ //璁剧疆鍏ㄨ閫氱姸鎬�
+ Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
+ }
+
+
Console.WriteLine("OnActivated");
base.OnActivated(application);
//HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
@@ -233,6 +270,14 @@
{
Language.CurrentLanguage = "Czech";
}
+ //else if (NSLocale.PreferredLanguages[0].Contains("ru-"))
+ //{
+ // Language.CurrentLanguage = "russian";
+ //}
+ else if (NSLocale.PreferredLanguages[0].Contains("es-"))
+ {
+ Language.CurrentLanguage = "Spanish";
+ }
else
{
Language.CurrentLanguage = "English";
@@ -246,6 +291,13 @@
public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
{
+
+ if (DB_ResidenceData.Instance.SupportFVDevice) {
+ //璁剧疆鍏ㄨ閫氱姸鎬�
+ Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
+ }
+
+
Console.WriteLine("111111111111");
SetCurrentLanguage();
//Shared.Application.FontSize = 12;
@@ -303,6 +355,7 @@
var messageType = "";
var expantContent = "";
var homeId = "";
+
if (userInfo.ContainsKey(new NSString("expandData")))
{
var expandDataStr = userInfo["expandData"] as NSString;
@@ -329,6 +382,7 @@
Utlis.WriteLine("homeId: " + homeId);
}
+
}
}
else
--
Gitblit v1.8.0