修改支付宝UI

diff --git a/2.sdk/project/K5/ext/static/APP/alipay/1_2.jpg b/2.sdk/project/K5/ext/static/APP/alipay/1_2.jpg
deleted file mode 100644 (file)
index 6a7be6f..0000000
Binary files a/2.sdk/project/K5/ext/static/APP/alipay/1_2.jpg and /dev/null differ

diff --git a/2.sdk/project/K5/ext/static/APP/alipay/1_2.png b/2.sdk/project/K5/ext/static/APP/alipay/1_2.png
new file mode 100644 (file)
index 0000000..1cc13f6
Binary files /dev/null and b/2.sdk/project/K5/ext/static/APP/alipay/1_2.png differ

diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appAlipay.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appAlipay.py
index 7359e8f..ff4992f 100644 (file)
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appAlipay.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appAlipay.py
@@ -366,7 +366,7 @@ AlipayOpen_label.set_size(240, 50)
 AlipayOpen_label.set_long_mode(lv.label.LONG.WRAP)
 AlipayOpen_label.set_text("网络错误，请重试")
 AlipayOpen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-AlipayOpen_label.add_flag(lv.obj.FLAG.CLICKABLE)
+AlipayOpen_label.add_flag(lv.obj.FLAG.HIDDEN)
 AlipayOpen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 class AlipayOpenScreen(Screen):
@@ -381,13 +381,15 @@ class AlipayOpenScreen(Screen):
 
         
     def initialization(self):
-        print("AlipayOpenScreen:initialization")
-        self.flag = 0
         
+        self.flag = 0
+        state = EventMesh.publish(constants.EVENT.GET_CONNECT)
+        print("AlipayOpenScreen:state",state)
+
         if EventMesh.publish(constants.EVENT.GET_CONNECT) == 0:
-            AlipayOpen_label.clear_flag(lv.obj.FLAG.CLICKABLE)
+            AlipayOpen_label.clear_flag(lv.obj.FLAG.HIDDEN)
         else:
-            AlipayOpen_label.add_flag(lv.obj.FLAG.CLICKABLE)
+            AlipayOpen_label.add_flag(lv.obj.FLAG.HIDDEN)
             if EventMesh.publish("get_alipay_init") == 0:
                 if self.flag == 0:
                     self.flag = 1
@@ -401,6 +403,8 @@ class AlipayOpenScreen(Screen):
     def timeout_AlipayOpen(self, *args):
         #print("timeout_AlipayOpen:",self.flag)
         EventMesh.publish("system_sleep_rest")#防止黑屏
+        state = EventMesh.publish(constants.EVENT.GET_CONNECT)
+        print("AlipayOpenScreen:state",state)
         if EventMesh.publish(constants.EVENT.GET_CONNECT) == 0:
             if self.timer_AlipayOpen_count > 10:
                 self.timer_AlipayOpen_count = 0
@@ -526,13 +530,13 @@ alipay_invite_screen.add_style(style_alipay_screen_default, lv.PART.MAIN|lv.STAT
 #背景
 alipay_invite_bg = lv.img(alipay_invite_screen)
 alipay_invite_bg.center()
-alipay_invite_bg.set_size(240,240)
-alipay_invite_bg.set_src("E:/static/APP/alipay/1_2.jpg")
+alipay_invite_bg.set_size(240,320)
+alipay_invite_bg.set_src("E:/static/APP/alipay/1_2.png")
 alipay_invite_bg.add_style(style_alipay_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 #提示词
 alipay_invite_label = lv.label(alipay_invite_bg)
-alipay_invite_label.set_pos(0, 8)
+alipay_invite_label.set_pos(0, 28)
 alipay_invite_label.set_size(240, 50)
 alipay_invite_label.set_long_mode(lv.label.LONG.WRAP)
 alipay_invite_label.set_text("请家长用手机支付宝扫一扫")
@@ -544,7 +548,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,63)
+alipay_invite_alipay_qr.set_pos(41,103)
 # 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)
@@ -561,7 +565,7 @@ class Alipay_invite(Screen):
         self.alipay_invite.start(1000, 1, self.alipay_invite)
         EventMesh.publish("set_Alipay_Ui_isOpen",1)
 
-    def alipay_invite(self, *args, **kwargs):
+    def alipay_invite(self, *args):
         print("alipay_invite:")
         EventMesh.publish("system_sleep_rest")#防止黑屏
         

diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
index dffa400..7ffdf1a 100644 (file)
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
@@ -1929,6 +1929,34 @@ class HeartrateScreen(Screen):
             heartrate_done_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             heartrate_done_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
             heartrate_done_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT)
+
+            # screen_chart_1 = lv.chart(heartrate_screen)
+            # screen_chart_1.set_pos(int(0),int(79))
+            # screen_chart_1.set_size(240,155)
+            # screen_chart_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+            # screen_chart_1.set_type(lv.chart.TYPE.BAR)
+            # screen_chart_1.set_range(lv.chart.AXIS.PRIMARY_Y, 0, 100)
+            # screen_chart_1.set_div_line_count(0, 0)
+            # screen_chart_1.set_point_count(24)
+            # chart_series_0 = lv.chart.add_series(screen_chart_1, lv.color_make(0xff,0x00,0x00), lv.chart.AXIS.PRIMARY_Y)
+            # screen_chart_1.set_next_value(chart_series_0, 1)
+            # screen_chart_1.set_next_value(chart_series_0, 20)
+            # # create style style_screen_chart_1_main_main_default
+            # style_screen_chart_1_main_main_default = lv.style_t()
+            # style_screen_chart_1_main_main_default.init()
+            # style_screen_chart_1_main_main_default.set_radius(0)
+            # style_screen_chart_1_main_main_default.set_bg_color(lv.color_make(0x00,0x00,0x00))
+            # style_screen_chart_1_main_main_default.set_bg_grad_color(lv.color_make(0x00,0x00,0x00))
+            # style_screen_chart_1_main_main_default.set_bg_grad_dir(lv.GRAD_DIR.NONE)
+            # style_screen_chart_1_main_main_default.set_bg_opa(255)
+            # style_screen_chart_1_main_main_default.set_border_color(lv.color_make(0xe8,0xe8,0xe8))
+            # style_screen_chart_1_main_main_default.set_border_width(6)
+            # style_screen_chart_1_main_main_default.set_border_opa(255)
+            # style_screen_chart_1_main_main_default.set_line_color(lv.color_make(0xe8,0xe8,0xe8))
+            # style_screen_chart_1_main_main_default.set_line_width(2)
+            # style_screen_chart_1_main_main_default.set_line_opa(255)
+            # # add style for screen_chart_1
+            # screen_chart_1.add_style(style_screen_chart_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT)
             self.meta = heartrate_screen
         heartrate_done_label.set_text(" ")
         heartrate_bpm_label.set_text(" ")

diff --git a/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip b/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip
index 68169b9..9817b47 100644 (file)
Binary files a/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip and b/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip differ