From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs | 122 ++++++++++++++--------------------------
1 files changed, 43 insertions(+), 79 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
index 358e286..7a693a9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
@@ -72,27 +72,51 @@
#region 鈻� 鍏抽棴鐣岄潰___________________________
/// <summary>
+ /// 鐢婚潰鍏抽棴涔嬪墠(搴曞眰鍙樻洿,涓嶈兘閲嶈浇CloseForm鏂规硶浜�)
+ /// </summary>
+ public virtual void CloseFormBefore()
+ {
+ }
+
+ /// <summary>
+ /// 鐢婚潰鍏抽棴涔嬪悗(鏂板)
+ /// </summary>
+ public virtual void CloseFormAfter()
+ {
+ }
+
+ /// <summary>
/// 鐢婚潰鍏抽棴
/// </summary>
- public virtual void CloseForm()
+ public void CloseForm()
{
//Log鍑哄姏
HdlLogLogic.Current.WriteLog(1, this.FormID + " 鐣岄潰鍏抽棴");
+ try
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
- //绉婚櫎鎺ュ彈鍦ㄧ嚎鐘舵�佹帹閫�
- this.RemoveGatewayOnlinePush();
- //绉婚櫎璁惧灞炴�у彉鏇存帹閫�
- this.RemoveDeviceAttributePush();
+ //鐢婚潰鍏抽棴涔嬪墠
+ this.CloseFormBefore();
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
+ //璋冪敤鐨勬槸Base鐨勭Щ闄ゆ帶浠跺嚱鏁�
+ //鑰屼笉鏄皟鐢╰his鐨勭Щ闄ゆ帶浠跺嚱
+ base.RemoveFromParent();
- //璋冪敤鐨勬槸Base鐨勭Щ闄ゆ帶浠跺嚱鏁�
- //鑰屼笉鏄皟鐢╰his鐨勭Щ闄ゆ帶浠跺嚱
- base.RemoveFromParent();
+ //浠庡垪琛ㄤ腑绉婚櫎(闃叉鐢婚潰浜岄噸娣诲姞)
+ UserCenterLogic.RemoveActionForm(this);
- //浠庡垪琛ㄤ腑绉婚櫎(闃叉鐢婚潰浜岄噸娣诲姞)
- UserCenterLogic.RemoveActionForm(this);
+ //鐢婚潰鍏抽棴涔嬪悗
+ this.CloseFormAfter();
+ }
+ catch (Exception ex)
+ {
+ //鍑虹幇鏈煡閿欒
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(ex);
+ }
}
/// <summary>
@@ -107,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>
/// 缃戝叧鍦ㄧ嚎鐘舵�佸彉鏇存帹閫�(鍙湁鍦ㄥ彉鏇寸殑鏃跺�欐墠浼氭帹閫�)
@@ -141,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 鈻� 鍦嗗舰杩涘害鏉________________________
@@ -246,10 +210,10 @@
{
}
- #endregion
+ #endregion
#region 鈻� 涓�鑸殑鏂规硶_________________________
-
+
/// <summary>
/// 鏄剧ず淇℃伅妗�
/// </summary>
@@ -279,7 +243,7 @@
catch (Exception ex)
{
//鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
//Log鍑哄姏
HdlLogLogic.Current.WriteLog(ex);
@@ -368,16 +332,15 @@
{
return null;
}
- return form.GetType().InvokeMember(method, System.Reflection.BindingFlags.InvokeMethod, null, form, parameter);
+ var myMethod = form.GetType().GetMethod(method);
+ return myMethod.Invoke(form, parameter);
}
catch (Exception ex)
{
//鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));
-
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
//Log鍑哄姏
HdlLogLogic.Current.WriteLog(ex);
-
return null;
}
}
@@ -395,5 +358,6 @@
}
#endregion
+
}
}
--
Gitblit v1.8.0