From 37dc5f07121946aa03ce96030a9f400af032367d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 16:00:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW' into NewFilePath
---
HDL-ON_Android/Application.cs | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 1304502..06bf43d 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,7 @@
{
Language.CurrentLanguage = "Chinese";
}
- //#if DEBUG
-
- //#else
- // //娉ㄥ唽鏋佸厜鎺ㄩ��
- // InitJPush(activity);
- //#endif
+
//鑾峰彇鏋佸厜鎺ㄩ�両D
GetJPushRegistrationID(activity);
@@ -86,7 +83,7 @@
{
Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�");
}
-
+ MainPage.InternetStatus = obj;
};
};
BaseActivity.RefreshUIAction += (activity) =>
@@ -111,14 +108,23 @@
//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>
--
Gitblit v1.8.0