From d569f44a62fa915d4f01a80c21e617f676b6c5ea Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期五, 18 十月 2019 10:12:10 +0800 Subject: [PATCH] 2019.10.18 --- ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDimmableLightSetting.cs | 64 ++++++++++++++++---------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDimmableLightSetting.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDimmableLightSetting.cs index ec76115..fe677d7 100644 --- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDimmableLightSetting.cs +++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDimmableLightSetting.cs @@ -421,26 +421,26 @@ else { //鍥炲埌鍒嗙被 - var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.DeviceUI == sceneTargetDevice.DeviceUI); - 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.ThisSceneHadTheDevice), Language.StringByID(R.MyInternationalizationString.Close)); - alert.Show(); - alert.ResultEventHandler += (sendAlert, eAlert) => - { - return; - }; - } + //var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.DeviceUI == sceneTargetDevice.DeviceUI); + //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.ThisSceneHadTheDevice), Language.StringByID(R.MyInternationalizationString.Close)); + // alert.Show(); + // alert.ResultEventHandler += (sendAlert, eAlert) => + // { + // return; + // }; + //} } } //淇敼 @@ -463,18 +463,18 @@ } else { - var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID); - if (targetDeviceUI != null) - { - targetDeviceUI.DeviceUI = sceneTargetDevice.DeviceUI; - targetDeviceUI.TaskList = sceneTargetDevice.TaskList; - targetDeviceUI.Type = sceneTargetDevice.Type; - } - UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene"); - var categoryAddScene = new CategoryAddScene(); - UserView.HomePage.Instance.AddChidren(categoryAddScene); - UserView.HomePage.Instance.PageIndex += 1; - categoryAddScene.Show(); + //var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID); + //if (targetDeviceUI != null) + //{ + // targetDeviceUI.DeviceUI = sceneTargetDevice.DeviceUI; + // targetDeviceUI.TaskList = sceneTargetDevice.TaskList; + // targetDeviceUI.Type = sceneTargetDevice.Type; + //} + //UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene"); + //var categoryAddScene = new CategoryAddScene(); + //UserView.HomePage.Instance.AddChidren(categoryAddScene); + //UserView.HomePage.Instance.PageIndex += 1; + //categoryAddScene.Show(); } } }; -- Gitblit v1.8.0