From fd0bbcd6e475754d88cedb798000ebeb375d07e4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 19 七月 2023 11:18:48 +0800
Subject: [PATCH] Merge branch 'wjc' into Dev-1.9
---
HDL-ON_Android/SplashActivity.cs | 105 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 82 insertions(+), 23 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index c6ae1b6..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;
@@ -16,7 +20,7 @@
namespace HDL_ON_Android
{
- [Activity(Theme = "@style/SplashTheme", MainLauncher = true, Name = "com.hdl.onpro.SplashActivity",ScreenOrientation = ScreenOrientation.Portrait) ]
+ [Activity(Theme = "@style/SplashTheme", MainLauncher = true, LaunchMode = LaunchMode.SingleTask, Name = "com.hdl.onpro.SplashActivity", ScreenOrientation = ScreenOrientation.Portrait)]
[IntentFilter(new string[] { "com.hdl.onpro.SplashActivity", Intent.ActionView })]
public class SplashActivity : Activity
{
@@ -46,21 +50,24 @@
{
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;
- Console.WriteLine("褰撳墠璇█缂╁啓:"+localeList.Language);
+ Console.WriteLine("褰撳墠璇█缂╁啓:" + localeList.Language);
if (localeList.Language == "zh")
{
Language.CurrentLanguage = "Chinese";
@@ -83,7 +90,7 @@
}
Intent intent = new Intent(this, typeof(AgreementActivity));
- StartActivityForResult(intent,99);
+ StartActivityForResult(intent, 99);
}
else
{
@@ -95,8 +102,26 @@
initOhterSdk();
Finish();//鍏抽棴鑷繁
}
-
}
+
+
+ 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()
{
@@ -109,6 +134,8 @@
//#endif
JPushInterface.Init(this);
+ Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
+
BaseActivity.OnCreateActoin += (activity, application) =>
{
@@ -162,17 +189,17 @@
}
};
- BaseActivity.OnCreateActoin += (activity, application) =>
+ BaseActivity.OnCreateActoin = (activity, application) =>
{
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
- Console.WriteLine("褰撳墠璇█缂栧彿"+ localeList.Language);
+ Console.WriteLine("褰撳墠璇█缂栧彿" + localeList.Language);
if (localeList.Language == "zh")
{
Language.CurrentLanguage = "Chinese";
}
- else if(localeList.Language == "es")
+ else if (localeList.Language == "es")
{
Language.CurrentLanguage = "Spanish";
}
@@ -204,14 +231,14 @@
//}
//else
//{
- //Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�"+internetStatus);
+ //Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�"+internetStatus);
//}
//缃戠粶鍙樺寲澶勭悊
HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
};
};
- BaseActivity.RefreshUIAction += (activity) =>
+ BaseActivity.RefreshUIAction = (activity) =>
{
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
@@ -240,11 +267,11 @@
MainPage.Show();
checkSomeInfo();
};
- BaseActivity.OnResumeAction += (activity) =>
+ BaseActivity.OnResumeAction = (activity) =>
{
checkSomeInfo();
};
- BaseActivity.OnDestroyAction += (activity) =>
+ BaseActivity.OnDestroyAction = (activity) =>
{
Console.WriteLine("OnDestroyAction");
//BusSocket.Stop();
@@ -255,17 +282,19 @@
HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");
//Shared.Application.IsGpsEnable = true;
- bool isfirst = 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;
@@ -281,6 +310,8 @@
MainPage.Log($"缁忕含搴�:::{lon}:{lat}");
};
}
+
+
/// <summary>
///
@@ -330,7 +361,7 @@
}
public static bool IsShowTip = true;
-
+
void checkSomeInfo()
{
try
@@ -387,9 +418,37 @@
return false;
}
+
+
+
+
+ // 鍦ㄤ綘鐨勬椿鍔紙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