From e1ac4ab0e68024e6289e0b11756962d662749b04 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:15:23 +0800
Subject: [PATCH] Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC"
---
HDL_ON/Entity/FunctionList.cs | 37 ++++++-------------------------------
1 files changed, 6 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 0d05bdb..8d83075 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -41,7 +41,7 @@
/// <returns></returns>
public List<Function> GetAcList()
{
- return Functions.FindAll((obj) => obj.spk == SPK.AcStandard || obj.spk == SPK.AcIr);
+ return Functions.FindAll((obj) => obj.spk == SPK.AcStandard);
}
/// <summary>
@@ -97,21 +97,11 @@
return Functions.FindAll((obj) => obj.spk == SPK.ElectricFan || obj.spk == SPK.ElectricTuyaFan
|| obj.spk == SPK.ElectricSocket
- || obj.spk == SPK.IrLearn
- || obj.spk == SPK.TvIr
|| obj.spk == SPK.ElectricTV
|| obj.spk == SPK.ElectricTuyaAirCleaner
|| obj.spk == SPK.ElectricTuyaWeepRobot
|| obj.spk == SPK.ElectricTuyaWaterValve
|| obj.spk == SPK.ClothesHanger);
- }
- /// <summary>
- /// 閬ユ帶鍣ㄥ垪琛�
- /// </summary>
- /// <returns></returns>
- public List<Function> GetIrLearinList()
- {
- return Functions.FindAll((obj) => obj.spk == SPK.IrLearn);
}
/// <summary>
/// 椋庢墖鍒楄〃
@@ -125,7 +115,7 @@
/// </summary>
public List<Function> GetTVList()
{
- return Functions.FindAll((obj) => obj.spk == SPK.ElectricTV || obj.spk == SPK.TvIr);
+ return Functions.FindAll((obj) => obj.spk == SPK.ElectricTV);
}
/// <summary>
/// 瀹剁數鎻掑骇鍒楄〃
@@ -201,11 +191,7 @@
/// 鍔犺浇鍔熻兘鍒楄〃
/// </summary>
/// <param name="filePath"></param>
- /// <param name="checkRepeat">
- /// <para>鑰冭檻鍒版�ц兘闂杩藉姞姝ゅ彉閲�,鏄惁妫�娴嬮噸澶�,鍙function鏈夋晥</para>
- /// <para>true:褰撻噸澶嶅瓨鍦ㄦ椂,鏇挎崲鎺�</para>
- /// <para>false:鐩存帴鏃犳潯浠舵坊鍔�</para></param>
- public void IniFunctionList(string filePath, bool checkRepeat = false)
+ public void IniFunctionList(string filePath)
{
// todo 澧炲姞璁惧锛屽鍔犲姛鑳借繘鍔熻兘鍒楄〃
if (filePath.StartsWith("FunctionData_"))
@@ -218,21 +204,10 @@
FileUtlis.Files.DeleteFile(filePath);
return;
}
- if (checkRepeat == true)
- {
- //妫�娴嬮噸澶�
- for (int i = 0; i < Functions.Count; i++)
- {
- if (Functions[i].deviceId == tempFunction.deviceId)
- {
- //鍏堢Щ闄ゆ帀鍐嶅姞
- Functions.RemoveAt(i);
- Functions.Add(tempFunction);
- return;
- }
- }
- }
+
+
Functions.Add(tempFunction);
+
}
if (filePath.StartsWith("SceneData_"))
{
--
Gitblit v1.8.0