From f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 13:32:33 +0800
Subject: [PATCH] 2019-12-30-1
---
ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
index afe3f2f..824b65f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
@@ -10,7 +10,7 @@
/// <summary>
/// 鍏充簬鐨勭敾闈�
/// </summary>
- public class AbountForm : UserCenterCommonForm
+ public class AbountForm : EditorCommonForm
{
#region **鍙橀噺*****************************
/// <summary>
@@ -53,20 +53,20 @@
{
instance = this;
}
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- public void ShowForm()
- {
- //璁剧疆鏍囬淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uVersionInformation));
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
- }
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
+ {
+ //璁剧疆鏍囬淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uVersionInformation));
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ }
/// <summary>
/// Closes the form.
/// </summary>
- public override void CloseForm(bool isCloseForm = true)
+ public override void CloseFormBefore()
{
#if Android
if(isUpdating==true)
@@ -80,7 +80,7 @@
updateBtn.Visible = true;
SetDownLoadBtnNoVisible();
CommonPage.CancelDownLoadApkAsync();
- base.CloseForm(isCloseForm);
+ base.CloseFormBefore();
}
else
{
@@ -91,16 +91,16 @@
else
{
Phone.UserView.HomePage.Instance.ScrollEnabled = true;
- base.CloseForm(isCloseForm);
+ base.CloseFormBefore();
}
#elif iOS
- base.CloseForm(isCloseForm);
+ base.CloseFormBefore();
#endif
}
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame()
{
var logoBtn = new Button()
{
@@ -289,7 +289,7 @@
CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.UpdateAppFail);
return;
}
- if (versionResult.FirmwareVersion != CommonPage.CodeIDString)
+ if (int.Parse(versionResult.FirmwareVersion.Replace(".","")) > int.Parse(CommonPage.CodeIDString.Replace(".","")))
{
var alert = new Alert(Language.StringByID(R.MyInternationalizationString.UpdateContent), versionResult.Remarks, Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
alert.Show();
--
Gitblit v1.8.0