2020-12-19 1.IOS和Android网络切换，远程和本地控制切换优化。 2.IOS和Android后台回到前台，搜索网关，远程和本地控制...

JLChen

2020-12-19 2bbb1b72dbce5cf9bd4ac4a5b7488e3f18eaf929

 HDL-ON_Android/Application.cs

@@ -67,24 +67,29 @@
                //获取极光推送ID
                GetJPushRegistrationID(activity);

                BaseActivity.NetworkStateChanged += (int obj) =>
                BaseActivity.NetworkStateChanged += (int internetStatus) =>
                {
                    if (!IsEnterBackground)
                    {
                        //BusSocket.Stop();
                        new System.Threading.Thread(() =>
                        {
                            System.Threading.Thread.Sleep(1000);
                            //BusSocket.Start();
                        })
                        { IsBackground = true }.Start();
                    }
                    else
                    {
                        Console.WriteLine("HHH 网络变化但处于后台");
                    }
                    MainPage.InternetStatus = obj;
                    //if (!IsEnterBackground)
                    //{
                    //    ////BusSocket.Stop();
                    //    //new System.Threading.Thread(() =>
                    //    //{
                    //    //    System.Threading.Thread.Sleep(1000);
                    //    //    //BusSocket.Start();
                    //    //})
                    //    //{ IsBackground = true }.Start();

                    //}
                    //else
                    //{
                    //    Console.WriteLine("HHH 网络变化但处于后台");
                    //}

                    //网络变化处理
                    HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
                };
                //开启定位服务
                Shared.Application.StartGPSLocationService();
            };
            BaseActivity.RefreshUIAction += (activity) =>
            {
@@ -94,32 +99,33 @@
            BaseActivity.OnResumeAction += (activity) =>
            {
                checkSomeInfo();
                new HDL_ON.UI.AppUnlockPage().LoadPage();
                
            };
            BaseActivity.OnDestroyAction += (activity) =>
            {
                Console.WriteLine("OnDestroyAction");
                //BusSocket.Stop();
                UserInfo.Current.unlockTime = DateTime.Now;
                //UserInfo.Current.unlockTime = DateTime.Now;
            };

       

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

            //Shared.Application.IsGpsEnable = true;

            //获取经纬度 
            Shared.Application.LocationAction = (lon, lat) =>
            {
                try
                {
                    Shared.Application.LocationAction = null;
                    Shared.Application.StopGPSLocationService();
                    new HDL_ON.DAL.Server.HttpServerRequest().GetCityInfo(lon.ToString(), lat.ToString());
                    //关闭定位服务
                    Shared.Application.StopGPSLocationService();
                }
                catch
                  catch(Exception ex)
                {

                    Utlis.WriteLine("GetCityInfo catch"+ ex.Message);
                }
                MainPage.Log($"经纬度:::{lon}:{lat}");
            };
@@ -138,11 +144,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(() =>
@@ -159,11 +165,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();
                    }
                });

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

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

            }
        }

@@ -298,31 +309,53 @@

        int mCount;

        ///// <summary>
        ///// 是否进入后台
        ///// </summary>
        //public bool IsEnterBackground = false;

        /// <summary>
        /// 是否进入后台
        /// 进入后台的时间
        /// </summary>
        public bool IsEnterBackground = false;
        DateTime CloseTime = DateTime.Now;

        /// <summary>
        /// BusSocketStop
        /// </summary>
        void BusSocketStop()
        {
            IsEnterBackground = true;
            //BusSocket.Stop();
            UserInfo.Current.unlockTime = DateTime.Now;
            //IsEnterBackground = true;
            CloseTime = DateTime.Now;
            MainPage.IsEnterBackground = true;
            //进入后台mqtt正在连接重置状态
            HDL_ON.DAL.Mqtt.MqttClient.RemoteMqttIsConnecting = false;
            HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
           
        }


        /// <summary>
        /// BusSocketStart
        /// </summary>
        void BusSocketStart()
        {
            IsEnterBackground = false;
            //IsEnterBackground = false;

            //BusSocket.Start();
            if (CloseTime.AddSeconds(10) < DateTime.Now)
            {
                //后台超过10s就断开MQTT重连
                if (HDL_ON.DriverLayer.Control.Ins.IsRemote)
                {
                    HDL_ON.DAL.Mqtt.MqttClient.DisConnectRemote("closeTime", false);
                }
            }

            MainPage.IsEnterBackground = false;
            HDL_ON.DriverLayer.UdpSocket._BusSocket.Start();
            HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
        }

      

    }

}