From 351bdda734832d821a9764b0cde8be5d83c4ec50 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 01 十二月 2022 09:56:25 +0800
Subject: [PATCH] 2022年12月01日09:56:23

---
 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index 0f13170..aa3f637 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -13,7 +13,7 @@
         /// <summary>
         /// 涓昏彍鍗曡儗鏅
         /// </summary>
-        private FrameLayout frameMainMenuBack = null;
+        private NormalFrameLayout frameMainMenuBack = null;
         /// <summary>
         /// 鍏朵粬鑿滃崟鐨勫鍣ㄦ帶浠�
         /// </summary>
@@ -50,10 +50,14 @@
         /// </summary>
         public void ShowForm()
         {
+            this.FormID = "UserMainForm";
+
             //鐗规畩澶勭悊锛氭仮澶嶅彲鍏抽棴杩涘害鏉★紝鍒棶涓轰粈涔堬紝鎴戜篃涓嶇煡閬撲负浠�涔堬紝浠ラ槻涓囦竴鑰屽凡
             ProgressBar.SetCloseBarFlag(false);
-            //鍒濆鍖栨鏋�
-            this.InitForm();
+            //鍒濆鍖栧ご閮ㄦ帶浠�
+            this.InitTopFrameLayout();
+            //鍒濆鍖栦腑閮ㄦ帶浠�
+            this.InitBodyFrameLayout();
             //绉婚櫎杩斿洖閿�
             base.RemoveBackButton();
 
@@ -75,7 +79,7 @@
             this.ClearBodyFrame();
 
             //涓汉涓績
-            var btnTitle = new NormalViewControl(350, 100, true);
+            var btnTitle = new NormalViewControl(450, 100, true);
             btnTitle.X = ControlCommonResourse.XXLeft;
             btnTitle.Y = Application.GetRealHeight(112);
             btnTitle.TextColor = UserCenterColor.Current.White;
@@ -214,7 +218,7 @@
             else
             {
                 //鑳屾櫙妗�
-                frameMainMenuBack = new FrameLayout();
+                frameMainMenuBack = new NormalFrameLayout();
                 frameMainMenuBack.Y = Application.GetRealHeight(288);
                 frameMainMenuBack.Gravity = Gravity.CenterHorizontal;
                 frameMainMenuBack.Height = Application.GetRealHeight(371);
@@ -310,7 +314,7 @@
                 frame.ButtonClickEvent += (sender, e) =>
                 {
                     //浣忓畢鎺ュ彛涓嶉渶瑕佺壒娈婄殑鐧婚檰Token
-                    var form = new Residence.ResidenceListForm();
+                    var form = new Residence.ResidenceListMainForm();
                     form.AddForm();
                 };
             }
@@ -468,13 +472,8 @@
             btnAbountView.X -= ControlCommonResourse.XXLeft / 2;
             rowAbount.ButtonClickEvent += (sender, e) =>
             {
-                if (Common.Config.Instance.Home.IsVirtually == true)
-                {
-                    //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�,鍒欐鍔熻兘鏃犳晥
-                    return;
-                }
                 var form = new Abount.AbountForm();
-                form.AddForm();
+                form.AddForm(false);
             };
 
             if (UserCenterResourse.HideOption.CenterHideMenu == 1)

--
Gitblit v1.8.0