From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL-ON_Android/SplashActivity.cs | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 6b6401d..274ce31 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -10,9 +10,7 @@
using Android.Support.V4.Content;
using CN.Jpush.Android.Api;
//using Android.Widget;
-using Com.Hdl.ON.Jpush.Androidjpush;
using HDL_ON;
-using Java.Util;
using Shared;
namespace HDL_ON_Android
@@ -23,7 +21,6 @@
{
protected override void OnActivityResult(int requestCode, Result resultVal, Intent data)
{
- Console.WriteLine("123456");
if (requestCode == 99)
{
if (resultVal == Result.Ok)
@@ -46,7 +43,6 @@
[Obsolete]
protected override void OnCreate(Bundle savedInstanceState)
{
- Console.WriteLine("123456");
base.OnCreate(savedInstanceState);
if(Shared.Application.Activity != null && Shared.Application.Activity.GetType() == typeof(BaseActivity))
@@ -67,7 +63,6 @@
//OnAppConfig.Instance.FirstRunApp = false;
//OnAppConfig.Instance.SaveConfig();
Language.CurrentLanguage = "Chinese";
- Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
Console.WriteLine("褰撳墠璇█缂╁啓:" + localeList.Language);
if (localeList.Language == "zh")
@@ -86,6 +81,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -136,7 +135,7 @@
//#endif
JPushInterface.Init(this);
- Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
+ //Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
BaseActivity.OnCreateActoin += (activity, application) =>
@@ -146,17 +145,17 @@
};
- try
- {
- //鍒濆鍖栧弸鐩焥dk
- Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
- ////鍒濆鍖栧弸鐩焥dk config
- Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");
- }
- catch (Exception ex)
- {
- Console.WriteLine("鍒濆鍖栧弸鐩烻DK寮傚父:" + ex.Message);
- }
+ //try
+ //{
+ // //鍒濆鍖栧弸鐩焥dk
+ // Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
+ // ////鍒濆鍖栧弸鐩焥dk config
+ // Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");
+ //}
+ //catch (Exception ex)
+ //{
+ // Console.WriteLine("鍒濆鍖栧弸鐩烻DK寮傚父:" + ex.Message);
+ //}
}
@@ -201,7 +200,6 @@
BaseActivity.OnCreateActoin = (activity, application) =>
{
Language.CurrentLanguage = "Chinese";
- Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
Console.WriteLine("褰撳墠璇█缂栧彿" + localeList.Language);
if (localeList.Language == "zh")
@@ -220,6 +218,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -250,7 +252,6 @@
BaseActivity.RefreshUIAction = (activity) =>
{
Language.CurrentLanguage = "Chinese";
- Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
Console.WriteLine("褰撳墠璇█锛�" + localeList.Language);
if (localeList.Language == "zh")
@@ -269,6 +270,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -332,7 +337,7 @@
{
//淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
var tokenID = JPushInterface.GetRegistrationID(activity);
- Console.WriteLine("RegistrationID: " + tokenID);
+ Console.WriteLine("鏋佸厜鎺ㄩ�両d: " + tokenID);
if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
{
OnAppConfig.Instance.PushDeviceToken = tokenID;
@@ -346,14 +351,13 @@
{
System.Threading.Thread.Sleep(1000);
tokenID = JPushInterface.GetRegistrationID(activity);
- Console.WriteLine("Sleep.tokenID + " + JPushInterface.GetRegistrationID(activity));
loadTokenCount++;
if (loadTokenCount > 30)
{
break;
}
}
- Console.WriteLine("RegistrationID: " + tokenID);
+ Console.WriteLine("鏋佸厜鎺ㄩ�両d: " + tokenID);
if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
{
OnAppConfig.Instance.PushDeviceToken = tokenID;
--
Gitblit v1.8.0