From 99253403b560f761d5f9af8b4f5140496996433a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十一月 2020 16:49:50 +0800
Subject: [PATCH] 新云端的代码Ver1.0

---
 ZigbeeApp/Shared/Phone/UserView/UserPage.cs |   49 ++++++++++++++++++++++++++++++++++---------------
 1 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index a2fb881..4ef083c 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -52,7 +52,15 @@
         /// <summary>
         /// 濡傛灉璁剧疆姝ゅ彉閲忎负true,鍒欏湪鍗曞嚮搴曢儴鑿滃崟鏃�,寮哄埗鏃犳潯浠跺叏閮ㄥ埛鏂�
         /// </summary>
-        public bool RefreshForm = false;
+        public bool RefreshAllForm = false;
+        /// <summary>
+        /// 鍒锋柊涓婚〉
+        /// </summary>
+        public bool RefreshMainPageForm = false;
+        /// <summary>
+        /// 鍒锋柊鍒嗙被
+        /// </summary>
+        public bool RefreshCategoryForm = false;
 
         #endregion
 
@@ -64,11 +72,8 @@
         public UserPage()
         {
             BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
-            Shared.Application.LocationAction += (lon, lat) =>
-            {
-                //涓婃姤缁忕含搴�
-                Login.AccountLogic.Instance.ReceiveAppLatAndLon(lon.ToString(), lat.ToString());
-            };
+            //娣诲姞App鐨勭粡绾害涓婃姤浜嬩欢
+            HdlOtherFunctionLogic.Current.AddAppLatAndLonEvent();
         }
 
         /// <summary>
@@ -84,23 +89,23 @@
             if (Shared.Application.IsFullScreen == true)
             {
                 //楂樼増鏈殑鑻规灉鏈哄瀷锛屽睆骞曞簳閮ㄤ細鏈変竴涓粦鑹茬殑鏉�
-                ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(242);
+                ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(180);
             }
 #endif
             //鐢ㄦ埛涓讳綋鐣岄潰锛堜腑闂撮儴鍒嗭級
             this.bodyFrameView = new NormalFrameLayout();
-            bodyFrameView.Height = this.Height - UserCenter.ControlCommonResourse.BottomFrameHeight;
+            bodyFrameView.Height = this.Height - HdlControlResourse.BottomFrameHeight;
             bodyFrameView.BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
             this.AddChidren(bodyFrameView);
 
             //鐢ㄦ埛鑿滃崟鐣岄潰锛堝簳閮ㄩ儴鍒嗭級
             var bottomMenuFrame = new FrameLayout();
             bottomMenuFrame.Gravity = Gravity.BottomCenter;
-            bottomMenuFrame.Height = ControlCommonResourse.BottomFrameHeight;
+            bottomMenuFrame.Height = HdlControlResourse.BottomFrameHeight;
             bottomMenuFrame.BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCBottomColor;
             this.AddChidren(bottomMenuFrame);
             //搴曢儴鑿滃崟鐨勫ご閮ㄧ嚎
-            var bottomLine = new NormalViewControl(bottomMenuFrame.Width, ControlCommonResourse.BottomLineHeight, false);
+            var bottomLine = new NormalViewControl(bottomMenuFrame.Width, HdlControlResourse.BottomLineHeight, false);
             bottomLine.BackgroundColor = 0xffc8c8c9;
             bottomMenuFrame.AddChidren(bottomLine);
 
@@ -230,20 +235,20 @@
         /// <param name="handClick">鏄惁鏄墜鍔ㄧ偣鍑�</param>
         private void BottomMenuClickEvent(MenuSelectEnum selectEnum, bool handClick)
         {
-            if (this.RefreshForm == false && selectEnum == this.nowSelectMenu && handClick == true)
+            if (this.RefreshAllForm == false && selectEnum == this.nowSelectMenu && handClick == true)
             {
                 //鎵嬪姩鐐瑰嚮鍚屼竴涓彍鍗�,鍒欎笉鍋氬鐞�
                 return;
             }
 
             //濡傛灉寮哄埗鎸囧畾鍒锋柊鐣岄潰鐨勮瘽
-            if (this.RefreshForm == true)
+            if (this.RefreshAllForm == true)
             {
                 //鍏ㄩ儴鍒锋柊
                 this.listForm = new List<EditorCommonForm>() { null, null, null };
                 this.bodyFrameView.RemoveAll();
 
-                this.RefreshForm = false;
+                this.RefreshAllForm = false;
             }
 
             this.nowSelectMenu = selectEnum;
@@ -253,6 +258,13 @@
             {
                 //宸︽粦鑿滃崟鍙�
                 CommonPage.Instance.IsDrawerLockMode = false;
+                if (this.RefreshMainPageForm == true)
+                {
+                    //鍒锋柊涓婚〉
+                    listForm[0]?.CloseForm();
+                    listForm[0] = null;
+                    this.RefreshMainPageForm = false;
+                }
                 if (listForm[0] == null)
                 {
                     var form = new MainPage.HomeMainPageForm();
@@ -266,6 +278,13 @@
             {
                 //宸︽粦鑿滃崟涓嶅彲
                 CommonPage.Instance.IsDrawerLockMode = true;
+                if (this.RefreshCategoryForm == true)
+                {
+                    //鍒锋柊鍒嗙被
+                    listForm[1]?.CloseForm();
+                    listForm[1] = null;
+                    this.RefreshCategoryForm = false;
+                }
                 if (listForm[1] == null)
                 {
                     var form = new Category.CategoryMainForm();
@@ -328,9 +347,9 @@
         public void ShowCategoryAutoListForm()
         {
             //鍏抽棴鍏ㄩ儴鐣岄潰,鐩村埌涓婚〉涓烘
-            UserCenterLogic.CloseAllOpenForm();
+            HdlFormLogic.Current.CloseAllOpenForm(null, false);
             //寮哄埗鏄剧ず鑷姩鍖栧垪琛ㄧ晫闈�
-            UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;
+            HdlUserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;
 
             this.nowSelectMenu = MenuSelectEnum.A鍒嗙被;
 

--
Gitblit v1.8.0