From 675df74cdd4103ffdcbfa0a6ccfc105fd61af15a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 29 十月 2021 15:44:18 +0800
Subject: [PATCH] 2021-10-29 1.更新乐橙 AndroidSDK
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs | 167 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 100 insertions(+), 67 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
index eba16f4..d008e3f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
@@ -22,19 +22,31 @@
{
btnOption.MouseUpEventHandler = (sender, e) =>
{
- if (titleId == StringId.PermissionToUse)//浠庝釜浜轰腑蹇冭繘鍏ュ崟鐙垎浜�
+ Action action = () =>
{
UploadShareDeviceList();
- }
- else
- {
- //var sharedBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(funs_New));
- //2020-12-01 灞忚斀椤甸潰
- //var page = new ChooseShareMemberTargetListPage(funs_New, memberInfo);
- //MainPage.BasePageView.AddChidren(page);
- //page.LoadPage();
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
+ };
+ //鏄惁闇�瑕佷繚瀛�
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.IfNeedToSave, action);
+
+ //if (titleId == StringId.PermissionToUse)//浠庝釜浜轰腑蹇冭繘鍏ュ崟鐙垎浜�
+ //{
+ // Action action = () =>
+ // {
+ // UploadShareDeviceList();
+ // };
+ // //鏄惁闇�瑕佷繚瀛�
+ // new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.IfNeedToSave, action);
+ //}
+ //else
+ //{
+ // //var sharedBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(funs_New));
+ // //2020-12-01 灞忚斀椤甸潰
+ // //var page = new ChooseShareMemberTargetListPage(funs_New, memberInfo);
+ // //MainPage.BasePageView.AddChidren(page);
+ // //page.LoadPage();
+ // //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //}
};
}
@@ -55,46 +67,27 @@
act = new PublicAssmebly().TipLoadingMsgDialog(Language.StringByID(StringId.SavingPleaseWait));
});
- //1.绠＄悊鏈�缁堝睘浜庢埧闂寸殑鍒嗕韩
- if (funs_New != null && funs_New.Count > 0)
- {
- //鏈�缁堝睘浜庢埧闂寸殑鍒嗕韩澶т簬0
- var success = ShareRoom();
- if (success)
- {
- Utlis.WriteLine("娣诲姞鎴块棿鍒嗕韩鎴愬姛");
- }
- else
- {
- Utlis.WriteLine("娣诲姞鎴块棿鍒嗕韩澶辫触");
- }
- }
- else
- {
- var success = DeleteShareRoom();
- if (success)
- {
- Utlis.WriteLine("鍒犻櫎鎴块棿鍒嗕韩鎴愬姛");
- }
- else
- {
- Utlis.WriteLine("鍒犻櫎鎴块棿鍒嗕韩澶辫触");
- }
- }
+ //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);
//3.鎵归噺涓婁紶
var funs_NeedAdd = new List<ShareData>();
- foreach (var f in funs_New)
+ foreach (var f in funs_RoomAll)
{
- var sd = funs.Find((obj) => obj.shareTypeId == f.shareTypeId);
+ var sd = curResidenceShareData.Find((obj) => obj.shareTypeId == f.shareTypeId);
//濡傛灉璇ュ姛鑳藉凡缁忓垎浜紝涓嶇敤鍒嗕韩
if (null == sd)
{
@@ -108,7 +101,7 @@
{
shareDatas = funs_NeedAdd,
childAccountIds = childAccountIds,
- homeId = DB_ResidenceData.Instance.CurrentRegion.RegionID,
+ homeId = DB_ResidenceData.Instance.CurrentRegion.id,
};
result = LoadMethod_AddShareData(addShareObj);
@@ -128,7 +121,7 @@
{
//4.1绠＄悊鏈�缁堢殑鍒嗕韩鍒楄〃
var funs_final = new List<ShareData>();
- funs_final.AddRange(funs);
+ funs_final.AddRange(curResidenceShareData);
//4.2绉婚櫎鍒犻櫎鐨�
foreach (var share_d in funs_Del)
{
@@ -145,14 +138,13 @@
Application.RunOnMainThread(() =>
{
new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.FunctionSharingSucceeded), true);
- memberInfo.CurResidenceShareDate = funs_final;
+ memberInfo.CurResidenceShareData = funs_final;
});
Thread.Sleep(1600);
Application.RunOnMainThread(() =>
{
- //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
- refreshFunctionCount?.Invoke(funs_New.Count.ToString());
+ refreshAction?.Invoke();
});
}
}
@@ -203,6 +195,42 @@
}
/// <summary>
+ /// 绠＄悊鎴块棿鍒嗕韩鎿嶄綔
+ /// funs_New 澶т簬1鍒嗕韩鎴块棿
+ /// </summary>
+ bool ManageRoomSharing()
+ {
+ bool success = false;
+ //1.绠＄悊鏈�缁堝睘浜庢埧闂寸殑鍒嗕韩
+ if (funs_RoomAll != null && funs_RoomAll.Count > 0)
+ {
+ //鏈�缁堝睘浜庢埧闂寸殑鍒嗕韩澶т簬0
+ success = ShareRoom();
+ if (success)
+ {
+ Utlis.WriteLine("娣诲姞鎴块棿鍒嗕韩鎴愬姛");
+ }
+ else
+ {
+ Utlis.WriteLine("娣诲姞鎴块棿鍒嗕韩澶辫触");
+ }
+ }
+ else
+ {
+ success = DeleteShareRoom();
+ if (success)
+ {
+ Utlis.WriteLine("鍒犻櫎鎴块棿鍒嗕韩鎴愬姛");
+ }
+ else
+ {
+ Utlis.WriteLine("鍒犻櫎鎴块棿鍒嗕韩澶辫触");
+ }
+ }
+ return success;
+ }
+
+ /// <summary>
/// 鍒嗕韩鎴块棿
/// </summary>
/// <returns></returns>
@@ -212,14 +240,14 @@
roomList.Add(new ShareData()
{
shareType = ShareType.ROOM.ToString(),
- shareTypeId = room.roomId
+ shareTypeId = roomId
});
List<string> childAccountIds = new List<string>();
childAccountIds.Add(memberInfo.childAccountId);
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);
@@ -243,13 +271,13 @@
roomList.Add(new ShareData()
{
shareType = ShareType.ROOM.ToString(),
- shareTypeId = room.roomId
+ shareTypeId = roomId
});
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)
@@ -269,21 +297,21 @@
/// <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 = funs.Find((obj) => obj.shareTypeId == function.deviceId);
+ var sd = curResidenceShareData.Find((obj) => obj.shareTypeId == roomData.shareTypeId);
if (btnChoose.IsSelected)
{
try
{
if (null != sd)
{
- if (!funs_New.Contains(sd))
+ if (!funs_RoomAll.Contains(sd))
{
- funs_New.Add(sd);
+ funs_RoomAll.Add(sd);
}
if (funs_Del.Contains(sd))
{
@@ -293,14 +321,15 @@
else
{
var newSd = new ShareData();
- newSd.shareTypeId = function.deviceId;
+ newSd.shareTypeId = roomData.shareTypeId;
+ newSd.shareType = roomData.shareType;
- funs_New.Add(newSd);
+ funs_RoomAll.Add(newSd);
}
btnChooseAll.IsSelected = true;
- foreach (var f in room.GetRoomFunctions(false))
+ foreach (var f in roomFunctionOrSceneList)
{
- if (funs_New.Find((obj) => obj.shareTypeId == f.deviceId) == null)
+ if (funs_RoomAll.Find((obj) => obj.shareTypeId == f.shareTypeId) == null)
{
btnChooseAll.IsSelected = false;
break;
@@ -314,10 +343,10 @@
}
else
{
- var onFuns = funs_New.Find((obj) => obj.shareTypeId == function.deviceId);
- if (funs_New.Contains(onFuns))
+ var onFuns = funs_RoomAll.Find((obj) => obj.shareTypeId == roomData.shareTypeId);
+ if (funs_RoomAll.Contains(onFuns))
{
- funs_New.Remove(onFuns);
+ funs_RoomAll.Remove(onFuns);
}
if (null != sd)
@@ -344,32 +373,36 @@
{
btnChooseAll.IsSelected = !btnChooseAll.IsSelected;
funs_Del = new List<ShareData>();
- funs_New = new List<ShareData>();
+ funs_RoomAll = new List<ShareData>();
if (btnChooseAll.IsSelected)
{
- foreach (var f in room.GetRoomFunctions(false))
+ foreach (var f in roomFunctionOrSceneList)
{
var ssdd = new ShareData();
- ssdd.shareTypeId = f.deviceId;
- funs_New.Add(ssdd);
+ ssdd.shareTypeId = f.shareTypeId;
+ ssdd.shareType = f.shareType;
+ funs_RoomAll.Add(ssdd);
}
}
else
{
- foreach (var f in room.GetRoomFunctions(false))
+ foreach (var f in roomFunctionOrSceneList)
{
- var sd = funs.Find((obj) => obj.shareTypeId == f.deviceId);
+ var sd = curResidenceShareData.Find((obj) => obj.shareTypeId == f.shareTypeId);
if (sd != null)
{
funs_Del.Add(sd);
}
}
}
- LoadFunctionRow(funs_New);
+ LoadFunctionRow(funs_RoomAll);
};
btnChooseAll.MouseUpEventHandler = eventHandler;
allRoomView.MouseUpEventHandler = eventHandler;
}
}
+
+
+
}
--
Gitblit v1.8.0