From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs
similarity index 80%
rename from ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceMainForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs
index 54270de..e170e76 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone.UserCenter.Residence
+namespace Shared.Phone.UserCenter.Transfer
{
/// <summary>
/// 浣忓畢杩囨埛鐨勪富鐣岄潰
@@ -11,6 +11,11 @@
{
#region 鈻� 鍙橀噺澹版槑___________________________
+ /// <summary>
+ /// 1:绉讳氦缁欑敤鎴� 2:鎺堟潈缁欒皟璇曚汉鍛�
+ /// </summary>
+ private int TransferDiv = 0;
+
#endregion
#region 鈻� 鍒濆鍖朹____________________________
@@ -18,10 +23,14 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- public void ShowForm()
+ /// <param name="i_TransferDiv">1:绉讳氦缁欑敤鎴� 2:鎺堟潈缁欒皟璇曚汉鍛�</param>
+ public void ShowForm(int i_TransferDiv)
{
+ this.TransferDiv = i_TransferDiv;
//璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uTransferOfResidence));
+ base.SetTitleText(i_TransferDiv == 1
+ ? Language.StringByID(R.MyInternationalizationString.HandoverToUser).Replace("{0}", string.Empty)
+ : Language.StringByID(R.MyInternationalizationString.AuthorizedToCommissioningPersonnel).Replace("{0}", string.Empty));
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
@@ -45,45 +54,38 @@
btnMsg1.TextSize = 20;
btnMsg1.IsBold = true;
btnMsg1.TextAlignment = TextAlignment.Center;
- btnMsg1.TextID = R.MyInternationalizationString.uTransferOfResidenceToOtherEvoyoAccount1;
+ btnMsg1.Text = this.TransferDiv == 1 ? "杞Щ浣忓畢鍒板叾浠栫敤鎴疯处鍙�" : "杞Щ浣忓畢鍒板叾浠栬皟璇曚汉鍛樿处鍙�";
bodyFrameLayout.AddChidren(btnMsg1);
- var btnMsg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(90), false);
- btnMsg2.Y = btnMsg1.Bottom;
- btnMsg2.TextSize = 20;
- btnMsg2.IsBold = true;
- btnMsg2.TextAlignment = TextAlignment.Center;
- btnMsg2.TextID = R.MyInternationalizationString.uTransferOfResidenceToOtherEvoyoAccount2;
- bodyFrameLayout.AddChidren(btnMsg2);
//璇ユ搷浣滀笉鍙�嗭紝璇锋敞鎰忥細
var btnTip = new NormalViewControl(900, 60, true);
btnTip.X = Application.GetRealWidth(135);
- btnTip.Y = btnMsg2.Bottom + Application.GetRealHeight(167);
+ btnTip.Y = btnMsg1.Bottom + Application.GetRealHeight(257);
btnTip.TextID = R.MyInternationalizationString.uThisOperationIsIrreversiblePleaseNote;
bodyFrameLayout.AddChidren(btnTip);
- //1.鎺ユ敹鏂逛负Evoyo Home鏈夋晥娉ㄥ唽璐﹀彿
+ //1.鎺ユ敹鏂逛负鏈夋晥娉ㄥ唽璐﹀彿
var btnTipMsg1 = new NormalViewControl(900, 55, true);
btnTipMsg1.X = btnTip.X;
btnTipMsg1.Y = btnTip.Bottom + Application.GetRealHeight(30);
btnTipMsg1.TextSize = 12;
btnTipMsg1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnTipMsg1.TextID = R.MyInternationalizationString.uTheReceiverIsValidAccountForEvoyoHome;
+ btnTipMsg1.Text = "1.鎺ユ敹鏂逛负鏈夋晥娉ㄥ唽璐﹀彿";
bodyFrameLayout.AddChidren(btnTipMsg1);
- //2.鎺ユ敹鏂逛笌杩囨埛鏂逛笉鍙互涓哄悓涓�涓处鍙�
+ //2.鎺ユ敹鏂逛笌杞Щ鏂逛笉鍙互涓哄悓涓�涓处鍙�
var btnTipMsg2 = new NormalViewControl(900, 55, true);
btnTipMsg2.X = btnTip.X;
btnTipMsg2.Y = btnTipMsg1.Bottom + Application.GetRealHeight(30);
btnTipMsg2.TextSize = 12;
btnTipMsg2.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnTipMsg2.TextID = R.MyInternationalizationString.uTheReceiverAndTheTransferPartyCannotBeTheSameAccount;
+ btnTipMsg2.Text = "2.鎺ユ敹鏂逛笌杞Щ鏂逛笉鍙互涓哄悓涓�涓处鍙�";
bodyFrameLayout.AddChidren(btnTipMsg2);
- //3.杩囨埛鎴愬姛鍚庯紝灏嗗彇娑堣繃鎴锋柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈
+ //3.杞Щ鎴愬姛鍚庯紝灏嗗彇娑堣浆绉绘柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈
var btnTipMsg3 = new NormalViewControl(900, 55, true);
btnTipMsg3.X = btnTip.X;
btnTipMsg3.Y = btnTipMsg2.Bottom + Application.GetRealHeight(30);
btnTipMsg3.TextSize = 12;
btnTipMsg3.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnTipMsg3.TextID = R.MyInternationalizationString.uIfTheTransferIsSuccessfulTheRightToUseTheHouseWillBeCancelled;
+ btnTipMsg3.Text = "3.杞Щ鎴愬姛鍚庯紝灏嗗彇娑堣浆绉绘柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈";
bodyFrameLayout.AddChidren(btnTipMsg3);
//杈撳叆璐﹀彿
@@ -95,7 +97,7 @@
btnInputAccount.ButtonClickEvent += (sender, e) =>
{
var form = new TransferResidenceByIdForm();
- form.AddForm();
+ form.AddForm(this.TransferDiv);
};
//鎵弿浜岀淮鐮佺殑鑳屾櫙
@@ -145,7 +147,7 @@
{
var pra = new AccountInfoPra();
pra.Account = accountId;
- var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string>() { "AccountNoExists" });
+ var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string> { "NotCheck" });
if (byteData == null)
{
//寮傚父
@@ -165,6 +167,12 @@
var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountInfoResult>(revertObj.ResponseData.ToString());
infoResult.Account = accountId;
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var form2 = new AddMemberInfoForm();
+ form2.AddForm(infoResult, this.TransferDiv);
+ });
}
#endregion
--
Gitblit v1.8.0