From: dxy15521469561 <1731678236@qq.com> Date: Tue, 18 Jul 2023 10:01:35 +0000 (+0800) Subject: 部分ui调整 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=67e66c9fcedbaa78bc5df6240fd45f31cdb79e72;p=mirrors%2FASR1603_G5.git 部分ui调整 --- 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 9ca790f4..3cf2dd12 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 @@ -63,7 +63,7 @@ wechat_screen_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAUL wechat_press_btn = lv.btn(wechat_screen) -wechat_press_btn.set_pos(10, 260) +wechat_press_btn.set_pos(10, 264) wechat_press_btn.set_size(220, 56) 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) @@ -72,7 +72,7 @@ wechat_press_btn.set_style_radius(30,0) wechat_press_label = lv.label(wechat_screen) wechat_press_label.set_text("请按住说话") wechat_press_label.set_size(240, 56) -wechat_press_label.set_pos(0,278) +wechat_press_label.set_pos(0,282) 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) @@ -326,12 +326,12 @@ class WechatScreen(Screen): #_btn_label1 = lv.label(wechat_btn) if value.find("R:") != -1: self.wechat_list_dict[i]["_btn_label1"].set_size(0, 0) - self.wechat_list_dict[i]["_btn_label1"].set_pos(35, 8) + self.wechat_list_dict[i]["_btn_label1"].set_pos(35, 18) self.wechat_list_dict[i]["_btn_label1"].set_text(str(self.msg_tmp)+'\"') elif value.find("S:") != -1: self.wechat_list_dict[i]["_btn_label1"].set_size(0, 0) - self.wechat_list_dict[i]["_btn_label1"].set_pos(self.startWidth-78, 8) + self.wechat_list_dict[i]["_btn_label1"].set_pos(self.startWidth-78, 18) self.wechat_list_dict[i]["_btn_label1"].set_text(str(self.msg_tmp)+'\"') elif value.find("T:") != -1: self.wechat_list_dict[i]["_btn_label1"].set_size(216, 66) @@ -351,10 +351,10 @@ class WechatScreen(Screen): #_btn_img = lv.img(wechat_btn) self.wechat_list_dict[i]["_btn_img"].set_size(30, 30) if value.find("R:") != -1: - self.wechat_list_dict[i]["_btn_img"].set_pos(5, 0) + self.wechat_list_dict[i]["_btn_img"].set_pos(5, 10) self.wechat_list_dict[i]["_btn_img"].set_src("E:/static/APP/wechat/R_3.png") elif value.find("S:") != -1: - self.wechat_list_dict[i]["_btn_img"].set_pos(self.startWidth-50, 0) + self.wechat_list_dict[i]["_btn_img"].set_pos(self.startWidth-50, 10) self.wechat_list_dict[i]["_btn_img"].set_src("E:/static/APP/wechat/S_3.png") #self.wechat_list_dict[i]["_btn_img"].add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) self.wechat_list_dict[i]["_btn_img"].clear_flag(lv.obj.FLAG.HIDDEN) 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 931d315a..d48cd5c4 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 @@ -1544,7 +1544,7 @@ class MessageFullScreen(Screen): message_full_label = lv.label(message_full_screen) message_full_label.set_pos(0, 100) - message_full_label.set_size(240, 40) + message_full_label.set_size(240, 50) message_full_label.set_text("信息已满,是否清除所有？") message_full_label.set_long_mode(lv.label.LONG.WRAP) message_full_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -1595,8 +1595,6 @@ class MessageFullScreen(Screen): def done_return(self): EventMesh.publish("return_prev_screen") - def done_click(self): - EventMesh.publish("load_screen", {"screen": "popup"}) def btn1_release(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_setting.py index 4f9451db..54a873ff 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_setting.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_setting.py @@ -827,7 +827,7 @@ update_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) update_label = lv.label(update_screen) update_label.set_text(" 已经是最新版本") -update_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) +update_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) update_label.set_size(240, 50) update_label.set_pos(0,50) update_label.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 dbd37e61..bf7aae90 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