From 160785587667cc0d927f85e44c139ec9dde13a9e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 14:30:13 +0800
Subject: [PATCH] 原来的 IOS 工程舍弃（注：没有合并其他组员的代码）
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs | 73 +++---------------------------------
1 files changed, 7 insertions(+), 66 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
index 3afd627..7e1e04b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
@@ -88,19 +88,17 @@
/// <summary>
/// 鐢婚潰鍏抽棴
/// </summary>
- public virtual void CloseForm()
+ public void CloseForm()
{
//Log鍑哄姏
HdlLogLogic.Current.WriteLog(1, this.FormID + " 鐣岄潰鍏抽棴");
try
{
- //绉婚櫎鎺ュ彈鍦ㄧ嚎鐘舵�佹帹閫�
- this.RemoveGatewayOnlinePush();
- //绉婚櫎璁惧灞炴�у彉鏇存帹閫�
- this.RemoveDeviceAttributePush();
-
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
+
+ //鐢婚潰鍏抽棴涔嬪墠
+ this.CloseFormBefore();
//璋冪敤鐨勬槸Base鐨勭Щ闄ゆ帶浠跺嚱鏁�
//鑰屼笉鏄皟鐢╰his鐨勭Щ闄ゆ帶浠跺嚱
@@ -108,6 +106,9 @@
//浠庡垪琛ㄤ腑绉婚櫎(闃叉鐢婚潰浜岄噸娣诲姞)
UserCenterLogic.RemoveActionForm(this);
+
+ //鐢婚潰鍏抽棴涔嬪悗
+ this.CloseFormAfter();
}
catch (Exception ex)
{
@@ -130,30 +131,6 @@
#endregion
#region 鈻� 缃戝叧鍦ㄧ嚎鐘舵�佹帹閫乢__________________
-
- /// <summary>
- /// 璁剧疆缃戝叧鎺ュ彈鍦ㄧ嚎鐘舵�佹帹閫�
- /// </summary>
- public void AddGatewayOnlinePush()
- {
- for (int i = 0; i < UserCenterResourse.listGatewayOnlinePushForm.Count; i++)
- {
- if (this.FormID == UserCenterResourse.listGatewayOnlinePushForm[i].FormID)
- {
- //宸茬粡瀛樺湪,鍒欎笉鍐嶆坊鍔�
- return;
- }
- }
- UserCenterResourse.listGatewayOnlinePushForm.Add(this);
- }
-
- /// <summary>
- /// 绉婚櫎缃戝叧鎺ュ彈鍦ㄧ嚎鐘舵�佹帹閫�
- /// </summary>
- private void RemoveGatewayOnlinePush()
- {
- UserCenterResourse.listGatewayOnlinePushForm.RemoveAll((obj) => { return obj.FormID == this.FormID; });
- }
/// <summary>
/// 缃戝叧鍦ㄧ嚎鐘舵�佸彉鏇存帹閫�(鍙湁鍦ㄥ彉鏇寸殑鏃跺�欐墠浼氭帹閫�)
@@ -164,42 +141,6 @@
{
}
- #endregion
-
- #region 鈻� 璁惧灞炴�у彉鏇存帹閫乢__________________
-
- /// <summary>
- /// 璁剧疆鎺ュ彈璁惧灞炴�у彉鏇存帹閫�
- /// </summary>
- public void AddDeviceAttributePush()
- {
- for (int i = 0; i < UserCenterResourse.listDeviceAttributePushForm.Count; i++)
- {
- if (this.FormID == UserCenterResourse.listDeviceAttributePushForm[i].FormID)
- {
- //宸茬粡瀛樺湪,鍒欎笉鍐嶆坊鍔�
- return;
- }
- }
- UserCenterResourse.listDeviceAttributePushForm.Add(this);
- }
-
- /// <summary>
- /// 绉婚櫎璁惧灞炴�у彉鏇存帹閫�
- /// </summary>
- private void RemoveDeviceAttributePush()
- {
- UserCenterResourse.listDeviceAttributePushForm.RemoveAll((obj) => { return obj.FormID == this.FormID; });
- }
-
- /// <summary>
- /// 璁惧灞炴�у彉鏇存帹閫�(鍙湁鍦ㄥ彉鏇寸殑鏃跺�欐墠浼氭帹閫�)
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- public virtual void DeviceAttributePush(ZigBee.Device.CommonDevice device)
- {
- }
-
#endregion
#region 鈻� 鍦嗗舰杩涘害鏉________________________
--
Gitblit v1.8.0