From 8960f866958ece0900b0ee13e70c9320507f98db Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 二月 2023 18:50:23 +0800
Subject: [PATCH] 2023年02月07日18:50:21

---
 HDL_ON/UI/MainPage.cs |   91 ++++++++++++++++++++++++++++-----------------
 1 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 66ae421..3d3d5ad 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.1";
+        public static string VersionString = "1.6.3";
         ///// <summary>
         ///// 瀹㈡埛绔被鍨�
         ///// </summary>
@@ -58,6 +58,10 @@
         /// 0:鏃犵綉缁�
         /// </summary>
         public static int InternetStatus = 2;
+        /// <summary>
+        /// 杩炴帴mqtt娆℃暟
+        /// </summary>
+        public static int LinkHdlMqttCount = 0;
         /// <summary>
         /// 鏄惁杩涘叆鍚庡彴
         /// </summary>
@@ -116,6 +120,7 @@
             SPK.AirFreshStandard,SPK.HvacAirFresh,
             SPK.AirSwitch,
             SPK.PanelSocket,SPK.ElectricSocket,
+            SPK.MechanicalArm,SPK.IpCam_Imou,
         };
 
 
@@ -395,30 +400,30 @@
                 {
                     Entity.FunctionList.List.Clear();
                     Entity.SpatialInfo.CurrentSpatial.Clear();
-              ///绛夊緟鑾峰彇浣忓畢淇℃伅
-              Application.RunOnMainThread(() =>
-              {
-                    if (waitPage != null)
+                    ///绛夊緟鑾峰彇浣忓畢淇℃伅
+                    Application.RunOnMainThread(() =>
                     {
-                        waitPage.RemoveFromParent();
-                        waitPage = null;
-                    }
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
 
-              //璺宠浆椤甸潰----
-              UserBasePage = new UserPage();
-                    BasePageView.AddChidren(UserBasePage);
-                    UserBasePage.LoadPage();
-                    BasePageView.PageIndex = 0;
+                        //璺宠浆椤甸潰----
+                        UserBasePage = new UserPage();
+                        BasePageView.AddChidren(UserBasePage);
+                        UserBasePage.LoadPage();
+                        BasePageView.PageIndex = 0;
 
-                    if (isFirstOpen)
-                    {
-                  //鍚姩瀵嗙爜楠岃瘉
-                  new AppUnlockPage().LoadPage(isFirstOpen);
-                    }
-              //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
-              pageShowEvent?.Invoke();
-                    pageShowEvent = null;
-                });
+                        if (isFirstOpen)
+                        {
+                            //鍚姩瀵嗙爜楠岃瘉
+                            new AppUnlockPage().LoadPage(isFirstOpen);
+                        }
+                        //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
+                        pageShowEvent?.Invoke();
+                        pageShowEvent = null;
+                    });
                 }
                 catch (Exception ex)
                 {
@@ -427,14 +432,14 @@
                 finally
                 {
                     Application.RunOnMainThread(() =>
-              {
-                    if (downloadData)
-                    {
-                        DB_ResidenceData.Instance.EixtAccount();
-                  ///鍒濆鍖朼pp鏁版嵁
-                  Common.ApiUtlis.Ins.DownloadData();
-                    };
-                });
+                      {
+                          if (downloadData)
+                          {
+                              DB_ResidenceData.Instance.EixtAccount();
+                              ///鍒濆鍖朼pp鏁版嵁
+                              Common.ApiUtlis.Ins.DownloadData();
+                          };
+                      });
                 }
             }).Start();
 
@@ -451,10 +456,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;
@@ -463,14 +486,14 @@
                     {
                         var loading = view as Loading;
                         if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎
-                  {
+                        {
                             loading.RemoveFromParent();
                             result = LoadEvent_BackAction();
                         }
                         else
                         {
                             result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
-                  }
+                        }
                     }
                     else
                     {
@@ -497,7 +520,7 @@
                 else
                 {
                     result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
-          }
+                }
             });
             return result;
         }

--
Gitblit v1.8.0