From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
index d92d8ae..67d7b61 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
@@ -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.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(DirNameResourse.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.ImagType = "-100";
+ listUpdate.Add(info);
+ }
+ }
+ }
+
+ return listUpdate;
+ }
+
+ #endregion
+
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
--
Gitblit v1.8.0