修改相关配置信息
authordxy15521469561 <1731678236@qq.com>
Fri, 11 Aug 2023 11:15:17 +0000 (19:15 +0800)
committerdxy15521469561 <1731678236@qq.com>
Fri, 11 Aug 2023 11:15:17 +0000 (19:15 +0800)
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appWechat.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_setting.py

index 2d720bf..6996a00 100644 (file)
@@ -104,7 +104,6 @@ class WechatScreen(Screen):
         self.MXA_MSG = 10
         self.wechat_recode_list = {}
         self.wechat_num = 0
-        self.read_data = {}
         self.volum_size = 8 
         self.msg_tmp = ""
         check_txt = ql_fs.path_exists("/ext/static/storage_file/wechat_record.json")
@@ -129,22 +128,34 @@ class WechatScreen(Screen):
         self.record_test = audio.Record()
         self.record_test.gain(4,12)
         self.aud = audio.Audio(0)
-        self.aud.set_pa(Pin.GPIO29)
-        check_volum = ql_fs.path_exists("/ext/static/storage_file/config.json")
-        if check_volum == True :
-            with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b = str("volum") in self.read_data.keys()
-                    if b == True:
-                        self.volum_size = self.read_data["volum"]  
-                    else:
-                        self.volum_size = 8
-                else:
-                    self.volum_size = 8
-        else:
-            self.volum_size = 8
-        self.aud.setVolume(self.volum_size)
+        # self.aud.set_pa(Pin.GPIO29)
+
+        # read_data = EventMesh.publish("get_storage_data")
+        # if read_data != None:
+        #     b = str("volum") in read_data.keys()
+        #     if b == True:
+        #         self.volum_size = read_data["volum"]  
+        #     else:
+        #         self.volum_size = 8
+        # else:
+        #     self.volum_size = 8
+
+
+        # # check_volum = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        # # if check_volum == True :
+        # #     with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
+        # #         self.read_data = ujson.load(fd)
+        # #         if self.read_data != {}:
+        # #             b = str("volum") in self.read_data.keys()
+        # #             if b == True:
+        # #                 self.volum_size = self.read_data["volum"]  
+        # #             else:
+        # #                 self.volum_size = 8
+        # #         else:
+        # #             self.volum_size = 8
+        # # else:
+        # #     self.volum_size = 8
+        # self.aud.setVolume(self.volum_size)
         self.meta = wechat_screen
         wechat_press_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.talking_cb(e)),
                                      lv.EVENT.LONG_PRESSED, None)
@@ -404,13 +415,14 @@ class WechatScreen(Screen):
    
 
     def sending_cb(self,e):
-        if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:#有卡时触发sos报警 无卡时自动关机
-            Wechat_log("sending_cb1")
-            EventMesh.publish("publish_message_event_ui",{"func":self.sending,"data":e})
-            #self.sending(e)
-            Wechat_log("sending_cb2")
-        else:
-            EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"})
+        if self.press_state == 1:
+            if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:#有卡时触发sos报警 无卡时自动关机
+                Wechat_log("sending_cb1")
+                EventMesh.publish("publish_message_event_ui",{"func":self.sending,"data":e})
+                #self.sending(e)
+                Wechat_log("sending_cb2")
+            else:
+                EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"})
        
     #松手0.2秒后显示
     def hide_label(self,*args):
@@ -588,7 +600,7 @@ class WechatScreen(Screen):
             self.countdown += 1
         else:
             self.countdown = 15
-            self.sending(0)
+            self.sending_cb(0)
 
         if self.countdown >= 15:
             self.countdown = 15
index 113cf48..e9b57a3 100644 (file)
@@ -175,6 +175,7 @@ def main_init():
 
     app = watchApp()
     app.set_ui(ui)
+    app.append_manager(getStorageDataManager())
     app.append_manager(mgr.AlarmVolumeLevelManager()) \
         .append_manager(mgr.MsgVolumeLevelManager()) \
         .append_manager(mgr.PhoneVolumeLevelManager()) \
@@ -198,7 +199,7 @@ def main_init():
     app.append_manager(gethistoryDataManager())
     app.append_manager(getHrTimeManager())
     app.append_manager(getBrightnessManager())
-    app.append_manager(getStorageDataManager())
+
     app.append_manager(getUpLoadDataManager())
     app.append_manager(getVolumSizeManager())
     app.append_manager(getTempTimeManager())
index 4673aa3..c705f64 100644 (file)
@@ -2161,34 +2161,48 @@ class gethistoryDataManager(Abstract):
         self.oldspo2 = 0
         self.oldstep = 0
         self.old_step = 0
-        self.read_data = {}
         self.read_histroy_hr_data = []
         self.read_histroy_temp_data = []
         self.read_histroy_spo2_data = []
