From 5b77d9d57a6cddb474a66ca54401ad5ab0892db3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 23 十一月 2022 14:23:42 +0800
Subject: [PATCH] Merge branch 'dev--wxr' into LcSdkV1
---
HDL-ON_Android/SplashActivity.cs | 87 +++++++++++++++++++++++++++++++++++++------
1 files changed, 75 insertions(+), 12 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index ac78c22..c6ae1b6 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;
@@ -41,10 +41,12 @@
base.OnActivityResult(requestCode, resultVal, data);
}
-
+ [Obsolete]
protected override void OnCreate(Bundle savedInstanceState)
{
base.OnCreate(savedInstanceState);
+
+
//Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
//StartActivityForResult(i, 1);
@@ -55,7 +57,31 @@
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);
}
@@ -84,7 +110,7 @@
JPushInterface.Init(this);
- BaseActivity.OnCreateActoin = (activity, application) =>
+ BaseActivity.OnCreateActoin += (activity, application) =>
{
//鑾峰彇鏋佸厜鎺ㄩ�両D
GetJPushRegistrationID(activity);
@@ -107,6 +133,9 @@
BaseActivity.KeepScreenON = false;
//闅愯棌铏氭嫙鎸夐敭
BaseActivity.IsHideVirualButtons = true;
+
+
+
//瀹炵幇瀹夊崜杩斿洖鎸夐敭
BaseActivity.BackKeyAction = () =>
{
@@ -133,11 +162,12 @@
}
};
- BaseActivity.OnCreateActoin = (activity, application) =>
+ BaseActivity.OnCreateActoin += (activity, application) =>
{
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
+ Console.WriteLine("褰撳墠璇█缂栧彿"+ localeList.Language);
if (localeList.Language == "zh")
{
Language.CurrentLanguage = "Chinese";
@@ -145,6 +175,14 @@
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,23 +204,47 @@
//}
//else
//{
- // Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�");
+ //Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�"+internetStatus);
//}
//缃戠粶鍙樺寲澶勭悊
HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
};
};
- BaseActivity.RefreshUIAction = (activity) =>
+ 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();
};
- BaseActivity.OnResumeAction = (activity) =>
+ BaseActivity.OnResumeAction += (activity) =>
{
checkSomeInfo();
};
- BaseActivity.OnDestroyAction = (activity) =>
+ BaseActivity.OnDestroyAction += (activity) =>
{
Console.WriteLine("OnDestroyAction");
//BusSocket.Stop();
@@ -199,6 +261,7 @@
{
try
{
+
if (isfirst)
{
//鍙Е鍙戜竴娆�
@@ -207,7 +270,7 @@
}
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();
}
@@ -229,7 +292,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 +313,7 @@
break;
}
}
- Console.WriteLine("RegistrationID2: " + tokenID);
+ Console.WriteLine("RegistrationID: " + tokenID);
if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
{
OnAppConfig.Instance.PushDeviceToken = tokenID;
--
Gitblit v1.8.0