C06S:
authordxy15521469561 <1731678236@qq.com>
Mon, 20 Nov 2023 09:14:16 +0000 (17:14 +0800)
committerdxy15521469561 <1731678236@qq.com>
Mon, 20 Nov 2023 09:14:16 +0000 (17:14 +0800)
UI资源缺少增加
K01 D10 K5闹钟关机后开机不响铃问题

21 files changed:
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modVideoCall.c
2.sdk/project/C06S/ext/static/menustyle_select.png [new file with mode: 0644]
2.sdk/project/C06S/ext/static/setting/menu_theme_menustyle.png [new file with mode: 0644]
2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/main_init.py
2.sdk/project/D10/audio.bin
2.sdk/project/D10/audio/R_SIM_FAILE.mp3
2.sdk/project/D10/list.json [new file with mode: 0644]
2.sdk/project/D10/merge_bin.py [new file with mode: 0644]
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py
2.sdk/project/D10/usr/static/audio.bin
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/alarm.py
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.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_health.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_setting.py
2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/config/mpconfigboard.h

index 71eef09..7f4b17b 100644 (file)
@@ -17,7 +17,7 @@
 #include "pyexec.h"
 #include "mphalport.h"
 #include "autoconf.h"
-#if 1 //
+#if 0 //
 
 
 STATIC const mp_rom_map_elem_t VideoCall_module_globals_table[] = {
diff --git a/2.sdk/project/C06S/ext/static/menustyle_select.png b/2.sdk/project/C06S/ext/static/menustyle_select.png
new file mode 100644 (file)
index 0000000..8743883
Binary files /dev/null and b/2.sdk/project/C06S/ext/static/menustyle_select.png differ
diff --git a/2.sdk/project/C06S/ext/static/setting/menu_theme_menustyle.png b/2.sdk/project/C06S/ext/static/setting/menu_theme_menustyle.png
new file mode 100644 (file)
index 0000000..45a2727
Binary files /dev/null and b/2.sdk/project/C06S/ext/static/setting/menu_theme_menustyle.png differ
index 4b45208..c893c3c 100644 (file)
@@ -329,5 +329,6 @@ def main_init():
     except Exception as e:
         usys.print_exception(e)
     
+    EventMesh.publish("set_rtc_alarm")
    
 
index 7159643..5682f9b 100644 (file)
Binary files a/2.sdk/project/D10/audio.bin and b/2.sdk/project/D10/audio.bin differ
index f807a04..78e0139 100644 (file)
Binary files a/2.sdk/project/D10/audio/R_SIM_FAILE.mp3 and b/2.sdk/project/D10/audio/R_SIM_FAILE.mp3 differ
diff --git a/2.sdk/project/D10/list.json b/2.sdk/project/D10/list.json
new file mode 100644 (file)
index 0000000..5a079f8
--- /dev/null
@@ -0,0 +1 @@
+['audio_find_haixiu', 'R_ALARM_NEW', 'R_CALL_mp3', 'R_CHARGE_FULL', 'R_CHARGE_IN', 'R_CHARGE_OUT', 'R_HSENSOR_RESULT_FAILE', 'R_HSENSOR_RESULT_HR_TITLE', 'R_HSENSOR_RESULT_OK', 'R_HSENSOR_SPO2_TITLE', 'R_HSENSOR_TEMP_TITLE', 'R_NO_SET_SOS_DIAL', 'R_NO_SIM', 'R_POWER_OFF_1', 'R_READ_STEP_0', 'R_READ_STEP_1', 'R_READ_STEP_2', 'R_READ_STEP_3', 'R_READ_STEP_4', 'R_READ_TIME_0', 'R_READ_TIME_1', 'R_READ_TIME_2', 'R_READ_TIME_3', 'R_READ_TIME_4', 'R_READ_TIME_5', 'R_READ_TIME_6', 'R_READ_TIME_7', 'R_READ_TIME_8', 'R_READ_TIME_9', 'R_READ_TIME_MIN', 'R_READ_TIME_ZHENG', 'R_SIM_CONNECT', 'R_SIM_FAILE', 'R_SOS_ALERT', 'R_TSENSOR_RESULT_VALUE_DOT', 'R_UNREAD_WECHAT', 'R_WECHAT_RECV']
\ No newline at end of file
diff --git a/2.sdk/project/D10/merge_bin.py b/2.sdk/project/D10/merge_bin.py
new file mode 100644 (file)
index 0000000..ed21894
--- /dev/null
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+@FileName : merge_bin.py
+@Author   : zhen.guo
+@Email    : zhen.guo@quectel.com
+@Date     : 2022-08-05 09:58:14
+"""
+import os
+output_list = []
+# 文件名--》下标
+def text_to_hash(filename: str) -> str:
+    output_list.append(filename.split("\\")[-1][:-4])
+    print(str(len(output_list)-1) + filename[-4:])
+    return str(len(output_list)-1) + filename[-4:]
+
+
+def merge_bin(res='res.bin', *args):
+    # 入参文件夹和文件处理
+    file_list = []
+    for i in args:
+        if os.path.isdir(i):
+            for j in os.walk(i):
+                for x in j[2]:
+                    file_list.append(j[0] + x)
+        else:
+            file_list.append(i)
+    f = open(res, 'wb')
+    fileheader = bytes("montage", 'utf-8') + bytes(1) + bytes.fromhex('%08X' % len(file_list))[::-1]
+    filebyte, bytesize, filebody = b'', 0, b''
+    for i in file_list:
+        print(i)
+        filename_byte = bytes(text_to_hash(i), 'utf-8')
+        filebyte += (filename_byte + bytes(128-len(filename_byte)) + bytes.fromhex('%08X' % (len(file_list)*136 + 12 + bytesize))[::-1] + bytes.fromhex('%08X' % os.path.getsize(i))[::-1])
+        bytesize += os.path.getsize(i)
+        filebody += open(i, 'rb').read()
+    f.write(fileheader + filebyte + filebody)
+    f.close()
+    print(output_list)
+    with open('list.json', 'w') as f:
+        f.write(str(output_list))
+    print("----MERGE SUCCESS----")
+    return output_list
+
+output_list = merge_bin("D:\\1.workspace\\3.ASR\\2.G5\\1.Code\\ASR1603_G5\\2.sdk\\project\\D10\\audio.bin", "D:\\1.workspace\\3.ASR\\2.G5\\1.Code\\ASR1603_G5\\2.sdk\\project\\D10\\audio\\")
\ No newline at end of file
index 2e3a7b3..39f9e0e 100644 (file)
@@ -27,7 +27,6 @@ def close_motor():
     motor_pin.write(0)
 
 audio_buf = ['audio_find_haixiu', 'R_ALARM_NEW', 'R_CALL_mp3', 'R_CHARGE_FULL', 'R_CHARGE_IN', 'R_CHARGE_OUT', 'R_HSENSOR_RESULT_FAILE', 'R_HSENSOR_RESULT_HR_TITLE', 'R_HSENSOR_RESULT_OK', 'R_HSENSOR_SPO2_TITLE', 'R_HSENSOR_TEMP_TITLE', 'R_NO_SET_SOS_DIAL', 'R_NO_SIM', 'R_POWER_OFF_1', 'R_READ_STEP_0', 'R_READ_STEP_1', 'R_READ_STEP_2', 'R_READ_STEP_3', 'R_READ_STEP_4', 'R_READ_TIME_0', 'R_READ_TIME_1', 'R_READ_TIME_2', 'R_READ_TIME_3', 'R_READ_TIME_4', 'R_READ_TIME_5', 'R_READ_TIME_6', 'R_READ_TIME_7', 'R_READ_TIME_8', 'R_READ_TIME_9', 'R_READ_TIME_MIN', 'R_READ_TIME_ZHENG', 'R_SIM_CONNECT', 'R_SIM_FAILE', 'R_SOS_ALERT', 'R_TSENSOR_RESULT_VALUE_DOT', 'R_UNREAD_WECHAT', 'R_WECHAT_RECV']
-
 class call:
     CALL_OUT = 1
     CALL_IN = 2
@@ -1938,7 +1937,7 @@ class BtnDevice(Abstract):
             # EventMesh.publish("set_manual_measure_mode",2)#测量血氧
             # EventMesh.publish("play_imei_event")#播報imei号
             pass
-        elif self.sosKey_press_count >= 5:#功能暂时屏蔽
+        elif self.sosKey_press_count == 5:#功能暂时屏蔽
             self.sosKey_press_count = 0
             EventMesh.publish("stop_led_timer")#设置参数
             EventMesh.publish("set_manual_measure_mode",3)#测量体温
index 1d71030..4961728 100644 (file)
@@ -195,7 +195,7 @@ def main_init():
         if timeSecond != 0:
             next_alarm_time = utime.localtime(timeSecond)
             machine.RTC().datetime((next_alarm_time[0],next_alarm_time[1],next_alarm_time[2],next_alarm_time[6],next_alarm_time[3],next_alarm_time[4],next_alarm_time[5],0))
-    
+    EventMesh.publish("set_rtc_alarm")
     EventMesh.publish("open_power_on", 1)#
     
     # EventMesh.publish("load_screen", {"screen": "main_menu"})
index 7159643..5682f9b 100644 (file)
Binary files a/2.sdk/project/D10/usr/static/audio.bin and b/2.sdk/project/D10/usr/static/audio.bin differ
index f6f27e1..7039939 100644 (file)
@@ -152,7 +152,7 @@ class ClockManager(Abstract):
         EventMesh.subscribe("get_alarm_indx", self.get_alarm_indx)
         EventMesh.subscribe("get_check_alarm_list", self.get_check_alarm_list)
 
-       
+        
 
     def get_check_alarm_list(self, event, msg):
         alarm_len = 0
@@ -386,9 +386,9 @@ class ClockManager(Abstract):
         
         get_hr_state = EventMesh.publish("get_hr_state")
         get_spo2_state = EventMesh.publish("get_spo2_state")
-        if get_hr_state != None or get_spo2_state != None:
-            if get_hr_state != 1 and get_spo2_state != 1:
-                EventMesh.publish("load_screen", {"screen": "popup_alarm"})
+        # if get_hr_state != None or get_spo2_state != None:
+        #     if get_hr_state != 1 and get_spo2_state != 1:
+        EventMesh.publish("load_screen", {"screen": "popup_alarm"})
     # def _reset_rtc_alarm_time(self, args):
     #     print("---alarm_ring---")
 
index 7ab0a45..541b77d 100644 (file)
@@ -300,7 +300,7 @@ def main_init():
         if timeSecond != 0:
             next_alarm_time = utime.localtime(timeSecond)
             machine.RTC().datetime((next_alarm_time[0],next_alarm_time[1],next_alarm_time[2],next_alarm_time[6],next_alarm_time[3],next_alarm_time[4],next_alarm_time[5],0))
-
+    EventMesh.publish("set_rtc_alarm")
    
     
 
index 70ef053..ae261fb 100644 (file)
@@ -1162,7 +1162,7 @@ class DialingScreen(Screen):
         if screen_NAME != None:
             if screen_NAME != "dialing_noplay_popup":
                 EventMesh.publish("return_prev_screen")
-                # EventMesh.publish("load_screen", {"screen": "main_menu"})  
+                
 
     def Close(self):
         self.timer.stop()
@@ -1626,6 +1626,7 @@ class DialingNoPlayPopupScreen(Screen):#正在拨号中...未打出
         self.time_count+=1
         if self.time_count >= 10:#5s内没有打通则不在继续拨打关闭
             self.time_count = 0
+            self.timer1.stop()
             EventMesh.publish("set_UI_high_priority", 0)
             sos_flag = EventMesh.publish("get_sos_flag")
             print("sos_flag!!!!!!!!!!!!!!!!:",sos_flag)
@@ -1645,7 +1646,7 @@ class DialingNoPlayPopupScreen(Screen):#正在拨号中...未打出
         EventMesh.publish("set_interrup_incall",0)
         EventMesh.publish("set_UI_high_priority",0)
         EventMesh.publish("return_prev_screen")
-        # EventMesh.publish("load_screen", {"screen": "main_menu"})  
+        
 
     def Close(self):
         self.timer1.stop()
index f7fdbdd..b78d0b0 100644 (file)
@@ -14,7 +14,7 @@ class BtnDevice(Abstract):
         self.__pwk_timer = osTimer()
 
         self.keypad = machine.KeyPad(4, 1)
-        self.__PowerDownTimeOut = 3000
+        self.__PowerDownTimeOut = 5000
         self.__tp = tp
         self.pwk_press = 0
         self.pwk_count = 0
@@ -52,28 +52,35 @@ class BtnDevice(Abstract):
             #print("3pwk_press_cb:self.pwk_count:{} self.GPIO26_status:{}".format(self.pwk_count,self.GPIO26_status))
             self.pwk_count += 1
             #
-            if self.GPIO26_status == 1:#松开
-                if(self.pwk_count >= 1): #防抖100ms
-                    self.__pwk_timer.stop()
-                    if self.pwk_count > (self.__PowerDownTimeOut//100): #长按
-                        EventMesh.publish("btn8_long_press") 
-                    else :
-                        EventMesh.publish("btn8_press")
+            if(self.pwk_count >= 1): #防抖100ms
+                if self.pwk_count > (15000//100): #长按
                     self.pwk_count = 0
                     self.pwk_press = 0
-                    self.GPIO26_flag = 1
-                    
-            # if self.pwk_count > (self.__PowerDownTimeOut//100): #长按
-            #     # self.__pwk_timer.stop()
-            #     # self.pwk_count = 0
-            #     # self.pwk_press = 0
-            #     EventMesh.publish("btn8_long_press")
-            if self.pwk_count > (10000//100): #长按
+                    self.__pwk_timer.stop()
+                    self.GPIO26_flag = 0
+                    # print("power end")
+                    Power.powerDown()
+                   
+                    return
+                elif self.pwk_count > (self.__PowerDownTimeOut//100): #长按
+                    if self.GPIO26_flag == 0:
+                        self.GPIO26_flag = 1
+                        EventMesh.publish("btn8_long_press")
+                        return
+                    if self.GPIO26_status == 1:#松开
+                        self.__pwk_timer.stop()
+                        self.pwk_count = 0
+                        self.pwk_press = 0
+                        self.GPIO26_flag = 0
+                        return
+            if self.GPIO26_status == 1:#松开
                 self.__pwk_timer.stop()
                 self.pwk_count = 0
                 self.pwk_press = 0
-                if self.GPIO26_flag == 1:
-                    Power.powerDown()
+                self.GPIO26_flag = 0
+                EventMesh.publish("btn8_press")
+                
+
 
     def __ui_callback(self, para):
        # print("para = {}".format(para))
index 90f7a3c..6f5952c 100644 (file)
@@ -69,6 +69,9 @@ def main_init():
     from mgr import setCallStateManager,setclassTimeManager,setSmsIndexManager,ConfigStoreManager,testSmsSetIPManager,playPowerAudioManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\
     AddrBookManager,MsgdetailManager,PhoneCallingManager,getOldTimeManager,getStorageDataManager,getBrightnessManager,getHrTimeManager,getTempTimeManager,getLowBatManager
 
+    from protocol import btemp2_ProtoCol,bodytemp2_ProtoCol,TEMP_Hour_ProtoCol,SILENCETIMEFS_ProtoCol,KEYBRD_ProtoCol,SILENCETIME2_ProtoCol,WLKEY_ProtoCol,LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,CENTER_ProtoCol,UPLOAD_ProtoCol,\
+            TEMP_ProtoCol,DLT_ProtoCol,WT_ProtoCol,UD_ProtoCol,REMIND_ProtoCol, CR_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,Time_ProtoCol,\
+                ProtoColResolver,PHL_ProtoCol,MONITOR_ProtoCol,bootoff_ProtoCol,WDSTART_ProtoCol,LOWBAT_ProtoCol,sosHome_dial_ProtoCol,SockManager,NetManager
     import ui as _ui
     # import ui as _ui
     #print("init4:{}".format(utime.localtime()))
@@ -202,9 +205,7 @@ def main_init():
     #print("init6:{}".format(utime.localtime()))
     
     try:
-        from protocol import btemp2_ProtoCol,bodytemp2_ProtoCol,TEMP_Hour_ProtoCol,SILENCETIMEFS_ProtoCol,KEYBRD_ProtoCol,SILENCETIME2_ProtoCol,WLKEY_ProtoCol,LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,CENTER_ProtoCol,UPLOAD_ProtoCol,\
-            TEMP_ProtoCol,DLT_ProtoCol,WT_ProtoCol,UD_ProtoCol,REMIND_ProtoCol, CR_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,Time_ProtoCol,\
-                ProtoColResolver,PHL_ProtoCol,MONITOR_ProtoCol,bootoff_ProtoCol,WDSTART_ProtoCol,LOWBAT_ProtoCol,sosHome_dial_ProtoCol,SockManager,NetManager
+        
         import mgr as mgr
         #print("init7:{}".format(utime.localtime()))
         
@@ -328,5 +329,6 @@ def main_init():
     except Exception as e:
         usys.print_exception(e)
     
+    EventMesh.publish("set_rtc_alarm")
    
 
index 595e1f5..ab1d90e 100644 (file)
@@ -610,7 +610,7 @@ def voice_callback(args):
         screen_NAME = EventMesh.publish("get_screen_NAME")
         if screen_NAME != None:
             if screen_NAME != "dialing_noplay_popup":
-                EventMesh.publish("load_screen", {"screen": "main_menu"})  
+                EventMesh.publish("return_prev_screen")
         
         EventMesh.publish("set_sos_info_call")  
         print('voicecall disconnect end')
index 8be1392..5a5ffc1 100644 (file)
@@ -729,6 +729,7 @@ class CallLogScreen(Screen):
         self.call_log_detail_list = None
         self.call_log_detail_list_dict = []
         self.timer = osTimer()
+        self.is_sliding = 0
         EventMesh.subscribe("call_log_update_show_list", self.call_log_update_show_list)
 
     def post_processor_before_initialization(self):
@@ -751,6 +752,7 @@ class CallLogScreen(Screen):
        self.btn_create()
 
     def initialization(self):
+        self.is_sliding = 0 
         global call_log_screen,contacts_cont_list ,call_log_title ,none_call_log_title ,call_log_cont_list_screen
         if call_log_screen  == None:
             call_log_screen = lv.obj()
@@ -791,6 +793,8 @@ class CallLogScreen(Screen):
                 _btn.add_flag(lv.obj.FLAG.CLICKABLE)
                 _btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling(e)),
                                         lv.EVENT.CLICKED, None)
+                _btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling(e)),
+                                        lv.EVENT.PRESSING, None)
                 _btn.add_flag(lv.obj.FLAG.HIDDEN)
                 _btn_label2 = lv.label(_btn)
                 _btn_label3 = lv.label(_btn)
@@ -899,60 +903,69 @@ class CallLogScreen(Screen):
         
     def calling(self,e):
         code = e.get_code()
-        if code == lv.EVENT.CLICKED:
-            global call_log_screen,contacts_cont_list ,call_log_title ,none_call_log_title 
-            # print("e.get_text():{} {}".format(e.get_target().get_child(0).get_text(),e.get_target().get_child(3).get_text()))
-            phonnum = str(e.get_target().get_child(0).get_text())
-            phnoname = e.get_target().get_child(3).get_text()
-            # print("phonnum :{} _msg:{}".format(phonnum,phnoname))
+        if code == lv.EVENT.PRESSING:
+            #print("PRESSING")
+            self.is_sliding += 1
+
+        elif  code == lv.EVENT.CLICKED:
+            #utime.sleep_ms(10)
+            print("1self.is_sliding",self.is_sliding)
+            if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件
+                self.is_sliding = 0
+                
+                global call_log_screen,contacts_cont_list ,call_log_title ,none_call_log_title 
+                # print("e.get_text():{} {}".format(e.get_target().get_child(0).get_text(),e.get_target().get_child(3).get_text()))
+                phonnum = str(e.get_target().get_child(0).get_text())
+                phnoname = e.get_target().get_child(3).get_text()
+                # print("phonnum :{} _msg:{}".format(phonnum,phnoname))
+                
             
-           
-            self.name = None
-            self.phonebook = {}
+                self.name = None
+                self.phonebook = {}
 
-            self.call_log = {}
-            self.call_log_value = {}
-            self.read_call_log = {}
-            self.number_tmp = {}
+                self.call_log = {}
+                self.call_log_value = {}
+                self.read_call_log = {}
+                self.number_tmp = {}
 
-            data = EventMesh.publish("get_phonebook_list")
-            if data != None:
-                check = data[0]
-                self.phonebook = data[1]
-                # print("check :{}".format(check))
-                if check == 1:#检查通讯录
-                    phonebook_keys = sorted(self.phonebook.keys())
-                    b = str(phonnum) in self.phonebook.values()#查找key中是否包含content电话号码 True 包含在里面 False不包含在里面
-                    j = 0
-                    if b == True:
-                        for i in range(len(self.phonebook)): #字典 key value
-                            #'001:':15521469561
-                            name = self.phonebook[phonebook_keys[j]]
-                            name_value = phonebook_keys[j]
-                            number_tmp = str(phonnum)
-                            # print("name :{} number_tmp:{}".format(name,number_tmp))
-                            if name.find(number_tmp) != -1:#查找电话号码是否在通讯录里面
-                                number_f= name_value
-                                name_s = number_f.split(':')
-                                name_s = name_s[1]
-                                self.name = name_s
-                                break
-                            j+=1
+                data = EventMesh.publish("get_phonebook_list")
+                if data != None:
+                    check = data[0]
+                    self.phonebook = data[1]
+                    # print("check :{}".format(check))
+                    if check == 1:#检查通讯录
+                        phonebook_keys = sorted(self.phonebook.keys())
+                        b = str(phonnum) in self.phonebook.values()#查找key中是否包含content电话号码 True 包含在里面 False不包含在里面
+                        j = 0
+                        if b == True:
+                            for i in range(len(self.phonebook)): #字典 key value
+                                #'001:':15521469561
+                                name = self.phonebook[phonebook_keys[j]]
+                                name_value = phonebook_keys[j]
+                                number_tmp = str(phonnum)
+                                # print("name :{} number_tmp:{}".format(name,number_tmp))
+                                if name.find(number_tmp) != -1:#查找电话号码是否在通讯录里面
+                                    number_f= name_value
+                                    name_s = number_f.split(':')
+                                    name_s = name_s[1]
+                                    self.name = name_s
+                                    break
+                                j+=1
+                        else:
+                            self.name = phnoname
                     else:
                         self.name = phnoname
-                else:
-                    self.name = phnoname
-
-            if self.name == None:
-                self.name = phnoname
-            if len(phonnum) > 0:
-                EventMesh.publish("save_phonename",self.name)#
-                EventMesh.publish("save_phonenum",phonnum)#保存电话号码用于界面显示获取
-                #voiceCall.callStart(str(phonnum))
-                EventMesh.publish("load_screen", {"screen": "dialing_noplay_popup"})
-            else:
-                EventMesh.publish("load_screen", {"screen": "no_valied_num_screen"})#无效的号码 请重新输入
 
+                if self.name == None:
+                    self.name = phnoname
+                if len(phonnum) > 0:
+                    EventMesh.publish("save_phonename",self.name)#
+                    EventMesh.publish("save_phonenum",phonnum)#保存电话号码用于界面显示获取
+                    #voiceCall.callStart(str(phonnum))
+                    EventMesh.publish("load_screen", {"screen": "dialing_noplay_popup"})
+                else:
+                    EventMesh.publish("load_screen", {"screen": "no_valied_num_screen"})#无效的号码 请重新输入
+            self.is_sliding = 0
 
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
@@ -1039,7 +1052,7 @@ class DialingScreen(Screen):
         screen_NAME = EventMesh.publish("get_screen_NAME")
         if screen_NAME != None:
             if screen_NAME != "dialing_noplay_popup":
-                EventMesh.publish("load_screen", {"screen": "main_menu"})  
+                EventMesh.publish("return_prev_screen") 
 
     def Close(self):
         self.timer.stop()
@@ -1557,12 +1570,7 @@ class DialingNoPlayPopupScreen(Screen):#正在拨号中...未打出
             EventMesh.publish("set_hangup_mode",0)
         EventMesh.publish("set_interrup_incall",0)
         EventMesh.publish("set_UI_high_priority",0)
-        
-
-        screen_NAME = EventMesh.publish("get_screen_NAME")
-        if screen_NAME != None:
-            if screen_NAME != "dialing_noplay_popup":
-                EventMesh.publish("load_screen", {"screen": "main_menu"})  
+        EventMesh.publish("return_prev_screen")
 
     def Close(self):
         self.timer1.stop()
@@ -1964,6 +1972,7 @@ class PopupScreen(Screen):
         self.sms_detail_list = None
         self.sms_detail_list_dict = []
         self.sms_data = [] #最新短信内容
+        self.is_sliding =0    
     def post_processor_before_initialization(self):
         pass
         # self.msg_nums = sms.getMsgNums() #获取短信条数
@@ -1972,6 +1981,7 @@ class PopupScreen(Screen):
         # self.msg_nums_old = self.msg_nums
 
     def initialization(self):
+        self.is_sliding = 0
         global msg_list_screen,msg_top_title,msg_cont_detail,msg_list_t,msg_list_t_done_img,no_msg_text,msg_cont_list_screen
         print("PopupScreen:initialization1")
         if msg_list_screen == None :
@@ -2021,6 +2031,8 @@ class PopupScreen(Screen):
                 msg_btn = lv.btn(self.sms_detail_list)
                 msg_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.sms_cb(e)),
                                         lv.EVENT.CLICKED, None)
+                msg_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.sms_cb(e)),
+                                        lv.EVENT.PRESSING, None)
                 msg_btn.add_flag(lv.obj.FLAG.HIDDEN)
                 _btn_label2 = lv.label(msg_btn)
                 _btn_label3 = lv.label(msg_btn)
@@ -2281,20 +2293,27 @@ class PopupScreen(Screen):
             if self.sms_detail_list != None:
                 self.sms_detail_list.add_flag(lv.obj.FLAG.HIDDEN)
             
-            
     def sms_cb(self,e):
         code = e.get_code()
-        if code == lv.EVENT.CLICKED:
-            print("tp test!!!!!!!!!!!!!!")
-            #上传标题和内容
-            _name = e.get_target().get_child(0).get_text()
-            EventMesh.publish("save_msg_name", _name)       
-            content = e.get_target().get_child(1).get_text()
-            EventMesh.publish("save_msg_content", content) 
-       
-        #显示详细页面
-        EventMesh.publish("load_screen", {"screen": "msg_detail"})
-    
+        if code == lv.EVENT.PRESSING:
+            #print("PRESSING")
+            self.is_sliding += 1
+
+        elif  code == lv.EVENT.CLICKED:
+            #utime.sleep_ms(10)
+            print("1self.is_sliding",self.is_sliding)
+            if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件
+                print("tp test!!!!!!!!!!!!!!")
+                #上传标题和内容
+                _name = e.get_target().get_child(0).get_text()
+                EventMesh.publish("save_msg_name", _name)       
+                content = e.get_target().get_child(1).get_text()
+                EventMesh.publish("save_msg_content", content) 
+                #显示详细页面
+                EventMesh.publish("load_screen", {"screen": "msg_detail"})
+                
+            self.is_sliding =0     
+
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
     def btn1_release(self):
@@ -2706,8 +2725,10 @@ class ToolboxScreen(Screen):
     def __init__(self):
         super().__init__()
         self.meta = None
+        self.is_sliding = 0
 
     def initialization(self):
+        self.is_sliding = 0
         global toolbox_screen,toolbox_text_img,toolbox_cont,toolbox_step_img,toolbox_weather_img ,toolbox_alarm_img  ,\
             toolbox_countdown_img,toolbox_stopwatch_img
         if toolbox_screen == None:
@@ -2777,13 +2798,34 @@ class ToolboxScreen(Screen):
             toolbox_stopwatch_img.set_src("E:/static/tool/IMAGE_SECMENU_STOPWATCH.png")
             toolbox_stopwatch_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-            toolbox_step_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "step"})), lv.EVENT.CLICKED, None)
-            toolbox_weather_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "weather"})), lv.EVENT.CLICKED, None)
-            toolbox_alarm_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "clk_list"})), lv.EVENT.CLICKED, None)
+            toolbox_step_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.toolbox_cb(e, "step")), lv.EVENT.CLICKED, None)
+            toolbox_weather_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.toolbox_cb(e, "weather")), lv.EVENT.CLICKED, None)
+            toolbox_alarm_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.toolbox_cb(e, "clk_list")), lv.EVENT.CLICKED, None)
             # toolbox_sms_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "popup"})), lv.EVENT.CLICKED, None)
-            toolbox_countdown_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "countdown"})), lv.EVENT.CLICKED, None)
-            toolbox_stopwatch_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "stopwatch"})), lv.EVENT.CLICKED, None)
+            toolbox_countdown_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.toolbox_cb(e, "countdown")), lv.EVENT.CLICKED, None)
+            toolbox_stopwatch_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.toolbox_cb(e, "stopwatch")), lv.EVENT.CLICKED, None)
+
+            toolbox_step_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.toolbox_cb(e, "step")), lv.EVENT.PRESSING, None)
+            toolbox_weather_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.toolbox_cb(e,"weather")), lv.EVENT.PRESSING, None)
+            toolbox_alarm_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.toolbox_cb(e, "clk_list")), lv.EVENT.PRESSING, None)
+            # toolbox_sms_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "popup"})), lv.EVENT.PRESSING, None)
+            toolbox_countdown_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.toolbox_cb(e,"countdown")), lv.EVENT.PRESSING, None)
+            toolbox_stopwatch_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.toolbox_cb(e, "stopwatch")), lv.EVENT.PRESSING, None)
             self.meta = toolbox_screen
+    def toolbox_cb(self,e,msg):
+        code = e.get_code()
+        if code == lv.EVENT.PRESSING:
+            #print("PRESSING")
+            self.is_sliding += 1
+
+        elif  code == lv.EVENT.CLICKED:
+            #utime.sleep_ms(10)
+            print("1self.is_sliding",self.is_sliding)
+            if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件
+                self.is_sliding = 0
+                EventMesh.publish("load_screen", {"screen":"{}".format(msg)})
+                
+            self.is_sliding =0
 
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
@@ -3004,7 +3046,7 @@ class IncomingCallScreen(Screen):
         screen_NAME = EventMesh.publish("get_screen_NAME")
         if screen_NAME != None:
             if screen_NAME != "dialing_noplay_popup":
-                EventMesh.publish("load_screen", {"screen": "main_menu"})  
+                EventMesh.publish("return_prev_screen") 
 
     def btn1_release(self):
         pass
@@ -3575,7 +3617,7 @@ class OnCallScreen(Screen):
         screen_NAME = EventMesh.publish("get_screen_NAME")
         if screen_NAME != None:
             if screen_NAME != "dialing_noplay_popup":
-                EventMesh.publish("load_screen", {"screen": "main_menu"})  
+                EventMesh.publish("return_prev_screen")
         
     def Close(self):
         self.timer.stop()
@@ -3857,6 +3899,7 @@ class ContactsScreen(Screen):
         self.MXA_phone_num = 50 #最大显示号码个数
         self.contact_detail_listt_dict = []
         self.calling_btn = []
+        self.is_sliding = 0
 
     def post_processor_before_initialization(self):
         data = EventMesh.publish("get_phonebook_list")
@@ -3866,6 +3909,7 @@ class ContactsScreen(Screen):
             self.count = 0
 
     def initialization(self):
+        self.is_sliding = 0
         global contacts_screen,contacts_cont,contacts_top_title,contact_none_label,contacts_screen_list_screen
         if contacts_screen == None:
             contacts_screen = lv.obj()
@@ -3906,6 +3950,8 @@ class ContactsScreen(Screen):
                 contact_btn.add_flag(lv.obj.FLAG.CLICKABLE)
                 contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e)),
                                         lv.EVENT.CLICKED, None)
+                contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e)),
+                                        lv.EVENT.PRESSING, None)
                 contact_btn.add_flag(lv.obj.FLAG.HIDDEN)
                 
                 contact_btn_label_1 = lv.label(contact_btn)
@@ -4001,16 +4047,24 @@ class ContactsScreen(Screen):
                 contact_none_label.clear_flag(lv.obj.FLAG.HIDDEN) #显示空文本
             if self.contact_detail_list != None:
                 self.contact_detail_list.add_flag(lv.obj.FLAG.HIDDEN)#隐藏空文本
-            
 
     def calling_cb(self,e):
         code = e.get_code()
-        if code == lv.EVENT.CLICKED:
-            if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:#有卡时触发sos报警 无卡时自动关机
-                msg_text = e.get_target().get_child(1).get_text()
-                EventMesh.publish("publish_message_event_ui",{"func":self.calling,"data":msg_text})
-            else:
-                EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"})
+        if code == lv.EVENT.PRESSING:
+            #print("PRESSING")
+            self.is_sliding += 1
+
+        elif  code == lv.EVENT.CLICKED:
+            #utime.sleep_ms(10)
+            print("1self.is_sliding",self.is_sliding)
+            if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件
+                self.is_sliding = 0
+                if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:#有卡时触发sos报警 无卡时自动关机
+                    msg_text = e.get_target().get_child(1).get_text()
+                    EventMesh.publish("publish_message_event_ui",{"func":self.calling,"data":msg_text})
+                else:
+                    EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"})
+            self.is_sliding =0 
 
     def calling(self,msg_text):    
         _msg = msg_text
@@ -4030,7 +4084,8 @@ class ContactsScreen(Screen):
 
 
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+        EventMesh.publish("return_prev_screen")
+        # EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
index ba3cf5a..0edc12e 100644 (file)
@@ -142,12 +142,34 @@ class HealthScreen(Screen):#健康测量
 
     def __init__(self):
         super().__init__()
+        self.is_sliding = 0
         self.meta = health_screen
         # setting_language.add_event_cb(lambda e: self.load_screen(e, {"screen": "language"}), lv.EVENT.CLICKED, None)
-        health_hr_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "heartrate"})), lv.EVENT.CLICKED, None)
+        health_hr_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.health_cb(e, "heartrate")), lv.EVENT.CLICKED, None)
         # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.CLICKED, None)
-        health_spo2_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "spo2"})), lv.EVENT.CLICKED, None)
-        health_temp_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "temperature"})), lv.EVENT.CLICKED, None)
+        health_spo2_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.health_cb(e, "spo2")), lv.EVENT.CLICKED, None)
+        health_temp_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.health_cb(e, "temperature")), lv.EVENT.CLICKED, None)
+
+       
+        health_hr_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.health_cb(e,"heartrate")), lv.EVENT.PRESSING, None)
+        # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.CLICKED, None)
+        health_spo2_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.health_cb(e, "spo2")), lv.EVENT.PRESSING, None)
+        health_temp_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.health_cb(e, "temperature")), lv.EVENT.PRESSING, None)
+    
+    def health_cb(self,e,msg):
+        code = e.get_code()
+        if code == lv.EVENT.PRESSING:
+            #print("PRESSING")
+            self.is_sliding += 1
+
+        elif  code == lv.EVENT.CLICKED:
+            #utime.sleep_ms(10)
+            print("1self.is_sliding",self.is_sliding)
+            if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件
+                self.is_sliding = 0
+                EventMesh.publish("load_screen", {"screen":"{}".format(msg)})
+                
+            self.is_sliding =0
 
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
index 992f973..2c0d6de 100644 (file)
@@ -264,29 +264,41 @@ class SettingScreen(Screen):
         self.is_sliding = 0
         self.meta = setting_screen
         # setting_language.add_event_cb(lambda e: self.load_screen(e, {"screen": "language"}), lv.EVENT.CLICKED, None)
-        setting_dialswitch.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "dialswitch"})), lv.EVENT.CLICKED, None)
+        setting_dialswitch.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "dialswitch")), lv.EVENT.CLICKED, None)
         # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.CLICKED, None)
-        setting_imei.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "imei"})), lv.EVENT.CLICKED, None)
-        setting_app.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "app"})), lv.EVENT.CLICKED, None)
-        setting_bright.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "brightness"})), lv.EVENT.CLICKED, None)
-        setting_volume.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "totalvolume"})), lv.EVENT.CLICKED, None)
-        setting_restore.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "restore"})), lv.EVENT.CLICKED, None)
-        setting_poweroff.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "poweroff"})), lv.EVENT.CLICKED, None)
+        setting_imei.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "imei")), lv.EVENT.CLICKED, None)
+        setting_app.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "app")), lv.EVENT.CLICKED, None)
+        setting_bright.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e,"brightness")), lv.EVENT.CLICKED, None)
+        setting_volume.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e,"totalvolume")), lv.EVENT.CLICKED, None)
+        setting_restore.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "restore")), lv.EVENT.CLICKED, None)
+        setting_poweroff.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "poweroff")), lv.EVENT.CLICKED, None)
         # setting_update.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "update"})), lv.EVENT.CLICKED, None)
-        setting_version.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "version"})), lv.EVENT.CLICKED, None)
+        setting_version.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "version")), lv.EVENT.CLICKED, None)
 
         # img regist btton
         # setting_language.add_event_cb(lambda e: self.load_screen(e, {"screen": "language"}), lv.EVENT.CLICKED, None)
-        setting_dialswitch_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "dialswitch"})), lv.EVENT.CLICKED, None)
+        setting_dialswitch_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "dialswitch")), lv.EVENT.CLICKED, None)
         # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.CLICKED, None)
-        setting_imei_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "imei"})), lv.EVENT.CLICKED, None)
-        setting_app_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "app"})), lv.EVENT.CLICKED, None)
-        setting_bright_img.add_event_cb(lambda e:EventMesh.callback_wrapper( self.setting_cb(e, {"screen": "brightness"})), lv.EVENT.CLICKED, None)
-        setting_volume_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "totalvolume"})), lv.EVENT.CLICKED, None)
-        setting_restore_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "restore"})), lv.EVENT.CLICKED, None)
-        setting_poweroff_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "poweroff"})), lv.EVENT.CLICKED, None)
+        setting_imei_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "imei")), lv.EVENT.CLICKED, None)
+        setting_app_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "app")), lv.EVENT.CLICKED, None)
+        setting_bright_img.add_event_cb(lambda e:EventMesh.callback_wrapper( self.setting_cb(e, "brightness")), lv.EVENT.CLICKED, None)
+        setting_volume_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "totalvolume")), lv.EVENT.CLICKED, None)
+        setting_restore_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e,"restore")), lv.EVENT.CLICKED, None)
+        setting_poweroff_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "poweroff")), lv.EVENT.CLICKED, None)
         # setting_update_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "update"})), lv.EVENT.CLICKED, None)
-        setting_version_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, {"screen": "version"})), lv.EVENT.CLICKED, None)
+        setting_version_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "version")), lv.EVENT.CLICKED, None)
+
+
+        setting_dialswitch_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "dialswitch")), lv.EVENT.PRESSING, None)
+        # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.CLICKED, None)
+        setting_imei_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "imei")), lv.EVENT.PRESSING, None)
+        setting_app_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "app")), lv.EVENT.PRESSING, None)
+        setting_bright_img.add_event_cb(lambda e:EventMesh.callback_wrapper( self.setting_cb(e,"brightness")), lv.EVENT.PRESSING, None)
+        setting_volume_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "totalvolume")), lv.EVENT.PRESSING, None)
+        setting_restore_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "restore")), lv.EVENT.PRESSING, None)
+        setting_poweroff_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e,"poweroff")), lv.EVENT.PRESSING, None)
+        # setting_update_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "update"})), lv.EVENT.CLICKED, None)
+        setting_version_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "version")), lv.EVENT.PRESSING, None)
 
     
     def setting_cb(self,e,msg):
index 354f319..ab9183f 100644 (file)
@@ -56,8 +56,8 @@
 #define MICROPY_QPY_MODULE_VFS_THREADSAFE   (1)
 
 #if CONFIG_MBEDTLS
-    #define MICROPY_QPY_MODULE_USSL         (0)
-    #define MICROPY_QPY_SSL_MBEDTLS         (0)
+    #define MICROPY_QPY_MODULE_USSL         (1)
+    #define MICROPY_QPY_SSL_MBEDTLS         (1)
 #endif
 
 #if CONFIG_QUECTHING