-        check_json= ql_fs.path_exists("/ext/static/storage_file/config.json")
-        if check_json == True :
-            with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b = str("old_hr") in self.read_data.keys()
-                    if b == True:
-                        self.oldHr = self.read_data["old_hr"]  
-                    else:
-                        self.oldHr = 0
-                    old_spo2 = str("old_spo2") in self.read_data.keys()
-                    if old_spo2 == True:
-                        self.oldspo2 = self.read_data["old_spo2"]  
-                    else:
-                        self.oldspo2 = 0
-                    old_step = str("old_step") in self.read_data.keys()
-                    if old_step == True:
-                        self.oldstep = self.read_data["old_step"]  
-                    else:
-                        self.oldstep = 0
-                else:
-                    self.oldHr = 0
-                    self.oldspo2 = 0
-                    self.oldstep = 0
+
+        read_data = EventMesh.publish("get_storage_data")
+        if read_data != None:
+            b = str("old_hr") in read_data.keys()
+            if b == True:
+                self.oldHr = read_data["old_hr"]  
+
+            old_spo2 = str("old_spo2") in read_data.keys()
+            if old_spo2 == True:
+                self.oldspo2 = read_data["old_spo2"] 
+            
+            old_step = str("old_step") in read_data.keys()
+            if old_step == True:
+                self.oldstep = read_data["old_step"]  
+
+        # check_json= ql_fs.path_exists("/ext/static/storage_file/config.json")
+        # if check_json == True :
+        #     with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
+        #         self.read_data = ujson.load(fd)
+        #         if self.read_data != {}:
+        #             b = str("old_hr") in self.read_data.keys()
+        #             if b == True:
+        #                 self.oldHr = self.read_data["old_hr"]  
+        #             else:
+        #                 self.oldHr = 0
+        #             old_spo2 = str("old_spo2") in self.read_data.keys()
+        #             if old_spo2 == True:
+        #                 self.oldspo2 = self.read_data["old_spo2"]  
+        #             else:
+        #                 self.oldspo2 = 0
+        #             old_step = str("old_step") in self.read_data.keys()
+        #             if old_step == True:
+        #                 self.oldstep = self.read_data["old_step"]  
+        #             else:
+        #                 self.oldstep = 0
+        #         else:
+        #             self.oldHr = 0
+        #             self.oldspo2 = 0
+        #             self.oldstep = 0
         check_hr= ql_fs.path_exists("/ext/static/storage_file/history_hr.json")
         if check_hr == True :
             with open("/ext/static/storage_file/history_hr.json","r") as fd:#音频文件编号
@@ -2270,10 +2284,10 @@ class gethistoryDataManager(Abstract):
     def save_hr_value(self, event, msg): 
         if msg >= 50:
             
-            self.read_data = EventMesh.publish("get_storage_data")
-            self.read_data["old_hr"] = msg
+            read_data_hr = EventMesh.publish("get_storage_data")
+            read_data_hr["old_hr"] = msg
             self.oldHr = msg
-            EventMesh.publish("set_storage_data", self.read_data)
+            EventMesh.publish("set_storage_data", read_data_hr)
 
             date_tmp = utime.localtime()
             time_tmp = utime.mktime(date_tmp)
@@ -2290,7 +2304,7 @@ class gethistoryDataManager(Abstract):
                 self.read_histroy_hr_data.append({"timeSec": time_tmp, "hr": self.oldHr}) 
 
             with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
-                ujson.dump(self.read_data,fd)
+                ujson.dump(read_data_hr,fd)
 
             with open("/ext/static/storage_file/history_hr.json","w",encoding="utf-8") as fd:
                 ujson.dump(self.read_histroy_hr_data,fd)
@@ -2302,10 +2316,10 @@ class gethistoryDataManager(Abstract):
 
     def save_spo2_value(self, event, msg): 
         if msg >= 85:
-            self.read_data = EventMesh.publish("get_storage_data")
-            self.read_data["old_spo2"] = msg
+            read_data_spo2 = EventMesh.publish("get_storage_data")
+            read_data_spo2["old_spo2"] = msg
             self.oldspo2 = msg
-            EventMesh.publish("set_storage_data", self.read_data)
+            EventMesh.publish("set_storage_data", read_data_spo2)
 
             date_tmp = utime.localtime()
             time_tmp = utime.mktime(date_tmp)
@@ -2322,7 +2336,7 @@ class gethistoryDataManager(Abstract):
                 self.read_histroy_spo2_data.append({"timeSec": time_tmp, "spo2": self.oldspo2}) 
 
             with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
-                ujson.dump(self.read_data,fd)
+                ujson.dump(read_data_spo2,fd)
 
             with open("/ext/static/storage_file/history_spo2.json","w",encoding="utf-8") as fd:
                 ujson.dump(self.read_histroy_spo2_data,fd)
@@ -2344,15 +2358,20 @@ class getOldTimeManager(Abstract):
     # 获取天气数据
     def __init__(self):
         self.time_sec = 0
-        self.read_data = {}
-        check_json= ql_fs.path_exists("/ext/static/storage_file/config.json")
-        if check_json == True :
-            with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b = str("old_time") in self.read_data.keys()
-                    if b == True:
-                        self.time_sec = self.read_data["old_time"]  
+        read_data = EventMesh.publish("get_storage_data")
+        if read_data != None:
+            b = str("old_time") in read_data.keys()
+            if b == True:
+                self.time_sec = read_data["old_time"]  
+
+        # check_json= ql_fs.path_exists("/ext/static/storage_file/config.json")
+        # if check_json == True :
+        #     with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
+        #         self.read_data = ujson.load(fd)
+        #         if self.read_data != {}:
+        #             b = str("old_time") in self.read_data.keys()
+        #             if b == True:
+        #                 self.time_sec = self.read_data["old_time"]  
 
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("get_old_time_data", self.get_old_time_data)
@@ -2363,11 +2382,11 @@ class getOldTimeManager(Abstract):
 
     def set_old_time_data(self, event, msg):
         self.time_sec = msg
