From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs | 69 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
index 77d544c..c72883a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
@@ -16,13 +16,13 @@
/// </summary>
public Action FormCloseEvent = null;
/// <summary>
+ /// 鎴愬憳璐﹀彿淇℃伅
+ /// </summary>
+ private AccountInfoResult memberAccountResult = null;
+ /// <summary>
/// 鎴愬憳淇℃伅
/// </summary>
private MemberInfoRes memberResult = null;
- /// <summary>
- /// 娓呯┖浜嬩欢
- /// </summary>
- private bool clearEvent = true;
#endregion
@@ -30,10 +30,12 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
+ /// </summary>
+ /// <param name="i_accountInfoResult">鎴愬憳璐﹀彿淇℃伅</param>
/// <param name="i_memberResult">鎴愬憳淇℃伅</param>
- public void ShowForm(MemberInfoRes i_memberResult)
+ public void ShowForm(AccountInfoResult i_accountInfoResult, MemberInfoRes i_memberResult)
{
+ this.memberAccountResult = i_accountInfoResult;
this.memberResult = i_memberResult;
//鍒濆鍖栦腑閮ㄦ帶浠�
@@ -92,6 +94,37 @@
btnSuccess.TextSize = 20;
frame.AddChidren(btnSuccess);
+ //鎴块棿閲岄潰鏈夎澶囨墠浼氭樉绀哄叡浜澶囪彍鍗�
+ if (this.CheckIsCanShard() == true)
+ {
+ //閰嶇疆鍏变韩鍐呭
+ var btnmsg = new NormalViewControl(frame.Width, Application.GetRealHeight(50), false);
+ btnmsg.Y = Application.GetRealHeight(783);
+ btnmsg.TextSize = 12;
+ btnmsg.TextAlignment = TextAlignment.Center;
+ btnmsg.TextColor = UserCenterColor.Current.TextOrangeColor;
+ btnmsg.Text = Language.StringByID(R.MyInternationalizationString.uConfigureSharedContent);
+ btnmsg.ButtonClickEvent += (sender, e) =>
+ {
+ //鍏堟竻绌哄叡浜枃浠跺す
+ HdlShardLogic.Current.ClearShardDirectory();
+
+ var memberInfo = new MemberShardInfoData();
+ var form = new SharedContent.ConfigureNewSharedListRoomForm();
+ this.AddFromAndRemoveNowForm(form, memberResult, memberInfo);
+ };
+ frame.AddChidren(btnmsg);
+
+ //搴曠嚎
+ int lineWidth = btnmsg.GetRealWidthByText(12);
+ var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
+ btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
+ btnLine.Gravity = Gravity.CenterHorizontal;
+ btnLine.Y = btnmsg.Bottom - Application.GetRealHeight(10);
+ frame.AddChidren(btnLine);
+
+ }
+
//瀹屾垚
var btnFinish = new BottomClickButton(688);
btnFinish.Y = Application.GetRealHeight(867);
@@ -99,28 +132,28 @@
frame.AddChidren(btnFinish);
btnFinish.ButtonClickEvent += (sender, e) =>
{
- this.clearEvent = false;
-
this.CloseForm();
- FormCloseEvent?.Invoke();
- FormCloseEvent = null;
};
}
#endregion
- #region 鈻� 鐣岄潰鍏抽棴___________________________
+ #region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
- /// 鐣岄潰鍏抽棴
+ /// 妫�娴嬭兘鍚﹀垎浜�
/// </summary>
- public override void CloseForm()
+ /// <returns></returns>
+ private bool CheckIsCanShard()
{
- if (clearEvent == true)
- {
- FormCloseEvent = null;
- }
- base.CloseForm();
+ //foreach (var room in Shared.Common.Room.Lists)
+ //{
+ // if (room.DeviceUIList.Count > 0)
+ // {
+ // return true;
+ // }
+ //}
+ return false;
}
#endregion
--
Gitblit v1.8.0