From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
index e1f7466..124ab42 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
@@ -45,7 +45,7 @@
/// </summary>
public AbountForm()
{
-
+
}
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
@@ -180,7 +180,7 @@
UpdateVersion();
};
-
+
updatingBtn = new Button()
{
Y = Application.GetRealHeight(994),
@@ -194,7 +194,7 @@
Gravity=Gravity.CenterHorizontal
};
bodyFrameLayout.AddChidren(updatingBtn);
-
+
SetDownLoadBtnNoVisible();
CheckVersion();
}
@@ -247,7 +247,6 @@
#if iOS
try
{
- CommonPage.Loading.Start();
var versionResult = await RequestHttpsiOSAppVersionAsync();
if (versionResult == null || versionResult.Results == null)
{
@@ -264,14 +263,13 @@
{
return true;
}
- retuun false;
+ return false;
}
catch
{
- return false;
-
+ return false;
}
-
+
#elif Android
try
{
@@ -300,7 +298,7 @@
private async void UpdateVersion()
{
#if iOS
- CommonPage.Instance.OpenUrl();
+ OpenUrl();
#elif Android
try
{
@@ -351,7 +349,7 @@
/// 鑾峰彇iOS-APP鐗堟湰淇℃伅
/// </summary>
/// <returns>The https app version async.</returns>
- public async System.Threading.Tasks.Task<ResponseEntity.ResultPack> RequestHttpsiOSAppVersionAsync()
+ public async System.Threading.Tasks.Task<Common.ResponseEntity.ResultPack> RequestHttpsiOSAppVersionAsync()
{
try
{
@@ -361,7 +359,7 @@
{
return null;
}
- return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponseEntity.ResultPack>(Encoding.UTF8.GetString(result));
+ return Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResultPack>(Encoding.UTF8.GetString(result));
}
catch
{
--
Gitblit v1.8.0