-        self.read_data = EventMesh.publish("get_storage_data")
-        self.read_data["old_time"] = msg
-        EventMesh.publish("set_storage_data", self.read_data)
+        read_data_time = EventMesh.publish("get_storage_data")
+        read_data_time["old_time"] = msg
+        EventMesh.publish("set_storage_data", read_data_time)
         with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
-            ujson.dump(self.read_data,fd)
+            ujson.dump(read_data_time,fd)
 
 
         
@@ -2412,17 +2431,26 @@ class getHrTimeManager(Abstract):
         self.set_spo2 = 0
         self.open_btn = 0
         self.get_temp = 0
-        check = ql_fs.path_exists("/ext/static/storage_file/config.json")
-        if check == True:
-            with open("/ext/static/storage_file/config.json","r") as fd:
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b = str("measure_time") in self.read_data.keys()
-                    if b == True:
-                        self.set_time = self.read_data["measure_time"]   
-                    btn = str("open_hr_btn") in self.read_data.keys()
-                    if btn == True:
-                        self.open_btn = self.read_data["measure_time"]   
+        read_data = EventMesh.publish("get_storage_data")
+        if read_data != None:
+            b = str("measure_time") in read_data.keys()
+            if b == True:
+                self.set_time = read_data["measure_time"]   
+            btn = str("open_hr_btn") in read_data.keys()
+            if btn == True:
+                self.open_btn = read_data["measure_time"]   
+
+        # check = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        # if check == True:
+        #     with open("/ext/static/storage_file/config.json","r") as fd:
+        #         self.read_data = ujson.load(fd)
+        #         if self.read_data != {}:
+        #             b = str("measure_time") in self.read_data.keys()
+        #             if b == True:
+        #                 self.set_time = self.read_data["measure_time"]   
+        #             btn = str("open_hr_btn") in self.read_data.keys()
+        #             if btn == True:
+        #                 self.open_btn = self.read_data["measure_time"]   
 
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("set_time_hr_spo2", self.set_time_hr_spo2)
@@ -2458,14 +2486,19 @@ class getTempTimeManager(Abstract):
     def __init__(self):
         self.set_time = 0
         self.get_temp = 0
-        check = ql_fs.path_exists("/ext/static/storage_file/config.json")
-        if check == True:
-            with open("/ext/static/storage_file/config.json","r") as fd:
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b = str("temp_time") in self.read_data.keys()
-                    if b == True:
-                        self.set_time = self.read_data["temp_time"]   
+        read_data = EventMesh.publish("get_storage_data")
+        if read_data != None:
+            b = str("temp_time") in read_data.keys()
+            if b == True:
+                self.set_time = read_data["temp_time"] 
+        # check = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        # if check == True:
+        #     with open("/ext/static/storage_file/config.json","r") as fd:
+        #         self.read_data = ujson.load(fd)
+        #         if self.read_data != {}:
+        #             b = str("temp_time") in self.read_data.keys()
+        #             if b == True:
+        #                 self.set_time = self.read_data["temp_time"]   
 
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("set_temp_time", self.set_temp_time)
@@ -2491,13 +2524,13 @@ class getTempTimeManager(Abstract):
 class getBrightnessManager(Abstract):#获取亮度级别
     def __init__(self):
         self.level = 6#默认值6
-        self.read_data = {}
+        # self.read_data = {}
         self.time = 5
         self.PWM_backlight  = None
-        check = ql_fs.path_exists("/ext/static/storage_file/config.json")
-        if check == True:
-            with open("/ext/static/storage_file/config.json","r") as fd:
-                self.read_data = ujson.load(fd)
+        # check = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        # if check == True:
+        #     with open("/ext/static/storage_file/config.json","r") as fd:
+        #         self.read_data = ujson.load(fd)
 
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("get_brightness_level", self.get_brightness_level)
@@ -2512,10 +2545,11 @@ class getBrightnessManager(Abstract):#获取亮度级别
         self.level = msg
     
     def get_brightness_level(self, event, msg): 
-        if self.read_data != {}:
-            b = str("brightness_level") in self.read_data.keys()
+        read_data = EventMesh.publish("get_storage_data")
+        if read_data != {}:
+            b = str("brightness_level") in read_data.keys()
             if b == True:
-                self.level = self.read_data["brightness_level"]
+                self.level = read_data["brightness_level"]
         return self.level
     
     def set_brightness_time(self, event, msg): 
@@ -2523,10 +2557,11 @@ class getBrightnessManager(Abstract):#获取亮度级别
     
     def get_brightness_time(self, event, msg): 
         # print("get_brightness_time self.read_data:{} self.time:{}".format(self.read_data,self.time))
-        if self.read_data != {}:
-            b = str("brightness_time") in self.read_data.keys()
+        read_data = EventMesh.publish("get_storage_data")
+        if read_data != {}:
+            b = str("brightness_time") in read_data.keys()
             if b == True:
