From 52748710122f275a060538564c1086e69d11ff76 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 08 七月 2021 19:37:18 +0800
Subject: [PATCH] 新增功能：海林传感器，调试云端接口，暂时无法通过接口读取数据 Bug修复：乐橙可视对讲历史记录
---
HDL-ON_iOS/AppDelegate.cs | 132 +++++++++++++++++++++++++-------------------
1 files changed, 75 insertions(+), 57 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index f520b4b..03ce2b3 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -132,6 +132,8 @@
}
Console.WriteLine(userInfo);
+ //HDLCommon.Current.ShowAlert("DidReceiveRemoteNotification:" + userInfo.ToString());
+
if (application.ApplicationState == UIApplicationState.Active || application.ApplicationState == UIApplicationState.Background)
{
@@ -202,7 +204,7 @@
{
Console.WriteLine("OnActivated");
base.OnActivated(application);
- HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
+ //HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
//if (haveToSignOut == true)
//{
@@ -215,72 +217,65 @@
}
+ /// <summary>
+ /// 璁剧疆褰撳墠浣跨敤璇█
+ /// </summary>
+ void SetCurrentLanguage()
+ {
+ if (string.IsNullOrEmpty(OnAppConfig.Instance.SetLanguage))
+ {
+ if (NSLocale.PreferredLanguages[0].Contains("zh-"))
+ {
+ Language.CurrentLanguage = "Chinese";
+ }
+ else if (NSLocale.PreferredLanguages[0].Contains("cs-"))
+ {
+ Language.CurrentLanguage = "Czech";
+ }
+ else
+ {
+ Language.CurrentLanguage = "English";
+ }
+ }
+ else
+ {
+ Language.CurrentLanguage = OnAppConfig.Instance.SetLanguage;
+ }
+ }
+
public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
{
+ Console.WriteLine("111111111111");
+ SetCurrentLanguage();
//Shared.Application.FontSize = 12;
//Bugly.Bugly.StartWithAppId("b58fb35436");
-
//鍙栨秷EditText榛樿瀵嗙爜杈撳叆鏂瑰紡
- Shared.Application.IsEditTextContentTypePassword = false;
+ //Shared.Application.IsEditTextContentTypePassword = false;
//榛樿浣跨敤鑻规柟瀛椾綋
Shared.Application.IsUsePingFang = true;
//淇濇寔灞忓箷甯镐寒鎴栬�呰嚜鍔ㄩ攣灞�
application.IdleTimerDisabled = false;
+ base.FinishedLaunching(application, launchOptions);
Window = new UIWindow(UIScreen.MainScreen.Bounds);
rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
Window.RootViewController = rootViewController;
Window.MakeKeyAndVisible();
- //AppCenter.Start("e1add75a-82c6-4a5c-a902-4705b195748e",typeof(Analytics), typeof(Crashes));
- base.FinishedLaunching(application, launchOptions);
+ AppCenter.Start("e1add75a-82c6-4a5c-a902-4705b195748e", typeof(Analytics), typeof(Crashes));
SharedMethod.SharedMethod.sharedApp = application;
//NSString* nsCount = [[NSLocale currentLocale] objectForKey: NSLocaleCountryCode];
application.StatusBarStyle = UIStatusBarStyle.DarkContent;
-
- //string nsCount = NSLocale.CurrentLocale.CountryCode;
-
- //if ( UserInfo.Current != null && nsCount != UserInfo.Current.areaCode.ToString())
- //{
- // //int.TryParse(nsCount,out UserInfo.Current.areaCode);
- // //2020-11-18
- // UserInfo.Current.areaCode = nsCount;
- // OnAppConfig.Instance.SaveUserConfig();
- //}
-
-
- application.RegisterForRemoteNotificationTypes(UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge | UIRemoteNotificationType.Sound);
-
//window.AccessibilityNavigationStyle = UIAccessibilityNavigationStyle.Automatic;
// check for a notification
DealWithPushMes(launchOptions);
+
+ //if (UIApplication.SharedApplication.ApplicationIconBadgeNumber > 0)
+ //{
+ // //RemoteInfo.Current.ReadMsgList(true);
+ //}
- if (UIDevice.CurrentDevice.CheckSystemVersion(8, 0))
- {
- var notificationSettings = UIUserNotificationSettings.GetSettingsForTypes(UIUserNotificationType.Alert | UIUserNotificationType.Badge | UIUserNotificationType.Sound, null);
- application.RegisterUserNotificationSettings(notificationSettings);
- application.RegisterForRemoteNotifications();
- }
- else
- {
- //==== register for remote notifications and get the device token
- // set what kind of notification types we want
- UIRemoteNotificationType notificationTypes = UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge;
- // register for remote notifications
- UIApplication.SharedApplication.RegisterForRemoteNotificationTypes(notificationTypes);
- }
-
- if (UIApplication.SharedApplication.ApplicationIconBadgeNumber > 0)
- {
- //RemoteInfo.Current.ReadMsgList(true);
- }
-
- //Harpy.Harpy.SharedInstance.PresentingViewController = this.Window.RootViewController;
- //Harpy.Harpy.SharedInstance.WeakDelegate = this;
- //Harpy.Harpy.SharedInstance.AlertType = Harpy.HarpyAlertType.Skip;
- //Harpy.Harpy.SharedInstance.DebugEnabled = false;
- //Harpy.Harpy.SharedInstance.ForceLanguageLocalization = Harpy.Constants.HarpyLanguageChineseSimplified;
Console.WriteLine("FinishedLaunching");
return true;
}
@@ -300,6 +295,8 @@
var title = alert["title"] as NSString;
var expandData = "";
var messageType = "";
+ var expantContent = "";
+ var homeId = "";
if (userInfo.ContainsKey(new NSString("expandData")))
{
var expandDataStr = userInfo["expandData"] as NSString;
@@ -311,9 +308,21 @@
expandData = expandDataNSD.ToString();
if(expandDataNSD.ContainsKey(new NSString("messageType"))){
messageType = expandDataNSD["messageType"] as NSString;
- Utlis.WriteLine("messageType: "+ messageType);
+ Utlis.WriteLine("messageType: " + messageType);
}
-
+
+ if (expandDataNSD.ContainsKey(new NSString("expantContent")))
+ {
+ expantContent = expandDataNSD["expantContent"] as NSString;
+ Utlis.WriteLine("expantContent: " + expantContent);
+ }
+
+ if (expandDataNSD.ContainsKey(new NSString("homeId")))
+ {
+ homeId = expandDataNSD["homeId"].ToString();
+ Utlis.WriteLine("homeId: " + homeId);
+ }
+
}
}
else
@@ -324,10 +333,12 @@
}
var pushMes = new JPushMessageInfo()
{
+ HomeId = homeId,
Title = title,
Content = body,
Extras = expandData,
- messageType = messageType
+ messageType = messageType,
+ expantContent = expantContent
};
Utlis.WriteLine("PushMes title : " + pushMes.Title);
Utlis.WriteLine("PushMes message : " + pushMes.Content);
@@ -335,14 +346,21 @@
if (bFinishedLaunching)
{
- if (pushMes.Extras != null && pushMes.Extras.Contains("OffLine"))
+ if (pushMes.Extras != null)
{
- //haveToSignOut = true;
- //寮哄埗涓嬬嚎
- UserInfo.Current.LastTime = DateTime.MinValue;
- UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚
- UserInfo.Current.SaveUserInfo();
- HDLCommon.Current.ShowAlert(Language.StringByID(StringId.LoggedOnOtherDevices));
+ if (pushMes.Extras.Contains("OffLine"))
+ {
+ //haveToSignOut = true;
+ //寮哄埗涓嬬嚎
+ UserInfo.Current.LastTime = DateTime.MinValue;
+ UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚
+ UserInfo.Current.SaveUserInfo();
+ HDLCommon.Current.ShowAlert(Language.StringByID(StringId.LoggedOnOtherDevices));
+ }
+ else
+ {
+ HDLCommon.Current.AdjustPushMessage(pushMes);
+ }
}
}
else
@@ -354,7 +372,7 @@
}
catch
{
-
+ //HDLCommon.Current.ShowAlert("catch2222");
}
}
@@ -378,7 +396,7 @@
if (userInfo != null)
{
- HandleNotificationMessageUserInfo(userInfo, true);
+ //HandleNotificationMessageUserInfo(userInfo, true);
}
}
@@ -414,7 +432,7 @@
if (CloseTime.AddSeconds(10) < DateTime.Now)
{
//鍚庡彴瓒呰繃10s灏辨柇寮�MQTT閲嶈繛
- if (HDL_ON.DriverLayer.Control.Ins.IsRemote)
+ //if (HDL_ON.DriverLayer.Control.Ins.IsRemote)
{
HDL_ON.DAL.Mqtt.MqttClient.DisConnectRemote("closeTime", false);
}
--
Gitblit v1.8.0