新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

@@ -10,7 +10,7 @@
        /// 构造函数
        /// </summary>
        /// <param name="doorLock"></param>
        public UndistributeDoorlockUserPage(ZigBee.Device.DoorLock doorLock, List<Shared.Phone.UserCenter.MemberInfoRes> localAccountList)
        public UndistributeDoorlockUserPage(ZigBee.Device.DoorLock doorLock, List<MemberInfoRes> localAccountList)
        {
            this.doorLock = doorLock;
            this.localAccountList = localAccountList;
@@ -33,7 +33,7 @@
        /// <summary>
        /// 本地账户列表
        /// </summary>
        List<Shared.Phone.UserCenter.MemberInfoRes> localAccountList;
        List<MemberInfoRes> localAccountList;
        /// <summary>
        /// 滑动布局View
        /// </summary>
@@ -79,8 +79,8 @@
            });
        }

        /// <summary>

        /// UI显示

        /// <summary>
        /// UI显示
        /// </summary>
        public void Show()
        {
@@ -462,8 +462,8 @@

                var btnChoose = new Button()
                {
                    Width = Application.GetRealWidth(60),
                    Height = Application.GetRealHeight(60),
                    Width = Application.GetMinRealAverage(60),
                    Height = Application.GetMinRealAverage(60),
                    X = Application.GetRealWidth(861 + 81),
                    Y = Application.GetRealHeight(35),
                    SelectedImagePath = "DoorLock/SelectedIcon.png",
@@ -488,25 +488,19 @@
                    btnLine.Visible = false;
                }

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

                EventHandler<MouseEventArgs> eHandler = (sender, e) =>
                {
                    if (doorLock.IsFreezeAccount[currentAccount.SubAccountDistributedMark] == true)
                    {
                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = btnUserName.Text + Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        });
                        return;
                    }
                    //☆マーク☆
                    //if (doorLock.IsFreezeAccount[currentAccount.SubAccountDistributedMark] == true)
                    //{
                    //    Application.RunOnMainThread(() =>
                    //    {
                    //        new Tip() { MaxWidth = 150, Text = btnUserName.Text + Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                    //    });
                    //    return;
                    //}

                    if (!btnChoose.IsSelected)
                    {
@@ -526,7 +520,8 @@
                        oldbuttonChoose.IsSelected = true;
                        oldbuttonChoose.Visible = true;
                        oldUserName.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                        curAccountId = currentAccount.SubAccountDistributedMark;
                        //☆マーク☆
                        //curAccountId = currentAccount.SubAccountDistributedMark;
                    }
                };
                btnChoose.MouseUpEventHandler += eHandler;
@@ -563,9 +558,10 @@
                       else
                       {
                           var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
                           if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                           if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
                           {
                               addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                               //☆マーク☆
                               //addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                               addLockInfo.IsOtherAccountCtrl = true;
                           }
                           addLockInfo.CloudAccountId = curAccountId;
@@ -612,7 +608,7 @@
                           var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
                           if (result != null)
                           {
                               if (result.StateCode == "Success")
                               if (result.Code == HttpMessageEnum.A成功)
                               {
                                   //存门锁信息
                                   var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalDoorLocklist(doorLock, curAccountId);