合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

 ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs

@@ -202,10 +202,10 @@
                        //时间间隔
                        else if (targetDevice.Type == 1)
                        {
                            var delayTimeView = new CategorySceneSelectedDelayTime();
                            var delayTimeView = new SelectDelayTime();
                            UserView.HomePage.Instance.AddChidren(delayTimeView);
                            UserView.HomePage.Instance.PageIndex += 1;
                            delayTimeView.Show(1, targetDevice.SceneTargetDeviceUIID,-1,true);
                            //delayTimeView.Show(1, targetDevice.SceneTargetDeviceUIID,-1,true);
                        }
                        //场景
                        else if (targetDevice.Type == 2)
@@ -704,10 +704,10 @@
                selectedTimerBtn.MouseUpEventHandler += (send, ee) =>
                {
                    selectFL.RemoveFromParent();
                    var delayTimeView = new CategorySceneSelectedDelayTime();
                    var delayTimeView = new SelectDelayTime();
                    UserView.HomePage.Instance.AddChidren(delayTimeView);
                    UserView.HomePage.Instance.PageIndex += 1;
                    delayTimeView.Show(-1,"",-1,true);
                    //delayTimeView.Show(-1,"",-1,true);
                };
                cancelBtn.MouseUpEventHandler += (send, ee) =>
                {