From: p15692025051 <846603105@qq.com>
Date: Mon, 25 Sep 2023 02:27:04 +0000 (+0800)
Subject: 修复关机保存时间异常问题
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=5aee01d97599252fd59feadf84e04374a00cc95a;p=mirrors%2FASR1603_G5.git

修复关机保存时间异常问题
---

diff --git a/2.sdk/project/A616/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/A616/sdk/services/microPython/ports/quectel/core/ui_setting.py
index e6e6bfdc..de287fb1 100644
--- a/2.sdk/project/A616/sdk/services/microPython/ports/quectel/core/ui_setting.py
+++ b/2.sdk/project/A616/sdk/services/microPython/ports/quectel/core/ui_setting.py
@@ -1043,7 +1043,8 @@ class PoweroffConfirmScreen(Screen):
             EventMesh.publish("set_storage_config",["old_step",step])
             
         date_tmp = utime.localtime()
-        EventMesh.publish("set_storage_config",["old_timesecond",date_tmp])#关机保存一个是时间
+        time_tmp = utime.mktime(date_tmp) 
+        EventMesh.publish("set_storage_config",["old_time",time_tmp])#关机保存一个是时间
         self.count = 0
         self.aud.play(1, 1, 'U:/static/R_VOLUME_SET_1.mp3')  #文件名前面要加上路径
         self.timer.start(1*1000,1,self.power_off)
diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py
index e6e6bfdc..de287fb1 100644
--- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py
+++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py
@@ -1043,7 +1043,8 @@ class PoweroffConfirmScreen(Screen):
             EventMesh.publish("set_storage_config",["old_step",step])
             
         date_tmp = utime.localtime()
-        EventMesh.publish("set_storage_config",["old_timesecond",date_tmp])#关机保存一个是时间
+        time_tmp = utime.mktime(date_tmp) 
+        EventMesh.publish("set_storage_config",["old_time",time_tmp])#关机保存一个是时间
         self.count = 0
         self.aud.play(1, 1, 'U:/static/R_VOLUME_SET_1.mp3')  #文件名前面要加上路径
         self.timer.start(1*1000,1,self.power_off)
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 cfdced7b..388279e4 100644
--- 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
@@ -687,7 +687,9 @@ class intervManager(Abstract):
             if step != 0:
                 EventMesh.publish("set_storage_config",["old_step",step])
             date_tmp = utime.localtime()
-            EventMesh.publish("set_storage_config",["old_time",date_tmp])#关机保存一个是时间
+            time_tmp = utime.mktime(date_tmp) 
+            EventMesh.publish("set_storage_config",["old_time",time_tmp])#关机保存一个是时间
+
             str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_POWER_OFF_1"))
             
             EventMesh.publish("play_audio_file",[str_data,0])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py
index e6e6bfdc..35d1bc33 100644
--- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py
+++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py
@@ -1043,7 +1043,9 @@ class PoweroffConfirmScreen(Screen):
             EventMesh.publish("set_storage_config",["old_step",step])
             
         date_tmp = utime.localtime()
-        EventMesh.publish("set_storage_config",["old_timesecond",date_tmp])#关机保存一个是时间
+        time_tmp = utime.mktime(date_tmp) 
+        EventMesh.publish("set_storage_config",["old_time",time_tmp])#关机保存一个是时间
+
         self.count = 0
         self.aud.play(1, 1, 'U:/static/R_VOLUME_SET_1.mp3')  #文件名前面要加上路径
         self.timer.start(1*1000,1,self.power_off)
diff --git a/2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
index 391e4adb..4aee8d31 100644
--- a/2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
+++ b/2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
@@ -632,7 +632,9 @@ class intervManager(Abstract):
             if step != 0:
                 EventMesh.publish("set_storage_config",["old_step",step])
             date_tmp = utime.localtime()
-            EventMesh.publish("set_storage_config",["old_timesecond",date_tmp])#关机保存一个是时间
+            time_tmp = utime.mktime(date_tmp) 
+            EventMesh.publish("set_storage_config",["old_time",time_tmp])#关机保存一个是时间
+
             
             EventMesh.publish("set_motor_time",[1,2,4,4,2])#设置马达参数
             EventMesh.publish("set_led_time_arg",[1,2,4*8,led_mode.FLASH_LIGHT_RED,4,2,led_mode.OTHER_MEASURE_MODE])#測量成功
diff --git a/2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/ui_setting.py
index 66e2b5b9..cc80f243 100644
--- a/2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/ui_setting.py
+++ b/2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/ui_setting.py
@@ -1026,7 +1026,9 @@ class PoweroffConfirmScreen(Screen):
         if step != 0:
             self.read_data["old_step"] = step
         date_tmp = utime.localtime()
-        self.read_data["old_timesecond"] = date_tmp#关机保存一个是时间
+        time_tmp = utime.mktime(date_tmp) 
+        EventMesh.publish("set_storage_config",["old_time",time_tmp])#关机保存一个是时间
+
         #print("self.read_data:{}".format(self.read_data))
         with open("/usr/static/storage_file/config.json","w",encoding="utf-8") as fd:
             ujson.dump(self.read_data,fd)