From e87985ec1dcb69beedaf9f95e8e7aba14b7c08d6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 09 十二月 2020 18:50:14 +0800
Subject: [PATCH] 2020-12-09 1.信息中心,增加下划线和点击Alter提醒详情。

---
 HDL-ON_Android/Application.cs |   58 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index a61ad97..7317bbb 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -61,10 +61,9 @@
                 {
                     Language.CurrentLanguage = "Chinese";
                 }
-#if Release
-                //娉ㄥ唽鏋佸厜鎺ㄩ��
-                InitJPush(activity);
-#endif
+        
+                //鑾峰彇鏋佸厜鎺ㄩ�両D
+                GetJPushRegistrationID(activity);
 
                 BaseActivity.NetworkStateChanged += (int obj) =>
                 {
@@ -107,33 +106,41 @@
 
             //Shared.Application.IsGpsEnable = true;
 
-            Shared.Application.LocationAction = (arg1, arg2) =>
+            //鑾峰彇缁忕含搴� 
+            Shared.Application.LocationAction = (lon, lat) =>
             {
-                Shared.Application.LocationAction = null;
+                try
+                {
+                    Shared.Application.LocationAction = null;
+                    Shared.Application.StopGPSLocationService();
+                    new HDL_ON.DAL.Server.HttpServerRequest().GetCityInfo(lon.ToString(), lat.ToString());
+                }
+                catch
+                {
 
-                new HDL_ON.DAL.Server.HttpServerRequest().GetCityInfo(arg1.ToString(), arg2.ToString());
-
-                MainPage.Log($"缁忕含搴�:::{arg1}:{arg2}");
+                }
+                MainPage.Log($"缁忕含搴�:::{lon}:{lat}");
             };
+
+           
         }
 
         /// <summary>
         /// 
         /// </summary>
         /// <param name="activity"></param>
-        void InitJPush(BaseActivity activity)
+        void GetJPushRegistrationID(BaseActivity activity)
         {
             try
             {
-                //#if Release
                 //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
                 var tokenID = JPushInterface.GetRegistrationID(activity);
                 Console.WriteLine("RegistrationID:  " + tokenID);
-                if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
+                if (!string.IsNullOrEmpty(tokenID) && UserInfo.Current.PushDeviceToken != tokenID)
                 {
-                    OnAppConfig.Instance.PushDeviceToken = tokenID;
-                    OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
-                    OnAppConfig.Instance.SaveUserConfig();
+                    UserInfo.Current.PushDeviceToken = tokenID;
+                    UserInfo.Current.PhoneName = Android.OS.Build.Manufacturer;
+                    UserInfo.Current.SaveUserInfo();
                 }
                 int loadTokenCount = 0;
                 System.Threading.Tasks.Task.Run(() =>
@@ -142,23 +149,22 @@
                     {
                         System.Threading.Thread.Sleep(1000);
                         tokenID = JPushInterface.GetRegistrationID(activity);
-                        Utlis.WriteLine("Sleep.tokenID + " + JPushInterface.GetRegistrationID(activity));
+                        Console.WriteLine("Sleep.tokenID + " + JPushInterface.GetRegistrationID(activity));
                         loadTokenCount++;
                         if (loadTokenCount > 30)
                         {
                             break;
                         }
                     }
-                    Utlis.WriteLine("RegistrationID:  " + tokenID);
-                    if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
+                    Console.WriteLine("RegistrationID:  " + tokenID);
+                    if (!string.IsNullOrEmpty(tokenID) && UserInfo.Current.PushDeviceToken != tokenID)
                     {
-                        OnAppConfig.Instance.PushDeviceToken = tokenID;
-                        OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
-                        OnAppConfig.Instance.SaveUserConfig();
+                        UserInfo.Current.PushDeviceToken = tokenID;
+                        UserInfo.Current.PhoneName = Android.OS.Build.Manufacturer;
+                        UserInfo.Current.SaveUserInfo();
                     }
                 });
 
-                //#endif
             }
             catch
             {
@@ -171,11 +177,11 @@
         {
             //鎵嬫満鍚嶇О Android.OS.Build.Manufacturer;
             //OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
-#if Release
-            //璁剧疆鏋佸厜璋冭瘯妯″紡锛屼负false鏃跺彧鎵撳嵃璀﹀憡淇℃伅
-            JPushInterface.SetDebugMode(false);
-            JPushInterface.Init(this);//淇濆瓨鎵嬫満鍚嶇О鍒版湰鍦版枃浠�
+#if DEBUG
+            CN.Jpush.Android.Api.JPushInterface.SetDebugMode(true);
 #endif
+            CN.Jpush.Android.Api.JPushInterface.Init(this);
+
         }
         void checkSomeInfo()
         {

--
Gitblit v1.8.0