From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs | 85 ++++++++++++------------------------------
1 files changed, 24 insertions(+), 61 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
index 8c997e0..cbe5d50 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
@@ -4,13 +4,13 @@
using ZigBee.Device;
namespace Shared.Phone.UserCenter.DoorLock
{
- public class UndistributeDoorlockUserPage : DoorLockCommonLayout, ZigBee.Common.IStatus
+ public class UndistributeDoorlockUserPage : DoorLockCommonLayout
{
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </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()
{
@@ -401,7 +401,7 @@
Y = Application.GetRealHeight(35),
Height = Application.GetRealHeight(63),
Width = Application.GetRealWidth(762),
- Text = Language.StringByID(R.MyInternationalizationString.MatchPerson),
+ Text = Language.StringByID(R.MyInternationalizationString.MatchUser),
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextSize = 16,
TextAlignment = TextAlignment.Center,
@@ -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);
@@ -815,38 +811,5 @@
RefreshList();
}
}
- #region 鎺ュ彛瀹炵幇
- /// <summary>
- /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
- /// </summary>
- /// <returns>The changed.</returns>
- /// <param name="common">Common.</param>
- public void Changed(CommonDevice common)
- {
-
- }
- /// <summary>
- /// 澶勭悊鍙樺寲浜嬩欢
- /// </summary>
- /// <param name="common"></param>
- /// <param name="typeTag"></param>
- public void DeviceInfoChange(CommonDevice common, string typeTag)
- {
- }
- /// <summary>
- /// Changeds the IL ogic status.
- /// </summary>
- /// <param name="logic">Logic.</param>
- public void ChangedILogicStatus(ZigBee.Device.Logic logic)
- {
- }
- /// <summary>
- /// Changeds the IS cene status.
- /// </summary>
- /// <param name="scene">Scene.</param>
- public void ChangedISceneStatus(Scene scene)
- {
- }
- #endregion
}
}
--
Gitblit v1.8.0