Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs

old mode 100755
new mode 100644
@@ -43,7 +43,7 @@
        }

        /// <summary>

        /// UI显示 
        /// UI显示

        /// </summary>
        public void Show()
        {
@@ -56,7 +56,9 @@
            this.btnBack.MouseUpEventHandler += eHandlerBack;
            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
            this.MidFrameLayout(this);

            ReadDoorLockUserInfo();

        }

        public void MidFrameLayoutContent()
@@ -128,7 +130,10 @@
                    }
                    else
                    {

                        var userDoorLockPage = new UserDoorLockPage(doorLock, accountObj);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        userDoorLockPage.Show();
                    }
                };
                btnRight.MouseUpEventHandler += eHandler;
@@ -170,4 +175,4 @@
        }
        #endregion
    }
}
}