From: dxy15521469561 <1731678236@qq.com> Date: Fri, 18 Aug 2023 11:48:25 +0000 (+0800) Subject: k01:工具箱 设置界面调整 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=24d9faf349db77e418ebcea13769091123999745;p=mirrors%2FASR1603_G5.git k01:工具箱 设置界面调整 k5:加入充电状态ui --- diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py index 908be8b4..251cc65f 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py @@ -1352,7 +1352,7 @@ class ProtoColResolver(object): def handler(self, data): # 这里接收数据 - #print("handler -> {}".format(data)) + # print("handler -> {}".format(data)) # if data.startswith('Init;'): # data = data[5:] # EventMesh.publish(constants.EVENT.SET_KEY, {"value": ujson.loads(data)['KEY']}) diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py index a7b5d04d..8e6abcda 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py @@ -2627,7 +2627,7 @@ class ToolboxScreen(Screen): global toolbox_screen,toolbox_text_img,toolbox_cont,toolbox_step_img,toolbox_weather_img ,toolbox_alarm_img ,\ toolbox_countdown_img,toolbox_stopwatch_img if toolbox_screen == None: - tool_set_y = 0 + tool_set_y = 5 toolbox_screen = lv.obj() print("toolbox_screen") toolbox_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2638,17 +2638,17 @@ class ToolboxScreen(Screen): # toolbox_text_img.set_size(90, 30) # toolbox_text_img.set_src("U:/static/tool/tool_text.png") # toolbox_text_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - toolbox_title = lv.label(toolbox_screen) - toolbox_title.set_pos(0, 5) - toolbox_title.set_size(128, 20) - toolbox_title.set_text("工具箱") - toolbox_title.set_long_mode(lv.label.LONG.WRAP) - toolbox_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) - toolbox_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + # toolbox_title = lv.label(toolbox_screen) + # toolbox_title.set_pos(0, 5) + # toolbox_title.set_size(128, 20) + # toolbox_title.set_text("工具箱") + # toolbox_title.set_long_mode(lv.label.LONG.WRAP) + # toolbox_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + # toolbox_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) toolbox_cont = lv.obj(toolbox_screen) - toolbox_cont.set_pos(0, 25) - toolbox_cont.set_size(128, 128-25) + toolbox_cont.set_pos(0, 0) + toolbox_cont.set_size(128, 128) toolbox_cont.add_style(toolbox_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT) @@ -3353,6 +3353,7 @@ class OnCallScreen(Screen): self.phone_list = [] self.button = 0 self.mute_state = 0 + on_call_volum_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) def show_num(self): global on_call_screen_tab_label @@ -6539,7 +6540,7 @@ class chargeInScreen(Screen): charge_out_screen = None charge_out_screen_label = None -#没有设置紧急联系人的号码 +# class chargeOutScreen(Screen): NAME = "charge_out" def __init__(self): diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py index ab01a2be..8968100e 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py @@ -23,7 +23,7 @@ style_volume_btn.set_bg_color(lv.color_make(0x80, 0x80, 0x80)) -setting_cont_y = 0 +setting_cont_y = 5 setting_screen = lv.obj() print("setting_screen") setting_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -33,13 +33,13 @@ setting_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) # setting_imei_img.set_size(90, 30) # setting_imei_img.set_src("U:/static/setting/setting_text.png") # setting_imei_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_title = lv.label(setting_screen) -setting_title.set_pos(0, 5) -setting_title.set_size(128, 20) -setting_title.set_text("设置") -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_title = lv.label(setting_screen) +# setting_title.set_pos(0, 5) +# setting_title.set_size(128, 20) +# setting_title.set_text("设置") +# 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() @@ -56,8 +56,8 @@ setting_cont_style.set_pad_bottom(0) setting_cont = lv.obj(setting_screen) -setting_cont.set_pos(0, 25) -setting_cont.set_size(128, 128-25) +setting_cont.set_pos(0, 0) +setting_cont.set_size(128, 128) setting_cont.add_style(setting_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT) # setting_language = lv.btn(setting_cont) @@ -1051,7 +1051,7 @@ class PoweroffConfirmScreen(Screen): with open("/usr/static/storage_file/config.json","w",encoding="utf-8") as fd: ujson.dump(read_data,fd) self.count = 0 - self.aud.play(1, 1, '/usr/static/R_VOLUME_SET_1.mp3') #文件名前面要加上路径 + self.aud.play(1, 1, 'U:/static/R_VOLUME_SET_1.mp3') #文件名前面要加上路径 self.timer.start(1*1000,1,self.power_off) def power_off(self,*args): diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py index 726fb2d7..8715adac 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py @@ -124,10 +124,10 @@ class BtnDevice(Abstract): # if(self.GPIO26_status == 1): # EventMesh.publish("btn8_press") #self.__pwk_timer.start(self.__PowerDownTimeOut, 0, self.pwk_press_cb) - EventMesh.publish(constants.EVENT.SYSTEM_UP) + EventMesh.publish("load_screen", {"screen": "charge_in"}) pass elif status == 0:#插入usb - EventMesh.publish(constants.EVENT.SYSTEM_UP) + EventMesh.publish("load_screen", {"screen": "charge_out"}) # self.__pwk_timer.stop() # # print("btn_back:{}".format(mdls.screen_size_style[mdls.models][1])) # if self.pwk_press != 0: diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py index 48a16100..0ee4b2d2 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py @@ -152,6 +152,8 @@ def main_init(): ui.add_screen(_ui.RemoveMessageScreen()) ui.add_screen(_ui.NoSimAutoScreen()) ui.add_screen(_ui.chargefullScreen()) + ui.add_screen(_ui.chargeInScreen()) + ui.add_screen(_ui.chargeOutScreen()) ui.add_screen(NewWechatPopupScreen()) ui.add_screen(HealthScreen()) # ui.add_screen(_ui.Setting3Screen()) 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 8e941406..5857d2c1 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 @@ -2802,16 +2802,17 @@ class IncomingCallScreen(Screen): incoming_call_answer = lv.img(incoming_call_screen) incoming_call_answer.set_size(64, 64) incoming_call_answer.add_flag(lv.obj.FLAG.CLICKABLE) - incoming_call_answer.set_pos(30, 220) + incoming_call_answer.set_pos(150, 220) incoming_call_answer.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) incoming_call_answer.set_src("E:/static/answer.png") incoming_call_hangup = lv.img(incoming_call_screen) incoming_call_hangup.set_size(64, 64) incoming_call_hangup.add_flag(lv.obj.FLAG.CLICKABLE) - incoming_call_hangup.set_pos(150, 220) + incoming_call_hangup.set_pos(30, 220) incoming_call_hangup.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) incoming_call_hangup.set_src("E:/static/hang_up.png") + incoming_call_answer.add_event_cb(lambda e: EventMesh.callback_wrapper(self.answer(e)), lv.EVENT.CLICKED, None) incoming_call_hangup.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), @@ -3021,6 +3022,7 @@ class OnCallScreen(Screen): self.phone_num = '' self.phone_list = [] self.button = 0 + self.mute_btn = 0 def initialization(self): EventMesh.publish("set_UI_high_priority", 1) @@ -3063,21 +3065,33 @@ class OnCallScreen(Screen): on_call_volum_reduce = lv.img(on_call_obj) on_call_volum_reduce.set_size(36, 36) - on_call_volum_reduce.add_flag(lv.obj.FLAG.CLICKABLE) on_call_volum_reduce.set_pos(4, 178) on_call_volum_reduce.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_volum_reduce.set_src("E:/static/REDUCE_VOLUM_ICON.png") - on_call_volum_reduce.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_volum_size(e)), - lv.EVENT.CLICKED, None) + + + on_call_volum_reduce_btn = lv.label(on_call_obj) + on_call_volum_reduce_btn.set_pos(0, 170) + on_call_volum_reduce_btn.add_flag(lv.obj.FLAG.CLICKABLE) + on_call_volum_reduce_btn.set_size(60, 50) + on_call_volum_reduce_btn.set_text(" ") + on_call_volum_reduce_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_volum_size(e)), + lv.EVENT.CLICKED, None) on_call_volum_add = lv.img(on_call_obj) on_call_volum_add.set_size(36, 36) - on_call_volum_add.add_flag(lv.obj.FLAG.CLICKABLE) on_call_volum_add.set_pos(194, 178) on_call_volum_add.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_volum_add.set_src("E:/static/VOLUM_ADD_ICON.png") - on_call_volum_add.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_volum_size(e)), - lv.EVENT.CLICKED, None) + + + on_call_volum_add_btn = lv.label(on_call_obj) + on_call_volum_add_btn.set_pos(180, 170) + on_call_volum_add_btn.add_flag(lv.obj.FLAG.CLICKABLE) + on_call_volum_add_btn.set_size(60, 50) + on_call_volum_add_btn.set_text(" ") + on_call_volum_add_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_volum_size(e)), + lv.EVENT.CLICKED, None) on_call_volum_label = lv.label(on_call_obj) @@ -3261,10 +3275,11 @@ class OnCallScreen(Screen): on_call_label_name.set_text(name) # on_call_label.set_text(str(self.meta_info)) on_call_second_label.set_text("00:00") + on_call_volum_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) self.phone_num = '' self.phone_list = [] self.button = 0 - + self.mute_btn = 0 def show_num(self): global on_call_screen_tab_label @@ -3405,6 +3420,12 @@ class OnCallScreen(Screen): def open_volum_show(self, e): global on_call_screen_tab,on_call_screen,on_call_obj + if self.mute_btn == 0:#默认是开启 + self.mute_btn = 1 + on_call_volum_label.set_style_text_color(lv.color_make(128, 128, 128), lv.STATE.DEFAULT) + else: + on_call_volum_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) + self.mute_btn = 0 # self.aud.setVolume(0) # if self.open_volum_state == 1: # self.open_volum_state = 0 @@ -3448,10 +3469,7 @@ class OnCallScreen(Screen): def show_bar(self,msg): on_call_bar.set_value((100 // 11) * self.volum_size, lv.ANIM.OFF) if msg == 1: - - self.aud.setVolume(self.volum_size) - EventMesh.publish("set_volum_size",self.volum_size) @@ -3475,9 +3493,10 @@ class OnCallScreen(Screen): if on_call_screen_tab != None: on_call_screen_tab.add_flag(lv.obj.FLAG.HIDDEN) self.show_num() - - def refresh(self,e): + EventMesh.publish("publish_message_event_ui",{"func":self.refresh_do,"data":0}) + + def refresh_do(self,data): # print("call_in") global on_call_screen,on_call_label_name,on_call_second_label ,on_call_hangup min = self.count_sec/60 @@ -6004,7 +6023,171 @@ class SystemInitScreen(Screen): def Close(self): self.system_init_timer.stop() - +charge_in_screen = None +charge_in_screen_label = None + +#正在充电 +class chargeInScreen(Screen): + NAME = "charge_in" + def __init__(self): + super().__init__() + self.meta = None + self.meta_type = "popup" + self.count = 0 + self.timer = osTimer() + + def initialization(self): + global charge_in_screen ,charge_in_screen_label + if charge_in_screen == None : + charge_in_screen = lv.obj() + print("charge_in_screen") + charge_in_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # add style for watchface + charge_in_screen.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) + #进入图片 + + charge_in_screen_label = lv.label(charge_in_screen) + charge_in_screen_label.set_pos(0, 170) + charge_in_screen_label.set_size(240, 20) + charge_in_screen_label.set_text(" ") + charge_in_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + charge_in_screen_label.set_long_mode(lv.label.LONG.WRAP) + charge_in_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + + + self.meta = charge_in_screen + + + def post_processor_after_initialization(self): + global charge_in_screen_label + self.count = 0 + self.timer.start(1000,1,self.timer_cb_onescond) + charge_in_screen_label.set_text("正在充电") + + def Close(self): + self.timer.stop() + + def timer_cb_onescond(self,e): + EventMesh.publish("system_sleep_rest")#防止黑屏 + self.count+=1 + if self.count >= 5: + self.count = 0 + EventMesh.publish("return_prev_screen") + + + def done_left_to_right(self): + EventMesh.publish("return_prev_screen") + pass + def done_right_to_left(self): + EventMesh.publish("return_prev_screen") + pass + def done_bottom_to_top(self): + EventMesh.publish("return_prev_screen") + pass + def done_top_to_bottom(self): + EventMesh.publish("return_prev_screen") + pass + def done_return(self): + EventMesh.publish("return_prev_screen") + pass + def done_click(self): + EventMesh.publish("return_prev_screen") + pass + + def btn8_press(self): + EventMesh.publish("return_prev_screen") + pass + def btn1_press(self): + EventMesh.publish("return_prev_screen") + pass + def btn1_release(self): + EventMesh.publish("return_prev_screen") + pass + + +charge_out_screen = None +charge_out_screen_label = None + +#充电已移出 +class chargeOutScreen(Screen): + NAME = "charge_out" + def __init__(self): + super().__init__() + self.meta = None + self.meta_type = "popup" + self.count = 0 + self.timer = osTimer() + + + def initialization(self): + global charge_out_screen ,charge_out_screen_label + if charge_out_screen == None : + charge_out_screen = lv.obj() + print("charge_out_screen") + charge_out_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # add style for watchface + charge_out_screen.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) + #进入图片 + + charge_out_screen_label = lv.label(charge_out_screen) + charge_out_screen_label.set_pos(0, 170) + charge_out_screen_label.set_size(240, 20) + charge_out_screen_label.set_text(" ") + charge_out_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + charge_out_screen_label.set_long_mode(lv.label.LONG.WRAP) + charge_out_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + + + self.meta = charge_out_screen + + + + def post_processor_after_initialization(self): + global charge_out_screen_label + self.count = 0 + self.timer.start(1000,1,self.timer_cb_onescond) + charge_out_screen_label.set_text("充电已移出") + + def Close(self): + self.timer.stop() + + def timer_cb_onescond(self,e): + EventMesh.publish("system_sleep_rest")#防止黑屏 + self.count+=1 + if self.count >= 5: + self.count = 0 + EventMesh.publish("return_prev_screen") + + + def done_left_to_right(self): + EventMesh.publish("return_prev_screen") + pass + def done_right_to_left(self): + EventMesh.publish("return_prev_screen") + pass + def done_bottom_to_top(self): + EventMesh.publish("return_prev_screen") + pass + def done_top_to_bottom(self): + EventMesh.publish("return_prev_screen") + pass + def done_return(self): + EventMesh.publish("return_prev_screen") + pass + def done_click(self): + EventMesh.publish("return_prev_screen") + pass + + def btn8_press(self): + EventMesh.publish("return_prev_screen") + pass + def btn1_press(self): + EventMesh.publish("return_prev_screen") + pass + def btn1_release(self): + EventMesh.publish("return_prev_screen") + pass + #from usr.ui_WatchFaceScreen import WatchFaceScreen class UI(object):