~wjc/HomeApp.git

			@@ -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++)
			{
			//收集现有的排序ID
			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(() =>