-                self.time = self.read_data["brightness_time"]
+                self.time = read_data["brightness_time"]
         return self.time
     
 
@@ -2537,12 +2572,12 @@ class getBrightnessManager(Abstract):#获取亮度级别
         self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_MS, self.level, 10)
         self.PWM_backlight.open()
         
-        self.read_data = EventMesh.publish("get_storage_data")
-        self.read_data["brightness_level"] = self.level
+        read_data = EventMesh.publish("get_storage_data")
+        read_data["brightness_level"] = self.level
 
-        EventMesh.publish("set_storage_data", self.read_data)
+        EventMesh.publish("set_storage_data", read_data)
         with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
-            ujson.dump(self.read_data,fd)
+            ujson.dump(read_data,fd)
 
     def reduce(self, event, msg):
         if self.level > 0:
@@ -2553,11 +2588,11 @@ class getBrightnessManager(Abstract):#获取亮度级别
             self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_MS,self.level, 10)
 
         self.PWM_backlight.open()
-        self.read_data = EventMesh.publish("get_storage_data")
-        self.read_data["brightness_level"] = self.level
-        EventMesh.publish("set_storage_data", self.read_data)
+        read_data = EventMesh.publish("get_storage_data")
+        read_data["brightness_level"] = self.level
+        EventMesh.publish("set_storage_data", read_data)
         with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
-            ujson.dump(self.read_data,fd)
+            ujson.dump(read_data,fd)
     
 class getStorageDataManager(Abstract):#获取内存数据
     def __init__(self):
@@ -2583,14 +2618,19 @@ class getStorageDataManager(Abstract):#获取内存数据
 class getUpLoadDataManager(Abstract):#
     def __init__(self):
         self.upload_time = 1800
-        check = ql_fs.path_exists("/ext/static/storage_file/config.json")
-        if check == True:
-            with open("/ext/static/storage_file/config.json","r") as fd:
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b = str("upload_time") in self.read_data.keys()
-                    if b == True:
-                        self.upload_time = self.read_data["upload_time"]   
+        read_data = EventMesh.publish("get_storage_data")
+        if read_data != None:
+            b = str("upload_time") in read_data.keys()
+            if b == True:
+                self.upload_time = read_data["upload_time"]  
+        # check = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        # if check == True:
+        #     with open("/ext/static/storage_file/config.json","r") as fd:
+        #         self.read_data = ujson.load(fd)
+        #         if self.read_data != {}:
+        #             b = str("upload_time") in self.read_data.keys()
+        #             if b == True:
+        #                 self.upload_time = self.read_data["upload_time"]   
 
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("set_upload_data", self.set_upload_data)
@@ -2619,20 +2659,25 @@ class getplayAudiodStateManager(Abstract):#获取设置播放音频状态
 class getVolumSizeManager(Abstract):#设置或获取音量大小数据
     def __init__(self):
         self.volume_size = 8
-        self.read_data = {}
-        check = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        read_data = EventMesh.publish("get_storage_data")
+        if read_data != None:
+            b = str("volum") in read_data.keys()
+            if b == True:
+                self.volume_size = read_data["volum"]  
+        # self.read_data = {}
+        # check = ql_fs.path_exists("/ext/static/storage_file/config.json")
         
-        if check == True:
-            with open("/ext/static/storage_file/config.json","r") as fd:
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b = str("volum") in self.read_data.keys()
-                    if b == True:
-                        self.volume_size = self.read_data["volum"]   
-                    else:
-                        self.volume_size = 8
-        else:
-            self.volume_size = 8
+        # if check == True:
+        #     with open("/ext/static/storage_file/config.json","r") as fd:
+        #         self.read_data = ujson.load(fd)
+        #         if self.read_data != {}:
+        #             b = str("volum") in self.read_data.keys()
+        #             if b == True:
+        #                 self.volume_size = self.read_data["volum"]   
+        #             else:
+        #                 self.volume_size = 8
+        # else:
+        #     self.volume_size = 8
         # print("self.volume_size:{}".format(self.volume_size))
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("set_volum_size", self.set_volum_size)
@@ -2652,23 +2697,35 @@ class getSosFlagManager(Abstract):#设置sos
         self.call_timer = osTimer()
         self.sos_numer1 = []
         self.callnumer =""
-        self.read_data = {}
-        check = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        read_data = EventMesh.publish("get_storage_data")
+        if read_data != None:
+            b1 = str("SOS_NUMBER1") in read_data.keys()
+            if b1 == True:
+                self.sos_numer1 = [read_data["SOS_NUMBER1"]]
+            b2 = str("SOS_NUMBER2") in read_data.keys()
+            if b2 == True:
+                self.sos_numer1 = [read_data["SOS_NUMBER1"], read_data["SOS_NUMBER2"]]
+
+            b3 = str("SOS_NUMBER3") in read_data.keys()
+            if b3 == True:
+                self.sos_numer1 = [read_data["SOS_NUMBER1"], read_data["SOS_NUMBER2"],read_data["SOS_NUMBER3"]]
+        # self.read_data = {}
+        # check = ql_fs.path_exists("/ext/static/storage_file/config.json")
         
