From 666b28d77fc3c1b1dae61c9dfd878c8e683cef8c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 13:37:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL-ON_Android/SplashActivity.cs | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 7def421..1fbe7c2 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,21 +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);
+ Console.WriteLine("褰撳墠璇█缂╁啓:" + localeList.Language);
if (localeList.Language == "zh")
{
Language.CurrentLanguage = "Chinese";
@@ -83,7 +78,7 @@
}
Intent intent = new Intent(this, typeof(AgreementActivity));
- StartActivityForResult(intent,99);
+ StartActivityForResult(intent, 99);
}
else
{
@@ -95,7 +90,6 @@
initOhterSdk();
Finish();//鍏抽棴鑷繁
}
-
}
void initOhterSdk()
@@ -170,12 +164,12 @@
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";
}
@@ -207,7 +201,7 @@
//}
//else
//{
- //Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�"+internetStatus);
+ //Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�"+internetStatus);
//}
//缃戠粶鍙樺寲澶勭悊
@@ -333,7 +327,7 @@
}
public static bool IsShowTip = true;
-
+
void checkSomeInfo()
{
try
@@ -390,9 +384,8 @@
return false;
}
+
}
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0