From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码,完成晾衣架最终功能。

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

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index f8976bc..c4691c6 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>
@@ -79,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;
@@ -218,7 +218,7 @@
             else
             {
                 //鑳屾櫙妗�
-                frameMainMenuBack = new FrameLayout();
+                frameMainMenuBack = new NormalFrameLayout();
                 frameMainMenuBack.Y = Application.GetRealHeight(288);
                 frameMainMenuBack.Gravity = Gravity.CenterHorizontal;
                 frameMainMenuBack.Height = Application.GetRealHeight(371);
@@ -314,7 +314,7 @@
                 frame.ButtonClickEvent += (sender, e) =>
                 {
                     //浣忓畢鎺ュ彛涓嶉渶瑕佺壒娈婄殑鐧婚檰Token
-                    var form = new Residence.ResidenceListForm();
+                    var form = new Residence.ResidenceListMainForm();
                     form.AddForm();
                 };
             }

--
Gitblit v1.8.0