From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
index aa44917..6d9e61b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
@@ -219,7 +219,7 @@
#elif Android
try
{
- var versionResult = await RequestHttpsAndroidAppVersionAsync();
+ var versionResult = RequestHttpsAndroidAppVersionAsync();
if (versionResult == null)
{
return false;
@@ -255,7 +255,7 @@
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var bytesTotalLengthResult = await CommonPage.Instance.RequestHttpsZigbeeAsync("FirmwareMana/DownloadPlatformUploadFirmwarePreLength", Encoding.UTF8.GetBytes(requestJson));
+ var bytesTotalLengthResult = CommonPage.Instance.RequestHttpsZigbeeAsync("FirmwareMana/DownloadPlatformUploadFirmwarePreLength", Encoding.UTF8.GetBytes(requestJson));
if (bytesTotalLengthResult == null || bytesTotalLengthResult.ResponseData == null)
{
CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.UpdateAppFail);
@@ -354,7 +354,7 @@
/// 鑾峰彇 Android-APP 鐗堟湰淇℃伅
/// </summary>
/// <returns>The https app version async.</returns>
- private async System.Threading.Tasks.Task<Common.ResponseEntity.ApkInfoOBJ> RequestHttpsAndroidAppVersionAsync()
+ private Common.ResponseEntity.ApkInfoOBJ RequestHttpsAndroidAppVersionAsync()
{
try
{
@@ -364,7 +364,7 @@
RequestVersion = CommonPage.CodeIDString
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestOBJ);
- var result = await CommonPage.Instance.RequestHttpsZigbeeAsync("FirmwareMana/DetectionPlatformUploadFirmware", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ var result = CommonPage.Instance.RequestHttpsZigbeeAsync("FirmwareMana/DetectionPlatformUploadFirmware", System.Text.Encoding.UTF8.GetBytes(requestJson));
if (result == null)
{
return null;
--
Gitblit v1.8.0