-        if check == True:
-            with open("/ext/static/storage_file/config.json","r") as fd:
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b1 = str("SOS_NUMBER1") in self.read_data.keys()
-                    if b1 == True:
-                        self.sos_numer1 = [self.read_data["SOS_NUMBER1"]]
-                    b2 = str("SOS_NUMBER2") in self.read_data.keys()
-                    if b2 == True:
-                        self.sos_numer1 = [self.read_data["SOS_NUMBER1"], self.read_data["SOS_NUMBER2"]]
-
-                    b3 = str("SOS_NUMBER3") in self.read_data.keys()
-                    if b3 == True:
-                        self.sos_numer1 = [self.read_data["SOS_NUMBER1"], self.read_data["SOS_NUMBER2"],self.read_data["SOS_NUMBER3"]]
+        # if check == True:
+        #     with open("/ext/static/storage_file/config.json","r") as fd:
+        #         self.read_data = ujson.load(fd)
+        #         if self.read_data != {}:
+        #             b1 = str("SOS_NUMBER1") in self.read_data.keys()
+        #             if b1 == True:
+        #                 self.sos_numer1 = [self.read_data["SOS_NUMBER1"]]
+        #             b2 = str("SOS_NUMBER2") in self.read_data.keys()
+        #             if b2 == True:
+        #                 self.sos_numer1 = [self.read_data["SOS_NUMBER1"], self.read_data["SOS_NUMBER2"]]
+
+        #             b3 = str("SOS_NUMBER3") in self.read_data.keys()
+        #             if b3 == True:
+        #                 self.sos_numer1 = [self.read_data["SOS_NUMBER1"], self.read_data["SOS_NUMBER2"],self.read_data["SOS_NUMBER3"]]
                         
         # print("self.sos_numer1:{} self.read_data:{}".format(self.sos_numer1,self.read_data))
 
@@ -2734,17 +2791,22 @@ class getSosFlagManager(Abstract):#设置sos
         return self.sos_numer1
 class getLowBatManager(Abstract):#低电提醒
     def __init__(self):
-        self.read_data = {}
+
         self.low_btn = 0
-        check = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        read_data = EventMesh.publish("get_storage_data")
+        if read_data != None:
+            b1 = str("low_on") in read_data.keys()
+            if b1 == True:
+                self.low_btn = read_data["low_on"]
+        # check = ql_fs.path_exists("/ext/static/storage_file/config.json")
         
-        if check == True:
-            with open("/ext/static/storage_file/config.json","r") as fd:
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b1 = str("low_on") in self.read_data.keys()
-                    if b1 == True:
-                        self.low_btn = self.read_data["low_on"]
+        # if check == True:
+        #     with open("/ext/static/storage_file/config.json","r") as fd:
+        #         self.read_data = ujson.load(fd)
+        #         if self.read_data != {}:
+        #             b1 = str("low_on") in self.read_data.keys()
+        #             if b1 == True:
+        #                 self.low_btn = self.read_data["low_on"]
 
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("set_low_bat_btn", self.set_low_bat_btn)#
@@ -2775,24 +2837,6 @@ class getCountDownManager(Abstract):#倒计时
 class playPowerAudioManager(Abstract):#播放开关机音频文件
     def __init__(self):
         self.aud = audio.Audio(0)
-        self.aud.set_pa(Pin.GPIO29)
-        self.read_data = {}
-        self.volum_size = 8
-        check_volum = ql_fs.path_exists("/ext/static/storage_file/config.json")
-        if check_volum == True :
-            with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b = str("volum") in self.read_data.keys()
-                    if b == True:
-                        self.volum_size = self.read_data["volum"]  
-                    else:
-                        self.volum_size = 8
-                else:
-                    self.volum_size = 8
-        else:
-            self.volum_size = 8
-        self.aud.setVolume(self.volum_size)
 
     def post_processor_after_instantiation(self):
         
@@ -2808,26 +2852,35 @@ class playPowerAudioManager(Abstract):#播放开关机音频文件
     
 class getBootOffManager(Abstract):#开关机时间
     def __init__(self):
-        self.read_data = {}
         self.off_msg = {}
         self.off_flag = 0
         self.rtc =  RTC()
-        check = ql_fs.path_exists("/ext/static/storage_file/config.json")
-        
-        if check == True:
-            with open("/ext/static/storage_file/config.json","r") as fd:
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b1 = str("off_on") in self.read_data.keys()
-                    if b1 == True:
-                        self.off_on = self.read_data["off_on"]
-                    b2 = str("off_start") in self.read_data.keys()
-                    if b2 == True:
-                        self.off_start= self.read_data["off_start"]
-
-                    b3 = str("off_end") in self.read_data.keys()
-                    if b3 == True:
-                        self.off_end = self.read_data["off_end"]
+        read_data = EventMesh.publish("get_storage_data")
+        if read_data != None:
+            b1 = str("off_on") in read_data.keys()
+            if b1 == True:
+                self.off_on = read_data["off_on"]
+            b2 = str("off_start") in read_data.keys()
+            if b2 == True:
+                self.off_start= read_data["off_start"]
+
+            b3 = str("off_end") in read_data.keys()
+            if b3 == True:
+                self.off_end = read_data["off_end"]
+        # if check == True:
+        #     with open("/ext/static/storage_file/config.json","r") as fd:
+        #         self.read_data = ujson.load(fd)
+        #         if self.read_data != {}:
+        #             b1 = str("off_on") in self.read_data.keys()
+        #             if b1 == True:
+        #                 self.off_on = self.read_data["off_on"]
+        #             b2 = str("off_start") in self.read_data.keys()
+        #             if b2 == True:
+        #                 self.off_start= self.read_data["off_start"]
+
+        #             b3 = str("off_end") in self.read_data.keys()
+        #             if b3 == True:
+        #                 self.off_end = self.read_data["off_end"]
                         
         # print("self.sos_numer1:{} self.read_data:{}".format(self.sos_numer1,self.read_data))
 
