合并了晾衣架(非新云端)

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

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

@@ -24,7 +24,7 @@
        #region ◆ 变量申明__________________________
        ZigBee.Device.DoorLock doorLock;
        VerticalRefreshLayout midVerticalScrolViewLayout;
        public List<MemberInfoRes> localAllAccountListTemp = new List<MemberInfoRes> { };
        public List<Shared.Phone.UserCenter.MemberInfoRes> localAllAccountListTemp = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
        public Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj> localDoorLockUserListTemp = new Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj>();


@@ -49,19 +49,18 @@
                        //初始化权限信息
                        foreach (var sub in localAccountListTemp)
                        {
                            //☆マーク☆
                            //if (doorLock.IsFreezeAccount.ContainsKey(sub.SubAccountDistributedMark) == false)
                            //{
                            //    doorLock.IsFreezeAccount.Add(sub.SubAccountDistributedMark, false);
                            //}
                            //if (doorLock.HasRemoteUnlockAccess.ContainsKey(sub.SubAccountDistributedMark) == false)
                            //{
                            //    doorLock.HasRemoteUnlockAccess.Add(sub.SubAccountDistributedMark, false);
                            //}
                            //if (doorLock.IsFailedToGetDoorLockInfo.ContainsKey(sub.SubAccountDistributedMark) == false)
                            //{
                            //    doorLock.IsFailedToGetDoorLockInfo.Add(sub.SubAccountDistributedMark, false);
                            //}
                            if (doorLock.IsFreezeAccount.ContainsKey(sub.SubAccountDistributedMark) == false)
                            {
                                doorLock.IsFreezeAccount.Add(sub.SubAccountDistributedMark, false);
                            }
                            if (doorLock.HasRemoteUnlockAccess.ContainsKey(sub.SubAccountDistributedMark) == false)
                            {
                                doorLock.HasRemoteUnlockAccess.Add(sub.SubAccountDistributedMark, false);
                            }
                            if (doorLock.IsFailedToGetDoorLockInfo.ContainsKey(sub.SubAccountDistributedMark) == false)
                            {
                                doorLock.IsFailedToGetDoorLockInfo.Add(sub.SubAccountDistributedMark, false);
                            }
                        }

                        //获取本地门锁列表
@@ -124,10 +123,11 @@
            };
            btnAddFrameLayout.AddChidren(btnUndistributeIcon);

            btnAddFrameLayout.Width = Application.GetRealWidth(190 + 50);
            var btnUndistributeText = new Button
            {
                Height = Application.GetRealHeight(72),
                Width = Application.GetRealWidth(150),
                Width = Application.GetRealWidth(200),
                TextID = R.MyInternationalizationString.Undistributed,
                TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
                X = btnUndistributeIcon.Right,
@@ -136,7 +136,7 @@
                TextAlignment = TextAlignment.CenterLeft,
            };
            btnAddFrameLayout.AddChidren(btnUndistributeText);
            if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
            {
                btnAddFrameLayout.Width = 0;
                btnUndistributeIcon.Width = 0;
@@ -232,7 +232,14 @@
                    line2.Visible = false;
                }

                btnText.Text = currentAccount.ShowName;
                if (!string.IsNullOrEmpty(currentAccount.UserName))
                {
                    btnText.Text = currentAccount.UserName;
                }
                else
                {
                    btnText.Text = currentAccount.Account;
                }

                EventHandler<MouseEventArgs> eHandler = (sender, e) =>
                {