blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
WJC
2020-03-31 3a662a08e1c54c9a5687a43a8133c8e42981f474 
 ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs


@@ -280,7 +280,7 @@


                        case 1:


                            {


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


                                name = deviceinof.DeviceEpointName;


                                name = LocalDevice.Current.GetDeviceEpointName(deviceinof);


                                selecteddevice.regionNameBtn.Visible = true;


                                Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);




@@ -660,10 +660,11 @@


                        alert.ConfirmClickEvent += () =>


                        {


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


                            var logicCommunalPage = new LogicCommunalPage();


                            UserView.HomePage.Instance.AddChidren(logicCommunalPage);


                            UserView.HomePage.Instance.PageIndex += 1;


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


                            selecteddevice.selecetdFrameLayout.RemoveFromParent();


                            //var logicCommunalPage = new LogicCommunalPage();


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


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


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


                        };




                    };


@@ -724,7 +725,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);


                                switch (deviceinof.Type)


@@ -1151,11 +1152,12 @@


                        alert.ConfirmClickEvent += () =>


                        {


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


                            actiondevice.selecetdFrameLayout.RemoveFromParent();


                            // devicesFrameLayout.RemoveFromParent();


                            var logicCommunalPage = new LogicCommunalPage();


                            UserView.HomePage.Instance.AddChidren(logicCommunalPage);


                            UserView.HomePage.Instance.PageIndex += 1;


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


                            //var logicCommunalPage = new LogicCommunalPage();


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


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


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


                        };




                    };