From dc840e2d67654781ebc9c7640e6c44a63a6d04d0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 11 十二月 2020 09:44:37 +0800
Subject: [PATCH] 2020-12-11 1.注册、忘记密码、重置密码、点击返回到时候屏蔽检测错误提示。底部按钮使能效果优化修改。邮箱变密码输入问题修复。2.网络请求底层增加token过期检测刷新方法。3.更新控件库,iOS EditText取消默认密码输入方式。

---
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
index 372f78f..172eb57 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
@@ -35,8 +35,17 @@
 
         Action<string> refreshFunctionCount;
 
+        /// <summary>
+        /// 涔嬪墠鐨勫垎浜垪琛�
+        /// </summary>
         List<ShareData> funs;
+        /// <summary>
+        /// 灞炰簬褰撳墠鎴块棿鏈�缁堢殑璁惧鍒嗕韩鍒楄〃
+        /// </summary>
         List<ShareData> funs_New;
+        /// <summary>
+        /// 鍒犻櫎鐨勫垎浜垪琛�
+        /// </summary>
         List<ShareData> funs_Del;
 
         public MemberFunctionPermissionPage(ResidenceMemberInfo mInfo, Room r, Action<string> action)
@@ -119,7 +128,7 @@
                 Y = Application.GetRealHeight(519 + 64),
                 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,
@@ -148,7 +157,7 @@
         void LoadFunctionRow(List<ShareData>  shareDatas)
         {
             contentView.RemoveAll();
-            foreach (var function in room.functions)
+            foreach (var function in room.GetRoomFunctions(false))
             {
                 var roomView = new FrameLayout()
                 {
@@ -180,9 +189,13 @@
                     Tag = "ChooseIcon"
                 };
                 roomView.AddChidren(btnChoose);
-                if (shareDatas.Find((obj) => obj.ShareName == function.sid) != null)
+
+                var shareData = shareDatas.Find((obj) => obj.shareTypeId == function.deviceId);
+                if (shareData != null)
                 {
                     btnChoose.IsSelected = true;
+                    //鍒锋柊灞炰簬褰撳墠鎴块棿鐨勫垎浜粺璁�
+                    funs_New.Add(shareData);
                 }
                 else
                 {

--
Gitblit v1.8.0