Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL-ON_Android/SplashActivity.cs

@@ -1,4 +1,4 @@
using System;

using 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,25 +41,44 @@
            base.OnActivityResult(requestCode, resultVal, data);
        }


        [Obsolete]
        protected override void OnCreate(Bundle savedInstanceState)
        {
            base.OnCreate(savedInstanceState);

          

            //Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class);
            //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
            {
@@ -71,7 +90,6 @@
                initOhterSdk();
                Finish();//关闭自己
            }

        }

        void initOhterSdk()
@@ -85,8 +103,11 @@
            //#endif
            JPushInterface.Init(this);

            Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");

            BaseActivity.OnCreateActoin = (activity, application) =>


            BaseActivity.OnCreateActoin += (activity, application) =>
            {
                //获取极光推送ID
                GetJPushRegistrationID(activity);
@@ -138,23 +159,27 @@
                }
            };

            BaseActivity.OnCreateActoin = (activity, application) =>
            BaseActivity.OnCreateActoin += (activity, application) =>
            {
                Language.CurrentLanguage = "Chinese";
                Locale locale1 = Locale.Default;
                var localeList = Resources.Configuration.Locale;
                Console.WriteLine("999999999999999999999999999999999999999999999"+ localeList.Language);
                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
                {
@@ -176,19 +201,19 @@
                    //}
                    //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("999999999999999999999999999999999999999999999" + localeList.Language);
                Console.WriteLine("当前语言：" + localeList.Language);
                if (localeList.Language == "zh")
                {
                    Language.CurrentLanguage = "Chinese";
@@ -201,6 +226,10 @@
                {
                    Language.CurrentLanguage = "russian";
                }
                else if (localeList.Language == "bg")
                {
                    Language.CurrentLanguage = "български";
                }
                else
                {
                    Language.CurrentLanguage = "English";
@@ -208,11 +237,11 @@
                MainPage.Show();
                checkSomeInfo();
            };
            BaseActivity.OnResumeAction = (activity) =>
            BaseActivity.OnResumeAction += (activity) =>
            {
                checkSomeInfo();
            };
            BaseActivity.OnDestroyAction = (activity) =>
            BaseActivity.OnDestroyAction += (activity) =>
            {
                Console.WriteLine("OnDestroyAction");
                //BusSocket.Stop();
@@ -223,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();
                }
@@ -249,6 +281,8 @@
            };
        }

        

        /// <summary>
        /// 
        /// </summary>
@@ -259,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;
@@ -280,7 +314,7 @@
                            break;
                        }
                    }
                    Console.WriteLine("RegistrationID2:  " + tokenID);
                    Console.WriteLine("RegistrationID:  " + tokenID);
                    if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
                    {
                        OnAppConfig.Instance.PushDeviceToken = tokenID;
@@ -297,7 +331,7 @@
        }

        public static bool IsShowTip = true;
 

        void checkSomeInfo()
        {
            try
@@ -354,9 +388,8 @@
            return false;
        }


    }


    

}