From 3cebdfad56d78ba04a214fccd1b942a010aeba77 Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期五, 26 三月 2021 09:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL-ON_Android/Application.cs | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index bb26507..bb0bab8 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -33,7 +33,6 @@
public override void OnCreate()
{
//娉ㄥ唽鏈鐞嗗紓甯镐簨浠�
-
Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "cb89f20750");
if (Shared.Application.Activity != null)
{
@@ -47,6 +46,9 @@
initAll();
}
+
+
+
/// <summary>
/// 鎵�鏈夊垵濮嬪寲鍏ㄩ儴鍦ㄨ繖涓柟娉曞疄鐜�
/// </summary>
@@ -60,7 +62,8 @@
//闅愯棌铏氭嫙鎸夐敭
BaseActivity.IsHideVirualButtons = true;
//瀹炵幇瀹夊崜杩斿洖鎸夐敭
- BaseActivity.BackKeyAction = () => {
+ BaseActivity.BackKeyAction = () =>
+ {
try
{
var result = MainPage.LoadEvent_BackAction();
@@ -97,7 +100,7 @@
{
Language.CurrentLanguage = "English";
}
-
+
//鑾峰彇鏋佸厜鎺ㄩ�両D
GetJPushRegistrationID(activity);
@@ -133,7 +136,8 @@
BaseActivity.OnResumeAction += (activity) =>
{
checkSomeInfo();
-
+
+
};
BaseActivity.OnDestroyAction += (activity) =>
{
@@ -142,7 +146,7 @@
//UserInfo.Current.unlockTime = DateTime.Now;
};
-
+
HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");
@@ -157,14 +161,14 @@
//鍏抽棴瀹氫綅鏈嶅姟
Shared.Application.StopGPSLocationService();
}
- catch(Exception ex)
+ catch (Exception ex)
{
- Utlis.WriteLine("GetCityInfo catch"+ ex.Message);
+ Utlis.WriteLine("GetCityInfo catch" + ex.Message);
}
MainPage.Log($"缁忕含搴�:::{lon}:{lat}");
};
-
+
}
/// <summary>
@@ -173,8 +177,10 @@
/// <param name="activity"></param>
void GetJPushRegistrationID(BaseActivity activity)
{
+
try
{
+
//淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
var tokenID = JPushInterface.GetRegistrationID(activity);
Console.WriteLine("RegistrationID: " + tokenID);
@@ -364,7 +370,7 @@
//杩涘叆鍚庡彴mqtt姝ｅ湪杩炴帴閲嶇疆鐘舵��
HDL_ON.DAL.Mqtt.MqttClient.RemoteMqttIsConnecting = false;
HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
-
+
}
/// <summary>
--
Gitblit v1.8.0