金茂科技系统更新

wxr

2022-11-15 02498f7744e6fdc413e518f96b25f3635540dc6b

 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.6.0";
        public static string VersionString = "1.6.2";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -116,6 +116,7 @@
            SPK.AirFreshStandard,SPK.HvacAirFresh,
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,
            SPK.MechanicalArm,
        };


@@ -262,6 +263,7 @@
            BaseView.AddChidren(BtnBackIcon);
            backView.MouseMoveEventHandler = (sender, e) =>
            {

                if (BasePageView.ChildrenCount <= 1)
                {
                    return;
@@ -291,6 +293,26 @@
            };
            backView.MouseUpEventHandler = (sender, e) =>
            {

                if (Inverter.Ins.H5Page.Parent != null)
                {
                    if (Inverter.Ins.PageIndex != "1")
                    {
                        Inverter.Ins.PageIndex = "1";
                        var status = new Dictionary<string, object> { ["method"] = "backPrePage", ["data"] = "" };
                        Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
                        MainPage.Log($"up{e.X}");
                        StartX = 0;
                        BtnBackIcon.X = -Application.GetRealWidth(100);
                        return;
                    }
                    else
                    {
                        Inverter.Ins.PageIndex = "1";
                    }
                }


                MainPage.Log($"up{e.X}");
                StartX = 0;
                BtnBackIcon.X = -Application.GetRealWidth(100);
@@ -305,6 +327,28 @@
            };
            backView.MouseUpOutsideEventHandler = (sender, e) =>
            {
                if (Inverter.Ins.H5Page.Parent != null)
                {
                    if (Inverter.Ins.PageIndex != "1")
                    {
                        Inverter.Ins.PageIndex = "1";
                        List<AlinkStatusData> ddd = new List<AlinkStatusData>();
                        //var status = new Dictionary<string, object> { ["method"] = "status", ["data"] = ddd };
                        //var ddd3 = Newtonsoft.Json.JsonConvert.SerializeObject(status);
                        var status = new Dictionary<string, object> { ["method"] = "backPrePage", ["data"] = "" };
                        Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
                        MainPage.Log($"up{e.X}");
                        StartX = 0;
                        BtnBackIcon.X = -Application.GetRealWidth(100);
                        return;
                    }
                    else
                    {
                        Inverter.Ins.PageIndex = "1";
                    }
                }


                MainPage.Log($"up{e.X}");
                StartX = 0;
                BtnBackIcon.X = -Application.GetRealWidth(100);
@@ -408,10 +452,28 @@
            int result = 0;
            Application.RunOnMainThread(() =>
            {
                if (Inverter.Ins.H5Page.Parent != null)
                {
                    if (Inverter.Ins.PageIndex != "1")
                    {
                        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;
@@ -420,14 +482,14 @@
                    {
                        var loading = view as Loading;
                        if (loading.CurStatus == false)//有一些等待界面隐藏了，但是没有移除到，需要先移除
                  {
                        {
                            loading.RemoveFromParent();
                            result = LoadEvent_BackAction();
                        }
                        else
                        {
                            result = 1;//正在等待某些操作
                  }
                        }
                    }
                    else
                    {
@@ -454,7 +516,7 @@
                else
                {
                    result = 2;//无法再后退，可以执行退到桌面
          }
                }
            });
            return result;
        }