1.优化清除日程提醒还会继续提醒的问题

2.优化IOT没有token时重连的逻辑

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_alarm.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_alarm.py
index 7c448c5..23444e5 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_alarm.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_alarm.py
@@ -843,6 +843,7 @@ class schedule(Abstract):
         self.schedule_play_count_tmp=0
         EventMesh.subscribe("AI_schedule_open",self.AI_schedule_open)#
         EventMesh.subscribe("set_schedule_info",self.set_schedule_info)#
+        EventMesh.subscribe("clear_shcheude_flag",self.clear_shcheude_flag)
         self.schedule_play_timer = osTimer()
         self.base_sentence = ""
         self.schedul_timer_default = 60*5 #默认5分钟提醒一次日程
@@ -850,6 +851,7 @@ class schedule(Abstract):
     def set_schedule_info(self,event=None,msg=None):
         print("msg:{}".format(msg))
         self.schedule_array=msg
+        EventMesh.publish("clear_shcheude_flag")#
         EventMesh.publish("AI_schedule_open")#
         pass
 
@@ -857,6 +859,7 @@ class schedule(Abstract):
         if self.schedule_array == None:
             return
         if len(self.schedule_array) == 0:
+            
             return
         # print("AI_alarm_open")
         alarm_TTS_str = ""
@@ -944,9 +947,18 @@ class schedule(Abstract):
                 
                 print("日程:{} self.schedule_array :{}".format(final_sentence,self.schedule_array))
     #循环播放定时器
+    def clear_shcheude_flag(self,event = None,msg = None):
+        
+        if self.schedule_array == []:
+            print("清除日程clear_shcheude_flag!!!!!!!!!!{}".format(self.schedule_play_count))
+            self.schedule_play_timer.stop()
+            self.schedule_play_count=0
+            self.schedule_play_count_tmp=0
+            self.base_sentence=""
+        pass
     def shchedu_play_repeat_timer(self,*argc):
         print("播放日程提醒定时器{} {} self.base_sentence:{}".format(self.schedule_play_count,self.schedule_play_count_tmp,self.base_sentence))
-        if self.schedule_play_count <= 1:
+        if self.schedule_play_count <= 1 or self.schedule_array == None or self.schedule_array == []:
             self.schedule_play_count=0
             self.schedule_play_count_tmp=0
             return

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
index 38f470e..b31f733 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
@@ -1617,6 +1617,7 @@ class SockMangager(Abstract):
         if self.timerHr >= DEFIEN_HR_REPORT_TIME:
             self.timerHr= 0
             self.reconnect_count = 0
+            self.connect_web_timer_count=0
             EventMesh.publish("publish_AI_btnInfo",{"func":self.hr_report_publish_event,"data":0}) 
         # print("self.locate_duration_state:{} self.locate_duration:{}".format(self.locate_duration_state,self.locate_duration))
         if self.locate_duration_state == 1: