From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL-ON_Android/SplashActivity.cs | 123 +++++++++++++++++++++++++++++++----------
1 files changed, 93 insertions(+), 30 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 680bb95..76e7e2b 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+锘縰sing System;
using Android.App;
using Android.Content;
using Android.Content.PM;
@@ -16,7 +16,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
{
@@ -28,10 +28,6 @@
{
if (!OnAppConfig.Instance.FirstRunApp)
{
- //鍒濆鍖栧弸鐩焥dk
- Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
- //鍒濆鍖栧弸鐩焥dk config
- Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");
////鎵撳紑baseActivity
Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
StartActivityForResult(i, 1);
@@ -45,7 +41,7 @@
base.OnActivityResult(requestCode, resultVal, data);
}
-
+ [Obsolete]
protected override void OnCreate(Bundle savedInstanceState)
{
base.OnCreate(savedInstanceState);
@@ -54,21 +50,38 @@
//StartActivityForResult(i, 1);
//OverridePendingTransition(0, 0);
//initAll();
-
-
-
if (HDL_ON.OnAppConfig.Instance.FirstRunApp || !HDL_ON.OnAppConfig.Instance.isAgreePrivacyPolicy)
{
-
+ 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
{
- //鍒濆鍖栧弸鐩焥dk
- Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
- //鍒濆鍖栧弸鐩焥dk config
- Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android","");
////鎵撳紑baseActivity
Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
StartActivityForResult(i, 1);
@@ -77,7 +90,6 @@
initOhterSdk();
Finish();//鍏抽棴鑷繁
}
-
}
void initOhterSdk()
@@ -91,6 +103,9 @@
//#endif
JPushInterface.Init(this);
+ Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
+
+
BaseActivity.OnCreateActoin += (activity, application) =>
{
@@ -99,6 +114,10 @@
};
+ //鍒濆鍖栧弸鐩焥dk
+ Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
+ //鍒濆鍖栧弸鐩焥dk config
+ Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");
}
@@ -111,6 +130,9 @@
BaseActivity.KeepScreenON = false;
//闅愯棌铏氭嫙鎸夐敭
BaseActivity.IsHideVirualButtons = true;
+
+
+
//瀹炵幇瀹夊崜杩斿洖鎸夐敭
BaseActivity.BackKeyAction = () =>
{
@@ -142,9 +164,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")
+ {
+ Language.CurrentLanguage = "Spanish";
+ }
+ else if (localeList.Language == "ru")
+ {
+ Language.CurrentLanguage = "russian";
+ }
+ else if (localeList.Language == "bg")
+ {
+ Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
else
{
@@ -166,7 +201,7 @@
//}
//else
//{
- // Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�");
+ //Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�"+internetStatus);
//}
//缃戠粶鍙樺寲澶勭悊
@@ -175,6 +210,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,21 +252,24 @@
HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");
//Shared.Application.IsGpsEnable = true;
- bool isfirst = true;
+ //bool isfirst = true;
+
+
+
//鑾峰彇缁忕含搴�
Shared.Application.LocationAction = (lon, lat) =>
{
try
{
- if (isfirst)
- {
- //鍙Е鍙戜竴娆�
- //Shared.Application.LocationAction = null;
- new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(lon.ToString(), lat.ToString());
- }
- isfirst = false;
+ //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();
}
@@ -218,6 +280,8 @@
MainPage.Log($"缁忕含搴�:::{lon}:{lat}");
};
}
+
+
/// <summary>
///
@@ -267,7 +331,7 @@
}
public static bool IsShowTip = true;
-
+
void checkSomeInfo()
{
try
@@ -324,9 +388,8 @@
return false;
}
+
}
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0