From df3906c03db154e8622b7caeaa3bf93b67c6d40a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 10:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into CJL-Linphone

---
 HDL-ON_Android/Application.cs |   39 ++++++++++++++++++++++++---------------
 1 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 4f9f009..4c277a1 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -11,6 +11,9 @@
 using CN.Jpush.Android.Api;
 using HDL_ON;
 using Java.Util;
+using Microsoft.AppCenter;
+using Microsoft.AppCenter.Analytics;
+using Microsoft.AppCenter.Crashes;
 using Shared;
 
 namespace HDL_ON_Android
@@ -28,12 +31,12 @@
             application.StartActivity(intent);
             Android.OS.Process.KillProcess(Android.OS.Process.MyPid());
         }
-        
+
         public Application(IntPtr handle, Android.Runtime.JniHandleOwnership ownerShip) : base(handle, ownerShip) { }
         public override void OnCreate()
         {
             //娉ㄥ唽鏈鐞嗗紓甯镐簨浠�
-            Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "cb89f20750");
+            AppCenter.Start("64ac5859-2cd7-4ef8-a5da-5455e29679ec", typeof(Analytics), typeof(Crashes));
             if (Shared.Application.Activity != null)
             {
                 reStartApp(this);
@@ -46,6 +49,8 @@
             initAll();
 
         }
+
+
 
         /// <summary>
         /// 鎵�鏈夊垵濮嬪寲鍏ㄩ儴鍦ㄨ繖涓柟娉曞疄鐜�
@@ -80,7 +85,8 @@
                 }
                 catch (Exception ex)
                 {
-                    Console.WriteLine(ex.Message);
+                    MainPage.Log(ex.Message);
+                    BaseActivity.VerifyDateTime = DateTime.MaxValue;
                 }
             };
 
@@ -98,7 +104,6 @@
                 {
                     Language.CurrentLanguage = "English";
                 }
-
                 //鑾峰彇鏋佸厜鎺ㄩ�両D
                 GetJPushRegistrationID(activity);
 
@@ -123,8 +128,6 @@
                     //缃戠粶鍙樺寲澶勭悊
                     HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
                 };
-                //寮�鍚畾浣嶆湇鍔�
-                Shared.Application.StartGPSLocationService();
             };
             BaseActivity.RefreshUIAction += (activity) =>
             {
@@ -134,7 +137,6 @@
             BaseActivity.OnResumeAction += (activity) =>
             {
                 checkSomeInfo();
-
             };
             BaseActivity.OnDestroyAction += (activity) =>
             {
@@ -142,7 +144,6 @@
                 //BusSocket.Stop();
                 //UserInfo.Current.unlockTime = DateTime.Now;
             };
-
 
 
             HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");
@@ -164,8 +165,6 @@
                 }
                 MainPage.Log($"缁忕含搴�:::{lon}:{lat}");
             };
-
-
         }
 
         /// <summary>
@@ -174,7 +173,6 @@
         /// <param name="activity"></param>
         void GetJPushRegistrationID(BaseActivity activity)
         {
-          
             try
             {
                 //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
@@ -221,9 +219,9 @@
         {
             //鎵嬫満鍚嶇О Android.OS.Build.Manufacturer;
             //OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
-#if DEBUG
-            CN.Jpush.Android.Api.JPushInterface.SetDebugMode(true);
-#endif
+            //#if DEBUG
+            //CN.Jpush.Android.Api.JPushInterface.SetDebugMode(true);
+            //#endif
             CN.Jpush.Android.Api.JPushInterface.Init(this);
 
         }
@@ -366,7 +364,7 @@
             //杩涘叆鍚庡彴mqtt姝ｅ湪杩炴帴閲嶇疆鐘舵��
             HDL_ON.DAL.Mqtt.MqttClient.RemoteMqttIsConnecting = false;
             HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
-           
+
         }
 
         /// <summary>
@@ -395,6 +393,17 @@
             base.Dispose(disposing);
         }
 
+        /// <summary>
+        /// 鏌ヨ閫氱煡鏉冮檺锛屽苟鎻愮ず
+        /// </summary>
+        public  void QueryNotificationPermission()
+        {
+          
+
+        }
+
+
+
     }
 
 }

--
Gitblit v1.8.0