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/MemberFunctionPermissionPageBLL.cs | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
old mode 100755
new mode 100644
index ee44a30..5dad07a
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
@@ -67,11 +67,12 @@
act = new PublicAssmebly().TipLoadingMsgDialog(Language.StringByID(StringId.SavingPleaseWait));
});
- if (!string.IsNullOrEmpty(roomId))
- {
- //濡傛灉鎴块棿ID涓嶄负绌猴紝绠＄悊鎴块棿
- ManageRoomSharing();
- }
+ //2020-12-22 灞忚斀鎴块棿鍒嗕韩绠＄悊
+ //if (!string.IsNullOrEmpty(roomId))
+ //{
+ // //濡傛灉鎴块棿ID涓嶄负绌猴紝绠＄悊鎴块棿
+ // ManageRoomSharing();
+ //}
//2.鎵归噺鍒犻櫎鍒嗕韩
@@ -296,12 +297,12 @@
/// <param name="btn2"></param>
/// <param name="btn3"></param>
/// <param name="function"></param>
- void LoadMethod_SharedDataChange(Button btnChoose, Button btn2, FrameLayout btn3, Function function)
+ void LoadMethod_SharedDataChange(Button btnChoose, Button btn2, FrameLayout btn3, RoomData roomData)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
btnChoose.IsSelected = !btnChoose.IsSelected;
- var sd = curResidenceShareData.Find((obj) => obj.shareTypeId == function.deviceId);
+ var sd = curResidenceShareData.Find((obj) => obj.shareTypeId == roomData.shareTypeId);
if (btnChoose.IsSelected)
{
try
@@ -320,14 +321,14 @@
else
{
var newSd = new ShareData();
- newSd.shareTypeId = function.deviceId;
+ newSd.shareTypeId = roomData.shareTypeId;
funs_RoomAll.Add(newSd);
}
btnChooseAll.IsSelected = true;
- foreach (var f in roomFunctionList)
+ foreach (var f in roomFunctionOrSceneList)
{
- if (funs_RoomAll.Find((obj) => obj.shareTypeId == f.deviceId) == null)
+ if (funs_RoomAll.Find((obj) => obj.shareTypeId == f.shareTypeId) == null)
{
btnChooseAll.IsSelected = false;
break;
@@ -341,7 +342,7 @@
}
else
{
- var onFuns = funs_RoomAll.Find((obj) => obj.shareTypeId == function.deviceId);
+ var onFuns = funs_RoomAll.Find((obj) => obj.shareTypeId == roomData.shareTypeId);
if (funs_RoomAll.Contains(onFuns))
{
funs_RoomAll.Remove(onFuns);
@@ -374,18 +375,19 @@
funs_RoomAll = new List<ShareData>();
if (btnChooseAll.IsSelected)
{
- foreach (var f in roomFunctionList)
+ foreach (var f in roomFunctionOrSceneList)
{
var ssdd = new ShareData();
- ssdd.shareTypeId = f.deviceId;
+ ssdd.shareTypeId = f.shareTypeId;
+ ssdd.shareType = f.shareType;
funs_RoomAll.Add(ssdd);
}
}
else
{
- foreach (var f in roomFunctionList)
+ foreach (var f in roomFunctionOrSceneList)
{
- var sd = curResidenceShareData.Find((obj) => obj.shareTypeId == f.deviceId);
+ var sd = curResidenceShareData.Find((obj) => obj.shareTypeId == f.shareTypeId);
if (sd != null)
{
funs_Del.Add(sd);
@@ -399,4 +401,7 @@
}
}
+
+
+
}
--
Gitblit v1.8.0