From dc840e2d67654781ebc9c7640e6c44a63a6d04d0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 11 十二月 2020 09:44:37 +0800
Subject: [PATCH] 2020-12-11 1.注册、忘记密码、重置密码、点击返回到时候屏蔽检测错误提示。底部按钮使能效果优化修改。邮箱变密码输入问题修复。2.网络请求底层增加token过期检测刷新方法。3.更新控件库，iOS EditText取消默认密码输入方式。
---
HDL-ON_Android/Application.cs | 90 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 77 insertions(+), 13 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index fd6bb1c..7317bbb 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,19 @@
{
Language.CurrentLanguage = "Chinese";
}
+
+ //鑾峰彇鏋佸厜鎺ㄩ�両D
+ GetJPushRegistrationID(activity);
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 +97,7 @@
BaseActivity.OnDestroyAction += (activity) =>
{
Console.WriteLine("OnDestroyAction");
- BusSocket.Stop();
+ //BusSocket.Stop();
OnAppConfig.Instance.unlockTime = DateTime.Now;
};
@@ -103,22 +106,82 @@
//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 GetJPushRegistrationID(BaseActivity activity)
+ {
+ try
+ {
+ //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
+ var tokenID = JPushInterface.GetRegistrationID(activity);
+ Console.WriteLine("RegistrationID: " + tokenID);
+ if (!string.IsNullOrEmpty(tokenID) && UserInfo.Current.PushDeviceToken != tokenID)
+ {
+ UserInfo.Current.PushDeviceToken = tokenID;
+ UserInfo.Current.PhoneName = Android.OS.Build.Manufacturer;
+ UserInfo.Current.SaveUserInfo();
+ }
+ int loadTokenCount = 0;
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ while (string.IsNullOrEmpty(tokenID))
+ {
+ System.Threading.Thread.Sleep(1000);
+ tokenID = JPushInterface.GetRegistrationID(activity);
+ Console.WriteLine("Sleep.tokenID + " + JPushInterface.GetRegistrationID(activity));
+ loadTokenCount++;
+ if (loadTokenCount > 30)
+ {
+ break;
+ }
+ }
+ Console.WriteLine("RegistrationID: " + tokenID);
+ if (!string.IsNullOrEmpty(tokenID) && UserInfo.Current.PushDeviceToken != tokenID)
+ {
+ UserInfo.Current.PushDeviceToken = tokenID;
+ UserInfo.Current.PhoneName = Android.OS.Build.Manufacturer;
+ UserInfo.Current.SaveUserInfo();
+ }
+ });
+
+ }
+ catch
+ {
+
+ }
+ }
+
public static bool IsShowTip = true;
void init()
{
//鎵嬫満鍚嶇О Android.OS.Build.Manufacturer;
+ //OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
+#if DEBUG
+ CN.Jpush.Android.Api.JPushInterface.SetDebugMode(true);
+#endif
+ CN.Jpush.Android.Api.JPushInterface.Init(this);
+
}
void checkSomeInfo()
{
@@ -244,7 +307,7 @@
void BusSocketStop()
{
IsEnterBackground = true;
- BusSocket.Stop();
+ //BusSocket.Stop();
OnAppConfig.Instance.unlockTime = DateTime.Now;
}
@@ -256,7 +319,8 @@
{
IsEnterBackground = false;
- BusSocket.Start(6000);
+ //BusSocket.Start();
}
}
+
}
\ No newline at end of file
--
Gitblit v1.8.0