From 6cbd0936d3245fd7c433884ac9c1f5448a7cf657 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 13 十二月 2019 13:49:44 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Common/CommonPage.cs | 150 -------------------------------------------------
1 files changed, 1 insertions(+), 149 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 6e16115..e9bbe31 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -168,10 +168,7 @@
/// 鐢ㄤ簬楠岃瘉閭姝ｅ垯琛ㄨ揪寮�
/// </summary>
public static string EmailRegexStr = "^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$";
- /// <summary>
- /// 涓嬭浇瀹夊崜apk鐨刡yte闀垮害
- /// </summary>
- public static long ApkBytesTotalLength = 0;
+
//public static Encoding EncodingUTF8 = Encoding.UTF8;
//public static Encoding EncodingGB2312 = Encoding.GetEncoding("gb2312");
@@ -332,152 +329,7 @@
return null;
}
}
-#if iOS
- /// <summary>
- /// 鑾峰彇iOS-APP鐗堟湰淇℃伅
- /// </summary>
- /// <returns>The https app version async.</returns>
- public async System.Threading.Tasks.Task<ResponseEntity.ResultPack> RequestHttpsiOSAppVersionAsync()
- {
- try
- {
- var webClient = new WebClient { };
- var result = await webClient.DownloadDataTaskAsync("https://itunes.apple.com/lookup?id=1461693569");
- if (result == null)
- {
- return null;
- }
- return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponseEntity.ResultPack>(Encoding.UTF8.GetString(result));
- }
- catch
- {
- return null;
- }
- }
- /// <summary>
- /// 璺宠浆鍒癆PP Store
- /// </summary>
- public void OpenUrl()
- {
- Uri url = new Uri("https://itunes.apple.com/cn/app/hdl-home/id1461693569?mt=8");
- UIKit.UIApplication.SharedApplication.OpenUrl(url);
- }
-#elif Android
- /// <summary>
- /// 鑾峰彇 Android-APP 鐗堟湰淇℃伅
- /// </summary>
- /// <returns>The https app version async.</returns>
- public async System.Threading.Tasks.Task<ResponseEntity.ApkInfoOBJ> RequestHttpsAndroidAppVersionAsync()
- {
- try
- {
- var requestOBJ = new SendDataToServer.GetAndroidApkInfoOBJ
- {
- Name = "ZigbeeApp",
- RequestVersion = CodeIDString
- };
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestOBJ);
- var result = await RequestHttpsZigbeeAsync("FirmwareMana/DetectionPlatformUploadFirmware", System.Text.Encoding.UTF8.GetBytes(requestJson));
- if (result == null)
- {
- return null;
- }
- if (result.StateCode.ToUpper() == "SUCCESS")
- {
- if (result.ResponseData == null)
- {
- return null;
- }
- var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponseEntity.ApkInfoRes>(result.ResponseData.ToString());
- if (responeData == null || responeData.pageData == null || responeData.pageData.Count == 0)
- {
- return null;
- }
- int MaxIndex = 0;
- int NewVersion = 0;
- for (int i = 0; i < responeData.pageData.Count; i++)
- {
- var apkInfo = responeData.pageData[i];
- var version = int.Parse(apkInfo.FirmwareVersion.Replace(".", ""));
- if (version > NewVersion)
- {
- NewVersion = version;
- MaxIndex = i;
- }
- }
- return responeData.pageData[MaxIndex];
- }
- return null;
- }
- catch (Exception ex)
- {
- return null;
- }
- }
-
- /// <summary>
- /// 涓嬭浇瀹夎apk
- /// </summary>
- /// <returns>The load apk async.</returns>
- /// <param name="requestUrl">璇锋眰閾炬帴</param>
- /// <param name="byteData">璇锋眰鍙傛暟</param>
- public System.Threading.Tasks.Task<byte[]> DownLoadApkAsync(string requestUrl, byte[] byteData)
- {
- try
- {
- AbountForm.instance.webClient.Headers.Add(HttpRequestHeader.ContentType, "application/json");
- AbountForm.instance.webClient.Headers.Add(HttpRequestHeader.Authorization, Config.Instance.Token);
- AbountForm.instance.webClient.UploadProgressChanged += Client_DownloadProgressChanged;
- AbountForm.instance.webClient.UploadDataCompleted += Client_UploadCompleted;
- var result = AbountForm.instance.webClient.UploadDataTaskAsync($"{RequestHttpsHost}/{requestUrl}", "POST", byteData);
- if (result == null)
- {
- return null;
- }
- return result;
- }
- catch (Exception ex)
- {
- return null;
- }
- finally
- {
- }
- }
- /// <summary>
- /// apk涓嬭浇杩涘害
- /// </summary>
- /// <param name="sender">Sender.</param>
- /// <param name="e">E.</param>
- void Client_DownloadProgressChanged(object sender, UploadProgressChangedEventArgs e)
- {
- System.Console.WriteLine($"褰撳墠杩涘害--{(int)(e.BytesReceived / (float)ApkBytesTotalLength * 100)} % --BytesReceived--{e.BytesReceived}--totalByte{e.TotalBytesToReceive}");
- if (e.BytesReceived <= ApkBytesTotalLength)
- {
- Application.RunOnMainThread(() =>
- {
- //Loading.Start($"{(int)(e.BytesReceived / (float)ApkBytesTotalLength * 100)} %");
- AbountForm.instance.seekBar.Progress = (int)(e.BytesReceived / (float)ApkBytesTotalLength * 100);
- AbountForm.instance.seekBarTitle.Text = $"{(int)(e.BytesReceived / (float)ApkBytesTotalLength * 100)}%";
- });
- }
- }
- void Client_UploadCompleted(object sender, UploadDataCompletedEventArgs e)
- {
- System.Console.WriteLine("涓嬭浇apk瀹屾垚");
- //Application.RunOnMainThread(Loading.Hide);
- }
- /// <summary>
- /// 鍙栨秷涓嬭浇apk
- /// </summary>
- public static void CancelDownLoadApkAsync()
- {
- AbountForm.instance.webClient?.CancelAsync();
- System.Console.WriteLine("鍙栨秷涓嬭浇apk");
- }
-
-#endif
/// <summary>
/// 鏈嶅姟鍣ㄨ幏鍙栨暟鎹け璐ユ彁绀�
/// </summary>
--
Gitblit v1.8.0