From: dxy15521469561 <1731678236@qq.com>
Date: Mon, 10 Jul 2023 01:37:59 +0000 (+0800)
Subject: 微聊显示优化
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=9723be07876942f9bb28a28ad90388a9ebd117b9;p=mirrors%2FASR1603_G5.git

微聊显示优化
---

diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appWechat.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appWechat.py
index 1d6c7792..6e128c94 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appWechat.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appWechat.py
@@ -69,9 +69,11 @@ wechat_press_btn.add_style(style_wechat_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 wechat_press_btn.add_style(style_common_bg_rect_btn_pressed, lv.PART.MAIN | lv.STATE.PRESSED)
 wechat_press_btn.set_style_radius(30,0)
 
-wechat_press_label = lv.label(wechat_press_btn)
+wechat_press_label = lv.label(wechat_screen)
 wechat_press_label.set_text("请按住说话")
-wechat_press_label.align(lv.ALIGN.CENTER, 10, 0)
+wechat_press_label.set_size(240, 56)
+wechat_press_label.set_pos(0,278)
+wechat_press_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 wechat_press_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 wechat_label = lv.label(wechat_screen_list_screen)
@@ -172,6 +174,7 @@ class WechatScreen(Screen):
             _btn_label2 = lv.label(wechat_btn)
             _btn_img = lv.img(wechat_btn)
             wechat_btn.add_flag(lv.obj.FLAG.HIDDEN)
+            wechat_btn.add_flag(lv.obj.FLAG.CLICKABLE)
             wechat_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.play_label_cb(e)),
             lv.EVENT.CLICKED, None)
             self.wechat_list_dict.append({"num":i,"wechat_btn":wechat_btn,"_btn_label1":_btn_label1,"_btn_label2":_btn_label2,"_btn_img":_btn_img})
@@ -289,8 +292,8 @@ class WechatScreen(Screen):
                         
                         #Wechat_log("wechat_list_dict:num:{}".format(self.wechat_list_dict[i]["num"]))
                         value = self.wechat_recode_list[key]
-                        
-                        self.startY = 56*i
+
+                        self.startY = 64*i
                         
                         if value.find("S:") != -1 or value.find("R:") != -1:
                             self.msg_tmp = value[2:] 
@@ -303,17 +306,22 @@ class WechatScreen(Screen):
                         
                         #wechat_btn = lv.btn(self.wechat_list)
                         # if value.find("R:") != -1:self.wechat_list_dict[i]
-                        self.wechat_list_dict[i]["wechat_btn"].set_size(self.startWidth,54)
+                        
                         if value.find("R:") != -1 or value.find("T:") != -1 :#显示文字:
+                            if value.find("T:") != -1:
+                                self.wechat_list_dict[i]["wechat_btn"].set_size(self.startWidth,62)
+                            else:
+                                 self.wechat_list_dict[i]["wechat_btn"].set_size(self.startWidth,62)
+
                             self.wechat_list_dict[i]["wechat_btn"].set_pos(10,self.startY )
                             #self.wechat_list_dict[i]["wechat_btn"].add_style(style_wechat_s_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
                             self.wechat_list_dict[i]["wechat_btn"].set_style_bg_color(lv.color_make(0xff, 0xff, 0xff), lv.PART.MAIN | lv.STATE.DEFAULT)
                         elif value.find("S:") != -1 :
+                            self.wechat_list_dict[i]["wechat_btn"].set_size(self.startWidth,62)
                             self.wechat_list_dict[i]["wechat_btn"].set_pos(230-self.startWidth,self.startY )
                             #for k in range(100):
                             #self.wechat_list_dict[i]["wechat_btn"].add_style(style_wechat_r_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
                             self.wechat_list_dict[i]["wechat_btn"].set_style_bg_color(lv.color_make(0x00, 0xff, 0x2a), lv.PART.MAIN | lv.STATE.DEFAULT)
-                        
 
                         #_btn_label1 = lv.label(wechat_btn)
                         if value.find("R:") != -1:
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 df65a2d4..dffa4004 100644
--- 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
@@ -1217,7 +1217,7 @@ class NoSimPowerScreen(Screen):#
             no_sim_power_screen_title = lv.label(no_sim_power_screen)
             no_sim_power_screen_title.set_pos(0, 60)
             no_sim_power_screen_title.set_size(240, 80)
-            no_sim_power_screen_title.set_text("未插卡，无法拨打")
+            no_sim_power_screen_title.set_text("无SIM卡，无法拨打")
             no_sim_power_screen_title.set_long_mode(lv.label.LONG.WRAP)
             no_sim_power_screen_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             no_sim_power_screen_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
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 b8ee8507..1a243115 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