From 2ed75b8b337048e5d75e6d9ec8307633134f02fd Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 10 十月 2019 11:33:04 +0800 Subject: [PATCH] 个人中心添加楼层和创建房间,实装二级验证 --- ZigbeeApp/Shared/Phone/UserCenter/Safety/AddAlarmTargetTypeListForm.cs | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddAlarmTargetTypeListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddAlarmTargetTypeListForm.cs index a798f83..7f49657 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddAlarmTargetTypeListForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddAlarmTargetTypeListForm.cs @@ -60,7 +60,7 @@ /// </summary> private void SetMiddleInfo() { - new System.Threading.Thread(() => + HdlThreadLogic.Current.RunThread(() => { //鑾峰彇璁惧鐨勬墍鏈夌被鍨嬶紝骞舵暣鐞嗘垚姣忎竴琛岀殑鏁版嵁 this.GetAllListData(); @@ -90,8 +90,7 @@ this.AddRowLaout(listAllDeviceInfo[i], i != count); } }); - }) - { IsBackground = true }.Start(); + }); } #endregion @@ -193,7 +192,7 @@ //璁惧鏀堕泦 var info = new uDeviceInfo { - listRoomName = Shared.Common.Room.CurrentRoom.GetRoomListNameByDevice(device), + RoomName = Shared.Common.Room.CurrentRoom.GetRoomNameByDevice(device), Device = device, MainKeys = device.DeviceAddr + device.DeviceEpoint.ToString() }; @@ -237,10 +236,12 @@ /// <summary> /// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠� /// </summary> - public override void FormActionAgainEvent() + public override int FormActionAgainEvent() { //閲嶆柊鍒锋柊鐣岄潰 this.InitMiddleFrame(); + + return 1; } #endregion -- Gitblit v1.8.0