From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs | 111 +++++++++++++------------------------------------------
1 files changed, 26 insertions(+), 85 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
index 7feed80..6eae1ad 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
@@ -18,13 +18,9 @@
/// </summary>
private VerticalFrameControl listView = null;
/// <summary>
- /// 鎴愬憳淇℃伅
+ /// 鎴愬憳ID
/// </summary>
- private MemberInfoRes memberResult = null;
- /// <summary>
- /// 鎴愬憳鐨勫垎浜暟鎹�
- /// </summary>
- private MemberShardInfoData memberShardInfo = null;
+ private string ChildAccountId = string.Empty;
#endregion
@@ -35,11 +31,9 @@
/// </summary>
/// <param name="i_memberResult">鎴愬憳淇℃伅</param>
/// <param name="i_memberShardInfo">鎴愬憳鐨勫叡浜俊鎭�</param>
- public void ShowForm(MemberInfoRes i_memberResult, MemberShardInfoData i_memberShardInfo)
+ public void ShowForm(string i_ChildAccountId)
{
- this.memberResult = i_memberResult;
- this.memberShardInfo = i_memberShardInfo;
- this.memberShardInfo.SubAccountDistributedMark = this.memberResult.SubAccountDistributedMark;
+ this.ChildAccountId = i_ChildAccountId;
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uShared2));
@@ -50,7 +44,7 @@
btnAdd.ButtonClickEvent += (sender, e) =>
{
var form = new AddNewSharedListRoomForm();
- form.AddForm(this.memberResult, this.memberShardInfo);
+ form.AddForm(this.ChildAccountId);
};
topFrameLayout.AddChidren(btnAdd);
btnAdd.InitControl();
@@ -69,8 +63,8 @@
HdlThreadLogic.Current.RunThread(() =>
{
- //鑾峰彇鎴愬憳鐨勫叡浜垪琛�
- var result = HdlShardLogic.Current.GetMemberShardContentListAndSetToLocation(memberShardInfo);
+ //鍒濆鍖栨垚鍛樼殑鍏变韩鍒楄〃
+ var result = HdlShardLogic.Current.InitMemberShardContentListAndSetToLocation(this.ChildAccountId);
if (result == false)
{
//鏄剧ず閲嶆柊鍔犺浇鐨勭晫闈�
@@ -91,7 +85,8 @@
/// </summary>
private void InitAreaListRow()
{
- if (memberShardInfo.dicShardRoom.Count == 0)
+ var dicShardRoom = HdlShardLogic.Current.GetShardRoomFromMemory();
+ if (dicShardRoom.Count == 0)
{
HdlThreadLogic.Current.RunMain(() =>
{
@@ -106,7 +101,7 @@
{
//鍚堝苟鍚屼竴妤煎眰鐨勬埧闂�
var dicGroup = new Dictionary<string, List<Common.Room>>();
- foreach (var room in memberShardInfo.dicShardRoom.Values)
+ foreach (var room in dicShardRoom.Values)
{
if (dicGroup.ContainsKey(room.FloorId) == false)
{
@@ -114,6 +109,9 @@
}
dicGroup[room.FloorId].Add(room);
}
+ //鑾峰彇鍒嗕韩鐨勬ゼ灞�(鎺掑簭)
+ var dicSortFloor = HdlShardLogic.Current.GetShardFloorFormMemory();
+ dicSortFloor = HdlRoomLogic.Current.GetFloorSortList(dicSortFloor);
HdlThreadLogic.Current.RunMain(() =>
{
@@ -123,21 +121,19 @@
listView.Height = bodyFrameLayout.Height;
bodyFrameLayout.AddChidren(listView);
- //鎺掑簭妤煎眰
- var dicSort = HdlRoomLogic.Current.GetFloorSortList();
- foreach (var floorId in dicSort.Keys)
+ foreach (var floorId in dicSortFloor.Keys)
{
if (dicGroup.ContainsKey(floorId) == true)
{
//娣诲姞鍚勮嚜妤煎眰鐨勬埧闂村垪琛�
- this.AddRoomListRow(floorId, dicGroup[floorId]);
+ this.AddRoomListRow(floorId, dicSortFloor[floorId], dicGroup[floorId]);
dicGroup.Remove(floorId);
}
}
//娣诲姞鍚勮嚜妤煎眰鐨勬埧闂村垪琛�(杩欓噷鏄寚瀹氭ゼ灞傚苟涓嶅湪鎺掑簭璁板綍閲岄潰鐨�)
foreach (var floorId in dicGroup.Keys)
{
- this.AddRoomListRow(floorId, dicGroup[floorId]);
+ this.AddRoomListRow(floorId, string.Empty, dicGroup[floorId]);
}
//璋冩暣妗屽竷楂樺害
listView.AdjustTableHeight();
@@ -149,7 +145,7 @@
/// 娣诲姞鎴块棿鍒楄〃琛�
/// </summary>
/// <param name="listRoom"></param>
- private void AddRoomListRow(string floorId, List<Common.Room> listRoom)
+ private void AddRoomListRow(string floorId, string floorName, List<Common.Room> listRoom)
{
var frameBack = new FrameListControl(29);
frameBack.BackgroundColor = UserCenterColor.Current.White;
@@ -160,14 +156,14 @@
if (string.IsNullOrEmpty(floorId) == false)
{
var btnFloor = new NormalViewControl(800, 60, true);
- btnFloor.X = ControlCommonResourse.XXLeft;
+ btnFloor.X = HdlControlResourse.XXLeft;
btnFloor.Y = Application.GetRealHeight(52);
btnFloor.TextColor = UserCenterColor.Current.TextColor2;
btnFloor.TextSize = 15;
frameBack.AddChidren(btnFloor);
- if (memberShardInfo.dicShardFloor.ContainsKey(floorId) == true)
+ if (floorName != string.Empty)
{
- btnFloor.Text = memberShardInfo.dicShardFloor[floorId];
+ btnFloor.Text = floorName;
}
else if (floorId == "Other")
{
@@ -180,34 +176,10 @@
}
}
//鎴块棿鎺掑簭
- var listSortRoom = HdlRoomLogic.Current.GetFloorSortRoom(floorId, false);
- var listSort = new HashSet<string>();
- foreach (var room in listSortRoom)
+ var listSortRoom = HdlRoomLogic.Current.SortRoom(listRoom);
+ for (int i = 0; i < listSortRoom.Count; i++)
{
- //鏀堕泦鐜版湁鐨勬帓搴廔D
- listSort.Add(room.Id);
- }
- var dicRoom = new Dictionary<string, Common.Room>();
- foreach (var room in listRoom)
- {
- //淇濆瓨闇�瑕佹樉绀哄嚭鏉ョ殑鎴块棿
- dicRoom[room.Id] = room;
- if (listSort.Contains(room.Id) == false)
- {
- //涓嶅啀鎺掑簭璁板綍鍐�,鍒欏湪灏鹃儴杩藉姞
- listSort.Add(room.Id);
- }
- }
-
- foreach(var roomId in listSort)
- {
- if (dicRoom.ContainsKey(roomId) == false)
- {
- continue;
- }
- var room = dicRoom[roomId];
- dicRoom.Remove(roomId);
-
+ var room = listSortRoom[i];
var frameRow = new RowLayoutControl(frameBack.rowSpace / 2);
frameBack.AddChidren(frameRow);
//鍥炬爣
@@ -218,7 +190,7 @@
btnName.TextSize = 15;
//鍙崇澶�
frameRow.frameTable.AddRightArrow();
- if (dicRoom.Count != 0)
+ if (i != listSortRoom.Count - 1)
{
//搴曠嚎
frameRow.frameTable.AddBottomLine();
@@ -226,7 +198,7 @@
frameRow.frameTable.ButtonClickEvent += (sender, e) =>
{
var form = new LookSharedContentForm();
- form.AddForm(room, memberShardInfo);
+ form.AddForm(room, this.ChildAccountId);
};
//鍒犻櫎
@@ -261,41 +233,10 @@
/// <param name="room">鎸囧畾瑕佸垹闄ょ殑鍏变韩鍖哄煙</param>
public void DoDeleteShardContentByRoom(Common.Room room)
{
- //鑾峰彇鍏ㄩ儴璁惧
- var listDevice = new List<CommonDevice>();
- foreach (var deviceKeys in room.ListDevice)
- {
- string deviceFile = HdlShardLogic.Current.GetShardDeviceFileName(deviceKeys);
- if (deviceFile == string.Empty)
- {
- continue;
- }
- var byteData = HdlShardLogic.Current.GetShardFileContent(deviceFile);
- if (byteData == null)
- {
- continue;
- }
- var device = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice>(System.Text.Encoding.UTF8.GetString(byteData));
- device.Type = (DeviceType)device.DeviceID;
- listDevice.Add(device);
- }
- //鑾峰彇鍏ㄩ儴鍦烘櫙
- var listScene = new List<Common.SceneUI>();
- foreach (var sceneId in room.ListSceneId)
- {
- var byteData = HdlShardLogic.Current.GetShardFileContent($"Scene_{sceneId}.json");
- if (byteData == null)
- {
- continue;
- }
- var sceneUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(System.Text.Encoding.UTF8.GetString(byteData));
- listScene.Add(sceneUi);
- }
-
HdlThreadLogic.Current.RunThread(() =>
{
//鎵ц鍒犻櫎
- var result = HdlShardLogic.Current.DoDeleteSharedContent(memberShardInfo, room, listDevice, listScene);
+ var result = HdlShardLogic.Current.DeleteSharedRoom(this.ChildAccountId, new List<Common.Room> { room });
if (result == true)
{
HdlThreadLogic.Current.RunMain(() =>
--
Gitblit v1.8.0