From f23ad1b3f9f6193f35f72104d690b21dc67d5c1f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 七月 2020 12:35:25 +0800
Subject: [PATCH] 去掉了访问外网的异步
---
ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
index 81d6f2a..af70771 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
@@ -22,7 +22,7 @@
/// <summary>
/// 鍔熻兘鐨勬甯冩帶浠�
/// </summary>
- private FrameLayout DeviceBodyTableControl = null;
+ private NormalFrameLayout DeviceBodyTableControl = null;
/// <summary>
/// 鍦烘櫙鐨勫垪琛ㄦ帶浠�
/// </summary>
@@ -34,7 +34,7 @@
/// <summary>
/// 鍦烘櫙鐨勬甯冩帶浠�
/// </summary>
- private FrameLayout SceneBodyTableControl = null;
+ private NormalFrameLayout SceneBodyTableControl = null;
/// <summary>
/// 鍏ㄩ�夋帶浠�
/// </summary>
@@ -98,12 +98,12 @@
bodyFrameLayout.AddChidren(tabControl);
//鍒濆鍖栧満鏅甯�
- this.SceneBodyTableControl = new FrameLayout();
+ this.SceneBodyTableControl = new NormalFrameLayout();
SceneBodyTableControl.Y = tabControl.Bottom;
SceneBodyTableControl.Height = bodyFrameLayout.Height - tabControl.Bottom;
bodyFrameLayout.AddChidren(SceneBodyTableControl);
//鍒濆鍖栬澶囨甯�
- this.DeviceBodyTableControl = new FrameLayout();
+ this.DeviceBodyTableControl = new NormalFrameLayout();
DeviceBodyTableControl.Y = tabControl.Bottom;
DeviceBodyTableControl.Height = bodyFrameLayout.Height - tabControl.Bottom;
bodyFrameLayout.AddChidren(DeviceBodyTableControl);
@@ -176,13 +176,13 @@
SceneBodyTableControl.AddChidren(listSceneView);
var listScene = HdlSceneLogic.Current.GetUnalloctedScenes();
- if (listScene == null || listScene.Count == 0) { return; }
+ if (listScene.Count == 0) { return; }
foreach (var data in listScene)
{
//鍦烘櫙鍥剧墖
var frameContr = new ScenePictrueControl();
- listSceneView.AddChidrenFrame(frameContr);
+ listSceneView.AddChidren(frameContr);
frameContr.InitControl(data);
//娣诲姞閫夋嫨鎺т欢
@@ -193,7 +193,7 @@
frameContr.CollectEvent += (collect) =>
{
//濡傛灉褰撳墠鏄敹钘忔埧闂�,鍒欓渶瑕佸埛鏂颁富椤�
- if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)
+ if (HdlRoomLogic.Current.NowMainPageRoom.IsLove == true)
{
this.dataHadChanged = true;
}
@@ -218,7 +218,7 @@
//淇冧娇瀹冭秴杩囨椂,鑳藉寰�涓婃粦
var frameTemp = new FrameLayout();
frameTemp.Height = Application.GetRealHeight(202 + 23);
- listSceneView.AddChidrenFrame(frameTemp);
+ listSceneView.AddChidren(frameTemp);
});
}
@@ -527,7 +527,7 @@
btnAdd.TextID = R.MyInternationalizationString.AddTo;
btnAdd.TextSize = 17;
btnAdd.Radius = (uint)Application.GetRealHeight(35);
- frameAddBackGroud.AddChidren(btnAdd, ChidrenBindMode.BindEventOnly);
+ frameAddBackGroud.AddChidren(btnAdd, ChidrenBindMode.BindEvent);
frameAddBackGroud.ButtonClickEvent += (sender, e) =>
{
var selectZone = new SelectZone();
@@ -536,7 +536,7 @@
selectZone.ZoneAction += (selectRoom) =>
{
//鍙樻洿浜嗗綋鍓嶆埧闂寸殑涓滆タ,涓婚〉闇�瑕佸埛鏂�
- if (HdlRoomLogic.Current.CurrentRoom.Id == selectRoom.Id)
+ if (HdlRoomLogic.Current.NowMainPageRoom.Id == selectRoom.Id)
{
this.dataHadChanged = true;
}
@@ -635,7 +635,7 @@
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- Common.LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref path1, ref path2);
+ Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);
dic[typeInfo.BeloneTextId].IconPath = path1;
dic[typeInfo.BeloneTextId].IconPathSelected = path2;
dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;
@@ -659,7 +659,7 @@
HdlThreadLogic.Current.RunMainInThread(() =>
{
//鍒锋柊涓婚〉
- this.LoadFormMethodByName("HomeMainPageForm", "RefreshBodyView");
+ HomeMainPageForm.Instance?.RefreshBodyView();
});
}
base.CloseFormBefore();
--
Gitblit v1.8.0