@@ -2881,42 +2934,62 @@ class testSmsSetIPManager(Abstract):#
         self.timer = osTimer()
         self.newip = ""#默认防走丢协议
         self.newcom = 0
-        self.read_data = {}
-        check = ql_fs.path_exists("/ext/static/storage_file/config.json")
-        if check == True:
-            with open("/ext/static/storage_file/config.json","r") as fd:
-                self.read_data = ujson.load(fd)
-                print("config.json:{}".format(self.read_data))
-                b1 = str("set_new_ip_addr") in self.read_data.keys()
-                if b1 == True:
-                    self.newip = self.read_data["set_new_ip_addr"]
-                else:
-                    self.newip = "api.xcloudtech.com"
 
-                b2 = str("set_new_com") in self.read_data.keys()
-                if b2 == True:
-                    self.newcom = self.read_data["set_new_com"]
-                else:
-                    self.newcom = 9000
+        read_data = EventMesh.publish("get_storage_data")
+        if read_data != None:
+            b1 = str("set_new_ip_addr") in read_data.keys()
+            if b1 == True:
+                self.newip = read_data["set_new_ip_addr"]
+            else:
+                self.newip = "api.xcloudtech.com"
+            
+            b2 = str("set_new_com") in read_data.keys()
+            if b2 == True:
+                self.newcom = read_data["set_new_com"]
+            else:
+                self.newcom = 9000
 
-                b3 = str("set_new_md5") in self.read_data.keys()
-                if b3 == True:
-                    self.newmd5 = self.read_data["set_new_md5"]
-                else:
-                    self.newmd5 = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
+            b3 = str("set_new_md5") in read_data.keys()
+            if b3 == True:
+                self.newmd5 = read_data["set_new_md5"]
+            else:
+                self.newmd5 = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
+
+        # check = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        # if check == True:
+        #     with open("/ext/static/storage_file/config.json","r") as fd:
+        #         self.read_data = ujson.load(fd)
+        #         print("config.json:{}".format(self.read_data))
+        #         b1 = str("set_new_ip_addr") in self.read_data.keys()
+        #         if b1 == True:
+        #             self.newip = self.read_data["set_new_ip_addr"]
+        #         else:
+        #             self.newip = "api.xcloudtech.com"
+
+        #         b2 = str("set_new_com") in self.read_data.keys()
+        #         if b2 == True:
+        #             self.newcom = self.read_data["set_new_com"]
+        #         else:
+        #             self.newcom = 9000
+
+        #         b3 = str("set_new_md5") in self.read_data.keys()
+        #         if b3 == True:
+        #             self.newmd5 = self.read_data["set_new_md5"]
+        #         else:
+        #             self.newmd5 = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
                 
-                self.read_data["set_new_ip_addr"] = self.newip
-                self.read_data["set_new_com"] = self.newcom
-                # self.read_data["set_new_md5"] = self.newmd5
+        #         self.read_data["set_new_ip_addr"] = self.newip
+        #         self.read_data["set_new_com"] = self.newcom
+        #         # self.read_data["set_new_md5"] = self.newmd5
 
 
-                with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
-                    ujson.dump(self.read_data,fd)
-        else:
-            self.newip = "api.xcloudtech.com"#默认防走丢协议
-            self.newcom = 9000
-            # self.newmd5 = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
-        print("config.json:{}".format(self.read_data))
+        #         with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
+        #             ujson.dump(self.read_data,fd)
+        # else:
+        #     self.newip = "api.xcloudtech.com"#默认防走丢协议
+        #     self.newcom = 9000
+        #     # self.newmd5 = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
+        # print("config.json:{}".format(self.read_data))
         # server_addr = "tcptest.tx.kidxin.com"
         # #SETIP:api.xcloudtech.com:9000
         # server_port = 11500
@@ -2931,14 +3004,17 @@ class testSmsSetIPManager(Abstract):#
         self.newcom = int(msg[1])
         # self.newmd5 = str(msg[2])
         #短信格式:SETIP:api.xcloudtech.com:9000:bZld0ALsZTt15tKEZhOlLPgbsO75BLTP 以冒号分隔 SETIP:ip地址:ip端口号:ip密钥key
-        self.read_data["set_new_ip_addr"] = self.newip #通过短信设置ip地址
-        self.read_data["set_new_com"]= self.newcom #通过短信设置ip端口号
+        read_data = EventMesh.publish("get_storage_data")
+        read_data["set_new_ip_addr"] = self.newip #通过短信设置ip地址
+        read_data["set_new_com"]= self.newcom #通过短信设置ip端口号
         # self.read_data["set_new_md5"] = self.newmd5  #通过短信设置ip的key密钥
        
         
         with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
