From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs | 116 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 77 insertions(+), 39 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..d4f4569 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
@@ -31,35 +31,54 @@
ResidenceMemberInfo memberInfo;
- Room room;
+ /// <summary>
+ /// 褰撳墠鐨勬埧闂磖oomId
+ /// 濡傛灉涓虹┖锛屽垯浠ｈ〃绠＄悊鏃犲垎閰嶅尯鍩熺殑鍔熻兘鍒嗕韩
+ /// </summary>
+ string roomId;
+ /// <summary>
+ /// 鎴块棿鎵�鏈夊姛鑳藉拰鍦烘櫙鍒楄〃
+ /// </summary>
+ List<RoomData> roomFunctionOrSceneList = new List<RoomData>();
+
- Action<string> refreshFunctionCount;
-
- List<ShareData> funs;
- List<ShareData> funs_New;
+ /// <summary>
+ /// 鍒锋柊鍥炶皟Action
+ /// </summary>
+ Action refreshAction;
+ /// <summary>
+ /// 褰撳墠璐﹀彿鐨勬墍鏈夊垎浜垪琛�
+ /// </summary>
+ List<ShareData> curResidenceShareData;
+ /// <summary>
+ /// 灞炰簬褰撳墠鎴块棿鏈�缁堢殑璁惧鍒嗕韩鍒楄〃
+ /// </summary>
+ List<ShareData> funs_RoomAll;
+ //shareDataList = new List<ShareData>();
+ /// <summary>
+ /// 鍒犻櫎鐨勫垎浜垪琛�
+ /// </summary>
List<ShareData> funs_Del;
- public MemberFunctionPermissionPage(ResidenceMemberInfo mInfo, Room r, Action<string> action)
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="mInfo"></param>
+ /// <param name="roomFunctionOrSceneList">鎴块棿鎵�鏈夊姛鑳藉拰鍦烘櫙鍒楄〃</param>
+ /// <param name="roomId"></param>
+ /// <param name="refreshAction"></param>
+ public MemberFunctionPermissionPage(ResidenceMemberInfo mInfo, List<RoomData> roomFunctionOrSceneList, List<ShareData> funs_RoomAll, string roomId, Action refreshAction)
{
bodyView = this;
- memberInfo = mInfo;
- room = r;
- funs = new List<ShareData>();
- funs = memberInfo.CurResidenceShareDate;
- funs_New = new List<ShareData>();
- funs_Del = new List<ShareData>();
-
- refreshFunctionCount = action;
- }
-
- public MemberFunctionPermissionPage(Room r,List<ShareData> sd)
- {
- bodyView = this;
- room = r;
- funs = new List<ShareData>();
- funs_New = sd;
- funs_Del = new List<ShareData>();
- memberInfo = new ResidenceMemberInfo();
+ this.memberInfo = mInfo;
+ this.roomFunctionOrSceneList = roomFunctionOrSceneList;
+ this.roomId = roomId;
+ //this.curResidenceShareData = new List<ShareData>();
+ this.curResidenceShareData = memberInfo.CurResidenceShareData;
+ this.funs_RoomAll = new List<ShareData>();
+ this.funs_RoomAll.AddRange(funs_RoomAll);
+ this.funs_Del = new List<ShareData>();
+ this.refreshAction = refreshAction;
}
public void LoadPage(int tId)
@@ -119,11 +138,11 @@
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,
- TextID = titleId == StringId.PermissionToUse ? StringId.Confirm : StringId.Shared,
+ TextID = titleId == StringId.MemberPermissionManagement ? StringId.Confirm : StringId.Shared,
TextSize = CSS_FontSize.SubheadingFontSize,
IsBold = true,
Radius = (uint)Application.GetRealWidth(22),
@@ -132,23 +151,17 @@
};
bodyView.AddChidren(btnOption);
- if(titleId == StringId.PermissionToUse)
- {
- LoadFunctionRow(funs);
- }
- else
- {
- LoadFunctionRow(funs_New);
- }
+ LoadFunctionRow(funs_RoomAll);
+
LoadEventList();
}
/// <summary>
/// 鍔犺浇鍔熻兘鍒楄〃
/// </summary>
- void LoadFunctionRow(List<ShareData> shareDatas)
+ void LoadFunctionRow(List<ShareData> shareDatas)
{
contentView.RemoveAll();
- foreach (var function in room.functions)
+ foreach (var roomData in roomFunctionOrSceneList)
{
var roomView = new FrameLayout()
{
@@ -165,7 +178,7 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
- Text = function.name,
+ Text = roomData.name,
};
roomView.AddChidren(btnRoomText);
@@ -180,16 +193,20 @@
Tag = "ChooseIcon"
};
roomView.AddChidren(btnChoose);
- if (shareDatas.Find((obj) => obj.ShareName == function.sid) != null)
+
+ var shareData = shareDatas.Find((obj) => obj.shareTypeId == roomData.shareTypeId);
+ if (shareData != null)
{
btnChoose.IsSelected = true;
+ //鍒锋柊灞炰簬褰撳墠鎴块棿鐨勫垎浜粺璁�
+ //funs_New.Add(shareData);
}
else
{
if (btnChooseAll.IsSelected)
btnChooseAll.IsSelected = false;
}
- LoadMethod_SharedDataChange(btnChoose, btnRoomText, roomView, function);
+ LoadMethod_SharedDataChange(btnChoose, btnRoomText, roomView, roomData);
var btnLine = new Button()
{
@@ -201,7 +218,28 @@
};
contentView.AddChidren(btnLine);
}
+
+
}
}
+
+ /// <summary>
+ /// 鎴块棿鎵�鏈夊姛鑳藉拰鑰呭満鏅垪琛�
+ /// </summary>
+ public class RoomData
+ {
+ /// <summary>
+ /// 璁惧鍚嶅瓧鎴栬�呭満鏅悕瀛�
+ /// </summary>
+ public string shareTypeId;
+ /// <summary>
+ /// 璁惧鍚嶅瓧鎴栬�呭満鏅悕瀛�
+ /// </summary>
+ public string name;
+ /// <summary>
+ /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ /// </summary>
+ public string shareType = ShareType.DEVICE.ToString();
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0