From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
index 2bdb33a..45aed43 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
@@ -93,24 +93,24 @@
var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.Linux, Pra);
return result;
}
- else if (levelType == FirmwareLevelType.Coordinator)
+ else if (levelType == FirmwareLevelType.A鍗忚皟鍣�)
{
//鍗忚皟鍣ㄦā鍧�
Pra.FirmwareManaFirstType = 1;
Pra.FirmwareManaSecondType = 1;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.Coordinator, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.A鍗忚皟鍣�, Pra);
return result;
}
- else if (levelType == FirmwareLevelType.VirtualDevice)
+ else if (levelType == FirmwareLevelType.A铏氭嫙椹卞姩)
{
//铏氭嫙璁惧妯″潡
Pra.FirmwareManaFirstType = 1;
Pra.FirmwareManaSecondType = 2;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.VirtualDevice, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.A铏氭嫙椹卞姩, Pra);
return result;
}
else
@@ -120,7 +120,7 @@
Pra.FirmwareManaSecondType = null;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.ZigbeeDevice, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.A璁惧, Pra);
return result;
}
}
@@ -332,14 +332,6 @@
//瀹冧笉鏄崌绾у浐浠�, .bin鏄壒娈婄殑
continue;
}
- int testVersion = Convert.ToInt32(verInfo.FirmwareVersion.ToString().PadLeft(6, '0').Substring(2, 2));
- if (testVersion % 2 != 0)
- {
- //涓棿閭ｄ釜byte涓哄鏁版椂锛屼唬琛ㄦ槸娴嬭瘯鐗堟湰,鍦ㄦ樉绀烘渶鏂扮増鏈椂,涓嶉渶瑕佹樉绀猴紝浣嗘槸鍦ㄥ巻鍙茬増鏈偅閲屽彲浠ユ樉绀�
- //涓棿閭ｄ釜byte涓哄伓鏁版椂,浠ｈ〃鏄寮忕増鏈�
- continue;
- }
-
if (verInfo.FirmwareVersion == nowVersion)
{
return verInfo;
@@ -469,7 +461,7 @@
if (fileData != null)
{
//鏈湴瀛樻斁鐨勫浐浠跺師鏉ョ殑鍚嶅瓧(鍥犱负璁惧鍗囩骇鏃�,瀹冮渶瑕佽瘑鍒枃浠跺悕瀛楅噷闈㈠寘鍚殑鐗规畩瀛楃)
- //key:纭欢鐗堟湰_闀滃儚ID_鍥轰欢鐗堟湰 value:鍥轰欢鍘熸潵鐨勫悕瀛�
+ //key:鍏ㄨ矾寰�,纭欢鐗堟湰_闀滃儚ID_鍥轰欢鐗堟湰 value:鍥轰欢鍘熸潵鐨勫悕瀛�
dicFirmwareName = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(fileData);
}
@@ -504,7 +496,7 @@
}
//淇濆瓨鍥轰欢
var saveFile = System.IO.Path.Combine(firmwareDir, versionData.FileDiv + versionData.HwVersion + "_" + versionData.ImageType + "_" + versionData.FirmwareVersion + ".ota");
- HdlFileLogic.Current.SaveTextToFile(saveFile, Encoding.UTF8.GetString(byteData));
+ HdlFileLogic.Current.SaveByteToFile(saveFile, byteData);
dicFirmwareName[saveFile] = versionFirmware.Name;
//杩涘害鍊�
@@ -542,7 +534,7 @@
listVersion.Add(new TemplateDeviceVersion
{
FileDiv = "Device_",
- levelType = FirmwareLevelType.ZigbeeDevice,
+ levelType = FirmwareLevelType.A璁惧,
HwVersion = device.HwVersion.ToString(),
ImageType = device.ImgTypeId.ToString(),
FirmwareVersion = device.ImgVersion
@@ -575,7 +567,7 @@
listVersion.Add(new TemplateDeviceVersion
{
FileDiv = "Coordinator_",
- levelType = FirmwareLevelType.Coordinator,
+ levelType = FirmwareLevelType.A鍗忚皟鍣�,
HwVersion = gateway.CoordinatorHardVersion.ToString(),
ImageType = gateway.CoordinatorImageId.ToString(),
FirmwareVersion = gateway.CoordinatorFirmwareVersion
@@ -596,7 +588,7 @@
listVersion.Add(new TemplateDeviceVersion
{
FileDiv = "DriveCode_",
- levelType = FirmwareLevelType.VirtualDevice,
+ levelType = FirmwareLevelType.A铏氭嫙椹卞姩,
HwVersion = data.DriveHwVersion.ToString(),
ImageType = data.DriveImageType.ToString(),
FirmwareVersion = data.DriveFwVersion
--
Gitblit v1.8.0