From 490696fba6c1f1318e088c439ee81d536126581b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 18 五月 2020 10:35:26 +0800
Subject: [PATCH] 优化门锁远程问题
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
old mode 100755
new mode 100644
index 3cf0c4f..5414e02
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
@@ -36,7 +36,11 @@
/// <summary>
/// 鎸夐敭閰嶇疆鐨勭洰鏍囧垪琛�
/// </summary>
- List<CommonDevice> targetList = new List<CommonDevice>();
+ List<CommonDevice> targetListDevice = new List<CommonDevice>();
+ /// <summary>
+ /// 鎸夐敭閰嶇疆鐨勫満鏅洰鏍囧垪琛�
+ /// </summary>
+ List<SceneUI> targetListScene = new List<SceneUI>();
/// <summary>
/// 鏈湴鎴块棿鍒楄〃
/// </summary>
@@ -147,6 +151,7 @@
btnHorizontalScrolViewLayout = new HorizontalScrolViewLayout
{
X = Application.GetRealWidth(58),
+ BackgroundColor = 0xff00ff00,
};
btnMidTopLayout.AddChidren(btnHorizontalScrolViewLayout);
@@ -224,7 +229,7 @@
var sc = currentKey.bindList.Find(obj => (obj != null) && (obj.BindScenesId == scTemp.Id));
if (sc != null)
{
- targetList.Add(scTemp);
+ targetListScene.Add(scTemp);
}
}
}
@@ -244,7 +249,7 @@
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
}
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
btnFinifh.Enable = false;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
@@ -259,7 +264,7 @@
bool isFinish = false;
try
{
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
Application.RunOnMainThread(() =>
{
@@ -348,7 +353,7 @@
var addBindeDev = new AddBindData();
addBindeDev.DeviceAddr = currentKey.DeviceAddr;
addBindeDev.Epoint = currentKey.DeviceEpoint;
- foreach (var de in targetList)
+ foreach (var de in targetListDevice)
{
if (de.DeviceAddr != null)
{
@@ -359,15 +364,14 @@
addBindInfo.BindEpoint = de.DeviceEpoint;
addBindeDev.BindList.Add(addBindInfo);
}
- else
- {
- var addBindInfo = new AddBindListObj();
- addBindInfo.BindType = 1;
- addBindInfo.BindCluster = 6;
- var sc1 = (SceneUI)de;
- addBindInfo.BindScenesId = sc1.Id;
- addBindeDev.BindList.Add(addBindInfo);
- }
+ }
+ foreach (var de in targetListScene)
+ {
+ var addBindInfo = new AddBindListObj();
+ addBindInfo.BindType = 1;
+ addBindInfo.BindCluster = 6;
+ addBindInfo.BindScenesId = de.Id;
+ addBindeDev.BindList.Add(addBindInfo);
}
var dev = new AddedDeviceBindResponseAllData();
@@ -377,7 +381,8 @@
if (dev.addedDeviceBindResponseData.Result == 0)
{
currentKey.bindList = dev.addedDeviceBindResponseData.BindList;
- targetList.Clear();
+ targetListDevice.Clear();
+ targetListScene.Clear();
isFinish = true;
if (isFinish)
{
@@ -547,7 +552,6 @@
curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
}
curRoom = room;
- currentKey.RoomId = room.Id;
if (curRoom.ListSceneId.Count == 0)
{
btnFinifh.Enable = false;
@@ -558,7 +562,7 @@
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
}
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
btnFinifh.Enable = false;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
@@ -665,7 +669,7 @@
{
btnBindName.Text = scene.Name;
}
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
foreach (var bindedSc in currentKey.bindList)
{
@@ -674,16 +678,15 @@
btnChoose.IsSelected = true;
btnChoose.Visible = true;
oldScene = btnChoose;
- targetList.Add(scene);
+ targetListScene.Add(scene);
}
}
}
else
{
- foreach (var bindedSc in targetList)
+ foreach (var bindedSc in targetListScene)
{
- var sc1 = (SceneUI)bindedSc;
- if (scene.Id == sc1.Id)
+ if (scene.Id == bindedSc.Id)
{
btnChoose.IsSelected = true;
btnChoose.Visible = true;
@@ -719,11 +722,11 @@
oldScene = btnChoose;
oldScene.IsSelected = true;
oldScene.Visible = true;
- currentKey.curSelectSceneID = scene.Id.ToString();
- targetList.Clear();
- targetList.Add(scene);
+ targetListDevice.Clear();
+ targetListScene.Clear();
+ targetListScene.Add(scene);
}
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
btnFinifh.Enable = false;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
@@ -740,7 +743,7 @@
btnChoose.MouseUpEventHandler += hander;
curIndex++;
}
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
btnFinifh.Enable = false;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
@@ -893,7 +896,7 @@
int index = 0;
RefreshRoomList(curRoom, ref index);
RefreshSceneList(roomList[0]);
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
btnFinifh.Enable = false;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
--
Gitblit v1.8.0