【修改内容】1. 添加获取当前时间秒数；2.网关有数据，更新网关时间

【提交人】huang.zhenling

common/hal/HAL_OS_linux.c

@@ -115,6 +115,18 @@ uint64_t HAL_UptimeMs(void)
     return time_ms;
 }
 
+uint64_t HAL_GetTimeMs(void)
+{
+    uint64_t            time_ms;
+    struct timespec     ts;
+
+    clock_gettime(CLOCK_REALTIME, &ts);
+    time_ms = ((uint64_t)ts.tv_sec * (uint64_t)1000) + (ts.tv_nsec / 1000 / 1000);
+
+    return time_ms;
+}
+
+
 char *HAL_GetTimeStr(_IN_ char *buf, _IN_ int len)
 {
     struct timeval tv;

midware/midware/dm/kk_dm_msg.c

@@ -316,7 +316,7 @@ const char DM_MSG_COMBINE_STATUS_ONLINE[] DM_READ_ONLY =
 	 }
  
 	 /* TimeStamp */
-	 HAL_Snprintf(timestamp, DM_UTILS_UINT64_STRLEN, "%llu", (unsigned long long)HAL_UptimeMs());
+	 HAL_Snprintf(timestamp, DM_UTILS_UINT64_STRLEN, "%llu", (unsigned long long)HAL_GetTimeMs());
 	 /* dm_log_debug("Time Stamp: %s", timestamp); */
  
 
@@ -360,7 +360,7 @@ int dm_msg_status_offline(_IN_ char productCode[PRODUCT_CODE_MAXLEN],
    }
 
    /* TimeStamp */
-   HAL_Snprintf(timestamp, DM_UTILS_UINT64_STRLEN, "%llu", (unsigned long long)HAL_UptimeMs());
+   HAL_Snprintf(timestamp, DM_UTILS_UINT64_STRLEN, "%llu", (unsigned long long)HAL_GetTimeMs());
    /* dm_log_debug("Time Stamp: %s", timestamp); */
 
 
@@ -406,7 +406,7 @@ int dm_msg_combine_login(_IN_ char productCode[PRODUCT_CODE_MAXLEN],
     }
 
     /* TimeStamp */
-    HAL_Snprintf(timestamp, DM_UTILS_UINT64_STRLEN, "%llu", (unsigned long long)HAL_UptimeMs());
+    HAL_Snprintf(timestamp, DM_UTILS_UINT64_STRLEN, "%llu", (unsigned long long)HAL_GetTimeMs());
     /* dm_log_debug("Time Stamp: %s", timestamp); */
 
     /* Client ID */
@@ -543,7 +543,7 @@ int dm_msg_request (_IN_ dm_msg_request_t *request)
     }
     memset(payload, 0, payload_len);
     snprintf(payload, payload_len, DM_MSG_REQUEST, request->msgid,
-                 DM_MSG_VERSION, request->params,HAL_UptimeMs(), request->method);
+                 DM_MSG_VERSION, request->params,HAL_GetTimeMs(), request->method);
 
 	req_info_len = strlen(DM_MSG_INFO)+10+strlen(request->productCode)+strlen(request->deviceCode)+strlen(request->msgTypeStr)+1;
     req_info = malloc(req_info_len);

midware/midware/midware.c

@@ -180,7 +180,7 @@ void kk_platMsg_handle(void* data, char* chalMark){
         info = cJSON_GetObjectItem(json, "info");
 		payload = cJSON_GetObjectItem(json, "payload");
 		if (info == NULL || payload == NULL){
-            ERROR_PRINT("info or payload params is error\n");
+            ERROR_PRINT("info or payload params error\n");
             goto error;
 		}
 
@@ -194,6 +194,10 @@ void kk_platMsg_handle(void* data, char* chalMark){
             goto error;
 		}
 
+        if (chalMark != NULL){
+		    dm_mgr_update_timestamp_by_devicecode(chalMark,HAL_UptimeMs());
+		}
+
         dm_mgr_update_timestamp_by_devicecode(info_dcode->valuestring,HAL_UptimeMs());
 		
         if (strcmp(msgType->valuestring, "/thing/topo/add")==0){