From 82a773d1783549caca563831aac8affc059deedf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 10:56:13 +0800
Subject: [PATCH] 合并了全部的代码，IOS 图片需要从新引入工程
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
index 4f3dfb9..2649cd1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
@@ -141,30 +141,29 @@
//鏇存柊鐘舵�佸彉鍖栫殑浜嬩欢
updateLogic.UpdateStatuChangedEvent += (div, msg) =>
{
- if (div == -1)
+ HdlThreadLogic.Current.RunMain(() =>
{
- //寮傚父
- this.ShowMassage(ShowMsgType.Tip, msg);
- this.CloseForm();
- }
- else if (div == 0)
- {
- //涓�鑸俊鎭�
- btnText.Text = msg;
- }
- else if (div == 1)
- {
- //鍗囩骇瀹屾垚
- this.ShowMassage(ShowMsgType.Tip, msg);
- //璋冪敤鍥炶皟鍑芥暟
- this.FinishUpdateEvent?.Invoke();
- this.CloseForm();
- }
- else if (div == 2)
- {
- //涓诲姩缁堟鍗囩骇
- this.CloseForm();
- }
+ if (div == -1)
+ {
+ //寮傚父
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ this.CloseForm();
+ }
+ else if (div == 0)
+ {
+ //涓�鑸俊鎭�
+ btnText.Text = msg;
+ }
+ else if (div == 1)
+ {
+ //鍗囩骇瀹屾垚
+ btnText.Text = msg;
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ //璋冪敤鍥炶皟鍑芥暟
+ this.FinishUpdateEvent?.Invoke();
+ this.CloseForm();
+ }
+ });
};
//杩涘害鍊兼敼鍙樹簨浠�
updateLogic.ProgressEvent += (value) =>
@@ -172,12 +171,12 @@
Application.RunOnMainThread(() =>
{
//杩涘害鏉�
- decimal result = value / 100;
- int width = (int)(result * ProRowWidth);
+ int width = (int)(value * ProRowWidth);
btnProgressBar.Width = width;
//鏂囨湰鏄剧ず
- btnProgressView.Text = value + "%";
+ int persent = (int)(value * 100);
+ btnProgressView.Text = persent + "%";
//鏂囨湰鏄剧ず鐨勯偅涓浘鐗囨绉诲姩
frameProgress.X = ControlCommonResourse.XXLeft + btnProgressBar.Right - frameProgress.Width / 2;
});
--
Gitblit v1.8.0