From a170a2ecef6d5c87883ed552dbbc81cfb0358d13 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 19 十一月 2021 16:43:53 +0800
Subject: [PATCH] Merge branch 'WJC' into newBranch1
---
HDL-ON_Android/Application.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 7a4f0db..52059fc 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -137,8 +137,6 @@
BaseActivity.OnResumeAction += (activity) =>
{
checkSomeInfo();
-
-
};
BaseActivity.OnDestroyAction += (activity) =>
{
@@ -146,7 +144,6 @@
//BusSocket.Stop();
//UserInfo.Current.unlockTime = DateTime.Now;
};
-
HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");
@@ -158,7 +155,7 @@
try
{
Shared.Application.LocationAction = null;
- new HDL_ON.DAL.Server.HttpServerRequest().GetCityInfo(lon.ToString(), lat.ToString());
+ new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(lon.ToString(), lat.ToString());
//鍏抽棴瀹氫綅鏈嶅姟
Shared.Application.StopGPSLocationService();
}
@@ -168,8 +165,6 @@
}
MainPage.Log($"缁忕含搴�:::{lon}:{lat}");
};
-
-
}
/// <summary>
@@ -178,10 +173,8 @@
/// <param name="activity"></param>
void GetJPushRegistrationID(BaseActivity activity)
{
-
try
{
-
//淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
var tokenID = JPushInterface.GetRegistrationID(activity);
Console.WriteLine("RegistrationID: " + tokenID);
@@ -400,6 +393,17 @@
base.Dispose(disposing);
}
+ /// <summary>
+ /// 鏌ヨ閫氱煡鏉冮檺锛屽苟鎻愮ず
+ /// </summary>
+ public void QueryNotificationPermission()
+ {
+
+
+ }
+
+
+
}
}
--
Gitblit v1.8.0