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 ac78c22..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 { @@ -41,7 +41,7 @@ base.OnActivityResult(requestCode, resultVal, data); } - + [Obsolete] protected override void OnCreate(Bundle savedInstanceState) { base.OnCreate(savedInstanceState); @@ -50,14 +50,35 @@ //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 { @@ -69,7 +90,6 @@ initOhterSdk(); Finish();//鍏抽棴鑷繁 } - } void initOhterSdk() @@ -83,8 +103,11 @@ //#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 +130,9 @@ BaseActivity.KeepScreenON = false; //闅愯棌铏氭嫙鎸夐敭 BaseActivity.IsHideVirualButtons = true; + + + //瀹炵幇瀹夊崜杩斿洖鎸夐敭 BaseActivity.BackKeyAction = () => { @@ -133,18 +159,27 @@ } }; - 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"; } - 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,23 +201,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(); @@ -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().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.CurrLogicMethod.AppLatAndLonEvent(lon, lat); + HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.Current.AppLatAndLonEvent(lon, lat); //鍏抽棴瀹氫綅鏈嶅姟 //Shared.Application.StopGPSLocationService(); } @@ -219,6 +281,8 @@ }; } + + /// <summary> /// /// </summary> @@ -229,7 +293,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 +314,7 @@ break; } } - Console.WriteLine("RegistrationID2: " + tokenID); + Console.WriteLine("RegistrationID: " + tokenID); if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID) { OnAppConfig.Instance.PushDeviceToken = tokenID; @@ -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