-            ujson.dump(self.read_data,fd)
-        print("config.json:{}".format(self.read_data))
+            ujson.dump(read_data,fd)
+        with open("/ext/static/storage_file/config.json","r") as fd:
+            read_data = ujson.load(fd)
+        print("config.json:{}".format(read_data))
         # print("msg:{} self.read_data:{}".format(msg,self.read_data))
         number = str(msg[2])
         sms.sendPduMsg(number, 'set ok', 'UCS2')
index 0eb0491..3fcedde 100644 (file)
@@ -762,7 +762,7 @@ class CallLogScreen(Screen):
             call_log_title = lv.label(call_log_screen)
             call_log_title.set_pos(0, 10)
             call_log_title.set_size(240, 40)
-            call_log_title.set_long_mode(lv.label.LONG.WRAP)
+            call_log_title.set_long_mode(lv.label.LONG.CLIP)
             call_log_title.set_text("通话记录")
             call_log_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             call_log_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -858,6 +858,7 @@ class CallLogScreen(Screen):
                     #_btn_label4 = lv.label(_btn)
                     self.call_log_detail_list_dict[h]["_btn_label4"].set_pos(0, 38)
                     self.call_log_detail_list_dict[h]["_btn_label4"].set_size(230, 30)
+                    self.call_log_detail_list_dict[h]["_btn_label4"].set_long_mode(lv.label.LONG.CLIP)
                     self.call_log_detail_list_dict[h]["_btn_label4"].set_text(num_phonnum)
                     self.call_log_detail_list_dict[h]["_btn_label4"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
 
@@ -871,6 +872,7 @@ class CallLogScreen(Screen):
                     #_btn_label6 = lv.label(_btn)
                     self.call_log_detail_list_dict[h]["_btn_label6"].set_pos(0, 5)
                     self.call_log_detail_list_dict[h]["_btn_label6"].set_size(230, 28)
+                    self.call_log_detail_list_dict[h]["_btn_label6"].set_long_mode(lv.label.LONG.CLIP)
                     self.call_log_detail_list_dict[h]["_btn_label6"].set_text(num_name)
                     self.call_log_detail_list_dict[h]["_btn_label6"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                     
@@ -2751,25 +2753,24 @@ class IncomingCallScreen(Screen):
     def __init__(self):
         super().__init__()
         self.CALL_LOG_MAX = CALL_LOG_MAX
-        self.read_data = {}
-        self.volum_size = 8
-        check_volum = ql_fs.path_exists("/ext/static/storage_file/config.json")
-        if check_volum == True :
-            with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b = str("volum") in self.read_data.keys()
-                    if b == True:
-                        self.volum_size = self.read_data["volum"]  
-                    else:
-                        self.volum_size = 8
-                else:
-                    self.volum_size = 8
-        else:
-            self.volum_size = 8
+        # self.read_data = {}
+        # self.volum_size = 8
+        # check_volum = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        # if check_volum == True :
+        #     with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
+        #         self.read_data = ujson.load(fd)
+        #         if self.read_data != {}:
+        #             b = str("volum") in self.read_data.keys()
+        #             if b == True:
+        #                 self.volum_size = self.read_data["volum"]  
+        #             else:
+        #                 self.volum_size = 8
+        #         else:
+        #             self.volum_size = 8
+        # else:
+        #     self.volum_size = 8
         self.aud = audio.Audio(0)
-        self.aud.set_pa(Pin.GPIO29)
-        self.aud.setVolume(self.volum_size)
+
         self.call_timer = osTimer()
         self.name = None
         self.phonebook = {}
@@ -3020,8 +3021,6 @@ class OnCallScreen(Screen):
         self.count_sec = 0
         self.timer = osTimer()
         self.aud = audio.Audio(0)
-        self.aud.set_pa(Pin.GPIO29)
-        self.read_data = {}
         self.volum_size = 8
         self.open_volum = 0
         self.phone_num = ''
@@ -3454,27 +3453,25 @@ class OnCallScreen(Screen):
     def show_bar(self,msg):
         on_call_bar.set_value((100 // 11) * self.volum_size, lv.ANIM.OFF)
         if msg == 1:
-            self.read_data = EventMesh.publish("get_storage_data")
-            self.read_data["volum"] = self.volum_size
+            read_data = EventMesh.publish("get_storage_data")
+            read_data["volum"] = self.volum_size
             self.aud.setVolume(self.volum_size)
-            EventMesh.publish("set_storage_data", self.read_data)
+            EventMesh.publish("set_storage_data", read_data)
             EventMesh.publish("set_volum_size",self.volum_size)
             # print("self.read_data:size :{}".format(self.read_data))
             with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
-                ujson.dump(self.read_data,fd)
+                ujson.dump(read_data,fd)
 
     def post_processor_after_initialization(self):
         global on_call_screen_tab,on_call_obj
         self.count_sec = 0
         self.timer.start(1000,1,self.refresh)
-        self.read_data = EventMesh.publish("get_storage_data")
-        # print("self.read_data:{}".format(self.read_data))
+        
         num = EventMesh.publish("get_volum_size")
         if num == None:
             self.volum_size = 8
         else:
             self.volum_size = num
-        self.aud.setVolume(self.volum_size)
         self.show_bar(0)
         self.open_volum = 0
         self.phone_num = ''
@@ -5819,25 +5816,8 @@ class UIFINDScreen(Screen):
     NAME = "FIND"
     def __init__(self):
         super().__init__()
-        self.read_data = {}
-        self.volum_size = 8
-        check_volum = ql_fs.path_exists("/ext/static/storage_file/config.json")
-        if check_volum == True :
-            with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b = str("volum") in self.read_data.keys()
-                    if b == True:
-                        self.volum_size = self.read_data["volum"]  
-                    else:
-                        self.volum_size = 8
-                else:
-                    self.volum_size = 8
-        else:
-            self.volum_size = 8
         self.aud = audio.Audio(0)
-        self.aud.set_pa(Pin.GPIO29)
-        self.aud.setVolume(self.volum_size)
+        # self.aud.setVolume(self.volum_size)
         self.FIND_timer = osTimer()
         self.FIND_timer_count = 0
 
@@ -6314,32 +6294,29 @@ class UI(object):
         self.system_sleep_timer_count = 0
         self.sleep_flag = 1
         self.level = 6
-        self.read_data = {}
         self.aud = audio.Audio(0)
         self.level = EventMesh.publish("get_brightness_level")
-        self.read_data = EventMesh.publish("get_storage_data")
+        read_data = EventMesh.publish("get_storage_data")
         self.main_flag = 0
         self.main_id = 0
         self.set_interrup_flag = 0
         self.UI_high_priority_flag = 0 #如果=1,则当前ui不被打断
-        # print("self.read_data:{} self.level:{}".format(self.read_data,self.level))
+        # print("read_data:{} self.level:{}".format(read_data,self.level))
         check = ql_fs.path_exists("/ext/static/storage_file/config.json")
         if check == True:
             with open("/ext/static/storage_file/config.json","r") as fd:
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b = str("brightness_level") in self.read_data.keys()
+                read_data = ujson.load(fd)
+                if read_data != {}:
+                    b = str("brightness_level") in read_data.keys()
                     if b == True:
-                        self.level = self.read_data["brightness_level"]
+                        self.level = read_data["brightness_level"]
                     else:
                         self.level = 6
-                        self.read_data["brightness_level"] = self.level
-                        EventMesh.publish("set_storage_data", self.read_data)
-                        with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
-                            ujson.dump(self.read_data,fd)
         else:
             self.level = 6 #默认是6级别
         
+        print("self.read_data:{} self.level:{}".format(read_data,self.level))
+
         if self.level == None:
             self.level = 6
         self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_MS, self.level, 10)
index b4afa26..20b8b41 100644 (file)
@@ -1028,16 +1028,16 @@ class PowerOnScreen(Screen):
         self.timer = osTimer()
         self.aud = audio.Audio(0)
         self.aud.set_pa(Pin.GPIO29)
-        self.read_data = {}
+        read_data = {}
         self.volum_size = 8
         check_volum = ql_fs.path_exists("/ext/static/storage_file/config.json")
         if check_volum == True :
             with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
-                self.read_data = ujson.load(fd)
-                if self.read_data != {}:
-                    b = str("volum") in self.read_data.keys()
+                read_data= ujson.load(fd)
+                if read_data != {}:
+                    b = str("volum") in read_data.keys()
                     if b == True:
-                        self.volum_size = self.read_data["volum"]  
+                        self.volum_size = read_data["volum"]  
                     else:
                         self.volum_size = 8
                 else:
@@ -1771,14 +1771,10 @@ class totalvolumeScreen(Screen):
                                      lv.EVENT.CLICKED, None)
         totalvolume_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_volum_size(e)),
                                      lv.EVENT.CLICKED, None)
