From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
index 5ddbd8b..0e42ff0 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
@@ -94,7 +94,7 @@
InitData();
AddTop();
AddBodyView();
-
+
}
/// <summary>
@@ -250,7 +250,7 @@
public void RefreshBodyView()
{
functionSceneBodyView.RemoveAll();
-
+
if (functionBtn.IsSelected)
{
ShowFunction();
@@ -305,7 +305,7 @@
Width = Application.GetRealWidth(1028)
};
functionSceneBodyView.AddChidren(functionTypeScrowView);
-
+
deviceListScrolView = new VerticalScrolViewLayout
{
X = Application.GetRealWidth(CommonFormResouce.X_Left),
@@ -468,7 +468,7 @@
add.MouseUpEventHandler += (sender, e) =>
{
var selectZone = new SelectZone();
- AddChidren(selectZone);
+ //AddChidren(selectZone);
selectZone.Init();
selectZone.ZoneAction = (r) =>
{
@@ -477,7 +477,7 @@
r.AddDevice(d.CommonDevice, true);
deviceListScrolView.RemoveViewByTag(d);
}
-
+
if (sameTypeList.Count == selectedList.Count)
{
RefreshData();
@@ -656,7 +656,7 @@
var frame = sceneScrolView.GetChildren(i) as FrameLayout;
(frame.GetChildren(1) as Button).IsSelected = (sender as Button).IsSelected;
}
-
+
if ((sender as Button).IsSelected)
{
(sender as Button).TextID = R.MyInternationalizationString.Cancel;
@@ -699,7 +699,7 @@
add.MouseUpEventHandler += (sender, e) =>
{
var selectZone = new SelectZone();
- CommonPage.Instance.AddChidren(selectZone);
+ //CommonPage.Instance.AddChidren(selectZone);
selectZone.Init();
selectZone.ZoneAction = (r) =>
{
--
Gitblit v1.8.0