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/MemberPermissionPageBLL.cs | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs
index 5018a0f..e9599c7 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs
@@ -132,11 +132,11 @@
/// 涓�閿垹闄ゅ綋鍓嶆埧闂存墍鏈夊垎浜�
/// </summary>
/// <param name="funs_Del">闇�瑕佷竴閿垹闄ょ殑鍒嗕韩鏁版嵁</param>
- /// <param name="roomFunctionList">褰撳墠鎴块棿鎵�鏈夊姛鑳藉垪琛�</param>
+ /// <param name="roomFunctionOrSceneList">褰撳墠鎴块棿鎵�鏈夊姛鑳藉垪琛�</param>
/// <param name="roomId">濡傛灉鎴块棿ID涓虹┖锛屽垯浠ｈ〃绠＄悊鏃犲垎閰嶅尯鍩熺殑鍔熻兘锛屼笉闇�瑕佸垹闄ゆ埧闂村垎浜�</param>
/// <param name="btnFunctionCount">涓暟缁熻鏁伴噺</param>
/// <param name="roomView">鑳屾櫙View</param>
- void DeleteRoomAllShare(List<ShareData> funs_Del, List<Function> roomFunctionList, string roomId, Button btnFunctionCount, RowLayout roomView)
+ void DeleteRoomAllShare(List<ShareData> funs_Del, List<RoomData> roomFunctionOrSceneList, string roomId, Button btnFunctionCount, RowLayout roomView)
{
//闇�瑕佸垹闄ょ殑鍒嗕韩涓�0
if (funs_Del == null || funs_Del.Count == 0)
@@ -156,26 +156,27 @@
try
{
bool result = false;
- //濡傛灉鎴块棿ID涓虹┖锛屽垯浠ｈ〃绠＄悊鏃犲垎閰嶅尯鍩熺殑鍔熻兘锛屼笉闇�瑕佸垹闄ゆ埧闂村垎浜�
- if (!string.IsNullOrEmpty(roomId))
- {
- //鍒犻櫎鎴块棿鍒嗕韩
- var success = DeleteShareRoom(roomId);
- if (success)
- {
- Utlis.WriteLine("鍒犻櫎鎴块棿鍒嗕韩鎴愬姛");
- }
- else
- {
- Utlis.WriteLine("鍒犻櫎鎴块棿鍒嗕韩澶辫触");
- }
- }
+ //2020-12-22 灞忚斀鎴块棿鍒嗕韩绠＄悊
+ ////濡傛灉鎴块棿ID涓虹┖锛屽垯浠ｈ〃绠＄悊鏃犲垎閰嶅尯鍩熺殑鍔熻兘锛屼笉闇�瑕佸垹闄ゆ埧闂村垎浜�
+ //if (!string.IsNullOrEmpty(roomId))
+ //{
+ // //鍒犻櫎鎴块棿鍒嗕韩
+ // var success = DeleteShareRoom(roomId);
+ // if (success)
+ // {
+ // Utlis.WriteLine("鍒犻櫎鎴块棿鍒嗕韩鎴愬姛");
+ // }
+ // else
+ // {
+ // Utlis.WriteLine("鍒犻櫎鎴块棿鍒嗕韩澶辫触");
+ // }
+ //}
//2.鎵归噺鍒犻櫎鍒嗕韩
var deleteShareObj = new DeleteShareObj()
{
shareDatas = funs_Del,
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
};
result = LoadMethod_DelSharedData(deleteShareObj);
@@ -209,7 +210,7 @@
//娓呯┖
funs_Del.Clear();
memberInfo.CurResidenceShareData = funs_final;
- btnFunctionCount.Text = 0 + "/" + roomFunctionList.Count.ToString();
+ btnFunctionCount.Text = 0 + "/" + roomFunctionOrSceneList.Count.ToString();
//鍏抽棴鍙虫粦鑿滃崟
roomView.HideMenu();
});
@@ -250,7 +251,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)
--
Gitblit v1.8.0