From 680d96f157e4609af3e7af6f8d01ee0bf3f55063 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 21:11:04 +0800
Subject: [PATCH] 20201210
---
HDL-ON_Android/Application.cs | 66 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 8b47174..8cb39a6 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -49,7 +49,9 @@
string[] permissions = new string[] { Manifest.Permission.WriteExternalStorage, Manifest.Permission.RecordAudio,
Manifest.Permission.Camera, Manifest.Permission.ProcessOutgoingCalls, Manifest.Permission.GetAccounts};
-
+ //绂佹灞忓箷闀夸寒
+ BaseActivity.KeepScreenON = false;
+ //闅愯棌杩嫓铏氭嫙鎸夐敭
BaseActivity.IsHideVirualButtons = true;
init();
BaseActivity.OnCreateActoin += (activity, application) =>
@@ -61,12 +63,9 @@
{
Language.CurrentLanguage = "Chinese";
}
-#if DEBUG
-
-#else
- //娉ㄥ唽鏋佸厜鎺ㄩ��
- InitJPush(activity);
-#endif
+
+ //鑾峰彇鏋佸厜鎺ㄩ�両D
+ GetJPushRegistrationID(activity);
BaseActivity.NetworkStateChanged += (int obj) =>
{
@@ -84,7 +83,7 @@
{
Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�");
}
-
+ MainPage.InternetStatus = obj;
};
};
BaseActivity.RefreshUIAction += (activity) =>
@@ -101,7 +100,7 @@
{
Console.WriteLine("OnDestroyAction");
//BusSocket.Stop();
- OnAppConfig.Instance.unlockTime = DateTime.Now;
+ UserInfo.Current.unlockTime = DateTime.Now;
};
@@ -109,33 +108,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(() =>
@@ -152,15 +159,14 @@
}
}
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();
}
});
- //#endif
}
catch
{
@@ -174,12 +180,10 @@
//鎵嬫満鍚嶇О Android.OS.Build.Manufacturer;
//OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
#if DEBUG
-
-#else
- //璁剧疆鏋佸厜璋冭瘯妯″紡锛屼负false鏃跺彧鎵撳嵃璀﹀憡淇℃伅
- JPushInterface.SetDebugMode(false);
- JPushInterface.Init(this);//淇濆瓨鎵嬫満鍚嶇О鍒版湰鍦版枃浠�
+ CN.Jpush.Android.Api.JPushInterface.SetDebugMode(true);
#endif
+ CN.Jpush.Android.Api.JPushInterface.Init(this);
+
}
void checkSomeInfo()
{
@@ -306,7 +310,7 @@
{
IsEnterBackground = true;
//BusSocket.Stop();
- OnAppConfig.Instance.unlockTime = DateTime.Now;
+ UserInfo.Current.unlockTime = DateTime.Now;
}
--
Gitblit v1.8.0