合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

 ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs

@@ -718,6 +718,7 @@
                                        break;
                                    case DeviceType.DoorLock:
                                        {
                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/doorlock.png";
                                            for (int a = 0; a < Common.Logic.CurrentLogic.Accounts.Count; a++)
                                            {
                                                if (Common.Logic.CurrentLogic.Accounts[a]["Type"] == "1")
@@ -1184,13 +1185,6 @@
                                ///编辑点击事件
                                deviceedit.MouseUpEventHandler += (sender, e) =>
                                {
                                    //var deviceStatePage = new DeviceStatePage();
                                    //UserView.HomePage.Instance.AddChidren(deviceStatePage);
                                    //UserView.HomePage.Instance.PageIndex += 1;
                                    //deviceStatePage.IsDeviceEditor = true;
                                    //deviceStatePage.Show(deviceinof);

                                    //ActionModifyDeviceStateView(deviceinof);
                                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                                    this.AddChidren(flMain);
                                    LogicDevicePage.CurrentDeviceStateView(flMain, deviceinof, true);