Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

 HDL-ON_Android/SplashActivity.cs

@@ -9,6 +9,7 @@
using Android.Support.V4.App;
using Android.Support.V4.Content;
using CN.Jpush.Android.Api;
//using Android.Widget;
using HDL_ON;
using Shared;

@@ -20,7 +21,6 @@
    {
        protected override void OnActivityResult(int requestCode, Result resultVal, Intent data)
        {
            Console.WriteLine("123456");
            if (requestCode == 99)
            {
                if (resultVal == Result.Ok)
@@ -43,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))
@@ -146,17 +145,17 @@

            };

            try
            {
                //初始化友盟sdk
                Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
                ////初始化友盟sdk config
                Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");
            }
            catch (Exception ex)
            {
                Console.WriteLine("初始化友盟SDK异常:" + ex.Message);
            }
            //try
            //{
            //    //初始化友盟sdk
            //    Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
            //    ////初始化友盟sdk config
            //    Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");
            //}
            //catch (Exception ex)
            //{
            //    Console.WriteLine("初始化友盟SDK异常:" + ex.Message);
            //}

        }