From 8dabf6b3c19e2191f45b3d05530ecacc06371e10 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 22:01:56 +0800
Subject: [PATCH] 2020-12-22 1.成员分享数据增加场景分享。2.分享房间的操作去掉，改为由云端处理。3.查询分享，去掉指定设备查询，不传参数指定查询全部。
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
old mode 100755
new mode 100644
index b47c385..d4f4569
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
@@ -37,9 +37,10 @@
/// </summary>
string roomId;
/// <summary>
- /// 鎴块棿鎵�鏈夊姛鑳藉垪琛�
+ /// 鎴块棿鎵�鏈夊姛鑳藉拰鍦烘櫙鍒楄〃
/// </summary>
- List<Function> roomFunctionList = new List<Function>();
+ List<RoomData> roomFunctionOrSceneList = new List<RoomData>();
+
/// <summary>
/// 鍒锋柊鍥炶皟Action
@@ -63,14 +64,14 @@
///
/// </summary>
/// <param name="mInfo"></param>
- /// <param name="roomFunctionList"></param>
+ /// <param name="roomFunctionOrSceneList">鎴块棿鎵�鏈夊姛鑳藉拰鍦烘櫙鍒楄〃</param>
/// <param name="roomId"></param>
/// <param name="refreshAction"></param>
- public MemberFunctionPermissionPage(ResidenceMemberInfo mInfo, List<Function> roomFunctionList, List<ShareData> funs_RoomAll, string roomId, Action refreshAction)
+ public MemberFunctionPermissionPage(ResidenceMemberInfo mInfo, List<RoomData> roomFunctionOrSceneList, List<ShareData> funs_RoomAll, string roomId, Action refreshAction)
{
bodyView = this;
this.memberInfo = mInfo;
- this.roomFunctionList = roomFunctionList;
+ this.roomFunctionOrSceneList = roomFunctionOrSceneList;
this.roomId = roomId;
//this.curResidenceShareData = new List<ShareData>();
this.curResidenceShareData = memberInfo.CurResidenceShareData;
@@ -160,7 +161,7 @@
void LoadFunctionRow(List<ShareData> shareDatas)
{
contentView.RemoveAll();
- foreach (var function in roomFunctionList)
+ foreach (var roomData in roomFunctionOrSceneList)
{
var roomView = new FrameLayout()
{
@@ -177,7 +178,7 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
- Text = function.name,
+ Text = roomData.name,
};
roomView.AddChidren(btnRoomText);
@@ -193,7 +194,7 @@
};
roomView.AddChidren(btnChoose);
- var shareData = shareDatas.Find((obj) => obj.shareTypeId == function.deviceId);
+ var shareData = shareDatas.Find((obj) => obj.shareTypeId == roomData.shareTypeId);
if (shareData != null)
{
btnChoose.IsSelected = true;
@@ -205,7 +206,7 @@
if (btnChooseAll.IsSelected)
btnChooseAll.IsSelected = false;
}
- LoadMethod_SharedDataChange(btnChoose, btnRoomText, roomView, function);
+ LoadMethod_SharedDataChange(btnChoose, btnRoomText, roomView, roomData);
var btnLine = new Button()
{
@@ -217,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