Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -97,7 +97,11 @@

        async void MidFrameLayoutContent()
        {
            var SubAccounList = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
            List<Shared.Phone.UserCenter.MemberInfoRes> SubAccounList = null;
            if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
            {
                SubAccounList = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
            }

            var masterAccount = new Shared.Phone.UserCenter.MemberInfoRes();
            masterAccount.Account = Shared.Common.Config.Instance.Account;
@@ -184,13 +188,6 @@
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(masterManagementPage);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        masterManagementPage.Show();
                    }
                    else if (currentIndex == 3)
                    {
                        var userDoorLockPage = new UserDoorLockPage(doorLock, currentAccount);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        userDoorLockPage.Show();
                    }
                    else
                    {