From cbe51169d0accacf5992794132ebfc2ae2d17efb Mon Sep 17 00:00:00 2001
From: JackSun <jack.sun@quectel.com>
Date: Thu, 26 May 2022 14:28:09 +0800
Subject: [PATCH] update: gps sleep method

---
 code/modules                                  |  2 +-
 code/tracker_collector.py                     |  3 +-
 object_model_demo/ali_cloud_object_model.json |  8 ++---
 .../quec_cloud_object_model.json              | 34 +++++++++----------
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/code/modules b/code/modules
index 853e2cc..a35456c 160000
--- a/code/modules
+++ b/code/modules
@@ -1 +1 @@
-Subproject commit 853e2ccafe0a6a715bfd86f4134759ecdbf00c16
+Subproject commit a35456c05c1115b5f8e63c1208b77f649d97d8a3
diff --git a/code/tracker_collector.py b/code/tracker_collector.py
index 95d899a..df709ab 100644
--- a/code/tracker_collector.py
+++ b/code/tracker_collector.py
@@ -189,7 +189,7 @@ class Collector(Singleton):
     def __locator_gps_hibernation_strategy(self, onoff):
         """Set GPS sleep"""
         current_settings = settings.get()
-        work_cycle_period = current_settings["UserConfig"]["work_cycle_period"]
+        work_cycle_period = current_settings["user_cfg"]["work_cycle_period"]
         if self.__locator.gps:
             if work_cycle_period >= 3600:
                 self.__locator.gps.power_switch(onoff)
@@ -412,6 +412,7 @@ class Collector(Singleton):
         device_data = {
             "power_switch": power_switch,
             "local_time": self.__get_local_time(),
+            "gps_mode": current_settings["LocConfig"]["gps_mode"],
         }
 
         # Get ota status & drive behiver code
diff --git a/object_model_demo/ali_cloud_object_model.json b/object_model_demo/ali_cloud_object_model.json
index bd60af4..e4c497a 100644
--- a/object_model_demo/ali_cloud_object_model.json
+++ b/object_model_demo/ali_cloud_object_model.json
@@ -617,7 +617,7 @@
       "dataType": {
         "type": "int",
         "specs": {
-          "min": "0",
+          "min": "3600",
           "max": "2147483647",
           "unit": "s",
           "unitName": "秒",
@@ -1203,7 +1203,7 @@
           "dataType": {
             "type": "int",
             "specs": {
-              "min": "0",
+              "min": "3600",
               "max": "2147483647",
               "unit": "s",
               "unitName": "秒",
@@ -1556,7 +1556,7 @@
           "dataType": {
             "type": "int",
             "specs": {
-              "min": "0",
+              "min": "3600",
               "max": "2147483647",
               "unit": "s",
               "unitName": "秒",
@@ -2173,7 +2173,7 @@
           "dataType": {
             "type": "int",
             "specs": {
-              "min": "0",
+              "min": "3600",
               "max": "2147483647",
               "unit": "s",
               "unitName": "秒",
diff --git a/object_model_demo/quec_cloud_object_model.json b/object_model_demo/quec_cloud_object_model.json
index 1e245ab..ca2db56 100644
--- a/object_model_demo/quec_cloud_object_model.json
+++ b/object_model_demo/quec_cloud_object_model.json
@@ -2,7 +2,7 @@
 	"profile":{
 		"tslVersion":"1.1.0",
 		"productKey":"p11275",
-		"version":"20220428155940369"
+		"version":"20220526133940091"
 	},
 	"properties":[
 		{
@@ -808,22 +808,6 @@
 			"type":"PROPERTY",
 			"desc":""
 		},
-		{
-			"specs":{
-				"unit":"s",
-				"min":"0",
-				"max":"2147483647",
-				"step":"1"
-			},
-			"code":"work_mode_timeline",
-			"dataType":"INT",
-			"name":"休眠策略参考时间",
-			"subType":"RW",
-			"id":44,
-			"sort":35,
-			"type":"PROPERTY",
-			"desc":""
-		},
 		{
 			"specs":{
 				"unit":"s",
@@ -839,6 +823,22 @@
 			"sort":36,
 			"type":"PROPERTY",
 			"desc":"-1：一直等待直到读取到数据才进行返回\n0：不等待，读取接口返回数据后立即返回\n>0: 等待超时时间，单位秒"
+		},
+		{
+			"specs":{
+				"unit":"s",
+				"min":"3600",
+				"max":"2147483647",
+				"step":"1"
+			},
+			"code":"work_mode_timeline",
+			"dataType":"INT",
+			"name":"休眠策略参考时间",
+			"subType":"RW",
+			"id":1,
+			"sort":37,
+			"type":"PROPERTY",
+			"desc":""
 		}
 	],
 	"events":[