From: dxy15521469561 <1731678236@qq.com>
Date: Mon, 10 Jul 2023 07:02:27 +0000 (+0800)
Subject: 1.修改一级界面图标
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=59f8a59a91a57ba49b4bce458de0ffd123210a3f;p=mirrors%2FASR1603_G5.git

1.修改一级界面图标
2.支付宝进入优化
---

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 93eec789..7359e8fa 100644
--- 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
@@ -358,6 +358,17 @@ AlipayOpen_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
 AlipayOpen_img.add_flag(lv.obj.FLAG.CLICKABLE)
 AlipayOpen_img.set_src("E:/static/APP/alipay/1.jpg")
 AlipayOpen_img.add_style(style_alipay_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+
+AlipayOpen_label = lv.label(alipay_open_screen)
+AlipayOpen_label.set_pos(0, 250)
+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_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
 class AlipayOpenScreen(Screen):
     NAME = "alipay_open"
     #打开支付宝
@@ -373,28 +384,43 @@ class AlipayOpenScreen(Screen):
         print("AlipayOpenScreen:initialization")
         self.flag = 0
         
-        if EventMesh.publish("get_alipay_init") == 0:
-            if self.flag == 0:
-                self.flag = 1
-                EventMesh.publish("alipay_1")
+        if EventMesh.publish(constants.EVENT.GET_CONNECT) == 0:
+            AlipayOpen_label.clear_flag(lv.obj.FLAG.CLICKABLE)
         else:
-            EventMesh.publish_async("Alipay_init","",40*1024)
+            AlipayOpen_label.add_flag(lv.obj.FLAG.CLICKABLE)
+            if EventMesh.publish("get_alipay_init") == 0:
+                if self.flag == 0:
+                    self.flag = 1
+                    EventMesh.publish("alipay_1")
+            else:
+                EventMesh.publish_async("Alipay_init","",40*1024)
+        self.timer_AlipayOpen_count = 0
         self.timer_AlipayOpen.start(1000, 1, self.timeout_AlipayOpen)
         EventMesh.publish("set_Alipay_Ui_isOpen",1)
 
-    def timeout_AlipayOpen(self, *args, **kwargs):
-        #print("timeout_AlipayOpen:")
-        
+    def timeout_AlipayOpen(self, *args):
+        #print("timeout_AlipayOpen:",self.flag)
         EventMesh.publish("system_sleep_rest")#防止黑屏
-        if EventMesh.publish("get_alipay_init") == 0:
-            if self.flag == 0:
-                self.flag = 1
-                EventMesh.publish("alipay_1")
-        else :
-            if(self.timer_AlipayOpen_count>10 or self.timer_AlipayOpen_count == 0 ):
-                EventMesh.publish_async("Alipay_init","",40*1024)
-                self.timer_AlipayOpen_count = 1
-            self.timer_AlipayOpen_count+=1
+        if EventMesh.publish(constants.EVENT.GET_CONNECT) == 0:
+            if self.timer_AlipayOpen_count > 10:
+                self.timer_AlipayOpen_count = 0
+                EventMesh.publish("return_prev_screen")
+        else:
+            if EventMesh.publish("get_alipay_init") == 0:
+                #print("timeout_AlipayOpen:2")
+                if self.flag == 0:
+                    self.flag = 1
+                    EventMesh.publish("alipay_1")
+            else :
+                #print("timeout_AlipayOpen:!!!!!!!!!!",self.timer_AlipayOpen_count)
+                if self.timer_AlipayOpen_count>10 or self.timer_AlipayOpen_count == 0:
+                    if self.timer_AlipayOpen_count > 10:
+                        self.timer_AlipayOpen_count = 0
+                        EventMesh.publish("return_prev_screen")
+                        return
+                    EventMesh.publish_async("Alipay_init","",40*1024)
+                    self.timer_AlipayOpen_count = 1
+        self.timer_AlipayOpen_count+=1
             # self.timer_AlipayOpen.stop()
             # self.timer_AlipayOpen.start(10000, 1, self.timeout_AlipayOpen)
 
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 1a243115..68169b94 100644
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
diff --git a/2.sdk/project/K5/usr/static/IMAGE_ONE_PAGE_HEALTH.png b/2.sdk/project/K5/usr/static/IMAGE_ONE_PAGE_HEALTH.png
index fc02e657..2312686c 100644
Binary files a/2.sdk/project/K5/usr/static/IMAGE_ONE_PAGE_HEALTH.png and b/2.sdk/project/K5/usr/static/IMAGE_ONE_PAGE_HEALTH.png differ
diff --git a/2.sdk/project/K5/usr/static/IMAGE_ONE_PAGE_SMS.png b/2.sdk/project/K5/usr/static/IMAGE_ONE_PAGE_SMS.png
index a182d4be..1b0fe104 100644
Binary files a/2.sdk/project/K5/usr/static/IMAGE_ONE_PAGE_SMS.png and b/2.sdk/project/K5/usr/static/IMAGE_ONE_PAGE_SMS.png differ