blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
WJC
2020-04-02 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7 
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs


@@ -139,7 +139,7 @@


                            {


                                var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);


                                selecteddevice.deviceNameBtn.Visible = true;


                                selecteddevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;


                                selecteddevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);


                                selecteddevice.regionNameBtn.Visible = true;


                                Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);


                                selecteddevice.edit.Tag = i;


@@ -183,10 +183,11 @@


                        alert.ConfirmClickEvent += () =>


                        {


                            Common.Logic.CurrentLogic.Conditions.Remove(conditions);


                            var lockLogicCommunalPage = new LockLogicCommunalPage();


                            UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);


                            UserView.HomePage.Instance.PageIndex += 1;


                            lockLogicCommunalPage.Show(() => { });


                            selecteddevice.selecetdFrameLayout.RemoveFromParent();


                            //var lockLogicCommunalPage = new LockLogicCommunalPage();


                            //UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);


                            //UserView.HomePage.Instance.PageIndex += 1;


                            //lockLogicCommunalPage.Show(() => { });


                        };


                    };




@@ -245,7 +246,7 @@


                            {




                                var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());


                                name = deviceinof.DeviceEpointName;


                                name =LocalDevice.Current.GetDeviceEpointName(deviceinof);


                                actiondevice.regionNameBtn.Visible = true;


                                Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);




@@ -587,10 +588,11 @@


                        alert.ConfirmClickEvent += () =>


                        {


                            Common.Logic.CurrentLogic.Actions.Remove(actions);


                            var lockLogicCommunalPage = new LockLogicCommunalPage();


                            UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);


                            UserView.HomePage.Instance.PageIndex += 1;


                            lockLogicCommunalPage.Show(() => { });


                            actiondevice.selecetdFrameLayout.RemoveFromParent();


                            //var lockLogicCommunalPage = new LockLogicCommunalPage();


                            //UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);


                            //UserView.HomePage.Instance.PageIndex += 1;


                            //lockLogicCommunalPage.Show(() => { });


                        };


                    };