2020-03-30-1

WJC

2020-03-30 fdc47d950498e088260a3b04028703adc0f878e0

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs

old mode 100755
new mode 100644
@@ -35,7 +35,6 @@
            }
            view.clickBtn.MouseDownEventHandler += (sender, e) =>
            {
                //UserView.HomePage.Instance.ScrollEnabled = true;//恢复左滑
                action();
                RemoveFromParent();
            };
@@ -155,7 +154,7 @@
                                                {
                                                    if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
                                                    {
                                                        selecteddevice.selecetddevicestateBtn.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
                                                        selecteddevice.selecetddevicestateBtn.Text = Common.Logic.CurrentLogic.Accounts[a]["AccountName"];
                                                        break;
                                                    }
                                                }
@@ -511,8 +510,8 @@
                            }
                            break;
                        case 2:
                            {

                                actiondevice.edit.Visible = false;//隐藏编辑按钮(场景不需要编辑)
                            {
                                actiondevice.edit.Visible = false;//隐藏编辑按钮(场景不需要编辑)

                                //在本地查找该场景;

                                var sceneinof = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(Convert.ToInt32(actions["DeviceAddr"].ToString()));
                                //本地没有存在;
@@ -604,7 +603,6 @@
            Method.Push(middle);
            #endregion

       
            saveBtn.clickviewBtn.MouseUpEventHandler += (sender, e) =>
           {
               var name = logicTextBox.Text.Trim();
@@ -614,12 +612,12 @@
        }
        public  void AddCondition(int value)
        {
            Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
            var addCondition = new AddCondition();
            addCondition.conditionsIndex = value;
            UserView.HomePage.Instance.AddChidren(addCondition);
            UserView.HomePage.Instance.PageIndex += 1;
            addCondition.Show();
      
        }
    }
}