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 | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 8561194..76e7e2b 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -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
{
@@ -46,20 +46,16 @@
{
base.OnCreate(savedInstanceState);
-
-
//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)
{
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
+ Console.WriteLine("褰撳墠璇█缂╁啓:" + localeList.Language);
if (localeList.Language == "zh")
{
Language.CurrentLanguage = "Chinese";
@@ -72,13 +68,17 @@
{
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
{
@@ -90,7 +90,6 @@
initOhterSdk();
Finish();//鍏抽棴鑷繁
}
-
}
void initOhterSdk()
@@ -103,6 +102,9 @@
//CN.Jpush.Android.Api.JPushInterface.SetDebugMode(true);
//#endif
JPushInterface.Init(this);
+
+ Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
+
BaseActivity.OnCreateActoin += (activity, application) =>
@@ -162,18 +164,22 @@
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
- Console.WriteLine("999999999999999999999999999999999999999999999"+ 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";
}
else if (localeList.Language == "ru")
{
Language.CurrentLanguage = "russian";
+ }
+ else if (localeList.Language == "bg")
+ {
+ Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
else
{
@@ -195,7 +201,7 @@
//}
//else
//{
- // Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�");
+ //Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�"+internetStatus);
//}
//缃戠粶鍙樺寲澶勭悊
@@ -220,6 +226,10 @@
{
Language.CurrentLanguage = "russian";
}
+ else if (localeList.Language == "bg")
+ {
+ Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
+ }
else
{
Language.CurrentLanguage = "English";
@@ -242,20 +252,22 @@
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().Replace(",", "."), lat.ToString().Replace(",", "."));
- }
- 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.Current.AppLatAndLonEvent(lon, lat);
//鍏抽棴瀹氫綅鏈嶅姟
@@ -268,6 +280,8 @@
MainPage.Log($"缁忕含搴�:::{lon}:{lat}");
};
}
+
+
/// <summary>
///
@@ -317,7 +331,7 @@
}
public static bool IsShowTip = true;
-
+
void checkSomeInfo()
{
try
@@ -374,9 +388,8 @@
return false;
}
+
}
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0