From 97e259d966cb5cb5d73c105d5dbaadcc1f920614 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 13:48:43 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedScene.cs | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedScene.cs
index 52a4935..4e412aa 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedScene.cs
@@ -174,26 +174,26 @@
}
else
{
- var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.ElseScenesId == sceneTargetDevice.ElseScenesId);
- if (sameScene == null)
- {
- CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDevice);
- UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
- var categoryAddScene = new CategoryAddScene();
- UserView.HomePage.Instance.AddChidren(categoryAddScene);
- UserView.HomePage.Instance.PageIndex += 1;
- categoryAddScene.Show();
- }
- else
- {
- //鎻愮ず璇ュ満鏅凡鍔犲叆
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.ThisSceneHadTheScene), Language.StringByID(R.MyInternationalizationString.Close));
- alert.Show();
- alert.ResultEventHandler += (sendAlert, eAlert) =>
- {
- return;
- };
- }
+ //var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.ElseScenesId == sceneTargetDevice.ElseScenesId);
+ //if (sameScene == null)
+ //{
+ // //CategoryAddScene.sceneTargetDevicesList.Add(sceneTargetDevice);
+ // UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
+ // var categoryAddScene = new CategoryAddScene();
+ // UserView.HomePage.Instance.AddChidren(categoryAddScene);
+ // UserView.HomePage.Instance.PageIndex += 1;
+ // categoryAddScene.Show();
+ //}
+ //else
+ //{
+ // //鎻愮ず璇ュ満鏅凡鍔犲叆
+ // var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.ThisSceneHadTheScene), Language.StringByID(R.MyInternationalizationString.Close));
+ // alert.Show();
+ // alert.ResultEventHandler += (sendAlert, eAlert) =>
+ // {
+ // return;
+ // };
+ //}
}
}
else
@@ -235,13 +235,13 @@
{
if (!string.IsNullOrEmpty(targetDeviceID))
{
- var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID);
- if (targetDeviceUI != null)
- {
- targetDeviceUI.Type = sceneTargetDevice.Type;
- targetDeviceUI.ElseScenesId = sceneTargetDevice.ElseScenesId;
- targetDeviceUI.SceneName = sceneTargetDevice.SceneName;
- }
+ //var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID);
+ //if (targetDeviceUI != null)
+ //{
+ // targetDeviceUI.Type = sceneTargetDevice.Type;
+ // targetDeviceUI.ElseScenesId = sceneTargetDevice.ElseScenesId;
+ // targetDeviceUI.SceneName = sceneTargetDevice.SceneName;
+ //}
}
//var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.ElseScenesId == sceneTargetDevice.ElseScenesId);
--
Gitblit v1.8.0