From 2d5639dfb8014e78e6f1e68240fa751c19bb3a28 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 18:35:40 +0800
Subject: [PATCH] 2019.1.2
---
ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
index 8c0d561..10b6ece 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
@@ -162,8 +162,6 @@
{
RemoveFromParent();
};
-
-
}
/// <summary>
@@ -359,7 +357,6 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void ShowSameTypeFunction(object typeSender, MouseEventArgs mouseEventArgs)
{
- //閫夋嫨鍔熻兘--鐩存帴浠庢埧闂寸殑devicelist涓幏鍙�
tempFunctionTypeBtn.IsSelected = false;
tempFunctionTypeBtn = (typeSender as Button).Parent as FunctionButton;
((typeSender as Button).Parent as FunctionButton).IsSelected = true;
@@ -432,6 +429,7 @@
if ((sender as Button).IsSelected)
{
(sender as Button).TextID = R.MyInternationalizationString.Cancel;
+ selectedList.Clear();
selectedList.AddRange(sameTypeList);
}
else
@@ -470,7 +468,7 @@
add.MouseUpEventHandler += (sender, e) =>
{
var selectZone = new SelectZone();
- AddChidren(selectZone);
+ //AddChidren(selectZone);
selectZone.Init();
selectZone.ZoneAction = (r) =>
{
@@ -479,7 +477,17 @@
r.AddDevice(d.CommonDevice, true);
deviceListScrolView.RemoveViewByTag(d);
}
- RefreshData();
+
+ if (sameTypeList.Count == selectedList.Count)
+ {
+ RefreshData();
+ RefreshBodyView();
+ }
+ else
+ {
+ RefreshData();
+ sameTypeList = typeDeviceDic[int.Parse((typeSender as Button).Tag.ToString())];
+ }
};
};
}
@@ -691,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