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 | 82 +++++++++++++++++++++++++++++++++++++----
1 files changed, 74 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
index 335f45b..67d7b61 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
@@ -19,7 +19,7 @@
/// <summary>
/// 璁惧
/// </summary>
- private AC deviceAc = null;
+ private CommonDevice deviceAc = null;
/// <summary>
/// 鍓嶅洖閫夋嫨鐨勬帶浠�
/// </summary>
@@ -33,7 +33,7 @@
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
/// <param name="i_deviceAc">璁惧</param>
- public void ShowForm(AC i_deviceAc)
+ public void ShowForm(CommonDevice i_deviceAc)
{
this.deviceAc = i_deviceAc;
this.otaDevice = Common.LocalDevice.Current.GetOTADevice(i_deviceAc.DeviceAddr);
@@ -77,8 +77,8 @@
/// </summary>
private void InitAirConditioningModuleList(VerticalListControl listView)
{
- var list = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.ZigbeeDevice, otaDevice.HwVersion.ToString(), otaDevice.ImgTypeId.ToString());
- if (list.Count == 0)
+ var listUpdate = this.GetAirConditioningModuleData();
+ if (listUpdate.Count == 0)
{
//娌℃湁鍙崌绾х殑绌鸿皟妯″潡
this.ShowNotDataImage(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uNotHadAirConditioningUpdateModule));
@@ -86,10 +86,10 @@
}
HdlThreadLogic.Current.RunMainInThread(() =>
{
- for (int i = 0; i < list.Count; i++)
+ for (int i = 0; i < listUpdate.Count; i++)
{
//娣诲姞妯″潡琛�
- this.AddModuleRow(listView, list[i], i.ToString(), i != list.Count - 1);
+ this.AddModuleRow(listView, listUpdate[i], i.ToString(), i != listUpdate.Count - 1);
}
//璋冩暣楂樺害
listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23));
@@ -100,7 +100,7 @@
bodyFrameLayout.AddChidren(btnUpdate);
btnUpdate.ButtonClickEvent += (sender, e) =>
{
- var selectInfo = this.GetSelectFirmware(listView, list);
+ var selectInfo = this.GetSelectFirmware(listView, listUpdate);
if (selectInfo == null)
{
//娌℃湁閫夋嫨鍥轰欢
@@ -121,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);
@@ -170,6 +170,31 @@
//閲嶅伐绌鸿皟妯″潡
textView = Language.StringByID(R.MyInternationalizationString.uHicAirConditioningModule);
}
+ else if (info.Name.Contains("IRACC_HITACHI") == true)
+ {
+ //鏃ョ珛绌鸿皟妯″潡
+ textView = Language.StringByID(R.MyInternationalizationString.uHitachiAirConditioningModule);
+ }
+ else if (info.Name.Contains("IRACC_SAEC") == true)
+ {
+ //鐢垫満绌鸿皟妯″潡
+ textView = Language.StringByID(R.MyInternationalizationString.uSaecAirConditioningModule);
+ }
+ else if (info.Name.Contains("IRACC_TOSHIBA") == true)
+ {
+ //涓滆姖绌鸿皟妯″潡
+ textView = Language.StringByID(R.MyInternationalizationString.uToshibaAirConditioningModule);
+ }
+ else if (info.Name.Contains("IRACC_GREE") == true)
+ {
+ //鏍煎姏绌鸿皟妯″潡
+ textView = Language.StringByID(R.MyInternationalizationString.uGreeAirConditioningModule);
+ }
+ else if (info.Name.Contains("IRACC_MIDEA") == true)
+ {
+ //缇庣殑绌鸿皟妯″潡
+ textView = Language.StringByID(R.MyInternationalizationString.uMideaAirConditioningModule);
+ }
else
{
//绌鸿皟鍗囩骇妯″潡
@@ -180,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