From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4

---
 ZigbeeApp/Shared/Phone/UserView/UserPage.cs |   56 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index f143967..e3904ea 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -40,7 +40,7 @@
         /// <summary>
         /// 鐢ㄦ埛涓讳綋鐣岄潰锛堜腑闂撮儴鍒嗭級
         /// </summary>
-        private FrameLayout bodyFrameView = null;
+        private NormalFrameLayout bodyFrameView = null;
         /// <summary>
         /// 鐣岄潰缂撳瓨(2020.05.07:鍒囨崲鏃朵笉绉婚櫎鐣岄潰,鐩存帴闅愯棌)
         /// </summary>
@@ -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
 
@@ -66,6 +74,7 @@
             BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
             Shared.Application.LocationAction += (lon, lat) =>
             {
+                //涓婃姤缁忕含搴�
                 Login.AccountLogic.Instance.ReceiveAppLatAndLon(lon.ToString(), lat.ToString());
             };
         }
@@ -80,14 +89,14 @@
                 return;
             }
 #if iOS
-            if (Shared.Application.PhoneType >= 10)
+            if (Shared.Application.IsFullScreen == true)
             {
                 //楂樼増鏈殑鑻规灉鏈哄瀷锛屽睆骞曞簳閮ㄤ細鏈変竴涓粦鑹茬殑鏉�
-                ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(242);
+                ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(180);
             }
 #endif
             //鐢ㄦ埛涓讳綋鐣岄潰锛堜腑闂撮儴鍒嗭級
-            this.bodyFrameView = new FrameLayout();
+            this.bodyFrameView = new NormalFrameLayout();
             bodyFrameView.Height = this.Height - UserCenter.ControlCommonResourse.BottomFrameHeight;
             bodyFrameView.BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
             this.AddChidren(bodyFrameView);
@@ -229,20 +238,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;
@@ -252,6 +261,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();
@@ -265,6 +281,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();
@@ -327,7 +350,7 @@
         public void ShowCategoryAutoListForm()
         {
             //鍏抽棴鍏ㄩ儴鐣岄潰,鐩村埌涓婚〉涓烘
-            UserCenterLogic.CloseAllOpenForm();
+            UserCenterLogic.CloseAllOpenForm(null, false);
             //寮哄埗鏄剧ず鑷姩鍖栧垪琛ㄧ晫闈�
             UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;
 
@@ -351,6 +374,21 @@
             this.SetAllControlStatu();
         }
 
+        /// <summary>
+        /// 鑾峰彇褰撳墠婵�娲荤殑鐣岄潰
+        /// </summary>
+        /// <returns></returns>
+        public EditorCommonForm GetNowActionForm()
+        {
+            int index = ((int)this.nowSelectMenu) - 1;
+            if (index != -1)
+            {
+                //璋冪敤姝ょ晫闈㈢殑婵�娲诲嚱鏁�
+                return this.listForm[index];
+            }
+            return null;
+        }
+
         #endregion
 
         #region 鈻� 缁撴瀯浣揰____________________________

--
Gitblit v1.8.0