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/Member/MemberManagementForm.cs | 187 ++++++++++++++++------------------------------
1 files changed, 67 insertions(+), 120 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
index 0b8607f..9b73486 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
@@ -36,8 +36,7 @@
this.memberInfo = info;
//璁剧疆鏍囬淇℃伅
- string title = string.IsNullOrEmpty(info.UserName) == true ? info.Account : info.UserName;
- base.SetTitleText(title);
+ base.SetTitleText(info.ShowName);
//鍒濆鍖栧彸涓婅鐨勫浘鏍�
this.InitTopRightIcon();
@@ -51,7 +50,7 @@
/// </summary>
private void InitTopRightIcon()
{
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
{
return;
}
@@ -76,7 +75,7 @@
//纭畾鎺堟潈銆寋0}銆嶆垚涓虹鐞嗗憳?
msg = Language.StringByID(R.MyInternationalizationString.uUpSubAccountLevel);
}
- msg = msg.Replace("{0}", string.IsNullOrEmpty(memberInfo.UserName) == true ? memberInfo.Account : memberInfo.UserName);
+ msg = msg.Replace("{0}", memberInfo.ShowName);
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
@@ -114,14 +113,14 @@
bodyFrameLayout.AddChidren(frame);
//鐢ㄦ埛鍥炬爣
- string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberInfo.DistributedMark + ".png");
+ string iconPath = System.IO.Path.Combine(HdlFileNameResourse.UserPictrueDirectory, memberInfo.ChildAccountId + ".png");
var btnUserIcon = new ImageView();
- btnUserIcon.Height = Application.GetMinRealAverage(207);
- btnUserIcon.Width = Application.GetMinRealAverage(207);
- btnUserIcon.Radius = (uint)Application.GetMinRealAverage(207) / 2;
+ btnUserIcon.Height = this.GetPictrueRealSize(207);
+ btnUserIcon.Width = this.GetPictrueRealSize(207);
+ btnUserIcon.Radius = (uint)this.GetPictrueRealSize(207) / 2;
if (System.IO.File.Exists(iconPath) == true)
{
- btnUserIcon.ImagePath = iconPath;
+ btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(iconPath);
}
else
{
@@ -139,7 +138,7 @@
btnAuthority.TextSize = 12;
btnAuthority.Y = btnUserIcon.Bottom + Application.GetRealHeight(23);
btnAuthority.Gravity = Gravity.CenterHorizontal;
- btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;
+ btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;
btnAuthority.TextID = R.MyInternationalizationString.uMember;
if (memberInfo.AccountType == 1)
{
@@ -159,8 +158,8 @@
private void InitInfoList()
{
//鏍囬:鎴愬憳鏉冮檺
- var btnMenberTile = new DetailTitleControl(800, 60, true);
- btnMenberTile.X = ControlCommonResourse.XXLeft;
+ var btnMenberTile = new NormalViewControl(800, 60, true);
+ btnMenberTile.X = HdlControlResourse.XXLeft;
btnMenberTile.Y = Application.GetRealHeight(418);
btnMenberTile.TextColor = UserCenterColor.Current.TextColor2;
btnMenberTile.TextID = R.MyInternationalizationString.MenberAuthority;
@@ -191,9 +190,9 @@
this.AddShardContentRow(rowShard);
//涓�鏃︾Щ闄よ瀹跺涵鎴愬憳锛屼粬/濂瑰皢鏃犳硶浣跨敤璇ョ綉鍏充笅鎵�缁戝畾鐨勮澶�
- var btnNote1 = new NormalViewControl(613, 98, true);
- btnNote1.X = Application.GetRealWidth(246);
- btnNote1.Y = Application.GetRealHeight(1328);
+ var btnNote1 = new NormalViewControl(613, 100, true);
+ btnNote1.X = Application.GetRealWidth(248);
+ btnNote1.Y = Application.GetRealHeight(1327);
btnNote1.TextSize = 12;
btnNote1.TextID = R.MyInternationalizationString.RemoveMenberAndDonotUserBindGatewayDevice;
btnNote1.IsMoreLines = true;
@@ -203,7 +202,7 @@
var btnIcon = new IconViewControl(58);
btnIcon.X = Application.GetRealWidth(167);
- btnIcon.Y = Application.GetRealHeight(1328);
+ btnIcon.Y = btnNote1.Y;
btnIcon.UnSelectedImagePath = "Item/Tips.png";
bodyFrameLayout.AddChidren(btnIcon);
@@ -218,7 +217,6 @@
string msg = Language.StringByID(R.MyInternationalizationString.uConfirmRemoveMember);
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
- //鍒犻櫎瀛愯处鍙�
this.DeleteSubAccount();
});
};
@@ -245,9 +243,35 @@
//寮�鍏�
var btnSwitch = row.AddMostRightSwitchIcon();
+ if (this.memberInfo.IsRemoteControl == true)
+ {
+ btnSwitch.IsSelected = true;
+ }
btnSwitch.ButtonClickEvent += (sender, e) =>
{
- btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ btnSwitch.CanClick = false;
+ bool statu = !btnSwitch.IsSelected;
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
+ var result = HdlMemberLogic.Current.SetRemoteOperationPermissions(this.memberInfo.ChildAccountId, statu);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+
+ if (result == false)
+ {
+ return;
+ }
+ this.memberInfo.IsRemoteControl = statu;
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnSwitch.IsSelected = statu;
+ btnSwitch.CanClick = true;
+ });
+ });
+
};
//搴曠嚎
row.AddBottomLine();
@@ -275,11 +299,10 @@
//鍙冲浘鏍�
row.AddRightArrow();
- var memberShardInfo = new MemberShardInfoData();
row.ButtonClickEvent += (sender, e) =>
{
var form = new SharedContent.LookSharedListRoomForm();
- form.AddForm(memberInfo, memberShardInfo);
+ form.AddForm(memberInfo.ChildAccountId);
};
}
@@ -290,47 +313,33 @@
/// <summary>
/// 鍗囩骇鎴栬�呴檷绾у瓙璐﹀彿
/// </summary>
- public async void UpOrDownSubAccountLevel()
+ private void UpOrDownSubAccountLevel()
{
- //寮�鍚繘搴︽潯
- this.ShowProgressBar();
-
- var pra = new UpOrDownLevelPra();
- pra.DistributedMark = memberInfo.DistributedMark;
-
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpSubAccount", false, pra);
+ //鍙樻洿鏉冮檺
+ var result = HdlMemberLogic.Current.EditorMemberAuthority(this.memberInfo.ChildAccountId, memberInfo.AccountType == 1 ? 1 : 3);
if (result == false)
{
- this.CloseProgressBar();
return;
}
- this.CloseProgressBar();
//鍙樻洿鏉冮檺
memberInfo.AccountType = memberInfo.AccountType == 1 ? 0 : 1;
- Application.RunOnMainThread(() =>
+ //鍙樻洿鏉冮檺鍥炬爣
+ if (memberInfo.AccountType == 1)
{
- if (this.Parent == null)
- {
- return;
- }
- //鍙樻洿鏉冮檺鍥炬爣
- if (memberInfo.AccountType == 1)
- {
- btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";
- }
- else
- {
- btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";
- }
- //鍙樻洿鏉冮檺鏂囧瓧
- btnAuthority.TextID = memberInfo.AccountType == 1 ? R.MyInternationalizationString.uMemberHadActionAuthority : R.MyInternationalizationString.uMember;
+ btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";
+ }
+ else
+ {
+ btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";
+ }
+ //鍙樻洿鏉冮檺鏂囧瓧
+ btnAuthority.TextID = memberInfo.AccountType == 1 ? R.MyInternationalizationString.uMemberHadActionAuthority : R.MyInternationalizationString.uMember;
- //鎵撳紑鏄剧ず鎴愬姛鐨勭敾闈�
- var form = new SubAccountLevelUpSuccessForm();
- form.AddForm(memberInfo);
- });
+ //鎵撳紑鏄剧ず鎴愬姛鐨勭敾闈�
+ var form = new SubAccountLevelUpSuccessForm();
+ form.AddForm(memberInfo);
}
#endregion
@@ -340,34 +349,13 @@
/// <summary>
/// 鍒犻櫎瀛愯处鍙�
/// </summary>
- private async void DeleteSubAccount()
+ private void DeleteSubAccount()
{
- //寮�鍚繘搴︽潯
- this.ShowProgressBar();
-
- var pra = new DeleteSubAccountPra();
- pra.SubAccount = memberInfo.SubAccountDistributedMark;
-
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/DeletedSubAccount", false, pra);
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
-
+ bool result = HdlMemberLogic.Current.DeleteMember(this.memberInfo.ChildAccountId);
if (result == false)
{
return;
}
-
- //绉婚櫎缂撳瓨
- UserCenterResourse.ListMemberInfo.RemoveAll((obj) =>
- {
- if (obj.SubAccountDistributedMark == memberInfo.SubAccountDistributedMark)
- {
- return true;
- }
- return false;
- });
- UserCenterLogic.SaveLocalMemberListInfo();
-
//浠庢垚鍛樹竴瑙堢敾闈㈢Щ闄�
this.LoadFormMethodByName("MemberListForm", "DeleteRowByAccount", memberInfo.Account);
//鑷韩鍏抽棴
@@ -383,63 +371,22 @@
/// </summary>
private void GetMemberIcon(ImageView btnUserIcon)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- var pra = new AccountInfoPra();
- pra.Account = memberInfo.Account;
- var result = await UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string>() { "NotSetAgain" });
- if (result == null)
- {
- return;
- }
- var revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResponsePack>(System.Text.Encoding.UTF8.GetString(result));
- if (revertObj == null || revertObj.ResponseData == null)
- {
- return;
- }
- var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountInfoResult>(revertObj.ResponseData.ToString());
- if (infoResult.HeadImage != null)
+ var imageData = HdlAccountLogic.Current.DownLoadAccountPictrue(memberInfo.Account);
+ if (imageData != null && imageData.Length > 0)
{
//鍐欏叆澶村儚鍐呭
- string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberInfo.DistributedMark + ".png");
- Shared.IO.FileUtils.WriteFileByBytes(iconPath, infoResult.HeadImage);
+ string iconPath = System.IO.Path.Combine(HdlFileNameResourse.UserPictrueDirectory, memberInfo.ChildAccountId + ".png");
+ Shared.IO.FileUtils.WriteFileByBytes(iconPath, imageData);
HdlThreadLogic.Current.RunMain(() =>
{
- btnUserIcon.ImagePath = iconPath;
+ btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(iconPath);
});
}
});
}
- #endregion
-
- #region 鈻� 缁撴瀯浣揰____________________________
-
- /// <summary>
- /// 鍗囩骇鎴栬�呴檷绾у瓙璐﹀彿鐨勫惎鍔ㄥ弬鏁�
- /// </summary>
- private class UpOrDownLevelPra : IfacePraCommon
- {
- /// <summary>
- /// 閫氳繃銆婁綇瀹呯殑Guid鏌ヨ浣忓畢涓嬮潰鐨勫瓙璐﹀彿銆嬫帴鍙ｆ椂锛岃繑鍥炵殑DistributedMark瀛楁
- /// </summary>
- public string DistributedMark = string.Empty;
- }
-
- /// <summary>
- /// 鍒犻櫎瀛愯处鍙风殑鍚姩鍙傛暟
- /// </summary>
- private class DeleteSubAccountPra : IfacePraCommon
- {
- /// <summary>
- /// 閫氳繃銆婁綇瀹呯殑Guid鏌ヨ浣忓畢涓嬮潰鐨勫瓙璐﹀彿銆嬫帴鍙ｆ椂锛岃繑鍥炵殑DistributedMark瀛楁
- /// </summary>
- public string SubAccount = string.Empty;
- /// <summary>
- /// HouseDistributedMark
- /// </summary>
- public string HouseDistributedMark = Common.Config.Instance.HomeId;
- }
#endregion
}
}
--
Gitblit v1.8.0