Revert "Merge branch 'tzy' into NewFilePath"

wxr

2020-12-17 1a13c963a5fb8cad92bf03667e411f46d6a6a843

 HDL-ON_Android/Application.cs

@@ -49,7 +49,9 @@

            string[] permissions = new string[] { Manifest.Permission.WriteExternalStorage, Manifest.Permission.RecordAudio,
            Manifest.Permission.Camera, Manifest.Permission.ProcessOutgoingCalls, Manifest.Permission.GetAccounts};

            //禁止屏幕长亮
            BaseActivity.KeepScreenON = false;
            //隐藏迪拜虚拟按键
            BaseActivity.IsHideVirualButtons = true;
            init();
            BaseActivity.OnCreateActoin += (activity, application) =>
@@ -61,12 +63,7 @@
                {
                    Language.CurrentLanguage = "Chinese";
                }
                //#if DEBUG

                //#else
                //                //注册极光推送
                //                InitJPush(activity);
                //#endif
        
                //获取极光推送ID
                GetJPushRegistrationID(activity);

@@ -86,7 +83,7 @@
                    {
                        Console.WriteLine("HHH 网络变化但处于后台");
                    }

                    MainPage.InternetStatus = obj;
                };
            };
            BaseActivity.RefreshUIAction += (activity) =>
@@ -97,28 +94,38 @@
            BaseActivity.OnResumeAction += (activity) =>
            {
                checkSomeInfo();
                new HDL_ON.UI.AppUnlockPage().LoadPage();
                
            };
            BaseActivity.OnDestroyAction += (activity) =>
            {
                Console.WriteLine("OnDestroyAction");
                //BusSocket.Stop();
                OnAppConfig.Instance.unlockTime = DateTime.Now;
                //UserInfo.Current.unlockTime = DateTime.Now;
            };

       

            HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");

            //Shared.Application.IsGpsEnable = true;

            Shared.Application.LocationAction = (arg1, arg2) =>
            //获取经纬度 
            Shared.Application.LocationAction = (lon, lat) =>
            {
                Shared.Application.LocationAction = null;
                try
                {
                    Shared.Application.LocationAction = null;
                    Shared.Application.StopGPSLocationService();
                    new HDL_ON.DAL.Server.HttpServerRequest().GetCityInfo(lon.ToString(), lat.ToString());
                }
                catch
                {

                new HDL_ON.DAL.Server.HttpServerRequest().GetCityInfo(arg1.ToString(), arg2.ToString());

                MainPage.Log($"经纬度:::{arg1}:{arg2}");
                }
                MainPage.Log($"经纬度:::{lon}:{lat}");
            };

           
        }

        /// <summary>
@@ -132,11 +139,11 @@
                //保存获取的极光服务器上的注册ID到本地文件
                var tokenID = JPushInterface.GetRegistrationID(activity);
                Console.WriteLine("RegistrationID:  " + tokenID);
                if (!string.IsNullOrEmpty(tokenID) && UserInfo.Current.PushDeviceToken != tokenID)
                if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
                {
                    UserInfo.Current.PushDeviceToken = tokenID;
                    UserInfo.Current.PhoneName = Android.OS.Build.Manufacturer;
                    UserInfo.Current.SaveUserInfo();
                    OnAppConfig.Instance.PushDeviceToken = tokenID;
                    OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
                    OnAppConfig.Instance.SaveConfig();
                }
                int loadTokenCount = 0;
                System.Threading.Tasks.Task.Run(() =>
@@ -153,11 +160,11 @@
                        }
                    }
                    Console.WriteLine("RegistrationID:  " + tokenID);
                    if (!string.IsNullOrEmpty(tokenID) && UserInfo.Current.PushDeviceToken != tokenID)
                    if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
                    {
                        UserInfo.Current.PushDeviceToken = tokenID;
                        UserInfo.Current.PhoneName = Android.OS.Build.Manufacturer;
                        UserInfo.Current.SaveUserInfo();
                        OnAppConfig.Instance.PushDeviceToken = tokenID;
                        OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
                        OnAppConfig.Instance.SaveConfig();
                    }
                });

@@ -269,6 +276,8 @@
            {
                Console.WriteLine("HHH OnActivityStarted：foreground");
                BusSocketStart();
                //后台回到前台
                new HDL_ON.UI.AppUnlockPage().LoadPage();
            }
        }

@@ -280,6 +289,9 @@
            {
                Console.WriteLine("HHH OnActivityStopped： background");
                BusSocketStop();
                //进入后台
                UserInfo.Current.unlockTime = DateTime.Now;

            }
        }

@@ -304,7 +316,6 @@
        {
            IsEnterBackground = true;
            //BusSocket.Stop();
            OnAppConfig.Instance.unlockTime = DateTime.Now;
        }