From 404cdc88627f942df7944af04ee05b9d527752d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 九月 2019 13:22:40 +0800
Subject: [PATCH] 合并了徐梅的按键面板绑定
---
ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
index afe3f2f..9dd6fd2 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>
@@ -66,7 +66,7 @@
/// <summary>
/// Closes the form.
/// </summary>
- public override void CloseForm(bool isCloseForm = true)
+ public override void CloseForm()
{
#if Android
if(isUpdating==true)
@@ -80,7 +80,7 @@
updateBtn.Visible = true;
SetDownLoadBtnNoVisible();
CommonPage.CancelDownLoadApkAsync();
- base.CloseForm(isCloseForm);
+ base.CloseForm();
}
else
{
@@ -91,10 +91,10 @@
else
{
Phone.UserView.HomePage.Instance.ScrollEnabled = true;
- base.CloseForm(isCloseForm);
+ base.CloseForm();
}
#elif iOS
- base.CloseForm(isCloseForm);
+ base.CloseForm();
#endif
}
/// <summary>
@@ -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