From bee7814dba8e033d0f36060926275b90c85c779c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 06 九月 2023 14:39:57 +0800
Subject: [PATCH] 2023年09月06日14:39:55

---
 HDL-ON_Android/SplashActivity.cs |   45 +++++++++++++++++++++++++++++----------------
 1 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index afcffdf..6b6401d 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -13,9 +13,6 @@
 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
@@ -24,12 +21,9 @@
     [IntentFilter(new string[] { "com.hdl.onpro.SplashActivity", Intent.ActionView })]
     public class SplashActivity : Activity
     {
-
-
-
-
         protected override void OnActivityResult(int requestCode, Result resultVal, Intent data)
         {
+            Console.WriteLine("123456");
             if (requestCode == 99)
             {
                 if (resultVal == Result.Ok)
@@ -52,14 +46,26 @@
         [Obsolete]
         protected override void OnCreate(Bundle savedInstanceState)
         {
+            Console.WriteLine("123456");
             base.OnCreate(savedInstanceState);
+
+            if(Shared.Application.Activity != null && Shared.Application.Activity.GetType() == typeof(BaseActivity))
+            {
+                Finish();
+                return;
+            }
 
             //Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
             //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;
@@ -122,7 +128,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
@@ -140,10 +146,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);
+            }
 
         }
 
@@ -185,7 +198,7 @@
                 }
             };
 
-            BaseActivity.OnCreateActoin += (activity, application) =>
+            BaseActivity.OnCreateActoin = (activity, application) =>
             {
                 Language.CurrentLanguage = "Chinese";
                 Locale locale1 = Locale.Default;
@@ -234,7 +247,7 @@
                     HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
                 };
             };
-            BaseActivity.RefreshUIAction += (activity) =>
+            BaseActivity.RefreshUIAction = (activity) =>
             {
                 Language.CurrentLanguage = "Chinese";
                 Locale locale1 = Locale.Default;
@@ -263,11 +276,11 @@
                 MainPage.Show();
                 checkSomeInfo();
             };
-            BaseActivity.OnResumeAction += (activity) =>
+            BaseActivity.OnResumeAction = (activity) =>
             {
                 checkSomeInfo();
             };
-            BaseActivity.OnDestroyAction += (activity) =>
+            BaseActivity.OnDestroyAction = (activity) =>
             {
                 Console.WriteLine("OnDestroyAction");
                 //BusSocket.Stop();

--
Gitblit v1.8.0