-        self.read_data = {}
         self.volum_size = 8
         self.aud = audio.Audio(0)
-        self.aud.set_pa(Pin.GPIO29)
         
     def initialization(self):
-        self.read_data = EventMesh.publish("get_storage_data")
-        # print("self.read_data:{}".format(self.read_data))
         num = EventMesh.publish("get_volum_size")
         if num == None:
             self.volum_size = 8
@@ -1803,14 +1799,14 @@ class totalvolumeScreen(Screen):
     def show_bar(self,msg):
         totalvolume_bar.set_value((100 // 11) * self.volum_size, lv.ANIM.OFF)
         if msg == 1:
-            self.read_data = EventMesh.publish("get_storage_data")
-            self.read_data["volum"] = self.volum_size
+            read_data = EventMesh.publish("get_storage_data")
+            read_data["volum"] = self.volum_size
             self.aud.setVolume(self.volum_size)
-            EventMesh.publish("set_storage_data", self.read_data)
+            EventMesh.publish("set_storage_data", read_data)
             EventMesh.publish("set_volum_size",self.volum_size)
             # print("self.read_data:size :{}".format(self.read_data))
             with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
-                ujson.dump(self.read_data,fd)
+                ujson.dump(read_data,fd)
             self.aud.play(1, 1, 'E:/static/audio_audio_haixiu.mp3')  #播放声音
  
     def Close(self):