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/LookSharedContentForm.cs | 67 +++++++++++++--------------------
1 files changed, 27 insertions(+), 40 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
index 5c1287b..0d010e3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.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>
@@ -58,10 +58,10 @@
/// </summary>
/// <param name="i_room">鏌ョ湅鐨勬埧闂村璞�</param>
/// <param name="i_memberShardInfo">鎴愬憳鐨勫垎浜暟鎹�</param>
- public void ShowForm(Common.Room i_room, MemberShardInfoData i_memberShardInfo)
+ public void ShowForm(Common.Room i_room, string i_ChildAccountId)
{
this.lookRoom = i_room;
- this.memberShardInfo = i_memberShardInfo;
+ this.ChildAccountId = i_ChildAccountId;
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(i_room.Name);
@@ -159,15 +159,13 @@
this.frameSceneTable.RemoveAll();
var listScene = new List<Common.SceneUI>();
- for (int i = 0; i < lookRoom.ListSceneId.Count; i++)
+ foreach (var sceneId in lookRoom.ListSceneId)
{
- var byteData = HdlShardLogic.Current.GetShardFileContent($"Scene_{lookRoom.ListSceneId[i]}.json");
- if (byteData == null)
+ var scene = HdlShardLogic.Current.GetShardSceneFromMemory(sceneId);
+ if (scene != null)
{
- continue;
+ listScene.Add(scene);
}
- var sceneUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(System.Text.Encoding.UTF8.GetString(byteData));
- listScene.Add(sceneUi);
}
if (listScene.Count == 0)
{
@@ -251,7 +249,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;
@@ -278,7 +276,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);
@@ -311,15 +309,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();
@@ -328,7 +326,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;
@@ -367,19 +365,19 @@
/// 鑾峰彇鍒嗙粍鍚庣殑璁惧
/// </summary>
/// <returns></returns>
- private Dictionary<int, List<CommonDevice>> GetAllGroupDevice()
+ private Dictionary<string, List<CommonDevice>> GetAllGroupDevice()
{
//鍏ㄩ儴鐨勮澶�
var listDevice = this.GetShardListDevice();
- var dic = new Dictionary<int, List<CommonDevice>>();
+ var dic = new Dictionary<string, List<CommonDevice>>();
foreach (var device in listDevice)
{
- 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;
}
@@ -409,10 +407,10 @@
//纭鍒犻櫎閫夋嫨鐨勫叡浜満鏅拰鍔熻兘锛�
this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteShardContentMsg), () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//涓婁紶鏂囦欢
- var result = await HdlShardLogic.Current.DoDeleteSharedContent(memberShardInfo, this.lookRoom, listDevice, listScene);
+ var result = HdlShardLogic.Current.DeleteSharedContent(this.ChildAccountId, this.lookRoom, listDevice, listScene);
if (result == true)
{
HdlThreadLogic.Current.RunMain(() =>
@@ -437,23 +435,12 @@
{
//鑾峰彇杩欎釜鎴块棿閲岄潰鐨勫垎浜澶�
var listDevice = new List<CommonDevice>();
- foreach (var deviceKeys in this.lookRoom.ListDevice)
+ foreach (var deviceKey in this.lookRoom.ListDevice)
{
- string deviceFile = HdlShardLogic.Current.GetShardDeviceFileName(deviceKeys);
- if (memberShardInfo.dicAllShardKeys.ContainsKey(deviceFile) == true)
+ var device = HdlShardLogic.Current.GetShardDeviceFromMemory(deviceKey);
+ if (device != null)
{
- var strArry = deviceFile.Split('_');
- if (strArry.Length < 3)
- {
- continue;
- }
- //浠庡垎浜枃浠朵腑搴忓垪鍖栧洖鏉�
- var deviceData = HdlShardLogic.Current.GetShardFileContent(deviceFile);
- var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(strArry[1], System.Text.Encoding.UTF8.GetString(deviceData));
- if (device != null)
- {
- listDevice.Add(device);
- }
+ listDevice.Add(device);
}
}
return listDevice;
--
Gitblit v1.8.0