From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL-ON_Android/Application.cs | 76 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 9 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index fd6bb1c..a61ad97 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -5,6 +5,7 @@
using Android.Content;
using Android.Net;
using Android.OS;
+using CN.Jpush.Android.Api;
using HDL_ON;
using Java.Util;
using Shared;
@@ -60,17 +61,20 @@
{
Language.CurrentLanguage = "Chinese";
}
+#if Release
+ //娉ㄥ唽鏋佸厜鎺ㄩ��
+ InitJPush(activity);
+#endif
BaseActivity.NetworkStateChanged += (int obj) =>
{
-
if (!IsEnterBackground)
{
- BusSocket.Stop();
+ //BusSocket.Stop();
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(1000);
- BusSocket.Start(6000);
+ //BusSocket.Start();
})
{ IsBackground = true }.Start();
}
@@ -94,7 +98,7 @@
BaseActivity.OnDestroyAction += (activity) =>
{
Console.WriteLine("OnDestroyAction");
- BusSocket.Stop();
+ //BusSocket.Stop();
OnAppConfig.Instance.unlockTime = DateTime.Now;
};
@@ -110,15 +114,68 @@
new HDL_ON.DAL.Server.HttpServerRequest().GetCityInfo(arg1.ToString(), arg2.ToString());
MainPage.Log($"缁忕含搴�:::{arg1}:{arg2}");
-
};
-
-
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="activity"></param>
+ void InitJPush(BaseActivity activity)
+ {
+ try
+ {
+ //#if Release
+ //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
+ var tokenID = JPushInterface.GetRegistrationID(activity);
+ Console.WriteLine("RegistrationID: " + tokenID);
+ if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
+ {
+ OnAppConfig.Instance.PushDeviceToken = tokenID;
+ OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
+ OnAppConfig.Instance.SaveUserConfig();
+ }
+ int loadTokenCount = 0;
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ while (string.IsNullOrEmpty(tokenID))
+ {
+ System.Threading.Thread.Sleep(1000);
+ tokenID = JPushInterface.GetRegistrationID(activity);
+ Utlis.WriteLine("Sleep.tokenID + " + JPushInterface.GetRegistrationID(activity));
+ loadTokenCount++;
+ if (loadTokenCount > 30)
+ {
+ break;
+ }
+ }
+ Utlis.WriteLine("RegistrationID: " + tokenID);
+ if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
+ {
+ OnAppConfig.Instance.PushDeviceToken = tokenID;
+ OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
+ OnAppConfig.Instance.SaveUserConfig();
+ }
+ });
+
+ //#endif
+ }
+ catch
+ {
+
+ }
+ }
+
public static bool IsShowTip = true;
void init()
{
//鎵嬫満鍚嶇О Android.OS.Build.Manufacturer;
+ //OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
+#if Release
+ //璁剧疆鏋佸厜璋冭瘯妯″紡锛屼负false鏃跺彧鎵撳嵃璀﹀憡淇℃伅
+ JPushInterface.SetDebugMode(false);
+ JPushInterface.Init(this);//淇濆瓨鎵嬫満鍚嶇О鍒版湰鍦版枃浠�
+#endif
}
void checkSomeInfo()
{
@@ -244,7 +301,7 @@
void BusSocketStop()
{
IsEnterBackground = true;
- BusSocket.Stop();
+ //BusSocket.Stop();
OnAppConfig.Instance.unlockTime = DateTime.Now;
}
@@ -256,7 +313,8 @@
{
IsEnterBackground = false;
- BusSocket.Start(6000);
+ //BusSocket.Start();
}
}
+
}
\ No newline at end of file
--
Gitblit v1.8.0