From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC

---
 HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs |   45 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs
index d1a0a8d..331dc4a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs
@@ -4,10 +4,20 @@
 
 namespace HDL_ON.UI
 {
+    /// <summary>
+    /// 宸茬粦瀹氭墜鏈烘垨鑰呴偖绠辩殑椤甸潰
+    /// </summary>
     public partial class AccountBindInfoPage : FrameLayout
     {
+        /// <summary>
+        /// 
+        /// </summary>
         FrameLayout bodyView;
+        /// <summary>
+        /// 
+        /// </summary>
         Action<string> action;
+
         /// <summary>
         /// 淇淇℃伅鐨勭被鍨�
         /// 1:閭锛�2:鎵嬫満
@@ -17,6 +27,10 @@
         /// 鐣岄潰鏍囬
         /// </summary>
         int titleId;
+
+        /// <summary>
+        /// 
+        /// </summary>
         public AccountBindInfoPage()
         {
             bodyView = this;
@@ -27,7 +41,7 @@
         /// </summary>
         /// <param name="act">鍒锋柊缁戝畾淇℃伅鏂规硶</param>
         /// <param name="option">淇淇℃伅鐨勭被鍨�:1:閭锛�2:鎵嬫満</param>
-        public void LoadPage(Action<string> act,int ot,int tId)
+        public void LoadPage(Action<string> act, int ot, int tId)
         {
             action = act;
             optionType = ot;
@@ -50,7 +64,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.SubheadingFontSize,
                 TextAlignment = TextAlignment.CenterLeft,
-                TextID = optionType == 1 ? StringId.CurrentEmail : StringId.CurPhone, 
+                TextID = optionType == 1 ? StringId.CurrentEmail : StringId.CurPhone,
             };
             rowView.AddChidren(btnTitle);
 
@@ -60,7 +74,7 @@
                 TextColor = CSS_Color.PromptingColor1,
                 TextSize = CSS_FontSize.TextFontSize,
                 TextAlignment = TextAlignment.CenterRight,
-                Text = optionType == 1 ? MainPage.LoginUser.userEmailInfo : MainPage.LoginUser.userMobileInfo,
+                Text = optionType == 1 ?  UserInfo.Current.userEmailInfo :  UserInfo.Current.userMobileInfo,
             };
             rowView.AddChidren(btnContent);
 
@@ -69,7 +83,7 @@
                 Y = Application.GetRealHeight(213),
                 Gravity = Gravity.CenterHorizontal,
                 Width = Application.GetRealWidth(220),
-                Height = Application.GetRealHeight(44),
+                Height = Application.GetRealWidth(44),
                 BackgroundColor = CSS_Color.MainColor,
                 TextAlignment = TextAlignment.Center,
                 TextColor = CSS_Color.MainBackgroundColor,
@@ -82,7 +96,8 @@
             };
             bodyView.AddChidren(btnChangeBind);
 
-            if( (!string.IsNullOrEmpty(MainPage.LoginUser.userMobileInfo) && optionType == 1) || (!string.IsNullOrEmpty(MainPage.LoginUser.userMobileInfo) && optionType == 2))
+            //鍚屾椂缁戝畾閭鎴栬�呮墜鏈烘墠鏄剧ず"鏇存崲楠岃瘉鏂瑰紡"
+            if (!string.IsNullOrEmpty( UserInfo.Current.userMobileInfo) && !string.IsNullOrEmpty( UserInfo.Current.userEmailInfo))
             {
                 Button btnUnbind = new Button()
                 {
@@ -111,16 +126,18 @@
         /// </summary>
         void LoadEvent_SkipChangeBandAccountInfo(Button button)
         {
-            EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+            {
                 var cbe = new ChangeBindAccountPage();
+                cbe.IsUnbind = false;
                 MainPage.BasePageView.AddChidren(cbe);
                 if (optionType == 1)
                 {
-                    cbe.LoadPage(action, optionType, StringId.ModifyBindingEmail, StringId.CurrentEmail);
+                    cbe.LoadPage(action, optionType, StringId.ModifyBindingEmail);
                 }
-                else if(optionType == 2)
+                else if (optionType == 2)
                 {
-                    cbe.LoadPage(action, optionType, StringId.ModifyBindingPhone, StringId.CurPhone);
+                    cbe.LoadPage(action, optionType, StringId.ModifyBindingPhone);
                 }
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             };
@@ -132,16 +149,18 @@
         /// </summary>
         void LoadEvent_SkipDelBandAccountInfo(Button button)
         {
-            EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+            {
                 var cbe = new ChangeBindAccountPage();
+                cbe.IsUnbind = true;//鏄惁涓鸿В缁戞爣璁�
                 MainPage.BasePageView.AddChidren(cbe);
                 if (optionType == 1)
                 {
-                    cbe.LoadPage(action, optionType, StringId.UnbindEmail, StringId.CurrentEmail);
+                    cbe.LoadPage(action, optionType, StringId.UnbindEmail);
                 }
-                else if(optionType == 2)
+                else if (optionType == 2)
                 {
-                    cbe.LoadPage(action, optionType, StringId.UnbindPhone, StringId.CurPhone);
+                    cbe.LoadPage(action, optionType, StringId.UnbindPhone);
                 }
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             };

--
Gitblit v1.8.0