合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

 ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectCurtainSetting.cs

@@ -390,50 +390,50 @@
                    if (isFromRoom)
                    {
                        //回到房间添加场景界面
                        var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.DeviceUI == sceneTargetDevice.DeviceUI);
                        if (sameScene == null)
                        {
                            Room.AddRoomScene.sceneTargetDevicesList.Add(sceneTargetDevice);
                            UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
                            var roomAddScene = new Room.AddRoomScene();
                            UserView.HomePage.Instance.AddChidren(roomAddScene);
                            UserView.HomePage.Instance.PageIndex += 1;
                            roomAddScene.Show(Room.AddRoomScene.CurrentRoom);
                        }
                        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)
                        //{
                        //    Room.AddRoomScene.sceneTargetDevicesList.Add(sceneTargetDevice);
                        //    UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
                        //    var roomAddScene = new Room.AddRoomScene();
                        //    UserView.HomePage.Instance.AddChidren(roomAddScene);
                        //    UserView.HomePage.Instance.PageIndex += 1;
                        //    roomAddScene.Show(Room.AddRoomScene.CurrentRoom);
                        //}
                        //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;
                        //    };
                        //}
                    }
                    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;
                        //    };
                        //}
                    }
                }
                //修改
@@ -456,18 +456,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();
                    }
                }
            };