From d1ab259186e2341a0839c87300065e9bb5f14e9c Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 12 十一月 2019 10:42:14 +0800
Subject: [PATCH] 2019.11.12

---
 ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
index deaf1b7..0bf877c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
@@ -57,24 +57,31 @@
             btnTopIcon = new MostRightIconControl(69, 69);
             if (memberInfo.AccountType == 1)
             {
-                btnTopIcon.UnSelectedImagePath = "Account/HadAuthority.png";
+                btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";
             }
             else
             {
-                btnTopIcon.UnSelectedImagePath = "Account/NotAuthority.png";
+                btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";
             }
             topFrameLayout.AddChidren(btnTopIcon);
             btnTopIcon.InitControl();
             btnTopIcon.ButtonClickEvent += (sender, e) =>
             {
+                //纭畾鍙栨秷銆寋0}銆嶇鐞嗗憳鏉冮檺锛�
                 string msg = Language.StringByID(R.MyInternationalizationString.uDownSubAccountLevel);
                 if (memberInfo.AccountType != 1)
                 {
+                    //纭畾鎺堟潈銆寋0}銆嶆垚涓虹鐞嗗憳?
                     msg = Language.StringByID(R.MyInternationalizationString.uUpSubAccountLevel);
                 }
+                msg = msg.Replace("{0}", string.IsNullOrEmpty(memberInfo.UserName) == true ? memberInfo.Account : memberInfo.UserName);
+
                 this.ShowMassage(ShowMsgType.Confirm, msg, () =>
                  {
-                     this.UpOrDownSubAccountLevel();
+                     //浜屾瀹夊叏楠岃瘉,濡傛灉娌℃湁璁剧疆鏈�,鐩存帴璺宠繃楠岃瘉
+                     HdlCheckLogic.Current.CheckSecondarySecurity(
+                         () => { this.UpOrDownSubAccountLevel(); },
+                         () => { this.UpOrDownSubAccountLevel(); });
                  });
             };
         }
@@ -222,10 +229,7 @@
             btnName.TextSize = 15;
 
             //寮�鍏�
-            var btnSwitch = row.AddMostRightEmptyIcon(104, 63);
-            row.ChangedChidrenBindMode(btnSwitch, ChidrenBindMode.NotBind);
-            btnSwitch.UnSelectedImagePath = "Item/Switch.png";
-            btnSwitch.SelectedImagePath = "Item/SwitchSelected.png";
+            var btnSwitch = row.AddMostRightSwitchIcon();
             btnSwitch.ButtonClickEvent += (sender, e) =>
             {
                 btnSwitch.IsSelected = !btnSwitch.IsSelected;
@@ -259,7 +263,7 @@
             var memberShardInfo = new MemberShardInfoData();
             row.ButtonClickEvent += (sender, e) =>
             {
-                var form = new SharedContent.SearchConfigureSharedListRoomForm();
+                var form = new SharedContent.LookSharedListRoomForm();
                 form.AddForm(memberInfo, memberShardInfo);
             };
         }
@@ -299,21 +303,18 @@
                 //鍙樻洿鏉冮檺鍥炬爣
                 if (memberInfo.AccountType == 1)
                 {
-                    btnTopIcon.UnSelectedImagePath = "Account/HadAuthority.png";
+                    btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";
                 }
                 else
                 {
-                    btnTopIcon.UnSelectedImagePath = "Account/NotAuthority.png";
+                    btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";
                 }
                 //鍙樻洿鏉冮檺鏂囧瓧
                 btnAuthority.TextID = memberInfo.AccountType == 1 ? R.MyInternationalizationString.uMemberHadActionAuthority : R.MyInternationalizationString.uMember;
 
                 //鎵撳紑鏄剧ず鎴愬姛鐨勭敾闈�
-                if (memberInfo.AccountType == 1)
-                {
-                    var form = new SubAccountLevelUpSuccessForm();
-                    form.AddForm(memberInfo);
-                }
+                var form = new SubAccountLevelUpSuccessForm();
+                form.AddForm(memberInfo);
             });
         }
 

--
Gitblit v1.8.0