2023年07月26日13:12:21

wjc

2023-07-26 9508510f0b27da3278fa1161eb2ba3dd1e3e2030

 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.8.0";
        public static string VersionString = "2.0.0";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -121,6 +121,8 @@
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,
            SPK.MechanicalArm,SPK.IpCam_Imou,
            SPK.GroupControl,
            SPK.AvMusic,SPK.MusicStandard
        };


@@ -223,7 +225,7 @@
#if __ANDROID__
            new System.Threading.Thread(async () =>
            {
                int i = 0;
                int i = 10;
                while (i < 10) {
                    try
                    {
@@ -454,7 +456,8 @@
                addResidencePage.LoadView();
                return;
            }
            new System.Threading.Thread(async () =>

            new System.Threading.Thread(() =>
            {
                try
                {
@@ -504,6 +507,19 @@
                }
            }).Start();


            try
            {
#if __ANDROID__
                Com.Chteam.Agent.BuglyAgentHelper.SetUserId(UserInfo.Current.AccountString);
#else
                Bugly.Bugly.SetUserIdentifier(UserInfo.Current.AccountString);
#endif
            }
            catch (Exception ex)
            {
                MainPage.Log("Bugly error");
            }
        }

        /// <summary>
@@ -515,72 +531,82 @@
        public static int LoadEvent_BackAction()
        {
            int result = 0;
            
            Application.RunOnMainThread(() =>
            {
                if (Inverter.Ins.H5Page.Parent != null)
                try
                {
                    if (Inverter.Ins.PageIndex != "1")
                    if (Inverter.Ins.H5Page.Parent != null)
                    {
                        Inverter.Ins.PageIndex = "1";
                        var status = new Dictionary<string, object> { ["method"] = "backPrePage", ["data"] = "" };
                        Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
                        StartX = 0;
                        BtnBackIcon.X = -Application.GetRealWidth(100);
                        return;
                    }
                    else
                    {
                        Inverter.Ins.PageIndex = "1";
                    }
                }


                if (BasePageView == null || BasePageView.ChildrenCount <= 1)
                {
                    result = 2;//无法再后退，可以执行退到桌面
                }
                if (BasePageView.ChildrenCount > 1)
                {
                    int index = BasePageView.ChildrenCount - 1;
                    var view = BasePageView.GetChildren(index);
                    if (view.GetType() == typeof(Loading))
                    {
                        var loading = view as Loading;
                        if (loading.CurStatus == false)//有一些等待界面隐藏了，但是没有移除到，需要先移除
                        if (Inverter.Ins.PageIndex != "1")
                        {
                            loading.RemoveFromParent();
                            result = LoadEvent_BackAction();
                            Inverter.Ins.PageIndex = "1";
                            var status = new Dictionary<string, object> { ["method"] = "backPrePage", ["data"] = "" };
                            Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
                            StartX = 0;
                            BtnBackIcon.X = -Application.GetRealWidth(100);
                            return;
                        }
                        else
                        {
                            result = 1;//正在等待某些操作
                            Inverter.Ins.PageIndex = "1";
                        }
                    }


                    if (BasePageView == null || BasePageView.ChildrenCount <= 1)
                    {
                        result = 2;//无法再后退，可以执行退到桌面
                    }
                    else
                    {
                        if (view != null)
                        if (BasePageView.ChildrenCount > 1)
                        {
                            if (view.Tag != null)
                            int index = BasePageView.ChildrenCount - 1;
                            var view = BasePageView.GetChildren(index);
                            if (view.GetType() == typeof(Loading))
                            {
                                if (view.Tag.ToString() != "unlockpage")
                                var loading = view as Loading;
                                if (loading.CurStatus == false)//有一些等待界面隐藏了，但是没有移除到，需要先移除
                                {
                                    view.RemoveFromParent();
                                    loading.RemoveFromParent();
                                    result = LoadEvent_BackAction();
                                }
                                else
                                {
                                    result = 2;
                                    result = 1;//正在等待某些操作
                                }
                            }
                            else
                            {
                                view.RemoveFromParent();
                                if (view != null)
                                {
                                    if (view.Tag != null)
                                    {
                                        if (view.Tag.ToString() != "unlockpage")
                                        {
                                            view.RemoveFromParent();
                                        }
                                        else
                                        {
                                            result = 2;
                                        }
                                    }
                                    else
                                    {
                                        view.RemoveFromParent();
                                    }
                                }
                            }
                        }
                        else
                        {
                            result = 2;//无法再后退，可以执行退到桌面
                        }
                    }
                }
                else
                }catch(Exception ex)
                {
                    result = 2;//无法再后退，可以执行退到桌面
                    MainPage.Log($"加载安卓后退异常:{ex.Message}");
                }
            });
            return result;
@@ -593,7 +619,12 @@
        public static void Log(string msg)
        {
#if DEBUG
            Console.WriteLine(msg);
            if (msg.Contains("收到数据")
                || msg.Contains("发送")
                || msg.Contains("接收到推送")

                )
                Console.WriteLine(msg);
#endif
        }