From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
index a1c6fb9..776aac3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
@@ -18,38 +18,33 @@
public static void DoUpdateNextFirmware()
{
//涓嬩竴涓鎵ц鏇存柊鐨勭綉鍏�
- HdlGatewayUpdateLogic gwControl = null;
- foreach (var contr in FirmwareUpdateResourse.dicGatewayUpdateList.Values)
+ HdlDeviceUpdateCommonLogic gwControl = null;
+ //涓嬩竴涓鎵ц鏇存柊鐨勮澶�
+ HdlDeviceUpdateCommonLogic deviceControl = null;
+ foreach (var contr in FirmwareUpdateResourse.dicUpdateList.Values)
{
//濡傛灉鍒殑杩樺湪鍗囩骇涓�,鍒欎笉鍐嶅鐞�
if (contr.IsFinishUpdate == false)
{
return;
}
- //濡傛灉杩欎釜缃戝叧鏄湪绛夊緟鍒楄〃鐨勮瘽
+ //濡傛灉杩欎釜鍦ㄧ瓑寰呭垪琛ㄧ殑璇�
if (contr.UpdateStatu == UpdateStatuMode.Wait && gwControl == null)
{
- //涓嬩竴涓崌绾х殑灏辨槸瀹冧簡
- gwControl = contr;
+ if (contr.ClassDiv == 1 && gwControl == null)
+ {
+ //涓嬩竴涓崌绾х殑灏辨槸瀹冧簡
+ gwControl = contr;
+ }
+ else if (contr.ClassDiv == 2 && deviceControl == null)
+ {
+ //涓嬩竴涓崌绾х殑灏辨槸瀹冧簡
+ deviceControl = contr;
+ }
}
}
- HdlDeviceUpdateLogic deviceControl = null;
- foreach (var contr in FirmwareUpdateResourse.dicDeviceUpdateList.Values)
- {
- //濡傛灉鍒殑杩樺湪鍗囩骇涓�,鍒欎笉鍐嶅鐞�
- if (contr.IsFinishUpdate == false)
- {
- return;
- }
- //濡傛灉杩欎釜璁惧鏄湪绛夊緟鍒楄〃鐨勮瘽
- if (contr.UpdateStatu == UpdateStatuMode.Wait && deviceControl == null)
- {
- //涓嬩竴涓崌绾х殑灏辨槸瀹冧簡
- deviceControl = contr;
- }
- }
- HdlThreadLogic.Current.RunMain(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
if (gwControl != null)
{
@@ -218,6 +213,11 @@
FirmwareVersionInfo newFirInfo = null;
foreach (var verInfo in listdata)
{
+ if (verInfo.Name.EndsWith(".bin") == true)
+ {
+ //瀹冧笉鏄崌绾у浐浠�, .bin鏄壒娈婄殑
+ continue;
+ }
if (verInfo.FirmwareVersion > nowVersion)
{
nowVersion = verInfo.FirmwareVersion;
--
Gitblit v1.8.0