From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
index 67d7b61..2dc55c9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
@@ -36,7 +36,7 @@
public void ShowForm(CommonDevice i_deviceAc)
{
this.deviceAc = i_deviceAc;
- this.otaDevice = Common.LocalDevice.Current.GetOTADevice(i_deviceAc.DeviceAddr);
+ this.otaDevice = HdlDeviceCommonLogic.Current.GetOTADevice(i_deviceAc.DeviceAddr);
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAirConditioningModule));
@@ -215,7 +215,7 @@
{
var listUpdate = new List<FirmwareVersionInfo>();
- var list = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.A璁惧, otaDevice.HwVersion.ToString(), otaDevice.ImgTypeId.ToString());
+ var list = HdlFirmwareUpdateLogic.Current.GetFirmwareVersionListInfo(FirmwareLevelType.A璁惧, otaDevice.HwVersion.ToString(), otaDevice.ImgTypeId.ToString());
foreach (var data in list)
{
if (data.Name.EndsWith(".bin") == true)
@@ -227,14 +227,14 @@
if (Common.Config.Instance.Home.TemplateMode == 2 && listUpdate.Count == 0)
{
//浠庢湰鍦拌幏鍙�
- var listFile = HdlFileLogic.Current.GetFileFromDirectory(DirNameResourse.FirmwareUpdateDirectory);
+ var listFile = HdlFileLogic.Current.GetFileFromDirectory(HdlFileNameResourse.FirmwareUpdateDirectory);
string otaKey = otaDevice.HwVersion.ToString() + "_" + otaDevice.ImgTypeId.ToString();
foreach (var file in listFile)
{
if (file.StartsWith("AC_" + otaKey) == true && file.EndsWith(".bin") == true)
{
var info = new FirmwareVersionInfo();
- info.Name = System.IO.Path.Combine(DirNameResourse.FirmwareUpdateDirectory, file);
+ info.Name = System.IO.Path.Combine(HdlFileNameResourse.FirmwareUpdateDirectory, file);
info.ImagType = "-100";
listUpdate.Add(info);
}
@@ -323,12 +323,12 @@
ProgressFormBar.Current.CloseEvent += () =>
{
//鍗囩骇瀵硅薄
- if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(deviceAc.DeviceAddr) == true
- && FirmwareUpdateResourse.dicUpdateList[deviceAc.DeviceAddr].IsFinishUpdate == true)
+ if (HdlFirmwareUpdateResourse.dicUpdateList.ContainsKey(deviceAc.DeviceAddr) == true
+ && HdlFirmwareUpdateResourse.dicUpdateList[deviceAc.DeviceAddr].IsFinishUpdate == true)
{
//濡傛灉璁惧宸茬粡鍗囩骇瀹屾垚锛岀晫闈㈠叧闂椂锛屽垯绉婚櫎鍐呭瓨
- FirmwareUpdateResourse.dicUpdateList[deviceAc.DeviceAddr].Dispose();
- FirmwareUpdateResourse.dicUpdateList.Remove(deviceAc.DeviceAddr);
+ HdlFirmwareUpdateResourse.dicUpdateList[deviceAc.DeviceAddr].Dispose();
+ HdlFirmwareUpdateResourse.dicUpdateList.Remove(deviceAc.DeviceAddr);
}
};
}
--
Gitblit v1.8.0