From 34e965100d635346e2d4cd6e6013bdaed66b3004 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:52:13 +0800
Subject: [PATCH] 2019.1.2-3
---
ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
old mode 100755
new mode 100644
index 5ddbd8b..cfc08c8
--- a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
@@ -94,7 +94,7 @@
InitData();
AddTop();
AddBodyView();
-
+
}
/// <summary>
@@ -123,7 +123,7 @@
}
foreach (var device in devList)
{
- var info = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device.CommonDevice);
+ var info = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice> { device?.CommonDevice });
if (typeDeviceDic.ContainsKey(info.BeloneTextId) == false)
{
var sameDevList = new List<DeviceUI> { };
@@ -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