From 02498f7744e6fdc413e518f96b25f3635540dc6b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十一月 2022 11:27:38 +0800
Subject: [PATCH] 金茂科技系统更新

---
 HDL_ON/UI/MainPage.cs |   77 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index a4ba8f6..e48a361 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/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>
@@ -36,6 +36,11 @@
         /// 
         /// </summary>
         public static Entity.CityInfo cityInfo = new Entity.CityInfo();
+        /// <summary>
+        /// 鍩庡競澶╂皵淇℃伅antion
+        /// </summary>
+        public static Action CityWeatherAction = null;
+
         /// <summary>
         /// 澶╂皵鍒锋柊action
         /// </summary>
@@ -111,6 +116,7 @@
             SPK.AirFreshStandard,SPK.HvacAirFresh,
             SPK.AirSwitch,
             SPK.PanelSocket,SPK.ElectricSocket,
+            SPK.MechanicalArm,
         };
 
 
@@ -257,6 +263,7 @@
             BaseView.AddChidren(BtnBackIcon);
             backView.MouseMoveEventHandler = (sender, e) =>
             {
+
                 if (BasePageView.ChildrenCount <= 1)
                 {
                     return;
@@ -286,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);
@@ -300,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);
@@ -403,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;
@@ -415,14 +482,14 @@
                     {
                         var loading = view as Loading;
                         if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎
-                  {
+                        {
                             loading.RemoveFromParent();
                             result = LoadEvent_BackAction();
                         }
                         else
                         {
                             result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
-                  }
+                        }
                     }
                     else
                     {
@@ -449,7 +516,7 @@
                 else
                 {
                     result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
-          }
+                }
             });
             return result;
         }

--
Gitblit v1.8.0