Merge branch 'Dev-Wxr'

wxr

2023-06-05 753e67c3705dddb8e913bd853db151f94f81d600

 HDL-ON_Android/SplashActivity.cs

@@ -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
    {
@@ -46,15 +46,10 @@
        {
            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";
@@ -95,7 +90,6 @@
                initOhterSdk();
                Finish();//关闭自己
            }

        }

        void initOhterSdk()
@@ -108,6 +102,9 @@
            //CN.Jpush.Android.Api.JPushInterface.SetDebugMode(true);
            //#endif
            JPushInterface.Init(this);

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



            BaseActivity.OnCreateActoin += (activity, application) =>
@@ -255,20 +252,22 @@
            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.Current.AppLatAndLonEvent(lon, lat);
                    //关闭定位服务
@@ -281,6 +280,8 @@
                MainPage.Log($"经纬度:::{lon}:{lat}");
            };
        }

        

        /// <summary>
        /// 
@@ -387,9 +388,8 @@
            return false;
        }


    }


    

}