From d3a9358843b9539017debde289fb38e4fdf26938 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 23 三月 2021 09:18:48 +0800
Subject: [PATCH] 增加新风bus命令
---
HDL_ON/Common/ApiUtlis.cs | 44 +++++++++++++++++++-------------------------
1 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 1517a67..2c87fbc 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -172,28 +172,6 @@
continue;
}
var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
- //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)
{
@@ -202,10 +180,7 @@
}
delFile = localFunction.savePath;
FunctionList.List.DeleteFunction(localFunction);
-
}
-
-
}
//澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
foreach (var newFunction in deviceList.list)
@@ -369,5 +344,24 @@
})
{ IsBackground = true }.Start();
}
+
+ /// <summary>
+ /// 鑾峰彇鍔熻兘淇℃伅
+ /// </summary>
+ public void GetFunctionInfo(string functionId)
+ {
+ var deviceResult = Ins.HttpRequest.GetDeviceInfo(functionId);
+ if (deviceResult.Code == StateCode.SUCCESS)
+ {
+ MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛");
+ var packList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
+
+ foreach(var function in packList.list)
+ {
+ function.SaveFunctionFile();
+ FunctionList.List.IniFunctionList(function.savePath,true);
+ }
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0