From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
index ee44a30..d008e3f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
@@ -67,18 +67,19 @@
act = new PublicAssmebly().TipLoadingMsgDialog(Language.StringByID(StringId.SavingPleaseWait));
});
- if (!string.IsNullOrEmpty(roomId))
- {
- //濡傛灉鎴块棿ID涓嶄负绌猴紝绠＄悊鎴块棿
- ManageRoomSharing();
- }
+ //2020-12-22 灞忚斀鎴块棿鍒嗕韩绠＄悊
+ //if (!string.IsNullOrEmpty(roomId))
+ //{
+ // //濡傛灉鎴块棿ID涓嶄负绌猴紝绠＄悊鎴块棿
+ // ManageRoomSharing();
+ //}
//2.鎵归噺鍒犻櫎鍒嗕韩
var deleteShareObj = new DeleteShareObj()
{
shareDatas = funs_Del,
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
};
LoadMethod_DelSharedData(deleteShareObj);
@@ -100,7 +101,7 @@
{
shareDatas = funs_NeedAdd,
childAccountIds = childAccountIds,
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
};
result = LoadMethod_AddShareData(addShareObj);
@@ -246,7 +247,7 @@
var addShareObj = new AddShareObj()
{
childAccountIds = childAccountIds,
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
shareDatas = roomList
};
var responePack = new HttpServerRequest().AddShareData(addShareObj);
@@ -276,7 +277,7 @@
var deleteShareObj = new DeleteShareObj()
{
shareDatas = roomList,
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
};
var responePack = new HttpServerRequest().DeleteShareData(deleteShareObj);
if (responePack.Code != StateCode.SUCCESS)
@@ -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,15 @@
else
{
var newSd = new ShareData();
- newSd.shareTypeId = function.deviceId;
+ newSd.shareTypeId = roomData.shareTypeId;
+ newSd.shareType = roomData.shareType;
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 +343,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 +376,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 +402,7 @@
}
}
+
+
+
}
--
Gitblit v1.8.0