From c047239d340038cea872bae276e713ef866c0a34 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 02 三月 2021 13:22:21 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/Common/ApiUtlis.cs | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 605a3b4..3141f5d 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -159,6 +159,7 @@
{
deviceList = new DevcieApiPack();
}
+ string delFile = "";
if (FunctionList.List.GetDeviceFunctionList().Count > 0)
{
@@ -171,34 +172,43 @@
continue;
}
var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
- if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
+ //if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
+ //{
+ // FunctionList.List.DeleteFunction(localFunction);
+ //}
+ //else
+ //{
+ // MainPage.Log($"deviceType:{localFunction.spk} local:{localFunction.modifyTime} server:{newFunction.modifyTime}");
+ // i++;
+ // //if (localFunction.modifyTime != newFunction.modifyTime)
+ // //{
+ // // //鍙紭鍖�
+ // // localFunction.name = newFunction.name;
+ // // localFunction.collect = newFunction.collect;
+ // // localFunction.modifyTime = newFunction.modifyTime;
+ // // localFunction.roomIds = newFunction.roomIds;
+ // // localFunction.bus = newFunction.bus;
+ // // localFunction.SaveFunctionFile();
+ // //}
+ // localFunction = newFunction;
+ // localFunction.SaveFunctionFile();
+ // deviceList.list.Remove(newFunction);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
+ //}
+
+ if (delFile == localFunction.savePath)
{
- FunctionList.List.DeleteFunction(localFunction);
- }
- else
- {
- MainPage.Log($"deviceType:{localFunction.spk} local:{localFunction.modifyTime} server:{newFunction.modifyTime}");
i++;
- //if (localFunction.modifyTime != newFunction.modifyTime)
- //{
- // //鍙紭鍖�
- // localFunction.name = newFunction.name;
- // localFunction.collect = newFunction.collect;
- // localFunction.modifyTime = newFunction.modifyTime;
- // localFunction.roomIds = newFunction.roomIds;
- // localFunction.bus = newFunction.bus;
- // localFunction.SaveFunctionFile();
- //}
- localFunction = newFunction;
- localFunction.SaveFunctionFile();
- deviceList.list.Remove(newFunction);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
+ continue;
}
+ delFile = localFunction.savePath;
+ FunctionList.List.DeleteFunction(localFunction);
+
}
}
//澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
- foreach (var newFunction in deviceList.list)
+ foreach (var newFunction in deviceList.list)
{
newFunction.SaveFunctionFile();
FunctionList.List.IniFunctionList(newFunction.savePath);
--
Gitblit v1.8.0