From 1b56157e8edc3f502810820d99b607e3629c7171 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 七月 2023 09:42:00 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL-ON_Android/SplashActivity.cs | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 75 insertions(+), 16 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 76e7e2b..4fccb42 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -1,9 +1,13 @@
锘縰sing System;
+using Android;
using Android.App;
using Android.Content;
using Android.Content.PM;
+using Android.Locations;
using Android.Net;
using Android.OS;
+using Android.Support.V4.App;
+using Android.Support.V4.Content;
using CN.Jpush.Android.Api;
//using Android.Widget;
using Com.Hdl.ON.Jpush.Androidjpush;
@@ -46,12 +50,20 @@
{
base.OnCreate(savedInstanceState);
+ if(Shared.Application.Activity != null && Shared.Application.Activity.GetType() == typeof(BaseActivity))
+ {
+ Finish();
+ return;
+ }
+
//Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
//StartActivityForResult(i, 1);
//OverridePendingTransition(0, 0);
//initAll();
if (HDL_ON.OnAppConfig.Instance.FirstRunApp || !HDL_ON.OnAppConfig.Instance.isAgreePrivacyPolicy)
{
+ //OnAppConfig.Instance.FirstRunApp = false;
+ //OnAppConfig.Instance.SaveConfig();
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
@@ -92,6 +104,25 @@
}
}
+
+ public void Permissions()
+ {
+ string[] mPermissionList = new string[]
+ {
+ Manifest.Permission.ReadSms
+ };
+
+ foreach (string permissions in mPermissionList)
+ {
+ if (ContextCompat.CheckSelfPermission(this, permissions) != 0)
+ {
+ ActivityCompat.RequestPermissions(this, new string[] { permissions }, 1);
+ }
+ }
+ }
+
+
+
void initOhterSdk()
{
//娉ㄥ唽鏈鐞嗗紓甯镐簨浠�
@@ -104,8 +135,7 @@
JPushInterface.Init(this);
Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
-
-
+
BaseActivity.OnCreateActoin += (activity, application) =>
{
@@ -159,7 +189,7 @@
}
};
- BaseActivity.OnCreateActoin += (activity, application) =>
+ BaseActivity.OnCreateActoin = (activity, application) =>
{
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
@@ -208,7 +238,7 @@
HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
};
};
- BaseActivity.RefreshUIAction += (activity) =>
+ BaseActivity.RefreshUIAction = (activity) =>
{
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
@@ -237,11 +267,11 @@
MainPage.Show();
checkSomeInfo();
};
- BaseActivity.OnResumeAction += (activity) =>
+ BaseActivity.OnResumeAction = (activity) =>
{
checkSomeInfo();
};
- BaseActivity.OnDestroyAction += (activity) =>
+ BaseActivity.OnDestroyAction = (activity) =>
{
Console.WriteLine("OnDestroyAction");
//BusSocket.Stop();
@@ -254,20 +284,20 @@
//Shared.Application.IsGpsEnable = true;
//bool isfirst = true;
-
+
+ var isfirst = true;
//鑾峰彇缁忕含搴�
Shared.Application.LocationAction = (lon, lat) =>
{
try
{
- //if (isfirst)
- //{
- // //鍙Е鍙戜竴娆�
- // //Shared.Application.LocationAction = null;
- // new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(lon.ToString().Replace(",", "."), lat.ToString().Replace(",", "."));
- //}
- //isfirst = false;
+ if (isfirst)
+ {
+ //鍙Е鍙戜竴娆�
+ new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(lon.ToString().Replace(",", "."), lat.ToString().Replace(",", "."));
+ }
+ isfirst = false;
///鐩戝惉缁忕含搴�
HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.Current.AppLatAndLonEvent(lon, lat);
//鍏抽棴瀹氫綅鏈嶅姟
@@ -389,7 +419,36 @@
}
+
+
+
+ // 鍦ㄤ綘鐨勬椿鍔紙Activity锛夋垨鐗囨锛團ragment锛変腑鐨勬煇涓柟娉曚腑锛屽紑濮嬬洃鍚綅缃彉鍖�
+ void StartLocationUpdates()
+ {
+ // 鍒涘缓浣嶇疆绠＄悊鍣�
+ var locationManager = (LocationManager)GetSystemService(Context.LocationService);
+
+ // 璁剧疆浣嶇疆鐩戝惉鍣�
+ var locationListener = new MyLocationListener_V2();
+
+ // 璇锋眰浣嶇疆鏇存柊
+ locationManager.RequestLocationUpdates(LocationManager.GpsProvider, 0, 0, locationListener);
+ }
+
+ // 鍦ㄤ綘鐨勬椿鍔紙Activity锛夋垨鐗囨锛團ragment锛変腑鐨勬煇涓柟娉曚腑锛屽仠姝㈢洃鍚綅缃彉鍖�
+ void StopLocationUpdates()
+ {
+ // 鍒涘缓浣嶇疆绠＄悊鍣�
+ var locationManager = (LocationManager)GetSystemService(Context.LocationService);
+
+ // 璁剧疆浣嶇疆鐩戝惉鍣�
+ var locationListener = new MyLocationListener_V2();
+
+ // 鍋滄浣嶇疆鏇存柊
+ locationManager.RemoveUpdates(locationListener);
+ }
+
+
+
}
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0