From e4ff4b4f64015836f109999b3421e7e6bd39982a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 31 七月 2023 14:19:26 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL-ON_Android/SplashActivity.cs | 166 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 144 insertions(+), 22 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index ac78c22..4fccb42 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -1,9 +1,13 @@
-锘縰sing System;
+锘縰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
{
@@ -41,23 +45,52 @@
base.OnActivityResult(requestCode, resultVal, data);
}
-
+ [Obsolete]
protected override void OnCreate(Bundle savedInstanceState)
{
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);
+ if (localeList.Language == "zh")
+ {
+ Language.CurrentLanguage = "Chinese";
+ }
+ else if (localeList.Language == "es")
+ {
+ Language.CurrentLanguage = "Spanish";
+ }
+ else if (localeList.Language == "ru")
+ {
+ Language.CurrentLanguage = "russian";
+ }
+ else if (localeList.Language == "bg")
+ {
+ Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
+ }
+ else
+ {
+ Language.CurrentLanguage = "English";
+ }
+
Intent intent = new Intent(this, typeof(AgreementActivity));
- StartActivityForResult(intent,99);
+ StartActivityForResult(intent, 99);
}
else
{
@@ -69,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()
{
@@ -83,8 +134,10 @@
//#endif
JPushInterface.Init(this);
+ Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
+
- BaseActivity.OnCreateActoin = (activity, application) =>
+ BaseActivity.OnCreateActoin += (activity, application) =>
{
//鑾峰彇鏋佸厜鎺ㄩ�両D
GetJPushRegistrationID(activity);
@@ -107,6 +160,9 @@
BaseActivity.KeepScreenON = false;
//闅愯棌铏氭嫙鎸夐敭
BaseActivity.IsHideVirualButtons = true;
+
+
+
//瀹炵幇瀹夊崜杩斿洖鎸夐敭
BaseActivity.BackKeyAction = () =>
{
@@ -138,13 +194,22 @@
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
+ Console.WriteLine("褰撳墠璇█缂栧彿" + localeList.Language);
if (localeList.Language == "zh")
{
Language.CurrentLanguage = "Chinese";
}
- else if(localeList.Language == "es")
+ else if (localeList.Language == "es")
{
Language.CurrentLanguage = "Spanish";
+ }
+ else if (localeList.Language == "ru")
+ {
+ Language.CurrentLanguage = "russian";
+ }
+ else if (localeList.Language == "bg")
+ {
+ Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
else
{
@@ -166,7 +231,7 @@
//}
//else
//{
- // Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�");
+ //Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�"+internetStatus);
//}
//缃戠粶鍙樺寲澶勭悊
@@ -175,6 +240,30 @@
};
BaseActivity.RefreshUIAction = (activity) =>
{
+ Language.CurrentLanguage = "Chinese";
+ Locale locale1 = Locale.Default;
+ var localeList = Resources.Configuration.Locale;
+ Console.WriteLine("褰撳墠璇█锛�" + localeList.Language);
+ if (localeList.Language == "zh")
+ {
+ Language.CurrentLanguage = "Chinese";
+ }
+ else if (localeList.Language == "es")
+ {
+ Language.CurrentLanguage = "Spanish";
+ }
+ else if (localeList.Language == "ru")
+ {
+ Language.CurrentLanguage = "russian";
+ }
+ else if (localeList.Language == "bg")
+ {
+ Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
+ }
+ else
+ {
+ Language.CurrentLanguage = "English";
+ }
MainPage.Show();
checkSomeInfo();
};
@@ -193,7 +282,11 @@
HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");
//Shared.Application.IsGpsEnable = true;
- bool isfirst = true;
+ //bool isfirst = true;
+
+
+
+ var isfirst = true;
//鑾峰彇缁忕含搴�
Shared.Application.LocationAction = (lon, lat) =>
{
@@ -202,12 +295,11 @@
if (isfirst)
{
//鍙Е鍙戜竴娆�
- //Shared.Application.LocationAction = null;
new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(lon.ToString().Replace(",", "."), lat.ToString().Replace(",", "."));
}
isfirst = false;
///鐩戝惉缁忕含搴�
- HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.CurrLogicMethod.AppLatAndLonEvent(lon, lat);
+ HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.Current.AppLatAndLonEvent(lon, lat);
//鍏抽棴瀹氫綅鏈嶅姟
//Shared.Application.StopGPSLocationService();
}
@@ -219,6 +311,8 @@
};
}
+
+
/// <summary>
///
/// </summary>
@@ -229,7 +323,7 @@
{
//淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
var tokenID = JPushInterface.GetRegistrationID(activity);
- Console.WriteLine("RegistrationID1: " + tokenID);
+ Console.WriteLine("RegistrationID: " + tokenID);
if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
{
OnAppConfig.Instance.PushDeviceToken = tokenID;
@@ -250,7 +344,7 @@
break;
}
}
- Console.WriteLine("RegistrationID2: " + tokenID);
+ Console.WriteLine("RegistrationID: " + tokenID);
if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
{
OnAppConfig.Instance.PushDeviceToken = tokenID;
@@ -267,7 +361,7 @@
}
public static bool IsShowTip = true;
-
+
void checkSomeInfo()
{
try
@@ -324,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