From 23532fa8ad34c89b6d24b01eaef6475fd0aad898 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 15 四月 2020 18:08:24 +0800
Subject: [PATCH] ???????
---
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
index d4bea54..36270f7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
@@ -41,9 +41,9 @@
/// </summary>
private Dictionary<string, CommonDevice> dicSelectDevice = new Dictionary<string, CommonDevice>();
/// <summary>
- /// 褰撳墠閫夋嫨鐨勫垎鏀� 1锛氬満鏅� 2锛氬姛鑳�
+ /// 褰撳墠閫夋嫨鐨勫垎鏀� 0锛氬満鏅� 1锛氬姛鑳�
/// </summary>
- private int nowSwitchIndex = 1;
+ private int nowSwitchIndex = 0;
/// <summary>
/// 褰撳墠閫夋嫨鐨勮澶囩储寮�
/// </summary>
@@ -126,7 +126,7 @@
tabControl.SelectTabEvent += (tabIndex) =>
{
this.nowSwitchIndex = tabIndex;
- if (tabIndex == 1)
+ if (tabIndex == 0)
{
//鏄剧ず鍦烘櫙鍒楄〃
this.frameSceneTable.Visible = true;
@@ -139,7 +139,11 @@
this.frameDeviceTable.Visible = true;
}
};
- tabControl.InitControl();
+ //寮�濮嬪垵濮嬪寲鍦烘櫙鍔熻兘鍒囨崲鎺т欢
+ var listTitle = new List<string>();
+ listTitle.Add(Language.StringByID(R.MyInternationalizationString.uScence));
+ listTitle.Add(Language.StringByID(R.MyInternationalizationString.uFunction));
+ tabControl.InitControl(listTitle);
}
#endregion
@@ -155,12 +159,15 @@
this.frameSceneTable.RemoveAll();
var listScene = new List<Common.SceneUI>();
- for (int i = 0; i < lookRoom.SceneUIList.Count; i++)
+ for (int i = 0; i < lookRoom.ListSceneId.Count; i++)
{
- if (HdlShardLogic.Current.IsFileExists(lookRoom.SceneUIList[i].FileName) == true)
+ var byteData = HdlShardLogic.Current.GetShardFileContent($"Scene_{lookRoom.ListSceneId[i]}.json");
+ if (byteData == null)
{
- listScene.Add(lookRoom.SceneUIList[i]);
+ continue;
}
+ var sceneUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(System.Text.Encoding.UTF8.GetString(byteData));
+ listScene.Add(sceneUi);
}
if (listScene.Count == 0)
{
@@ -171,7 +178,7 @@
HdlThreadLogic.Current.RunMainInThread(() =>
{
- var listView = new VerticalFrameControl(29);
+ var listView = new VerticalFrameControl(3);
listView.Y = Application.GetRealHeight(53);
listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);
frameSceneTable.AddChidren(listView);
@@ -430,8 +437,9 @@
{
//鑾峰彇杩欎釜鎴块棿閲岄潰鐨勫垎浜澶�
var listDevice = new List<CommonDevice>();
- foreach (var deviceFile in this.lookRoom.DeviceUIFilePathList)
+ foreach (var deviceKeys in this.lookRoom.ListDevice)
{
+ string deviceFile = HdlShardLogic.Current.GetShardDeviceFileName(deviceKeys);
if (memberShardInfo.dicAllShardKeys.ContainsKey(deviceFile) == true)
{
var strArry = deviceFile.Split('_');
--
Gitblit v1.8.0