2019.11.15-1

gxc

2019-11-15 05ce435c3b58e53eeab04c672affdeeab75f3036

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

old mode 100755
new mode 100644
@@ -14,6 +14,10 @@
            BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor;
            Tag = "categoryAddScene";
        }
        public override void RemoveFromParent()
        {
            base.RemoveFromParent();
        }
        /// <summary>
        /// 显示AirSwitch的详细设置界面  默认-1(新增-默认开)，0关 ，1开
        /// </summary>
@@ -171,7 +175,7 @@
            };
            dimmingRowView.AddChidren(dimmingNextBtn);

            var confirmBtn = new CommonForm.CompleteButton() { };
            var confirmBtn = new CommonForm.CompleteButton(1,2,3);
            AddChidren(confirmBtn);
            if (state == -1)
            {
@@ -334,26 +338,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;
                        //    };
                        //}
                    }
                }
                //修改
@@ -376,18 +380,18 @@
                    }
                    else
                    {
                        var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID);
                        if (targetDeviceUI != null)
                        {
                            targetDeviceUI.Type = sceneTargetDevice.Type;
                            targetDeviceUI.DeviceUI = sceneTargetDevice.DeviceUI;
                            targetDeviceUI.TaskList = sceneTargetDevice.TaskList;
                        }
                        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.Type = sceneTargetDevice.Type;
                        //    targetDeviceUI.DeviceUI = sceneTargetDevice.DeviceUI;
                        //    targetDeviceUI.TaskList = sceneTargetDevice.TaskList;
                        //}
                        //UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
                        //var categoryAddScene = new CategoryAddScene();
                        //UserView.HomePage.Instance.AddChidren(categoryAddScene);
                        //UserView.HomePage.Instance.PageIndex += 1;
                        //categoryAddScene.Show();
                    }
                }
            };