From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs | 70 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
index 9b6e56b..374d5fb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
@@ -23,11 +23,11 @@
/// <summary>
/// 璁惧妗屽竷鎺т欢
/// </summary>
- private FrameLayout frameDeviceTable = null;
+ private NormalFrameLayout frameDeviceTable = null;
/// <summary>
/// 璁惧妗屽竷鎺т欢
/// </summary>
- private FrameLayout frameSceneTable = null;
+ private NormalFrameLayout frameSceneTable = null;
/// <summary>
/// 鍒犻櫎鎸夐挳
/// </summary>
@@ -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>
@@ -81,12 +81,12 @@
this.dicSelectScene = new Dictionary<int, Common.SceneUI>();
//鍒濆鍖栨甯冩帶浠�
- this.frameSceneTable = new FrameLayout();
+ this.frameSceneTable = new NormalFrameLayout();
frameSceneTable.Y = Application.GetRealHeight(132);
frameSceneTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(132);
bodyFrameLayout.AddChidren(frameSceneTable);
- this.frameDeviceTable = new FrameLayout();
+ this.frameDeviceTable = new NormalFrameLayout();
frameDeviceTable.Y = frameSceneTable.Y;
frameDeviceTable.Height = frameSceneTable.Height;
bodyFrameLayout.AddChidren(frameDeviceTable);
@@ -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
@@ -162,8 +166,12 @@
{
continue;
}
- var sceneUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(System.Text.Encoding.UTF8.GetString(byteData));
- listScene.Add(sceneUi);
+ try
+ {
+ var sceneUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(System.Text.Encoding.UTF8.GetString(byteData));
+ listScene.Add(sceneUi);
+ }
+ catch { }
}
if (listScene.Count == 0)
{
@@ -183,7 +191,7 @@
{
//鍦烘櫙鎺т欢
var frameContr = new ScenePictrueControl();
- listView.AddChidrenFrame(frameContr);
+ listView.AddChidren(frameContr);
frameContr.InitControl(data);
var btnSelect = new IconViewControl(58);
@@ -191,7 +199,7 @@
btnSelect.SelectedImagePath = "Item/ItemSelected.png";
btnSelect.X = Application.GetRealWidth(887);
btnSelect.Y = Application.GetRealHeight(35);
- frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEventOnly);
+ frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEvent);
if (dicSelectScene.ContainsKey(data.Id) == true)
{
btnSelect.IsSelected = true;
@@ -274,7 +282,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);
@@ -363,19 +371,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)
+ 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;
}
@@ -405,10 +413,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.DoDeleteSharedContent(memberShardInfo, this.lookRoom, listDevice, listScene);
if (result == true)
{
HdlThreadLogic.Current.RunMain(() =>
@@ -438,18 +446,26 @@
string deviceFile = HdlShardLogic.Current.GetShardDeviceFileName(deviceKeys);
if (memberShardInfo.dicAllShardKeys.ContainsKey(deviceFile) == true)
{
- var strArry = deviceFile.Split('_');
- if (strArry.Length < 3)
+ //浠庡垎浜枃浠朵腑搴忓垪鍖栧洖鏉�
+ var deviceData = HdlShardLogic.Current.GetShardFileContent(deviceFile);
+ if (deviceData == null)
{
continue;
}
- //浠庡垎浜枃浠朵腑搴忓垪鍖栧洖鏉�
- var deviceData = HdlShardLogic.Current.GetShardFileContent(deviceFile);
- var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(strArry[1], System.Text.Encoding.UTF8.GetString(deviceData));
- if (device != null)
+ try
{
- listDevice.Add(device);
+ var jobject = Newtonsoft.Json.Linq.JObject.Parse(System.Text.Encoding.UTF8.GetString(deviceData));
+ if (jobject.Property("DeviceID") == null)
+ {
+ continue;
+ }
+ var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(Convert.ToInt32(jobject["DeviceID"].ToString()), System.Text.Encoding.UTF8.GetString(deviceData));
+ if (device != null)
+ {
+ listDevice.Add(device);
+ }
}
+ catch { }
}
}
return listDevice;
--
Gitblit v1.8.0