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 | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
index 0671c35..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);
}
@@ -390,9 +390,11 @@
//鍏ㄩ儴鐨勮澶�
var listDevice = HdlRoomLogic.Current.GetRoomListDevice(lookRoom);
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;
@@ -431,7 +433,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
//涓婁紶鏂囦欢
- var result = 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