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


        [Obsolete]
        protected override void OnCreate(Bundle savedInstanceState)
        {
            base.OnCreate(savedInstanceState);
@@ -50,14 +50,35 @@
            //StartActivityForResult(i, 1);
            //OverridePendingTransition(0, 0);
            //initAll();



            if (HDL_ON.OnAppConfig.Instance.FirstRunApp)
            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
            {
@@ -69,7 +90,6 @@
                initOhterSdk();
                Finish();//关闭自己
            }

        }

        void initOhterSdk()
@@ -83,6 +103,9 @@
            //#endif
            JPushInterface.Init(this);

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



            BaseActivity.OnCreateActoin += (activity, application) =>
            {
@@ -91,6 +114,10 @@

            };

            //初始化友盟sdk
            Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
            //初始化友盟sdk config
            Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");

        }

@@ -103,6 +130,9 @@
            BaseActivity.KeepScreenON = false;
            //隐藏虚拟按键
            BaseActivity.IsHideVirualButtons = true;



            //实现安卓返回按键
            BaseActivity.BackKeyAction = () =>
            {
@@ -134,9 +164,22 @@
                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
                {
@@ -158,7 +201,7 @@
                    //}
                    //else
                    //{
                    //    Console.WriteLine("HHH 网络变化但处于后台");
                    //Console.WriteLine("HHH 网络变化但处于后台"+internetStatus);
                    //}

                    //网络变化处理
@@ -167,6 +210,30 @@
            };
            BaseActivity.RefreshUIAction += (activity) =>
            {
                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";
                }
                MainPage.Show();
                checkSomeInfo();
            };
@@ -185,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(), lat.ToString());
                    }
                    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();
                }
@@ -210,6 +280,8 @@
                MainPage.Log($"经纬度:::{lon}:{lat}");
            };
        }

        

        /// <summary>
        /// 
@@ -259,7 +331,7 @@
        }

        public static bool IsShowTip = true;
 

        void checkSomeInfo()
        {
            try
@@ -316,6 +388,7 @@
            return false;
        }


    }