From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
index 36270f7..419cc54 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>
@@ -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);
@@ -166,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)
{
@@ -187,7 +191,7 @@
{
//鍦烘櫙鎺т欢
var frameContr = new ScenePictrueControl();
- listView.AddChidrenFrame(frameContr);
+ listView.AddChidren(frameContr);
frameContr.InitControl(data);
var btnSelect = new IconViewControl(58);
@@ -195,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;
@@ -409,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(() =>
@@ -449,11 +453,15 @@
}
//浠庡垎浜枃浠朵腑搴忓垪鍖栧洖鏉�
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 device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(strArry[1], System.Text.Encoding.UTF8.GetString(deviceData));
+ if (device != null)
+ {
+ listDevice.Add(device);
+ }
}
+ catch { }
}
}
return listDevice;
--
Gitblit v1.8.0