From 7f2d401e502bf89eea7404745c9ff7d103b37a63 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 07 五月 2020 16:06:43 +0800
Subject: [PATCH] 整一个

---
 ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
index 1def82e..614f21d 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
@@ -189,10 +189,10 @@
             var btnTiyan = new NormalViewControl(300, 100, true);
             btnTiyan.Y = btnLoginByCode.Y;
             btnTiyan.TextAlignment = TextAlignment.Center;
-            btnTiyan.TextColor = UserCenterColor.Current.TextGrayColor3;
+            btnTiyan.TextColor = UserCenterColor.Current.TextOrangeColor;
             btnTiyan.TextSize = 12;
             btnTiyan.Gravity = Gravity.CenterHorizontal;
-            btnTiyan.Text = "娓稿浣撻獙";
+            btnTiyan.TextID = R.MyInternationalizationString.uExperienceAccount;
             frameMidBack.AddChidren(btnTiyan);
             btnTiyan.ButtonClickEvent += (sender, e) =>
             {
@@ -207,7 +207,7 @@
                     {
                         this.RemoveFromParent();
                         CommonPage.Instance.RemoveViewByTag("Login");
-                        UserPage.Instance.Fresh();
+                        UserPage.Instance.ReFreshControl();
                     });
                 });
             };
@@ -637,14 +637,10 @@
             //瀛椾綋鎬诲搴�
             int fontWidth = 0;
             int btnWidth = 0;
-#if Android
+
             //鐗规畩鐨勮宸��
-            int speceilValue = Application.GetRealWidth(20);
-#endif
-#if iOS
-            //鐗规畩鐨勮宸��
-            int speceilValue = Application.GetRealWidth(10);
-#endif
+            int speceilValue = ControlCommonResourse.TwoTextSpace;
+
             //鎴戝凡闃呰骞跺悓鎰�
             var btnMsg1 = new NormalViewControl(100, 90, true);
             btnMsg1.Gravity = Gravity.CenterVertical;
@@ -855,7 +851,7 @@
                         {
                             this.RemoveFromParent();
                             CommonPage.Instance.RemoveViewByTag("Login");
-                            UserPage.Instance.Fresh();
+                            UserPage.Instance.ReFreshControl();
                         });
                     }
                     else
@@ -1119,7 +1115,7 @@
                     CommonPage.Loading.Hide();
                     this.RemoveFromParent();
                     CommonPage.Instance.RemoveViewByTag("Login");
-                    UserPage.Instance.Fresh();
+                    UserPage.Instance.ReFreshControl();
                 });
                 return;
             }

--
Gitblit v1.8.0