From 99253403b560f761d5f9af8b4f5140496996433a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十一月 2020 16:49:50 +0800
Subject: [PATCH] 新云端的代码Ver1.0
---
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs
index fc4a6f3..060a68b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs
@@ -76,7 +76,7 @@
bodyFrameLayout.AddChidren(frameBack);
//鎴块棿鍒楄〃
var btnTitle = new NormalViewControl(800, 60, true);
- btnTitle.X = ControlCommonResourse.XXLeft;
+ btnTitle.X = HdlControlResourse.XXLeft;
btnTitle.Y = Application.GetRealHeight(52);
btnTitle.TextID = R.MyInternationalizationString.RoomList;
btnTitle.TextColor = UserCenterColor.Current.TextColor2;
@@ -144,7 +144,7 @@
btnIconContr.ButtonClickEvent += (sender, e) =>
{
//妤煎眰鑿滃崟
- var contr = new TopRightFloorMenuControl(dicFloor.Count, 2, Language.StringByID(R.MyInternationalizationString.SelectFloor));
+ var contr = new TopRightFloorMenuControl(dicFloor.Count, 2, this.nowSelectFloorId, Language.StringByID(R.MyInternationalizationString.SelectFloor));
foreach (var floorId in dicFloor.Keys)
{
contr.AddRowMenu(floorId, () =>
@@ -282,7 +282,7 @@
int fileCount = this.GetUpLoadRoomData(listRoom, dicDevice, dicScene);
var listCheckFile = new HashSet<string>();
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
@@ -290,7 +290,7 @@
for (int index = 0; index < listRoom.Count; index++)
{
//鎵ц涓婁紶
- var result = await HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, listRoom[index], dicDevice[index], dicScene[index], fileCount, listCheckFile);
+ var result = HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, listRoom[index], dicDevice[index], dicScene[index], fileCount, listCheckFile);
if (result == false)
{
break;
@@ -300,7 +300,7 @@
this.CloseProgressBar();
//涓嶇鎴愬姛杩樻槸澶辫触,閮藉埛鏂扮晫闈�
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (this.Parent != null)
{
@@ -333,7 +333,7 @@
//鑾峰彇鎴块棿鍏ㄩ儴璁惧
foreach (var deviceKeys in listRoom[i].ListDevice)
{
- var device = Common.LocalDevice.Current.GetDevice(deviceKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
if (device == null || memberShardInfo.dicAllShardKeys.ContainsKey(device.FilePath) == true)
{
//寮傚父
@@ -440,7 +440,7 @@
}
foreach (var deviceKeys in room.ListDevice)
{
- var device = Common.LocalDevice.Current.GetDevice(deviceKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
if (device == null)
{
continue;
--
Gitblit v1.8.0