From c5cb6840bd986bbd71a9ebc232bbf44ed0e1fc3d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 五月 2024 17:43:11 +0800
Subject: [PATCH] jpush更新完成

---
 HDL-ON_Android/SplashActivity.cs |   43 ++++++++++++++++++++++++++++++-------------
 1 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 4fccb42..0259c11 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -10,12 +10,8 @@
 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 Microsoft.AppCenter;
-using Microsoft.AppCenter.Analytics;
-using Microsoft.AppCenter.Crashes;
 using Shared;
 
 namespace HDL_ON_Android
@@ -26,6 +22,7 @@
     {
         protected override void OnActivityResult(int requestCode, Result resultVal, Intent data)
         {
+            Console.WriteLine("123456");
             if (requestCode == 99)
             {
                 if (resultVal == Result.Ok)
@@ -48,6 +45,7 @@
         [Obsolete]
         protected override void OnCreate(Bundle savedInstanceState)
         {
+            Console.WriteLine("123456");
             base.OnCreate(savedInstanceState);
 
             if(Shared.Application.Activity != null && Shared.Application.Activity.GetType() == typeof(BaseActivity))
@@ -60,12 +58,14 @@
             //StartActivityForResult(i, 1);
             //OverridePendingTransition(0, 0);
             //initAll();
+#if DEBUG
+            HDL_ON.OnAppConfig.Instance.isAgreePrivacyPolicy = true;
+#endif
             if (HDL_ON.OnAppConfig.Instance.FirstRunApp || !HDL_ON.OnAppConfig.Instance.isAgreePrivacyPolicy)
             {
                 //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")
@@ -84,6 +84,10 @@
                 {
                     Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
                 }
+                //else if (localeList.Language == "uk")
+                //{
+                //    Language.CurrentLanguage = "Ukraine";
+                //}
                 else
                 {
                     Language.CurrentLanguage = "English";
@@ -126,7 +130,7 @@
         void initOhterSdk()
         {
             //娉ㄥ唽鏈鐞嗗紓甯镐簨浠�
-            AppCenter.Start("64ac5859-2cd7-4ef8-a5da-5455e29679ec", typeof(Analytics), typeof(Crashes));
+            //AppCenter.Start("64ac5859-2cd7-4ef8-a5da-5455e29679ec", typeof(Analytics), typeof(Crashes));
             //鎵嬫満鍚嶇О Android.OS.Build.Manufacturer;
             //OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
             //#if DEBUG
@@ -134,7 +138,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) =>
@@ -144,10 +148,17 @@
 
             };
 
-            //鍒濆鍖栧弸鐩焥dk
-            Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
-            //鍒濆鍖栧弸鐩焥dk config
-            Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");
+            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);
+            }
 
         }
 
@@ -192,7 +203,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")
@@ -211,6 +221,10 @@
                 {
                     Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
                 }
+                //else if (localeList.Language == "uk")
+                //{
+                //    Language.CurrentLanguage = "Ukraine";
+                //}
                 else
                 {
                     Language.CurrentLanguage = "English";
@@ -241,7 +255,6 @@
             BaseActivity.RefreshUIAction = (activity) =>
             {
                 Language.CurrentLanguage = "Chinese";
-                Locale locale1 = Locale.Default;
                 var localeList = Resources.Configuration.Locale;
                 Console.WriteLine("褰撳墠璇█锛�" + localeList.Language);
                 if (localeList.Language == "zh")
@@ -260,6 +273,10 @@
                 {
                     Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
                 }
+                //else if (localeList.Language == "uk")
+                //{
+                //    Language.CurrentLanguage = "Ukraine";
+                //}
                 else
                 {
                     Language.CurrentLanguage = "English";

--
Gitblit v1.8.0