From c0379d078e7919c9934085da038e8e3c20dee85a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 25 二月 2021 19:26:06 +0800
Subject: [PATCH] 2021-02-25 1.增加语音设备选择。2.增加场景全量更新上传。
---
Crabtree/SmartHome/HDL/Common/HDLLinkUtlis.cs | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Common/HDLLinkUtlis.cs b/Crabtree/SmartHome/HDL/Common/HDLLinkUtlis.cs
index 0359a0d..ca01b81 100644
--- a/Crabtree/SmartHome/HDL/Common/HDLLinkUtlis.cs
+++ b/Crabtree/SmartHome/HDL/Common/HDLLinkUtlis.cs
@@ -72,7 +72,7 @@
public static long ConvertDateTimeLong ()
{
System.DateTime startTime = TimeZoneInfo.ConvertTimeToUtc (new System.DateTime (2020, 1, 1));
- long l = (long)(Math.Round ((DateTime.Now - startTime).TotalSeconds, 1) * 10);
+ long l = (long)(Math.Round ((DateTime.Now - startTime).TotalMilliseconds, 1) / 10);
if (l <= LastTime) l = LastTime + 1;
LastTime = l;
return l;
@@ -134,14 +134,10 @@
hdlLinkSceneList.Add (mHDLLinkScene);
}
}
- //2.涓婁紶鍦烘櫙
- //2.1涓嶅瓨鍦紝闇�瑕佹柊涓婁紶鐨�
+
+ //鍏ㄩ噺鍚屾鍦烘櫙
res = UploadSceneList (hdlLinkSceneList);
- //2.2宸插瓨鍦紝闇�瑕佹洿鏂扮殑
- //if (res) {
- // var updateLinkSceneList = new List<HDLLinkScene> ();
- // res = UploadSceneList (updateLinkSceneList);
- //}
+
} catch (Exception ex){
Utlis.WriteLine ("catch :" + ex.ToString ());
@@ -205,14 +201,14 @@
}
/// <summary>
- ///
+ /// 鍏ㄩ噺鍚屾鍦烘櫙
/// </summary>
/// <param name="mScene"></param>
bool UploadSceneList (List<HDLLinkScene> hdlLinkSceneList)
{
var res = false;
try {
- var revertObj = HttpServerRequest.Current.AddScene (hdlLinkSceneList);
+ var revertObj = HttpServerRequest.Current.SecneSyncList (hdlLinkSceneList);
if (revertObj.Code == StateCode.SUCCESS) {
res = true;
} else {
@@ -736,11 +732,11 @@
functionLists.AddRange (ConvertToSidListToIotCloud (tmpOid.oid, tmp));
- Utlis.WriteLine ("鏂扮殑妯″潡锛屾柊鐨勭殑OID锛�" + tmpOid.addresses + " deviceType:" + tmpOid.deviceType);
+ //Utlis.WriteLine ("鏂扮殑妯″潡锛屾柊鐨勭殑OID锛�" + tmpOid.addresses + " deviceType:" + tmpOid.deviceType);
} else {
//3.2瀛樺湪鍒欏彇涔嬪墠鐨刼id
functionLists.AddRange (ConvertToSidListToIotCloud (deviceOid.oid, tmp));
- Utlis.WriteLine ("鐩稿悓鐨勬ā鍧楋紝鍙栦箣鍓嶇殑OID锛�" + deviceOid.addresses + " deviceType:" + deviceOid.deviceType);
+ //Utlis.WriteLine ("鐩稿悓鐨勬ā鍧楋紝鍙栦箣鍓嶇殑OID锛�" + deviceOid.addresses + " deviceType:" + deviceOid.deviceType);
}
}
--
Gitblit v1.8.0