From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
index 8e7a9d2..5361cdf 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
@@ -17,9 +17,9 @@
/// </summary>
private Common.Room lookRoom = null;
/// <summary>
- /// 鎴愬憳鐨勫垎浜暟鎹�
+ /// 鎴愬憳ID
/// </summary>
- private MemberShardInfoData memberShardInfo = null;
+ private string ChildAccountId = string.Empty;
/// <summary>
/// 璁惧妗屽竷鎺т欢
/// </summary>
@@ -57,11 +57,11 @@
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
/// <param name="i_room">鏌ョ湅鐨勬埧闂村璞�</param>
- /// <param name="i_memberShardInfo">鎴愬憳鐨勫垎浜暟鎹�</param>
- public void ShowForm(Common.Room i_room, MemberShardInfoData i_memberShardInfo)
+ /// <param name="i_ChildAccountId">鎴愬憳ID</param>
+ public void ShowForm(Common.Room i_room, string i_ChildAccountId)
{
this.lookRoom = i_room;
- this.memberShardInfo = i_memberShardInfo;
+ this.ChildAccountId = i_ChildAccountId;
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddShared));
@@ -168,16 +168,16 @@
//鍦烘櫙鏈夌偣鐗规畩,濡傛灉鍚屼竴涓埧闂村唴,宸茬粡鍒嗕韩浜�,鍒欎笉鍐嶆樉绀�
//濡傛灉杩欎釜鍦烘櫙鏄敱宓屽鑰屽垎浜殑,杩欎釜鏃跺��,瀹冨彲浠ユ樉绀哄嚭鏉�
var listScene = new List<int>();
- if (memberShardInfo.dicShardRoom.ContainsKey(lookRoom.FileName) == false)
+ var shardRoom = HdlShardLogic.Current.GetShardRoomFromMemory(lookRoom.Id);
+ if (shardRoom == null)
{
listScene.AddRange(lookRoom.ListSceneId);
}
else
{
- var tempRoom = memberShardInfo.dicShardRoom[lookRoom.FileName];
foreach (var dataId in lookRoom.ListSceneId)
{
- if (tempRoom.ListSceneId.Contains(dataId) == false)
+ if (shardRoom.ListSceneId.Contains(dataId) == false)
{
listScene.Add(dataId);
}
@@ -270,7 +270,7 @@
else
{
var frameBack = new FrameLayout();
- frameBack.X = ControlCommonResourse.XXLeft;
+ frameBack.X = HdlControlResourse.XXLeft;
frameBack.Y = Application.GetRealHeight(178);
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Width = bodyFrameLayout.Width;
@@ -297,7 +297,7 @@
/// </summary>
/// <param name="dicData"></param>
/// <param name="listView"></param>
- private void InitDeviceObjectRow(Dictionary<int, List<CommonDevice>> dicData, VerticalListControl listView)
+ private void InitDeviceObjectRow(Dictionary<string, List<CommonDevice>> dicData, VerticalListControl listView)
{
var scrolContr = new RoomDeviceGroupMenuControl(dicData);
this.frameDeviceTable.AddChidren(scrolContr);
@@ -328,15 +328,15 @@
foreach (var device in listDevice)
{
var frameRow = new FrameRowControl(listView.rowSpace / 2);
- frameRow.LeftOffset = Application.GetRealWidth(46) - ControlCommonResourse.XXLeft;
- frameRow.RightOffset = -ControlCommonResourse.XXLeft;
+ frameRow.LeftOffset = Application.GetRealWidth(46) - HdlControlResourse.XXLeft;
+ frameRow.RightOffset = -HdlControlResourse.XXLeft;
listView.AddChidren(frameRow);
//鍥炬爣
var btnIcon = frameRow.AddLeftIcon(81);
- Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device);
+ HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, device);
//鍚嶇О
var btnView = frameRow.AddLeftCaption(string.Empty, 600);
- btnView.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ btnView.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
btnView.TextSize = 15;
//搴曠嚎
frameRow.AddBottomLine();
@@ -345,7 +345,7 @@
btnSelect.UnSelectedImagePath = "Item/ItemUnSelected.png";
btnSelect.SelectedImagePath = "Item/ItemSelected.png";
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
if (dicSelectDevice.ContainsKey(mainKeys) == true)
{
btnSelect.IsSelected = true;
@@ -385,24 +385,26 @@
/// 鑾峰彇鍒嗙粍鍚庣殑璁惧
/// </summary>
/// <returns></returns>
- private Dictionary<int, List<CommonDevice>> GetAllGroupDevice()
+ private Dictionary<string, List<CommonDevice>> GetAllGroupDevice()
{
//鍏ㄩ儴鐨勮澶�
var listDevice = HdlRoomLogic.Current.GetRoomListDevice(lookRoom);
- var dic = new Dictionary<int, List<CommonDevice>>();
+ var dic = new Dictionary<string, List<CommonDevice>>();
+ var shardRoom = HdlShardLogic.Current.GetShardRoomFromMemory(lookRoom.Id);
foreach (var device in listDevice)
{
- if (memberShardInfo.dicAllShardKeys.ContainsKey(device.FilePath) == true)
+ string mainkey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
+ if (shardRoom.ListDevice.Contains(mainkey) == true)
{
//濡傛灉宸茬粡鍒嗕韩浜�,鍒欎笉鏄剧ず
continue;
}
- var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);
- if (dic.ContainsKey(typeInfo.BeloneTextId) == false)
+ var typeInfo = HdlDeviceCommonLogic.Current.GetDeviceBelongEnumInfo(device);
+ if (dic.ContainsKey(typeInfo.BeloneText) == false)
{
- dic[typeInfo.BeloneTextId] = new List<CommonDevice>();
+ dic[typeInfo.BeloneText] = new List<CommonDevice>();
}
- dic[typeInfo.BeloneTextId].Add(device);
+ dic[typeInfo.BeloneText].Add(device);
}
return dic;
}
@@ -428,10 +430,10 @@
{
listScene.Add(scene);
}
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//涓婁紶鏂囦欢
- var result = await HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, this.lookRoom, listDevice, listScene);
+ var result = HdlShardLogic.Current.UploadSharedContent(this.ChildAccountId, this.lookRoom, listDevice, listScene);
if (result == true)
{
HdlThreadLogic.Current.RunMain(() =>
--
Gitblit v1.8.0