合并了代码

黄学彪

2019-10-28 1f5636d69332170ea3a41c76c9519f6ff6f0a8d9

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

@@ -139,7 +139,7 @@
                        //1-60秒
                        //PickerView.Show(tList, (obj) =>
                        //{
                        //    targetDevice.DelayTime = int.Parse(obj.Split(' ')[0]);
                            //targetDevice.DelayTime = int.Parse(obj.Split(' ')[0]);
                        //}, Language.StringByID(R.MyInternationalizationString.Confrim));
                    };
                    devRight.MouseUpEventHandler += (sender, e) =>
@@ -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)
@@ -468,9 +468,9 @@
                Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                localPic.Show();
                localPic.action = () =>
                localPic.action = (imgPath) =>
                {
                    backGround.UnSelectedImagePath = ImagePath;
                    backGround.UnSelectedImagePath = imgPath;
                    IconType = 0;
                };

@@ -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) =>
                {