支付宝绑定成功跳转问题
authord15521469561 <d155214695615@qq.com>
Wed, 10 May 2023 07:39:05 +0000 (15:39 +0800)
committerd15521469561 <d155214695615@qq.com>
Wed, 10 May 2023 07:39:05 +0000 (15:39 +0800)
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appAlipay.py
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appFactoryMode.py
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appWechat.py
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/mgr.py
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_setting.py

index d968b40..4231002 100644 (file)
@@ -98,7 +98,7 @@ class Alipay(Abstract):
         #print("timeout_Alipay1:{}".format(EventMesh.publish(constants.EVENT.GET_CONNECT)))
         time = utime.localtime()
 
-        if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1 and self.alipay != None and (self.is_simcard_identify != 0 or time[3] == 0 or time[3] == 12):
+        if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1 and self.alipay != None and (self.is_simcard_identify != 0 ):#or time[3] == 0 or time[3] == 12):
         #if self.alipay != None and (self.is_simcard_identify != 0 or time[3] == 0 or time[3] == 12):
             self.is_simcard_identify = self.alipay.start_simcard_identify()
             print("is_simcard_identify:%d"%self.is_simcard_identify)
@@ -364,6 +364,7 @@ class AlipayOpenScreen(Screen):
         pass
 
     def timeout_AlipayOpen(self, *args, **kwargs):
+        EventMesh.publish("system_sleep_rest")#防止黑屏
         if EventMesh.publish("get_alipay_init") == 0:
             EventMesh.publish("alipay_1")
             self.timer_AlipayOpen.stop()
