1.格物平台联通G10版本屏蔽电量重复上传的功能

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/EventMesh.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/EventMesh.py
index e0c7091..4fb4c89 100644 (file)
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/EventMesh.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/EventMesh.py
@@ -3,13 +3,13 @@ import usys
 import versions
 import ql_fs
 
-model = "D15"
-# model = "D10"
-project = "D15"
-# project = "D10"
+# model = "D15"
+model = "D10"
+# project = "D15"
+project = "D10"
 
-# platform = "gewu"#格物平台 不用的话选择空 如果需要联通入库的需求就要打开 不需要就得写空通过变量区分
-platform = ""#格物平台 不用的话选择空
+platform = "gewu"#格物平台 不用的话选择空 如果需要联通入库的需求就要打开 不需要就得写空通过变量区分
+# platform = ""#格物平台 不用的话选择空
 
 # model = "G10W_DT_YBX_"
 

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
index e0b704c..9fe35c7 100644 (file)
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
@@ -1521,6 +1521,7 @@ if EventMesh.model == "D10" :
                         EventMesh.publish("set_hr_blood_led",3)#测量异常
                 else:
                     EventMesh.publish("set_hr_blood_led",3)#测量异常
+        
 
         def play_hr_fun(self,argc):#播放心率测试值
             flag = EventMesh.publish("get_call_state") 

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py
index b690713..409b351 100644 (file)
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py
@@ -1316,11 +1316,12 @@ class AL_ProtoCol(ProtoCol):
     repetition_queue = None
 
     def send(self, event, msg):
-        if self.timer_repetition_send == None:
-            self.timer_repetition_send = osTimer()
-        if self.repetition_queue == None:
-            self.repetition_queue = Queue(100)
-        
+        if EventMesh.platform != "gewu": 
+            if self.timer_repetition_send == None:
+                self.timer_repetition_send = osTimer()
+            if self.repetition_queue == None:
+                self.repetition_queue = Queue(100)
+            
 
         send_data ="AL,"+msg
         send_len = len(send_data)
@@ -1333,8 +1334,9 @@ class AL_ProtoCol(ProtoCol):
         # EventMesh.debug_log("AL_ProtoCol:send:{}".format(data))
         # 通过socket发送到服务器端
         EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND, data)
-        self.repetition_queue.put(data)#发送入队
-        self.timer_repetition_send.start(10000, 1, self.repetition_timer_cb)
+        if EventMesh.platform != "gewu":
+            self.repetition_queue.put(data)#发送入队
+            self.timer_repetition_send.start(10000, 1, self.repetition_timer_cb)
         EventMesh.publish("set_dev_state",0)
     def recv(self, event, msg):
         """
@@ -1346,11 +1348,12 @@ class AL_ProtoCol(ProtoCol):
         #EventMesh.publish(constants.EVENT.START_LOCATION,constants.PROTOCOL.UD_SEND) #开始ud定位
         # print("报警数据上报:recv:%s"%(msg))  
         EventMesh.debug_log("报警数据上报:recv:{}".format(msg)) 
-        #        
-        if self.repetition_queue.empty() == False:
-            self.repetition_queue.get()#出队
-        else:
-            self.timer_repetition_send.stop()
+        #       
+        if EventMesh.platform != "gewu": 
+            if self.repetition_queue.empty() == False:
+                self.repetition_queue.get()#出队
+            else:
+                self.timer_repetition_send.stop()
 
     def repetition_timer_cb(self, *args, **kwargs):#每隔10秒发送一次
         if self.repetition_queue.empty() == False: