From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
index d92d8ae..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));
@@ -77,16 +77,7 @@
/// </summary>
private void InitAirConditioningModuleList(VerticalListControl listView)
{
- var list = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.A璁惧, otaDevice.HwVersion.ToString(), otaDevice.ImgTypeId.ToString());
- var listUpdate = new List<FirmwareVersionInfo>();
- foreach (var data in list)
- {
- if (data.Name.EndsWith(".bin") == true)
- {
- //鍙.bin鏂囦欢
- listUpdate.Add(data);
- }
- }
+ var listUpdate = this.GetAirConditioningModuleData();
if (listUpdate.Count == 0)
{
//娌℃湁鍙崌绾х殑绌鸿皟妯″潡
@@ -130,7 +121,7 @@
/// <param name="listView"></param>
/// <param name="info"></param>
/// <param name="mainkeys"></param>
- private void AddModuleRow(VerticalListControl listView, FirmwareVersionInfo info, string mainkeys,bool addLine)
+ private void AddModuleRow(VerticalListControl listView, FirmwareVersionInfo info, string mainkeys, bool addLine)
{
//鑾峰彇绌鸿皟妯″潡鐨勫悕瀛�
string textView = this.GetAirConditioningModuleName(info);
@@ -214,6 +205,47 @@
#endregion
+ #region 鈻� 鑾峰彇绌鸿皟妯″潡鏁版嵁___________________
+
+ /// <summary>
+ /// 鑾峰彇绌鸿皟妯″潡鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ private List<FirmwareVersionInfo> GetAirConditioningModuleData()
+ {
+ var listUpdate = new List<FirmwareVersionInfo>();
+
+ var list = HdlFirmwareUpdateLogic.Current.GetFirmwareVersionListInfo(FirmwareLevelType.A璁惧, otaDevice.HwVersion.ToString(), otaDevice.ImgTypeId.ToString());
+ foreach (var data in list)
+ {
+ if (data.Name.EndsWith(".bin") == true)
+ {
+ //鍙.bin鏂囦欢
+ listUpdate.Add(data);
+ }
+ }
+ if (Common.Config.Instance.Home.TemplateMode == 2 && listUpdate.Count == 0)
+ {
+ //浠庢湰鍦拌幏鍙�
+ 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(HdlFileNameResourse.FirmwareUpdateDirectory, file);
+ info.ImagType = "-100";
+ listUpdate.Add(info);
+ }
+ }
+ }
+
+ return listUpdate;
+ }
+
+ #endregion
+
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
@@ -291,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