@@ -456,6 +457,7 @@ class Alipay_1_1(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
+        EventMesh.publish("watch_top_show")
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 alipay_invite_screen = lv.obj()
@@ -484,7 +486,7 @@ alipay_invite_bg_color = lv.palette_lighten(lv.PALETTE.LIGHT_BLUE, 5)
 alipay_invite_fg_color = lv.palette_darken(lv.PALETTE.BLUE, 4)
 
 alipay_invite_alipay_qr = lv.qrcode(alipay_invite_bg, 150, alipay_invite_fg_color, alipay_invite_bg_color)
-alipay_invite_alipay_qr.set_pos(41,67)
+alipay_invite_alipay_qr.set_pos(41,63)
 # Add a border with alipay_invite_bg_color
 alipay_invite_alipay_qr.set_style_border_color(alipay_invite_bg_color, 0)
 alipay_invite_alipay_qr.set_style_border_width(5, 0)
@@ -496,6 +498,7 @@ class Alipay_invite(Screen):
         self.meta = alipay_invite_screen
                      
     def initialization(self):
+
         pass
    
     def post_processor_after_initialization(self):
@@ -515,6 +518,7 @@ class Alipay_invite(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
+        EventMesh.publish("watch_top_show")
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 alipay_inviting_screen = lv.obj()
@@ -551,6 +555,7 @@ class Alipay_inviting(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
+        EventMesh.publish("watch_top_show")
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 alipay_success_screen = lv.obj()
@@ -587,9 +592,9 @@ class Alipay_success(Screen):
     def post_processor_after_initialization(self):
         pass
 
-    def timeout_AlipayOpen(self, *args, **kwargs):
+    def timeout_Alipay_success(self, *args, **kwargs):
         EventMesh.publish("load_screen", {"screen": "alipay_1_1"}) 
-        self.timer_AlipayOpen.stop()    
+        self.timer_Alipay_success.stop()    
         
 
     def Close(self):
@@ -597,9 +602,10 @@ class Alipay_success(Screen):
         pass
                 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+        EventMesh.publish("load_screen", {"screen": "alipay_1_1"})
 
     def btn8_press(self):
+        EventMesh.publish("watch_top_show")
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 alipay_paycode_screen = lv.obj()
index 078e0d7..900bd41 100644 (file)
@@ -7,8 +7,10 @@ import ujson
 import ql_fs
 import audio
 from machine import Pin
-from ui import style_screen,style_font_youyuan_20,ContStyle,style_btn,style_img,Screen,style_contact_btn
+from ui import style_screen,style_font_youyuan_20,style_btn,style_img,Screen,style_contact_btn
 import audio
+
+
 factorymode_cont_y = 0
 factorymode_screen = lv.obj()
 factorymode_screen.center()
@@ -23,13 +25,23 @@ factorymode_title.set_long_mode(lv.label.LONG.WRAP)
 factorymode_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 factorymode_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
+factorymode_cont_style = lv.style_t()
+factorymode_cont_style.init()
+factorymode_cont_style.set_radius(0)
+factorymode_cont_style.set_bg_color(lv.color_make(0x00, 0x00, 0x00))
+factorymode_cont_style.set_bg_grad_color(lv.color_make(0x00, 0x00, 0x00))
+factorymode_cont_style.set_bg_grad_dir(lv.GRAD_DIR.VER)
+factorymode_cont_style.set_bg_opa(255)
+factorymode_cont_style.set_border_width(0)
+factorymode_cont_style.set_pad_left(0)
+factorymode_cont_style.set_pad_right(0)
+factorymode_cont_style.set_pad_top(0)
+factorymode_cont_style.set_pad_bottom(0)
+
 factorymode_cont = lv.obj(factorymode_screen)
 factorymode_cont.set_pos(0, 50)
 factorymode_cont.set_size(240, 270)
-factorymode_cont_style = ContStyle()
-factorymode_cont.add_style(
-    factorymode_cont_style.style_cont(0, lv.color_make(0x00, 0x00, 0x00), lv.color_make(0x00, 0x00, 0x00), 255),
-    lv.PART.MAIN | lv.STATE.DEFAULT)
+factorymode_cont.add_style(factorymode_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT)
 
 factorymode_location = lv.btn(factorymode_cont)
 factorymode_location.set_pos(0, factorymode_cont_y)
index dfc09d8..a001675 100644 (file)
@@ -338,7 +338,7 @@ class WechatScreen(Screen):
             #修改或添加词典键值
             self.press_state = 0
             self.ble_send = 0
-            
+            self.timer.start(2 * 1000, 0, self.hide_label)
             with open("/ext/static/storage_file/wechat_record.json","w",encoding="utf-8") as fd:
                 ujson.dump(self.wechat_recode_list,fd)
             print("senddata self.wechat_num ...:{}".format(self.wechat_num))
@@ -350,7 +350,7 @@ class WechatScreen(Screen):
                 EventMesh.publish(constants.PROTOCOL.TK_SEND,senddata)
             #隐藏显示文本 显示列表显示框
             
-            self.timer.start(2 * 1000, 0, self.hide_label)
+            
             
             self.updata_list_show(2)
             
index 2abb08a..2fce4da 100644 (file)
@@ -663,7 +663,7 @@ class DeviceInfoManager(Abstract):
             if hr_time != None:
                 # print("hr......01....{}\r\n".format(hr_time))
                 if hr_time > 0:
-                    # print("get_hr_state:{} get_spo2_state:{} self.old_time:{} hr_time:{}".format(self.get_hr_state,self.get_spo2_state,self.old_time,hr_time))
+                    #print("get_hr_state:{} get_spo2_state:{} self.old_time:{} hr_time:{}".format(self.get_hr_state,self.get_spo2_state,self.old_time,hr_time))
                     if self.get_hr_state != 1 and self.get_spo2_state != 1:
                         if self.get_hr_state == 0 and self.get_spo2_state == 0:
                             if self.HR_state == 0 or self.HR_state == 3:
@@ -742,11 +742,10 @@ class DeviceInfoManager(Abstract):
                                 EventMesh.publish("set_old_spo2_data",spo2_value)
                                 EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value)
                             self.HR_state = 3
-                        
                     else:
-                        self.SENSOR_time = time_tmp
                         self.HR_state = 0
-                        self.old_time = 0 
+                        self.old_time = hr_time
+
                     if self.HR_state == 3 or self.HR_state == 0:#只有不在测量的时候才测单次的
                         if self.get_spo2_state == 3 or self.get_hr_state == 3:#单次测量
                             self.HR_state = 0
@@ -830,11 +829,9 @@ class DeviceInfoManager(Abstract):
                         else:
                             self.HR_Onestate = 0
                             self.HR_OneTime = 0
-                        
                 else:
-                    # print("hr......01....{} {} self.HR_Onestate {} {}".format(self.get_hr_state,self.get_spo2_state,self.HR_OneTime,self.HR_Onestate))
+                    #print("hr......01....{} {} self.HR_Onestate {} {}".format(self.get_hr_state,self.get_spo2_state,self.HR_OneTime,self.HR_Onestate))
                     self.SENSOR_time = time_tmp#进入最后一次的时间戳
-                    self.old_time = 0
 
                     if self.get_hr_state != 1 and self.get_spo2_state != 1:#没有设置间隔时间单次测量
                         if self.get_spo2_state == 3 or self.get_hr_state == 3:#单次测量
@@ -1889,7 +1886,7 @@ class getVolumSizeManager(Abstract):#设置或获取音量大小数据
         self.volume_size = 8
         self.read_data = {}
         check = ql_fs.path_exists("/ext/static/storage_file/config.json")
-        print("check:{}".format(check))
+        
         if check == True:
             with open("/ext/static/storage_file/config.json","r") as fd:
                 self.read_data = ujson.load(fd)
@@ -1901,6 +1898,7 @@ class getVolumSizeManager(Abstract):#设置或获取音量大小数据
                         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)
         EventMesh.subscribe("get_volum_size", self.get_volum_size)
index ee5d88b..c606501 100644 (file)
@@ -29,6 +29,7 @@ style_screen.set_pad_left(0)
 style_screen.set_pad_right(0)
 style_screen.set_pad_top(0)
 style_screen.set_pad_bottom(0)
+
 # 默认白色
 
 style_font_youyuan_20 = lv.style_t()
@@ -47,35 +48,6 @@ style_font_youyuan_20_black.set_text_color(lv.color_make(0x00, 0x00, 0x00))
 style_font_youyuan_20_black.set_text_font_v2("font_24.bin",24,0)
 
 
-class LabelStyle(object):
-    def __init__(self):
-        self.style = lv.style_t()
-
-    def style_label(self, font):
-        self.style.init()
-        self.style.set_text_color(lv.color_make(0xff, 0xff, 0xff))
-        self.style.set_text_font(font)
-        return self.style
-
-# cont style
-class ContStyle(object):
-    def __init__(self):
-        self.style = lv.style_t()
-
-    def style_cont(self, radius, color1, color2, opa):
-        self.style.init()
-        self.style.set_radius(radius)
-        self.style.set_bg_color(color1)
-        self.style.set_bg_grad_color(color2)
-        self.style.set_bg_grad_dir(lv.GRAD_DIR.VER)
-        self.style.set_bg_opa(opa)
-        self.style.set_border_width(0)
-        self.style.set_pad_left(0)
-        self.style.set_pad_right(0)
-        self.style.set_pad_top(0)
-        self.style.set_pad_bottom(0)
-        return self.style
-
 style_img = lv.style_t()
 style_img.init()
 style_img.set_img_opa(255)
@@ -1460,6 +1432,19 @@ toolbox_alarm_img = None
 toolbox_sms_img = None
 toolbox_countdown_img = None
 toolbox_stopwatch_img = None
+
+toolbox_cont_style = lv.style_t()
+toolbox_cont_style.init()
+toolbox_cont_style.set_radius(0)
+toolbox_cont_style.set_bg_color(lv.color_make(0x00, 0x00, 0x00))
+toolbox_cont_style.set_bg_grad_color(lv.color_make(0x00, 0x00, 0x00))
+toolbox_cont_style.set_bg_grad_dir(lv.GRAD_DIR.VER)
+toolbox_cont_style.set_bg_opa(255)
+toolbox_cont_style.set_border_width(0)
+toolbox_cont_style.set_pad_left(0)
+toolbox_cont_style.set_pad_right(0)
+toolbox_cont_style.set_pad_top(0)
+toolbox_cont_style.set_pad_bottom(0)
 class ToolboxScreen(Screen):
     NAME = "toolbox"
 
@@ -1484,10 +1469,7 @@ class ToolboxScreen(Screen):
             toolbox_cont = lv.obj(toolbox_screen)
             toolbox_cont.set_pos(0, 50)
             toolbox_cont.set_size(240, 270)
-            toolbox_cont_style = ContStyle()
-            toolbox_cont.add_style(
-                toolbox_cont_style.style_cont(0, lv.color_make(0x00, 0x00, 0x00), lv.color_make(0x00, 0x00, 0x00), 255),
-                lv.PART.MAIN | lv.STATE.DEFAULT)
+            toolbox_cont.add_style(toolbox_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT)
 
 
             toolbox_step_img = lv.img(toolbox_cont)
@@ -1915,14 +1897,14 @@ class StepScreen(Screen):
             step_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
             self.meta = step_screen
 
-        step = EventMesh.publish(constants.EVENT.GET_STEP)
-        step_label_01.set_text("{}步".format(step[0]))
+        step = EventMesh.publish("get_old_step_value")
+        step_label_01.set_text("{}步".format(step))
         self.timer.start(1000, 1, self.revcing)
 
     def revcing(self, *args, **kwargs):
         global step_screen,step_label ,step_label_01 ,step_img 
-        step = EventMesh.publish(constants.EVENT.GET_STEP)
-        step_label_01.set_text("{}步".format(step[0]))
+        step = EventMesh.publish("get_old_step_value")
+        step_label_01.set_text("{}步".format(step))
 
     def Close(self):
         self.timer.stop()
index b6c3013..f16111c 100644 (file)
@@ -3,7 +3,7 @@ import lvgl as lv
 import ql_fs
 import EventMesh
 from misc import Power
-from ui import style_screen,style_font_youyuan_20,ContStyle,style_btn,style_img,Screen,style_contact_btn
+from ui import style_screen,style_font_youyuan_20,style_btn,style_img,Screen,style_contact_btn
 import constants
 import osTimer
 import audio
@@ -54,14 +54,23 @@ setting_imei_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 # setting_title.set_long_mode(lv.label.LONG.WRAP)
 # setting_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 # setting_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+setting_cont_style = lv.style_t()
+setting_cont_style.init()
+setting_cont_style.set_radius(0)
+setting_cont_style.set_bg_color(lv.color_make(0x00, 0x00, 0x00))
+setting_cont_style.set_bg_grad_color(lv.color_make(0x00, 0x00, 0x00))
+setting_cont_style.set_bg_grad_dir(lv.GRAD_DIR.VER)
+setting_cont_style.set_bg_opa(255)
+setting_cont_style.set_border_width(0)
+setting_cont_style.set_pad_left(0)
+setting_cont_style.set_pad_right(0)
+setting_cont_style.set_pad_top(0)
+setting_cont_style.set_pad_bottom(0)
 
 setting_cont = lv.obj(setting_screen)
 setting_cont.set_pos(0, 50)
 setting_cont.set_size(240, 270)
-setting_cont_style = ContStyle()
-setting_cont.add_style(
-    setting_cont_style.style_cont(0, lv.color_make(0x00, 0x00, 0x00), lv.color_make(0x00, 0x00, 0x00), 255),
-    lv.PART.MAIN | lv.STATE.DEFAULT)
+setting_cont.add_style(setting_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT)
 
 # setting_language = lv.btn(setting_cont)
 # setting_language.set_pos(0, setting_cont_y)
@@ -652,28 +661,37 @@ restore_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 restore_label = lv.label(restore_screen)
 restore_label.set_pos(0, 100)
 restore_label.set_size(240, 40)
-restore_label.set_text("恢复出厂设置?")
+restore_label.set_text("恢复出厂设置?")
 restore_label.set_long_mode(lv.label.LONG.WRAP)
 restore_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 restore_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
+restore_confirm_label = lv.label(restore_screen)
+restore_confirm_label.set_text("确认")
+restore_confirm_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+restore_confirm_label.set_size(120, 60)
+restore_confirm_label.set_pos(0,180)
+restore_confirm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+
 restore_confirm = lv.label(restore_screen)
-restore_confirm.set_text("确认")
-restore_confirm.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-restore_confirm.set_size(120, 40)
-restore_confirm.set_pos(0,180)
-restore_confirm.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+restore_confirm.set_text(" ")
+restore_confirm.set_size(120, 80)
+restore_confirm.set_pos(0,160)
 restore_confirm.add_flag(lv.obj.FLAG.CLICKABLE)
-restore_confirm.set_ext_click_area(20)
+
+restore_cancel_label = lv.label(restore_screen)
+restore_cancel_label.set_text("返回")
+restore_cancel_label.set_size(120, 60)
+restore_cancel_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+restore_cancel_label.set_pos(120,180)
+restore_cancel_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 restore_cancel = lv.label(restore_screen)
-restore_cancel.set_text("返回")
-restore_cancel.set_size(120, 40)
-restore_cancel.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-restore_cancel.set_pos(120,180)
-restore_cancel.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+restore_cancel.set_text(" ")
+restore_cancel.set_size(120, 80)
+restore_cancel.set_pos(120,160)
 restore_cancel.add_flag(lv.obj.FLAG.CLICKABLE)
-restore_cancel.set_ext_click_area(20)
 
 
 
@@ -982,12 +1000,12 @@ class PoweroffConfirmScreen(Screen):
         self.read_data = {}
     def initialization(self):
         step = EventMesh.publish("get_old_step_value")
+        self.read_data = EventMesh.publish("get_storage_data")
         if step != 0:
-            self.read_data = EventMesh.publish("get_storage_data")
             self.read_data["old_step"] = step
-            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)
+        #print("self.read_data:{}".format(self.read_data))
+        with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
+            ujson.dump(self.read_data,fd)
         self.timer.start(3*1000,0,self.power_off)
 
     def power_off(self,*args):
@@ -1635,7 +1653,7 @@ class totalvolumeScreen(Screen):
             self.aud.setVolume(self.volum_size)
             EventMesh.publish("set_storage_data", self.read_data)
             EventMesh.publish("set_volum_size",self.volum_size)
-            print("self.read_data:size :{}".format(self.read_data))
+            # 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)
             self.aud.play(1, 1, 'E:/static/audio_audio_haixiu.mp3')  #播放声音