From 2f1b0d944bd8feb7c6dca5126a4832228ba826ce Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 04 十二月 2020 14:00:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL-ON_Android/Application.cs | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index a61ad97..1304502 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -61,10 +61,14 @@
{
Language.CurrentLanguage = "Chinese";
}
-#if Release
- //娉ㄥ唽鏋佸厜鎺ㄩ��
- InitJPush(activity);
-#endif
+ //#if DEBUG
+
+ //#else
+ // //娉ㄥ唽鏋佸厜鎺ㄩ��
+ // InitJPush(activity);
+ //#endif
+ //鑾峰彇鏋佸厜鎺ㄩ�両D
+ GetJPushRegistrationID(activity);
BaseActivity.NetworkStateChanged += (int obj) =>
{
@@ -121,19 +125,18 @@
///
/// </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 +145,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 +173,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