From: dxy15521469561 <1731678236@qq.com> Date: Fri, 11 Aug 2023 08:27:02 +0000 (+0800) Subject: K01: X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=2426598d9ece56ece2425fa06f365aea9b7f60a8;p=mirrors%2FASR1603_G5.git K01: 修改ui --- diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/alarm.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/alarm.py index d0bb76a3..3daf2f17 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/alarm.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/alarm.py @@ -32,7 +32,9 @@ MAX_ALARM = 3 #CONT的样式 style_cont_alarm = lv.style_t() style_cont_alarm.init() -style_cont_alarm.set_bg_color(lv.color_make(0x22, 0x28, 0x3D)) +style_cont_alarm.set_bg_color(lv.color_make(0xA0, 0xA0, 0xA0)) +style_cont_alarm.set_bg_grad_color(lv.color_make(0xA0, 0xA0, 0xA0)) +style_cont_alarm.set_bg_opa(255) style_cont_alarm.set_radius(0) style_cont_alarm.set_pad_left(0) style_cont_alarm.set_pad_right(0) @@ -69,16 +71,17 @@ style_alarm_screen_default.set_pad_bottom(0) clk_list_screen = lv.obj() print("clk_list_screen") clk_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) +clk_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) clk_list_title_bg= lv.btn(clk_list_screen) -clk_list_title_bg.set_size(220,40) -clk_list_title_bg.set_pos(10,10) +clk_list_title_bg.set_size(112,25) +clk_list_title_bg.set_pos(8,5) clk_list_title_bg.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_list_title_bg.set_ext_click_area(40) +clk_list_title_bg.set_ext_click_area(25) clk_list_title = lv.label(clk_list_title_bg) -clk_list_title.set_pos(0, 15) -clk_list_title.set_size(240, 40) +clk_list_title.set_pos(4, 5) +clk_list_title.set_size(112, 20) clk_list_title.set_text("闹钟列表") clk_list_title.set_long_mode(lv.label.LONG.WRAP) clk_list_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -98,23 +101,24 @@ clk_list_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) # clk_list_add.set_ext_click_area(15) clk_list_screen1_1 = lv.obj(clk_list_screen) -clk_list_screen1_1.set_pos(0, 65) -clk_list_screen1_1.set_size(240, 255) +clk_list_screen1_1.set_pos(0, 35) +clk_list_screen1_1.set_size(128, 128-35) +clk_list_screen1_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) clk_list_screen1_1.add_style(style_alarm_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT) -no_add_alarm_img = lv.img(clk_list_screen1_1) -no_add_alarm_img.set_pos(65, 0) -no_add_alarm_img.set_size(110, 140) -no_add_alarm_img.set_src("U:/static/IMAGE_IDLE_SCREEN_ALARM_ICON_NEW.png") -no_add_alarm_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) +# no_add_alarm_img = lv.img(clk_list_screen1_1) +# no_add_alarm_img.set_pos(15, 0) +# no_add_alarm_img.set_size(98, 94) +# no_add_alarm_img.set_src("U:/static/IMAGE_IDLE_SCREEN_ALARM_POPUP_02.png") +# no_add_alarm_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) #暂未添加闹钟 no_add_alarm = lv.label(clk_list_screen1_1) -no_add_alarm.set_pos(0, 170) -no_add_alarm.set_size(240, 50) -no_add_alarm.set_text("闹钟暂未设置") +no_add_alarm.set_pos(0, 20) +no_add_alarm.set_size(128, 20) +no_add_alarm.set_text("请在app上设置") no_add_alarm.set_long_mode(lv.label.LONG.WRAP) no_add_alarm.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) no_add_alarm.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -788,14 +792,14 @@ popup_alarm_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) popup_alarm_img = lv.img(popup_alarm_screen) -popup_alarm_img.set_pos(63, 60) -popup_alarm_img.set_size(110, 140) -popup_alarm_img.set_src("U:/static/IMAGE_IDLE_SCREEN_ALARM_ICON_NEW.png") +popup_alarm_img.set_pos(15, 5) +popup_alarm_img.set_size(98, 94) +popup_alarm_img.set_src("U:/static/IMAGE_IDLE_SCREEN_ALARM_POPUP_02.png") popup_alarm_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) popup_alarm_time = lv.label(popup_alarm_screen) -popup_alarm_time.set_pos(0, 230) -popup_alarm_time.set_size(240, 50) +popup_alarm_time.set_pos(0, 100) +popup_alarm_time.set_size(128, 20) popup_alarm_time.set_text(" ") popup_alarm_time.set_long_mode(lv.label.LONG.WRAP) popup_alarm_time.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -806,13 +810,14 @@ class PopupAlarmScreen(Screen): def __init__(self): super().__init__() self.meta = popup_alarm_screen + self.meta_type = "popup" self.timer = osTimer() self.aud = audio.Audio(0) self.alarm_count = 0 def initialization(self): self.alarm_count = 0 - self.timer.start(3*1000,1,self.exit_alarm_page) + self.timer.start(2*1000,1,self.exit_alarm_page) time = EventMesh.publish("screen_get_time")#获取系统时间 popup_alarm_time.set_text("{}:{}".format("%02d"%(time[0][0]),"%02d"%(time[0][1]))) @@ -823,14 +828,15 @@ class PopupAlarmScreen(Screen): self.aud.stop() def exit_alarm_page(self,*arges): + EventMesh.publish("system_sleep_rest") self.alarm_count+=1 - if self.alarm_count > 10: + if self.alarm_count > 5*60: self.alarm_count = 0 self.aud.stop() self.timer.stop() EventMesh.publish("load_screen", {"screen": "main_menu"}) return - self.aud.play(1, 1, 'U:/static/audio_audio_haixiu.mp3') #播放声音 + self.aud.play(1, 1, 'U:/static/R_VOLUME_SET_1.mp3') #播放声音 def close_timer(self): self.alarm_count=0 @@ -905,12 +911,12 @@ class ClkListScreen(Screen): if IFEXIST == True: if self.clock_list: # print("nalarm_list:{}".format(alarm_list)) - no_add_alarm_img.add_flag(lv.obj.FLAG.HIDDEN) + # no_add_alarm_img.add_flag(lv.obj.FLAG.HIDDEN) no_add_alarm.add_flag(lv.obj.FLAG.HIDDEN) self.alarm_show_list.delete()#先删除一次控件 - self.alarm_show_list = lv.obj(clk_list_screen) - self.alarm_show_list.set_pos(0, 65) - self.alarm_show_list.set_size(240, 255) + self.alarm_show_list = lv.obj(clk_list_screen1_1) + self.alarm_show_list.set_pos(0, 0) + self.alarm_show_list.set_size(128, 128) self.alarm_show_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) self.alarm_show_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) #print("菜单的孩子个数：",clk_list_screen1.get_child_cnt()) @@ -924,8 +930,8 @@ class ClkListScreen(Screen): if repeart == 10: continue _btn = lv.btn(self.alarm_show_list) - _btn.set_size(230,75) - _btn.set_pos(8,79*count) + _btn.set_size(112,45) + _btn.set_pos(8,49*count) _btn.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) _btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.edit_alarm(e)), lv.EVENT.CLICKED, None) @@ -938,8 +944,8 @@ class ClkListScreen(Screen): _btn_label1.set_text(str(num)) _btn_label2 = lv.label(_btn) - _btn_label2.set_pos(8, 10) - _btn_label2.set_size(97, 40) + _btn_label2.set_pos(8, 5) + _btn_label2.set_size(97, 20) _btn_label2.set_text("%02d" % each["hour"] + ":"+"%02d" % each["minute"]) # _btn_label2.set_text(str(each["days"])) @@ -951,8 +957,8 @@ class ClkListScreen(Screen): repeart = each["repeart"] _output = [self.weekdays_list[x] for x in _new_list] _btn_label3 = lv.label(_btn) - _btn_label3.set_pos(5, 44) - _btn_label3.set_size(200, 40) + _btn_label3.set_pos(8, 25) + _btn_label3.set_size(128-8, 20) print("_new_list:{} repeart:{}".format(_new_list,repeart)) if repeart == 1: _btn_label3.set_text("一次") @@ -984,15 +990,15 @@ class ClkListScreen(Screen): # _btn_switch.clear_state(lv.STATE.CHECKED) count+=1 if count == 0: - no_add_alarm_img.clear_flag(lv.obj.FLAG.HIDDEN) + # no_add_alarm_img.clear_flag(lv.obj.FLAG.HIDDEN) no_add_alarm.clear_flag(lv.obj.FLAG.HIDDEN) self.alarm_show_list.add_flag(lv.obj.FLAG.HIDDEN) else: - no_add_alarm_img.clear_flag(lv.obj.FLAG.HIDDEN) + # no_add_alarm_img.clear_flag(lv.obj.FLAG.HIDDEN) no_add_alarm.clear_flag(lv.obj.FLAG.HIDDEN) self.alarm_show_list.add_flag(lv.obj.FLAG.HIDDEN) else: - no_add_alarm_img.clear_flag(lv.obj.FLAG.HIDDEN) + # no_add_alarm_img.clear_flag(lv.obj.FLAG.HIDDEN) no_add_alarm.clear_flag(lv.obj.FLAG.HIDDEN) self.alarm_show_list.add_flag(lv.obj.FLAG.HIDDEN) diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/appWechat.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/appWechat.py index 23f9a527..ffabf41e 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/appWechat.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/appWechat.py @@ -15,6 +15,8 @@ import _thread from protocol import ProtoCol,UnicodeHexStr_To_Utf8Str import usys import log +LCD_X = 128 +LCD_Y = 128 Testlog = log.getLogger("WechatLog") log.set_output(usys.stdout) is_appwechat_log = 0 @@ -34,6 +36,12 @@ style_wechat_s_btn.init() style_wechat_s_btn.set_bg_color(lv.color_make(0xff, 0xff, 0xff)) style_wechat_s_btn.set_border_width(0) style_wechat_s_btn.set_shadow_opa(0) +style_wechat_s_btn.set_border_width(0) +style_wechat_s_btn.set_pad_left(0) +style_wechat_s_btn.set_pad_right(0) +style_wechat_s_btn.set_pad_top(0) +style_wechat_s_btn.set_pad_bottom(0) + style_common_bg_rect_btn_pressed = lv.style_t() style_common_bg_rect_btn_pressed.init() @@ -41,6 +49,11 @@ style_common_bg_rect_btn_pressed.set_bg_color(lv.color_make(0x1E, 0x26, 0xff)) style_common_bg_rect_btn_pressed.set_bg_opa(100) style_common_bg_rect_btn_pressed.set_border_width(0) style_common_bg_rect_btn_pressed.set_shadow_opa(0) +style_common_bg_rect_btn_pressed.set_border_width(0) +style_common_bg_rect_btn_pressed.set_pad_left(0) +style_common_bg_rect_btn_pressed.set_pad_right(0) +style_common_bg_rect_btn_pressed.set_pad_top(0) +style_common_bg_rect_btn_pressed.set_pad_bottom(0) style_wechat_btn = lv.style_t() style_wechat_btn.init() @@ -55,38 +68,38 @@ wechat_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) wechat_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) wechat_screen_list_screen = lv.obj(wechat_screen) -wechat_screen_list_screen.set_pos(0, 0) -wechat_screen_list_screen.set_size(240, 260) +wechat_screen_list_screen.set_pos(0, 5) +wechat_screen_list_screen.set_size(LCD_X, 90) wechat_screen_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) wechat_screen_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) wechat_press_btn = lv.btn(wechat_screen) -wechat_press_btn.set_pos(10, 264) -wechat_press_btn.set_size(220, 56) +wechat_press_btn.set_pos(10, 98) +wechat_press_btn.set_size(LCD_X-20, 30) 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_btn.set_style_radius(33,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,282) +wechat_press_label.set_size(LCD_X, 20) +wechat_press_label.set_pos(0,105) 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) -wechat_label.set_pos(0, 140) -wechat_label.set_size(240, 40) +wechat_label.set_pos(0, 50) +wechat_label.set_size(LCD_X, 20) wechat_label.set_long_mode(lv.label.LONG.WRAP) wechat_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) wechat_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) wechat_press_label_countdown = lv.label(wechat_screen_list_screen) -wechat_press_label_countdown.set_pos(0, 100) -wechat_press_label_countdown.set_size(240, 40) +wechat_press_label_countdown.set_pos(0, 30) +wechat_press_label_countdown.set_size(LCD_X, 20) wechat_press_label_countdown.set_text(" ") wechat_press_label_countdown.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) wechat_press_label_countdown.set_long_mode(lv.label.LONG.WRAP) @@ -153,14 +166,12 @@ class WechatScreen(Screen): self.second_timer = osTimer() self.play_timer = osTimer() - - self.startY = 0 self.startWidth = 0 self.check_json = 0 self.wechat_list = lv.obj(wechat_screen_list_screen) self.wechat_list.set_pos(0, 0) - self.wechat_list.set_size(240, 261) + self.wechat_list.set_size(LCD_X, 91) self.wechat_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) self.wechat_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -265,6 +276,7 @@ class WechatScreen(Screen): def updata_list_show(self,index): Wechat_log("updata_list_show1") global wechat_screen_list_screen + if self.press_state != 1: if self.wechat_num != 0: if index == 0: @@ -293,32 +305,32 @@ class WechatScreen(Screen): #Wechat_log("wechat_list_dict:num:{}".format(self.wechat_list_dict[i]["num"])) value = self.wechat_recode_list[key] - self.startY = 64*i + self.startY = 37*i if value.find("S:") != -1 or value.find("R:") != -1: self.msg_tmp = value[2:] self.msg_tmp = int(self.msg_tmp) - self.startWidth = 55+self.msg_tmp*10 + self.startWidth = 55+self.msg_tmp*4 elif value.find("T:") != -1:#文字显示 self.msg_tmp = value[2:] - self.startWidth = 230 + self.startWidth = 126 #wechat_btn = lv.btn(self.wechat_list) # if value.find("R:") != -1:self.wechat_list_dict[i] 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) + self.wechat_list_dict[i]["wechat_btn"].set_size(self.startWidth,39) else: - self.wechat_list_dict[i]["wechat_btn"].set_size(self.startWidth,62) + self.wechat_list_dict[i]["wechat_btn"].set_size(self.startWidth,35) - self.wechat_list_dict[i]["wechat_btn"].set_pos(10,self.startY ) + self.wechat_list_dict[i]["wechat_btn"].set_pos(2,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 ) + self.wechat_list_dict[i]["wechat_btn"].set_size(self.startWidth,35) + self.wechat_list_dict[i]["wechat_btn"].set_pos(LCD_X-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) @@ -334,8 +346,8 @@ class WechatScreen(Screen): 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) - self.wechat_list_dict[i]["_btn_label1"].set_pos(0, 0) + self.wechat_list_dict[i]["_btn_label1"].set_size(LCD_X-15, 39) + self.wechat_list_dict[i]["_btn_label1"].set_pos(5, 0) self.wechat_list_dict[i]["_btn_label1"].set_text(str(self.msg_tmp)) self.wechat_list_dict[i]["_btn_label1"].set_long_mode(lv.label.LONG.DOT) #self.wechat_list_dict[i]["_btn_label1"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -349,7 +361,7 @@ class WechatScreen(Screen): self.wechat_list_dict[i]["_btn_label2"].set_text('T:'+key) if value.find("R:") != -1 or value.find("S:") != -1: #_btn_img = lv.img(wechat_btn) - self.wechat_list_dict[i]["_btn_img"].set_size(30, 30) + self.wechat_list_dict[i]["_btn_img"].set_size(15, 15) if value.find("R:") != -1: self.wechat_list_dict[i]["_btn_img"].set_pos(5, 10) self.wechat_list_dict[i]["_btn_img"].set_src("U:/static/APP/wechat/R_3.png") @@ -409,7 +421,11 @@ class WechatScreen(Screen): #self.sending(e) Wechat_log("sending_cb2") else: - EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) + if self.press_state == 0: + EventMesh.publish("load_screen", {"screen": "wechat_failed_popup_screen"}) + pass + else: + EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) #松手0.2秒后显示 def hide_label(self,*args): diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/lcd.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/lcd.py index 60d93d54..02709842 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/lcd.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/lcd.py @@ -185,7 +185,7 @@ lcd_ctrl = Pin(Pin.GPIO18, Pin.OUT, Pin.PULL_DISABLE, 1) lcd.lcd_init(init_buf, 128, 128, 26000, 1, 4, 0, invalid, displayon, displayoff, None,TESel = True,TEPin = 17) # gpio_backlight = Pin(Pin.GPIO37, Pin.OUT, Pin.PULL_DISABLE, 0) # gpio_backlight.write(1) -PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, 0, 1) +PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, 0, 10) PWM_backlight.open() LCD_SIZE_W = 128 @@ -251,6 +251,7 @@ style_screen.set_pad_bottom(0) style_font_youyuan_40 = lv.style_t() style_font_youyuan_40.init() style_font_youyuan_40.set_text_color(lv.color_make(0xff, 0xff, 0xff)) +style_font_youyuan_40.set_text_font(lv.K01_font_15_ALL) #style_font_youyuan_40.set_text_font_v2("font_40.bin",40,0) lcd.lcd_display_on() diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py index 173b5344..c86fb283 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py @@ -126,6 +126,7 @@ def main_init(): ui.add_screen(_ui.NovaliedNumScreen()) ui.add_screen(_ui.DialNoconnectPopupScreen()) ui.add_screen(_ui.LowOnePowerScreen()) + ui.add_screen(_ui.wechatFailedScreen()) ui.add_screen(NewWechatPopupScreen()) ui.add_screen(HealthScreen()) # ui.add_screen(_ui.Setting3Screen()) diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py index 9b2780d1..a206b2e3 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py @@ -576,7 +576,7 @@ def voice_callback(args): screen_NAME = EventMesh.publish("get_screen_NAME") if screen_NAME != None: if screen_NAME != "dialing_noplay_popup": - EventMesh.publish("load_screen", {"screen": "main_menu"}) + EventMesh.publish("return_prev_screen") EventMesh.publish("set_sos_info_call") print('voicecall disconnect end') @@ -2236,7 +2236,7 @@ class getTempTimeManager(Abstract): class getBrightnessManager(Abstract):#获取亮度级别 def __init__(self): - self.level = 6#默认值6 + self.level = 60#默认值6 self.read_data = {} self.time = 5 self.PWM_backlight = None @@ -2278,9 +2278,10 @@ class getBrightnessManager(Abstract):#获取亮度级别 def add(self, event, msg): - if self.level < 10: - self.level = self.level + 2 - self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, self.level, 10) + if self.level < 100: + self.level = self.level + 20 + print("add self.level:{}".format(self.level)) + self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, self.level, 100) self.PWM_backlight.open() self.read_data = EventMesh.publish("get_storage_data") @@ -2292,13 +2293,15 @@ class getBrightnessManager(Abstract):#获取亮度级别 def reduce(self, event, msg): if self.level > 0: - self.level = self.level - 2 + self.level = self.level - 20 + print("reduce self.level:{}".format(self.level)) if self.level <= 0: - self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, 1, 10) + self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, 10, 100) else: - self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US,self.level, 10) + self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US,self.level, 100) self.PWM_backlight.open() + self.read_data = EventMesh.publish("get_storage_data") self.read_data["brightness_level"] = self.level EventMesh.publish("set_storage_data", self.read_data) 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 e2b3a2c8..11150dd0 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 @@ -577,11 +577,13 @@ class UD_ProtoCol(ProtoCol): #这个是发送WT位置数据到手机端 msg_tmp = wt_data.split('UD,') - msg_tmp = msg_tmp[1] + msg_tmp = "WT,"+msg_tmp[1] + data_1_len = len(msg_tmp) # print("WT_ProtoCol:msg_tmp:%s"%(msg_tmp)) - send_data_1 = self.PID+"*%s*%04x*WT"%(self.imei,len(msg_tmp)) - MD5_SIGN_1 = self.pack_MD5_head(send_data_1) - data_1 = "[%s%s,%s]"%(str(MD5_SIGN_1),send_data_1,msg_tmp) + MD5_head_data_1 = self.PID+"*%s*%04x*WT"%(self.imei,data_1_len) + MD5_SIGN_1 = self.pack_MD5_head(MD5_head_data_1) + send_data_1 = self.PID+"*%s*%04X*%s"%(self.imei,data_1_len,msg_tmp) + data_1 = "[%s%s]"%(str(MD5_SIGN_1),send_data_1) # print("WT_ProtoCol:send:%s"%(data_1)) EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND, data_1) # 通过socket发送到服务器端 @@ -734,7 +736,7 @@ class WT_ProtoCol(ProtoCol): def send(self, event, msg): # [SZKW*867387060319491*0008*WT] - send_data = self.PID+"*%s*003*WT"%(self.imei) + send_data = self.PID+"*%s*0002*WT"%(self.imei) MD5_SIGN = self.pack_MD5_head(send_data) data = "[%s%s]"%(str(MD5_SIGN),send_data) # print("WT_ProtoCol:send:%s"%(data)) @@ -783,7 +785,7 @@ class REMIND_ProtoCol(ProtoCol): def send(self, event, msg): # [SZKW*867387060319491*0008*REMIND] - send_data = self.PID+"*%s*006*REMIND"%(self.imei) + send_data = self.PID+"*%s*0006*REMIND"%(self.imei) MD5_SIGN = self.pack_MD5_head(send_data) data = "[%s%s]"%(str(MD5_SIGN),send_data) # print("REMIND_ProtoCol:send:%s"%(data)) @@ -853,7 +855,7 @@ class HRSTART_ProtoCol(ProtoCol): def send(self, event, msg): # [SZKW*867387060319491*0008*hrtstart] - send_data = self.PID+"*%s*008*hrtstart"%(self.imei) + send_data = self.PID+"*%s*0008*hrtstart"%(self.imei) MD5_SIGN = self.pack_MD5_head(send_data) data = "[%s%s]"%(str(MD5_SIGN),send_data) # print("HRSTART_ProtoCol:send:%s"%(data)) diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/sleep_test.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/sleep_test.py index 96694816..9de483a2 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/sleep_test.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/sleep_test.py @@ -43,7 +43,7 @@ hsensor.activate() hsensor.init() hsensor.open_blood_oxygen() utime.sleep(5) -PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, 0, 1) +PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, 0, 100) PWM_backlight.open() hsensor.close() tp_cst816.suspend() 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 70649975..fe2e76ee 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 @@ -21,7 +21,8 @@ import gc import _thread from queue import Queue from machine import RTC - +LCD_X = 128 +LCD_Y = 128 def audio_cb(event): if event == 0: EventMesh.publish("set_audio_state", 1) @@ -50,7 +51,7 @@ style_bar.set_radius(10) style_bar.set_bg_color(lv.color_make(0xA0, 0xA0, 0xA0)) style_bar.set_bg_grad_color(lv.color_make(0xA0, 0xA0, 0xA0)) style_bar.set_bg_grad_dir(lv.GRAD_DIR.VER) -style_bar.set_bg_opa(60) +style_bar.set_bg_opa(255) style_bar.set_pad_left(0) style_bar.set_pad_right(0) style_bar.set_pad_top(0) @@ -128,11 +129,18 @@ style_wechat_btn.set_bg_color(lv.color_make(0x1E, 0x26, 0xff)) style_wechat_btn.set_border_width(0) style_wechat_btn.set_shadow_opa(0) -style_contact_btn = lv.style_t() + +style_contact_btn = lv.style_t() style_contact_btn.init() +style_contact_btn.set_radius(5) style_contact_btn.set_bg_color(lv.color_make(0xff, 0xff, 0xff)) +style_contact_btn.set_bg_opa(255) style_contact_btn.set_border_width(0) -style_contact_btn.set_shadow_opa(0) +style_contact_btn.set_pad_left(0) +style_contact_btn.set_pad_right(0) +style_contact_btn.set_pad_top(0) +style_contact_btn.set_pad_bottom(0) + style_common_bg_rect_btn_pressed = lv.style_t() style_common_bg_rect_btn_pressed.init() @@ -143,7 +151,7 @@ style_common_bg_rect_btn_pressed.set_shadow_opa(0) style_contact_btn_pressed = lv.style_t() style_contact_btn_pressed.init() -style_contact_btn_pressed.set_radius(5) +style_contact_btn_pressed.set_radius(0) style_contact_btn_pressed.set_bg_color(lv.color_make(0xff,0xff,0xff)) style_contact_btn_pressed.set_bg_grad_color(lv.color_make(0x21,0x95,0xf6)) style_contact_btn_pressed.set_bg_grad_dir(lv.GRAD_DIR.HOR) @@ -268,149 +276,126 @@ class PhoneScreen(Screen): global phone_screen ,phone_line,phone_label,phone_one,phone_two,phone_three,phone_four,phone_five,phone_six,phone_seven,phone_eight,phone_nine,phone_start,\ phone_zero,phone_hash,phone_call,phone_call_btn,phone_contact,phone_contact_btn,phone_delete,phone_delete_btn - size_x = 42 #按钮大小 - size_y = 18 - start_x = 0 - start_y = 30 + size_x = 36 #按钮大小 + size_y = 22 + start_x = 5 + start_y = 25 + + offset_y = 4 if phone_screen == None: phone_screen = lv.obj() print("phone_screen") phone_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_line = lv.line(phone_screen) - phone_line.set_points(phone_line_points,2) - phone_line.set_pos(125,5) - phone_line.set_size(2,18) - phone_line.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - phone_line.add_style(style_line,0) + # phone_line = lv.line(phone_screen) + # phone_line.set_points(phone_line_points,2) + # phone_line.set_pos(125,5) + # phone_line.set_size(2,18) + # phone_line.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # phone_line.add_style(style_line,0) phone_label = lv.label(phone_screen) - phone_label.set_pos(0, 0) + phone_label.set_pos(0, 5) phone_label.set_size(128, 20) phone_label.set_text(" ") phone_label.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) phone_label.set_long_mode(lv.label.LONG.CLIP) - phone_label.set_style_text_align(lv.TEXT_ALIGN.RIGHT, 0) + phone_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) phone_one = lv.img(phone_screen) phone_one.set_src("U:/static/IMAGE_NUMBER_KEY1_ICON.png") phone_one.add_flag(lv.obj.FLAG.CLICKABLE) phone_one.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) phone_one.set_pos(start_x, start_y) - phone_one.set_size(start_x+size_x, size_y) + phone_one.set_size(size_x, size_y) phone_two = lv.img(phone_screen) phone_two.set_size(size_x, size_y) phone_two.set_src("U:/static/IMAGE_NUMBER_KEY2_ICON.png") phone_two.add_flag(lv.obj.FLAG.CLICKABLE) phone_two.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_two.set_pos(start_x+size_x, start_y) + phone_two.set_pos(start_x+size_x+5*1, start_y) phone_three = lv.img(phone_screen) phone_three.set_size(size_x, size_y) phone_three.set_src("U:/static/IMAGE_NUMBER_KEY3_ICON.png") phone_three.add_flag(lv.obj.FLAG.CLICKABLE) phone_three.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_three.set_pos(start_x+size_x*2, start_y) + phone_three.set_pos(start_x+size_x*2+5*2, start_y) phone_four = lv.img(phone_screen) phone_four.set_size(size_x, size_y) phone_four.set_src("U:/static/IMAGE_NUMBER_KEY4_ICON.png") phone_four.add_flag(lv.obj.FLAG.CLICKABLE) phone_four.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_four.set_pos(start_x, start_y+size_y) + phone_four.set_pos(start_x, start_y+size_y+offset_y) phone_five = lv.img(phone_screen) phone_five.set_size(size_x, size_y) phone_five.set_src("U:/static/IMAGE_NUMBER_KEY5_ICON.png") phone_five.add_flag(lv.obj.FLAG.CLICKABLE) phone_five.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_five.set_pos(start_x+size_x, start_y+size_y) + phone_five.set_pos(start_x+size_x+5*1, start_y+size_y+offset_y) phone_six = lv.img(phone_screen) phone_six.set_size(size_x, size_y) phone_six.set_src("U:/static/IMAGE_NUMBER_KEY6_ICON.png") phone_six.add_flag(lv.obj.FLAG.CLICKABLE) phone_six.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_six.set_pos(start_x+size_x*2, start_y+size_y) + phone_six.set_pos(start_x+size_x*2+5*2, start_y+size_y+offset_y) phone_seven = lv.img(phone_screen) phone_seven.set_size(size_x, size_y) phone_seven.set_src("U:/static/IMAGE_NUMBER_KEY7_ICON.png") phone_seven.add_flag(lv.obj.FLAG.CLICKABLE) phone_seven.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_seven.set_pos(start_x, start_y+size_y*2) + phone_seven.set_pos(start_x, start_y+size_y*2+offset_y*2) phone_eight = lv.img(phone_screen) phone_eight.set_size(size_x, size_y) phone_eight.set_src("U:/static/IMAGE_NUMBER_KEY8_ICON.png") phone_eight.add_flag(lv.obj.FLAG.CLICKABLE) phone_eight.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_eight.set_pos(start_x+size_x, start_y+size_y*2) + phone_eight.set_pos(start_x+size_x+5*1, start_y+size_y*2+offset_y*2) phone_nine = lv.img(phone_screen) phone_nine.set_size(size_x, size_y) phone_nine.set_src("U:/static/IMAGE_NUMBER_KEY9_ICON.png") phone_nine.add_flag(lv.obj.FLAG.CLICKABLE) phone_nine.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_nine.set_pos(start_x+size_x*2, start_y+size_y*2) + phone_nine.set_pos(start_x+size_x*2+5*2, start_y+size_y*2+offset_y*2) + + # phone_start = lv.img(phone_screen) + # phone_start.set_size(size_x, size_y) + # phone_start.set_src("U:/static/IMAGE_NUMBER_KEYSTAR_ICON.png") + # phone_start.add_flag(lv.obj.FLAG.CLICKABLE) + # phone_start.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + # phone_start.set_pos(start_x, start_y+size_y*3) + + phone_delete = lv.img(phone_screen) + phone_delete.set_size(size_x, size_y) + phone_delete.set_src("U:/static/IMAGE_BUTTON_DELKEY.png") + phone_delete.add_flag(lv.obj.FLAG.CLICKABLE) + phone_delete.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + phone_delete.set_pos(start_x, start_y+size_y*3+offset_y*3) + - phone_start = lv.img(phone_screen) - phone_start.set_size(size_x, size_y) - phone_start.set_src("U:/static/IMAGE_NUMBER_KEYSTAR_ICON.png") - phone_start.add_flag(lv.obj.FLAG.CLICKABLE) - phone_start.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_start.set_pos(start_x, start_y+size_y*3) phone_zero = lv.img(phone_screen) phone_zero.set_size(size_x, size_y) phone_zero.set_src("U:/static/IMAGE_NUMBER_KEY0_ICON.png") phone_zero.add_flag(lv.obj.FLAG.CLICKABLE) phone_zero.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_zero.set_pos(start_x+size_x, start_y+size_y*3) - - phone_hash = lv.img(phone_screen) - phone_hash.set_size(size_x, size_y) - phone_hash.set_src("U:/static/IMAGE_NUMBER_KEYHASH_ICON.png") - phone_hash.add_flag(lv.obj.FLAG.CLICKABLE) - phone_hash.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_hash.set_pos(start_x+size_x*2, start_y+size_y*3) + phone_zero.set_pos(start_x+size_x+5*1, start_y+size_y*3+offset_y*3) phone_call = lv.img(phone_screen) phone_call.set_size(size_x, size_y) phone_call.set_src("U:/static/IMAGE_BUTTON_DIAL.png") phone_call.add_flag(lv.obj.FLAG.CLICKABLE) phone_call.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_call.set_pos(start_x, start_y+size_y*4) - - phone_call_btn = lv.img(phone_screen) - phone_call_btn.set_size(size_x, size_y) - phone_call_btn.add_flag(lv.obj.FLAG.CLICKABLE) - phone_call_btn.set_pos(start_x, start_y+size_y*4) + phone_call.set_pos(start_x+size_x*2+5*2, start_y+size_y*3+offset_y*3) - phone_contact = lv.img(phone_screen) - phone_contact.set_size(size_x, size_y) - phone_contact.set_src("U:/static/IMAGE_BUTTON_DIAL_CONTACT.png") - phone_contact.add_flag(lv.obj.FLAG.CLICKABLE) - phone_contact.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_contact.set_pos(start_x+size_x, start_y+size_y*4) - - phone_contact_btn = lv.img(phone_screen) - phone_contact_btn.set_size(size_x, size_y) - phone_contact_btn.add_flag(lv.obj.FLAG.CLICKABLE) - phone_contact_btn.set_pos(start_x+size_x, start_y+size_y*4) - - phone_delete = lv.img(phone_screen) - phone_delete.set_size(size_x, size_y) - phone_delete.set_src("U:/static/IMAGE_BUTTON_DELKEY.png") - phone_delete.add_flag(lv.obj.FLAG.CLICKABLE) - phone_delete.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - phone_delete.set_pos(start_x+size_x*2, start_y+size_y*4) - phone_delete_btn = lv.img(phone_screen) - phone_delete_btn.set_size(size_x, size_y) - phone_delete_btn.add_flag(lv.obj.FLAG.CLICKABLE) - phone_delete_btn.set_pos(start_x+size_x*2, start_y+size_y*4) self.meta = phone_screen @@ -426,34 +411,57 @@ class PhoneScreen(Screen): lv.EVENT.CLICKED, None) phone_six.add_event_cb(lambda e: EventMesh.callback_wrapper(self.six(e)), lv.EVENT.CLICKED, None) - phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.seven(e)), + phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), lv.EVENT.CLICKED, None) + + phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), + lv.EVENT.LONG_PRESSED, None)#长按显示+ + + phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.endpressed_start(e)), + lv.EVENT.RELEASED, None)#释放按键 + phone_eight.add_event_cb(lambda e: EventMesh.callback_wrapper(self.eight(e)), lv.EVENT.CLICKED, None) - phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.nine(e)), - lv.EVENT.CLICKED, None) - phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero(e)), - lv.EVENT.CLICKED, None) + phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + lv.EVENT.CLICKED, None) + + phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), + lv.EVENT.LONG_PRESSED, None)#长按显示+ + + phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.nine_endpressed_start(e)), + lv.EVENT.RELEASED, None)#释放按键 - phone_call_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.call(e)), - lv.EVENT.CLICKED, None) - phone_contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.contact(e)), + # phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero(e)), + # lv.EVENT.CLICKED, None) + + phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + lv.EVENT.CLICKED, None)#短按显示* + + phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), + lv.EVENT.LONG_PRESSED, None)#长按显示+ + + phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero_endpressed_start(e)), + lv.EVENT.RELEASED, None)#释放按键 + + phone_call.add_event_cb(lambda e: EventMesh.callback_wrapper(self.call(e)), lv.EVENT.CLICKED, None) - phone_delete_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.delete(e)), + # phone_contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.contact(e)), + # lv.EVENT.CLICKED, None) + phone_delete.add_event_cb(lambda e: EventMesh.callback_wrapper(self.delete(e)), lv.EVENT.CLICKED, None) - phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), - lv.EVENT.CLICKED, None)#短按显示* + # phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + # lv.EVENT.CLICKED, None)#短按显示* - phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), - lv.EVENT.LONG_PRESSED, None)#长按显示+ + # phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), + # lv.EVENT.LONG_PRESSED, None)#长按显示+ - phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.endpressed_start(e)), - lv.EVENT.RELEASED, None)#释放按键 + # phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.endpressed_start(e)), + # lv.EVENT.RELEASED, None)#释放按键 - phone_hash.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hash(e)), - lv.EVENT.CLICKED, None) + # phone_hash.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hash(e)), + # lv.EVENT.CLICKED, None) self.phone_num='' @@ -467,10 +475,11 @@ class PhoneScreen(Screen): # print("self.phone_list :{} self.phone_num:{}".format(self.phone_list,self.phone_num)) if self.timer_cb == 0: self.timer_cb = 1 - self.timer.start(1000,1,self.refresh_line) + # self.timer.start(1000,1,self.refresh_line) def refresh_line(self,e): + return if self.count > 2 : self.count = 1 if self.count%2 == 0: @@ -567,7 +576,20 @@ class PhoneScreen(Screen): self.timer_cb = 0 self.timer.stop() - def endpressed_start(self,e): + def nine_endpressed_start(self,e): + if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 + #self.phone_list.pop(0) + return + + if self.button == 1:#长按 + self.phone_list.append("#") + else:#短按 + self.phone_list.append("9") + self.phone_num = ''.join(self.phone_list) + self.show_num() + + + def zero_endpressed_start(self,e): if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 #self.phone_list.pop(0) return @@ -575,8 +597,20 @@ class PhoneScreen(Screen): if self.button == 1:#长按 self.phone_list.append("+") else:#短按 + self.phone_list.append("0") + + self.phone_num = ''.join(self.phone_list) + self.show_num() + + def endpressed_start(self,e): + if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 + #self.phone_list.pop(0) + return + + if self.button == 1:#长按 self.phone_list.append("*") - + else:#短按 + self.phone_list.append("7") self.phone_num = ''.join(self.phone_list) self.show_num() @@ -643,11 +677,9 @@ class PhoneScreen(Screen): def show_num(self): #print("self.phone_num ",self.phone_num,self.phone_list) - len_t = len(self.phone_list)*20 - if len_t > 120: - len_t = 120 - phone_label.set_size(len_t,30) - phone_label.set_pos(120-len_t,5) + global phone_label + phone_label.set_pos(0, 5) + phone_label.set_size(128, 20) phone_label.set_text(self.phone_num) def lcd_on(self): @@ -720,23 +752,23 @@ class CallLogScreen(Screen): call_log_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) call_log_cont_list_screen = lv.obj(call_log_screen) - call_log_cont_list_screen.set_pos(0, 50) - call_log_cont_list_screen.set_size(240, 270) + call_log_cont_list_screen.set_pos(0, 30) + call_log_cont_list_screen.set_size(LCD_X, LCD_Y-30) call_log_cont_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) call_log_cont_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) call_log_title = lv.label(call_log_screen) call_log_title.set_pos(0, 10) - call_log_title.set_size(240, 40) + call_log_title.set_size(LCD_X, 20) call_log_title.set_long_mode(lv.label.LONG.WRAP) call_log_title.set_text("通话记录") call_log_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) call_log_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) none_call_log_title = lv.label(call_log_cont_list_screen) - none_call_log_title.set_pos(0, 120) - none_call_log_title.set_size(240, 40) + none_call_log_title.set_pos(0, (LCD_Y-30)//2-20) + none_call_log_title.set_size(LCD_X, 20) none_call_log_title.set_long_mode(lv.label.LONG.WRAP) none_call_log_title.set_text(" ") none_call_log_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -744,7 +776,7 @@ class CallLogScreen(Screen): #self.call_log_detail_list = lv.obj(call_log_screen) self.call_log_detail_list = lv.obj(call_log_cont_list_screen) self.call_log_detail_list.set_pos(0, 0) - self.call_log_detail_list.set_size(240, 271) + self.call_log_detail_list.set_size(LCD_X, LCD_Y-30+1) self.call_log_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) self.call_log_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) for i in range(self.CALL_LOG_MAX): @@ -784,7 +816,7 @@ class CallLogScreen(Screen): if self.check_json == True and len(self.read_call_log) != 0: none_call_log_title.set_text(" ") - + self.call_log_detail_list.clear_flag(lv.obj.FLAG.HIDDEN)#隐藏空文本 # self.call_log_detail_list.delete()#先删除一次控件 # self.call_log_detail_list = lv.obj(call_log_cont_list_screen) # self.call_log_detail_list.set_pos(0, 0) @@ -796,6 +828,7 @@ class CallLogScreen(Screen): # print("self.call_log :{} \r\n sort_new:{}\r\n".format(self.read_call_log,sort_new)) for sort_new_tmp in sort_new: #字典 key value + num_count = sort_new_tmp["count"]#获取通话次数 num_name = sort_new_tmp["name"]#获取名称 num_phonnum = sort_new_tmp["number"]#获取电话号码 @@ -803,16 +836,16 @@ class CallLogScreen(Screen): # print("num_count :{} num_name:{} num_time:{}".format(num_count,num_name,num_time)) #_btn = lv.btn(self.call_log_detail_list) - self.call_log_detail_list_dict[h]["_btn"].set_size(240,80) - self.call_log_detail_list_dict[h]["_btn"].set_pos(0,82*h) + self.call_log_detail_list_dict[h]["_btn"].set_size(LCD_X,45) + self.call_log_detail_list_dict[h]["_btn"].set_pos(0,47*h) self.call_log_detail_list_dict[h]["_btn"].add_style(style_contact_btn, lv.PART.MAIN | lv.STATE.DEFAULT) self.call_log_detail_list_dict[h]["_btn"].add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling(e)), lv.EVENT.CLICKED, None) #_btn_label2 = lv.label(_btn) - self.call_log_detail_list_dict[h]["_btn_label2"].set_pos(0, 5) - self.call_log_detail_list_dict[h]["_btn_label2"].set_size(0, 25) + self.call_log_detail_list_dict[h]["_btn_label2"].set_pos(0, 0) + self.call_log_detail_list_dict[h]["_btn_label2"].set_size(0, 20) self.call_log_detail_list_dict[h]["_btn_label2"].set_text(num_phonnum) #_btn_label2.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) # @@ -823,9 +856,10 @@ class CallLogScreen(Screen): # _btn_label3.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) #_btn_label4 = lv.label(_btn) - self.call_log_detail_list_dict[h]["_btn_label4"].set_pos(0, 38) - self.call_log_detail_list_dict[h]["_btn_label4"].set_size(230, 30) + self.call_log_detail_list_dict[h]["_btn_label4"].set_pos(5, 24) + self.call_log_detail_list_dict[h]["_btn_label4"].set_size(LCD_X-15, 21) self.call_log_detail_list_dict[h]["_btn_label4"].set_text(num_phonnum) + self.call_log_detail_list_dict[h]["_btn_label4"].set_long_mode(lv.label.LONG.CLIP) self.call_log_detail_list_dict[h]["_btn_label4"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) #_btn_label5 = lv.label(_btn) @@ -836,9 +870,10 @@ class CallLogScreen(Screen): # _btn_label5.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) #_btn_label6 = lv.label(_btn) - self.call_log_detail_list_dict[h]["_btn_label6"].set_pos(0, 5) - self.call_log_detail_list_dict[h]["_btn_label6"].set_size(230, 28) + self.call_log_detail_list_dict[h]["_btn_label6"].set_pos(5, 4) + self.call_log_detail_list_dict[h]["_btn_label6"].set_size(LCD_X-15, 20) self.call_log_detail_list_dict[h]["_btn_label6"].set_text(num_name) + self.call_log_detail_list_dict[h]["_btn_label6"].set_long_mode(lv.label.LONG.CLIP) self.call_log_detail_list_dict[h]["_btn_label6"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) self.call_log_detail_list_dict[h]["_btn"].clear_flag(lv.obj.FLAG.HIDDEN) @@ -928,11 +963,11 @@ dialing_call_label = None hangup_imgbtn = None class DialingScreen(Screen): NAME = "dialing" - + def __init__(self): super().__init__() self.meta = None - + self.meta_type = "popup" self.call_log = {} self.call_log_value = {} self.read_call_log = {} @@ -946,32 +981,33 @@ class DialingScreen(Screen): print("dialing_screen") dialing_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) - dialing_img = lv.img(dialing_screen) - dialing_img.set_pos(80, 20) - dialing_img.set_size(64, 64) - dialing_img.set_src("U:/static/IMAGE_NOTICE_CALL.png") - dialing_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + # dialing_img = lv.img(dialing_screen) + # dialing_img.set_pos(80, 20) + # dialing_img.set_size(64, 64) + # dialing_img.set_src("U:/static/IMAGE_NOTICE_CALL.png") + # dialing_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) dialing_name = lv.label(dialing_screen) - dialing_name.set_pos(0, 120) - dialing_name.set_size(240, 50) + dialing_name.set_pos(0, 14) + dialing_name.set_size(LCD_X, 20) dialing_name.set_text(" ") + dialing_name.set_long_mode(lv.label.LONG.DOT) dialing_name.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) dialing_name.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) dialing_call_label = lv.label(dialing_screen) - dialing_call_label.set_pos(0, 174) - dialing_call_label.set_size(240, 50) + dialing_call_label.set_pos(0, 43) + dialing_call_label.set_size(LCD_X, 40) dialing_call_label.set_text("正在等待对方接\n听电话") dialing_call_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) dialing_call_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - hangup_imgbtn = lv.img(dialing_screen) - hangup_imgbtn.set_size(64, 64) + hangup_imgbtn = lv.img(dialing_screen) #64 + hangup_imgbtn.set_size(32, 32) hangup_imgbtn.set_src("U:/static/hang_up.png") hangup_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) hangup_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - hangup_imgbtn.set_pos(80, 250) + hangup_imgbtn.set_pos(48, 90) hangup_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), lv.EVENT.CLICKED, None) self.meta = dialing_screen @@ -979,64 +1015,7 @@ class DialingScreen(Screen): name = EventMesh.publish("get_phonename")#获取拨打电话名称 dialing_name.set_text(name)#名称 def post_processor_after_initialization(self): - # print("创建通话记录 post_processor_before_initialization\n") - utime.sleep_ms(200)#不加延时会切屏 - #获取字符串 - name = EventMesh.publish("get_phonename")#获取拨打电话名称 - content = EventMesh.publish("get_phonenum")#获取电话号码 - time = EventMesh.publish("screen_get_time")#获取系统时间 - - # ["15692025051","2","12:59","哥gdh符合双方和开发商开发好看的思考"], - # 格式:{"电话号码"：{"timesec":'时间戳'，"number":'电话号码'，"name":'名字'，"time":'时间'，"count":'通话次数'}} - # dialing_content.set_text(content)#电话号码 - num = 0 - - date_tmp = utime.localtime() - time_tmp = utime.mktime(date_tmp) - # print("time_tmp:{}".format(time_tmp)) - read_call_log = EventMesh.publish("get_call_log_list") - check_json = read_call_log[0] - - if check_json == True: - self.read_call_log = read_call_log[1] - b = content in self.read_call_log.keys()#查找key中是否包含content电话号码 True 包含在里面 False不包含在里面 - if b == True:#查找是否有相同的电话号码 有就直接读出来的次数上加一 没有则从1开始加起 - number_tmp = {} - number_tmp = self.read_call_log[content] #通话次数加一 - num_tmp_t = number_tmp["count"] - # print("number_tmp:{} self.read_call_log.value:{}".format(number_tmp,self.read_call_log.values())) - else : - num_tmp_t = 0 - num = num_tmp_t - else: - num = 0 #通话次数 - - sort_tmp = {} - sort_tmp = self.read_call_log.values() - sort_new = {} - sort_new = sorted(sort_tmp, key = lambda i: i['timesec'],reverse = True)#按照时间戳进行排序 去掉最旧的一次数据如果满了五十条 - - i = 0 - # 49 50 - if len(self.read_call_log) >= self.CALL_LOG_MAX: - for sort_new_tmp in sort_new: #字典 key value - i+=1 # 1 - if i >= self.CALL_LOG_MAX:#大于50条把最后一条删除掉只保留前面50调最新的数据 - key_tmp = sort_new_tmp["number"] - del self.read_call_log[key_tmp] - tmp = {} - tmp["count"]= num+1 #通话次数 - tmp["time"]= "{}:{}".format("%02d"%(time[0][0]),"%02d"%(time[0][1]))#通湖时间 - tmp["name"]= name #名称 - tmp["timesec"]= time_tmp #时间戳 - tmp["number"] = content - - self.read_call_log[content] = tmp - with open("/usr/static/storage_file/Call_log.json","w",encoding="utf-8") as fd: - ujson.dump(self.read_call_log,fd) - print("创建通话记录") - EventMesh.publish("set_call_log_list", [1,self.read_call_log]) - EventMesh.publish("call_log_update_show_list") + pass def hangup(self,e): EventMesh.publish("set_UI_high_priority", 0) @@ -1079,15 +1058,15 @@ class NoSimScreen(Screen):# no_sim_popup_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) no_sim_popup_screen_title1 = lv.label(no_sim_popup_screen) - no_sim_popup_screen_title1.set_pos(0, 140) - no_sim_popup_screen_title1.set_size(240, 40) + no_sim_popup_screen_title1.set_pos(0, 40) + no_sim_popup_screen_title1.set_size(LCD_X, 40) no_sim_popup_screen_title1.set_text("无SIM卡或") no_sim_popup_screen_title1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) no_sim_popup_screen_title1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) no_sim_popup_screen_title2 = lv.label(no_sim_popup_screen) - no_sim_popup_screen_title2.set_pos(0, 190) - no_sim_popup_screen_title2.set_size(240, 40) + no_sim_popup_screen_title2.set_pos(0, 60) + no_sim_popup_screen_title2.set_size(LCD_X, 40) no_sim_popup_screen_title2.set_text("无网络") no_sim_popup_screen_title2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) no_sim_popup_screen_title2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -1116,6 +1095,62 @@ class NoSimScreen(Screen):# def btn8_press(self): EventMesh.publish("return_prev_screen") +wechat_failed_popup_screen = None +wechat_failed_popup_title1 = None +wechat_failed_popup_title2 = None +#未插卡 +class wechatFailedScreen(Screen):#录音失败提示 + NAME = "wechat_failed_popup_screen" + def __init__(self): + super().__init__() + self.meta = None + self.meta_type = "popup" + + def initialization(self): + global wechat_failed_popup_screen,wechat_failed_popup_title1,wechat_failed_popup_title2 + if wechat_failed_popup_screen == None : + wechat_failed_popup_screen = lv.obj() + print("wechat_failed_popup_screen") + wechat_failed_popup_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + + wechat_failed_popup_title1 = lv.label(wechat_failed_popup_screen) + wechat_failed_popup_title1.set_pos(0, 40) + wechat_failed_popup_title1.set_size(LCD_X, 40) + wechat_failed_popup_title1.set_text("录音失败") + wechat_failed_popup_title1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + wechat_failed_popup_title1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + + wechat_failed_popup_title2 = lv.label(wechat_failed_popup_screen) + wechat_failed_popup_title2.set_pos(0, 60) + wechat_failed_popup_title2.set_size(LCD_X, 40) + wechat_failed_popup_title2.set_text("请重试!") + wechat_failed_popup_title2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + wechat_failed_popup_title2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + + self.meta = wechat_failed_popup_screen + + def done_left_to_right(self): + EventMesh.publish("return_prev_screen") + + def done_right_to_left(self): + EventMesh.publish("return_prev_screen") + + def done_bottom_to_top(self): + EventMesh.publish("return_prev_screen") + + def done_top_to_bottom(self): + EventMesh.publish("return_prev_screen") + + def done_return(self): + EventMesh.publish("return_prev_screen") + + + def btn1_release(self): + EventMesh.publish("return_prev_screen") + + def btn8_press(self): + EventMesh.publish("return_prev_screen") + no_valied_num_screen = None no_valied_num_screen_title1 = None @@ -1212,23 +1247,23 @@ class NoSimPowerScreen(Screen):# no_sim_power_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) no_sim_power_screen_title = lv.label(no_sim_power_screen) - no_sim_power_screen_title.set_pos(0, 20) - no_sim_power_screen_title.set_size(240, 40) + no_sim_power_screen_title.set_pos(0, 5) + no_sim_power_screen_title.set_size(128, 20) 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) - no_sim_power_screen_img = lv.img(no_sim_power_screen) - no_sim_power_screen_img.set_pos(100, 70) - no_sim_power_screen_img.set_size(61, 61) - no_sim_power_screen_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - no_sim_power_screen_img.set_src("U:/static/poweroff_icon.png") + # no_sim_power_screen_img = lv.img(no_sim_power_screen) + # no_sim_power_screen_img.set_pos(49, 30) + # no_sim_power_screen_img.set_size(30, 30) + # no_sim_power_screen_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + # no_sim_power_screen_img.set_src("U:/static/poweroff_icon.png") no_sim_power_screen_label = lv.label(no_sim_power_screen) - no_sim_power_screen_label.set_pos(0, 150) - no_sim_power_screen_label.set_size(240, 40) + no_sim_power_screen_label.set_pos(0, 30) + no_sim_power_screen_label.set_size(128, 20) no_sim_power_screen_label.set_text("是否关机？") no_sim_power_screen_label.set_long_mode(lv.label.LONG.WRAP) no_sim_power_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -1236,34 +1271,48 @@ class NoSimPowerScreen(Screen):# no_sim_power_screen_comfirm = lv.img(no_sim_power_screen) - no_sim_power_screen_comfirm.set_size(176, 46) - no_sim_power_screen_comfirm.set_pos(32, 190) + no_sim_power_screen_comfirm.set_size(88, 23) + no_sim_power_screen_comfirm.set_pos(20, 60) no_sim_power_screen_comfirm.set_src("U:/static/off_icon.png") no_sim_power_screen_comfirm.add_flag(lv.obj.FLAG.CLICKABLE) no_sim_power_screen_comfirm.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + no_sim_power_screen_comfirm_btn = lv.img(no_sim_power_screen) + no_sim_power_screen_comfirm_btn.set_size(88, 35) + no_sim_power_screen_comfirm_btn.set_pos(20, 50) + no_sim_power_screen_comfirm_btn.add_flag(lv.obj.FLAG.CLICKABLE) + no_sim_power_screen_comfirm_btn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + + poweroff_confirm_label = lv.label(no_sim_power_screen_comfirm) poweroff_confirm_label.set_text("确定") - poweroff_confirm_label.align(lv.ALIGN.CENTER, 0, 5) + poweroff_confirm_label.align(lv.ALIGN.CENTER, 0, 0) poweroff_confirm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) no_sim_power_screen_cancel = lv.img(no_sim_power_screen) - no_sim_power_screen_cancel.set_size(176, 46) - no_sim_power_screen_cancel.set_pos(32, 250) + no_sim_power_screen_cancel.set_size(88, 23) + no_sim_power_screen_cancel.set_pos(20, 90) no_sim_power_screen_cancel.set_src("U:/static/cancel_icon.png") no_sim_power_screen_cancel.add_flag(lv.obj.FLAG.CLICKABLE) no_sim_power_screen_cancel.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + + no_sim_power_screen_cancel_btn = lv.img(no_sim_power_screen) + no_sim_power_screen_cancel_btn.set_size(88, 43) + no_sim_power_screen_cancel_btn.set_pos(20, 85) + no_sim_power_screen_cancel_btn.add_flag(lv.obj.FLAG.CLICKABLE) + no_sim_power_screen_cancel_btn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + poweroff_return_label = lv.label(no_sim_power_screen_cancel) poweroff_return_label.set_text("取消") - poweroff_return_label.align(lv.ALIGN.CENTER, 0, 5) + poweroff_return_label.align(lv.ALIGN.CENTER, 0, 0) poweroff_return_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) no_sim_power_screen_cancel.set_ext_click_area(20) self.meta = no_sim_power_screen - no_sim_power_screen_comfirm.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)), + no_sim_power_screen_comfirm_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)), lv.EVENT.CLICKED, None) - no_sim_power_screen_cancel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.cancel(e)), + no_sim_power_screen_cancel_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.cancel(e)), lv.EVENT.CLICKED, None) def confirm(self,e): @@ -1305,6 +1354,8 @@ class DialingNoPlayPopupScreen(Screen):#正在拨号中...未打出 self.timer1 = osTimer() self.time_count = 0 self.timer2 = osTimer() + self.CALL_LOG_MAX = CALL_LOG_MAX + self.read_call_log = {} def initialization(self): EventMesh.publish("set_UI_high_priority", 1) @@ -1314,32 +1365,33 @@ class DialingNoPlayPopupScreen(Screen):#正在拨号中...未打出 print("dialing_popup_screen") dialing_popup_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) - dialing_popup_img = lv.img(dialing_popup_screen) - dialing_popup_img.set_pos(80, 20) - dialing_popup_img.set_size(64, 64) - dialing_popup_img.set_src("U:/static/IMAGE_NOTICE_CALL.png") - dialing_popup_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + # dialing_popup_img = lv.img(dialing_popup_screen) + # dialing_popup_img.set_pos(32, 5) + # dialing_popup_img.set_size(64, 64) + # dialing_popup_img.set_src("U:/static/IMAGE_NOTICE_CALL.png") + # dialing_popup_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) dialing_popup_name = lv.label(dialing_popup_screen) - dialing_popup_name.set_pos(0, 120) - dialing_popup_name.set_size(240, 50) + dialing_popup_name.set_pos(0, 15) + dialing_popup_name.set_size(LCD_X, 20) dialing_popup_name.set_text(" ") + dialing_popup_name.set_long_mode(lv.label.LONG.DOT) dialing_popup_name.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) dialing_popup_name.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) dialing_popup_call = lv.label(dialing_popup_screen) - dialing_popup_call.set_pos(0, 180) - dialing_popup_call.set_size(240, 50) + dialing_popup_call.set_pos(0, 50) + dialing_popup_call.set_size(LCD_X, 20) dialing_popup_call.set_text("正在拨号中") dialing_popup_call.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) dialing_popup_call.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) dialing_popup_hangup_imgbtn = lv.img(dialing_popup_screen) - dialing_popup_hangup_imgbtn.set_size(64, 64) + dialing_popup_hangup_imgbtn.set_size(32, 32) dialing_popup_hangup_imgbtn.set_src("U:/static/hang_up.png") dialing_popup_hangup_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) dialing_popup_hangup_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - dialing_popup_hangup_imgbtn.set_pos(80, 250) + dialing_popup_hangup_imgbtn.set_pos(48, 90) dialing_popup_hangup_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), lv.EVENT.CLICKED, None) self.meta = dialing_popup_screen @@ -1349,6 +1401,65 @@ class DialingNoPlayPopupScreen(Screen):#正在拨号中...未打出 def post_processor_after_initialization(self): self.time_count = 0 + # print("创建通话记录 post_processor_before_initialization\n") + utime.sleep_ms(200)#不加延时会切屏 + #获取字符串 + name = EventMesh.publish("get_phonename")#获取拨打电话名称 + content = EventMesh.publish("get_phonenum")#获取电话号码 + time = EventMesh.publish("screen_get_time")#获取系统时间 + + # ["15692025051","2","12:59","哥gdh符合双方和开发商开发好看的思考"], + # 格式:{"电话号码"：{"timesec":'时间戳'，"number":'电话号码'，"name":'名字'，"time":'时间'，"count":'通话次数'}} + # dialing_content.set_text(content)#电话号码 + num = 0 + + date_tmp = utime.localtime() + time_tmp = utime.mktime(date_tmp) + # print("time_tmp:{}".format(time_tmp)) + read_call_log = EventMesh.publish("get_call_log_list") + check_json = read_call_log[0] + + if check_json == True: + self.read_call_log = read_call_log[1] + b = content in self.read_call_log.keys()#查找key中是否包含content电话号码 True 包含在里面 False不包含在里面 + if b == True:#查找是否有相同的电话号码 有就直接读出来的次数上加一 没有则从1开始加起 + number_tmp = {} + number_tmp = self.read_call_log[content] #通话次数加一 + num_tmp_t = number_tmp["count"] + # print("number_tmp:{} self.read_call_log.value:{}".format(number_tmp,self.read_call_log.values())) + else : + num_tmp_t = 0 + num = num_tmp_t + else: + num = 0 #通话次数 + + sort_tmp = {} + sort_tmp = self.read_call_log.values() + sort_new = {} + sort_new = sorted(sort_tmp, key = lambda i: i['timesec'],reverse = True)#按照时间戳进行排序 去掉最旧的一次数据如果满了五十条 + + i = 0 + # 49 50 + if len(self.read_call_log) >= self.CALL_LOG_MAX: + for sort_new_tmp in sort_new: #字典 key value + i+=1 # 1 + if i >= self.CALL_LOG_MAX:#大于50条把最后一条删除掉只保留前面50调最新的数据 + key_tmp = sort_new_tmp["number"] + del self.read_call_log[key_tmp] + tmp = {} + tmp["count"]= num+1 #通话次数 + tmp["time"]= "{}:{}".format("%02d"%(time[0][0]),"%02d"%(time[0][1]))#通湖时间 + tmp["name"]= name #名称 + tmp["timesec"]= time_tmp #时间戳 + tmp["number"] = content + + self.read_call_log[content] = tmp + with open("/usr/static/storage_file/Call_log.json","w",encoding="utf-8") as fd: + ujson.dump(self.read_call_log,fd) + print("创建通话记录") + EventMesh.publish("set_call_log_list", [1,self.read_call_log]) + EventMesh.publish("call_log_update_show_list") + self.timer1.start(1000, 1, self.timeout_hangup) self.timer2.start(2000, 0, self.timeout_call) @@ -1419,8 +1530,8 @@ class DialNoconnectPopupScreen(Screen):#你所拨打的电话暂时无法接通 dial_no_connect_popup.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) dialing_connect_call = lv.label(dial_no_connect_popup) - dialing_connect_call.set_pos(0, 110) - dialing_connect_call.set_size(240, 150) + dialing_connect_call.set_pos(0, 40) + dialing_connect_call.set_size(128, 88) dialing_connect_call.set_text("你好，你所拨打的\n电话暂时无法接\n通，请稍后再拨") dialing_connect_call.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) dialing_connect_call.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -1480,8 +1591,8 @@ class NewMessageScreen(Screen): message_popup_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) message_popup_title = lv.label(message_popup_screen) - message_popup_title.set_pos(0, 150) - message_popup_title.set_size(240, 40) + message_popup_title.set_pos(0, 40) + message_popup_title.set_size(128, 40) message_popup_title.set_text("你有新的消息") message_popup_title.set_long_mode(lv.label.LONG.WRAP) message_popup_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -1651,7 +1762,7 @@ class PopupScreen(Screen): msg_top_title = lv.label(msg_list_screen) msg_top_title.set_pos(0, 10) - msg_top_title.set_size(128, 40) + msg_top_title.set_size(LCD_X, 20) msg_top_title.set_text("信息") msg_top_title.set_long_mode(lv.label.LONG.WRAP) msg_top_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -1659,21 +1770,21 @@ class PopupScreen(Screen): msg_cont_list_screen = lv.obj(msg_list_screen) - msg_cont_list_screen.set_pos(0, 50) - msg_cont_list_screen.set_size(128, 128-50) + msg_cont_list_screen.set_pos(0, 30) + msg_cont_list_screen.set_size(LCD_X, LCD_Y-30) msg_cont_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) msg_cont_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) msg_list_t_done_img = lv.img(msg_cont_list_screen) - msg_list_t_done_img.set_pos(53, 20) - msg_list_t_done_img.set_size(134, 117) + msg_list_t_done_img.set_pos(53, 10) + msg_list_t_done_img.set_size(67, 59) msg_list_t_done_img.set_src("U:/static/IMAGE_NOTICE_NONE.png") msg_list_t_done_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) no_msg_text = lv.label(msg_cont_list_screen) - no_msg_text.set_pos(0, 210) - no_msg_text.set_size(128, 40) + no_msg_text.set_pos(0, 100) + no_msg_text.set_size(LCD_X, 20) no_msg_text.set_text("暂无信息") no_msg_text.set_long_mode(lv.label.LONG.WRAP) no_msg_text.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -1681,7 +1792,7 @@ class PopupScreen(Screen): self.sms_detail_list = lv.obj(msg_cont_list_screen) self.sms_detail_list.set_pos(0, 0) - self.sms_detail_list.set_size(118, 129) + self.sms_detail_list.set_size(LCD_X, 129) self.sms_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) self.sms_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) for i in range(MSG_MAX): @@ -1737,9 +1848,9 @@ class PopupScreen(Screen): tmp = sms.searchTextMsg(j) if tmp != -1: #msg_btn = lv.btn(self.sms_detail_list) - self.sms_detail_list_dict[i]["msg_btn"].set_size(118,65) - self.sms_detail_list_dict[i]["msg_btn"].set_pos(0,67*count) - self.sms_detail_list_dict[i]["msg_btn"].add_style(style_sms_bg_btn, lv.PART.MAIN | lv.STATE.DEFAULT) + self.sms_detail_list_dict[i]["msg_btn"].set_size(LCD_X,45) + self.sms_detail_list_dict[i]["msg_btn"].set_pos(0,47*count) + self.sms_detail_list_dict[i]["msg_btn"].add_style(style_contact_btn, lv.PART.MAIN | lv.STATE.DEFAULT) # self.sms_detail_list_dict[i]["msg_btn"].add_event_cb(lambda e: EventMesh.callback_wrapper(self.sms_cb(e)), # lv.EVENT.CLICKED, None) @@ -1761,16 +1872,16 @@ class PopupScreen(Screen): detail1 = tmp[1] #_btn_label4 = lv.label(msg_btn) - self.sms_detail_list_dict[i]["_btn_label4"].set_pos(0, 34) - self.sms_detail_list_dict[i]["_btn_label4"].set_size(180, 28) + self.sms_detail_list_dict[i]["_btn_label4"].set_pos(5, 24) + self.sms_detail_list_dict[i]["_btn_label4"].set_size(LCD_X-15, 21) self.sms_detail_list_dict[i]["_btn_label4"].set_text(detail1) self.sms_detail_list_dict[i]["_btn_label4"].set_long_mode(lv.label.LONG.DOT) self.sms_detail_list_dict[i]["_btn_label4"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) title1 = tmp[0] #_btn_label5 = lv.label(msg_btn) - self.sms_detail_list_dict[i]["_btn_label5"].set_pos(0, 5) - self.sms_detail_list_dict[i]["_btn_label5"].set_size(180, 25) + self.sms_detail_list_dict[i]["_btn_label5"].set_pos(5, 4) + self.sms_detail_list_dict[i]["_btn_label5"].set_size(LCD_X-15, 20) self.sms_detail_list_dict[i]["_btn_label5"].set_text(title1) self.sms_detail_list_dict[i]["_btn_label5"].set_long_mode(lv.label.LONG.DOT) self.sms_detail_list_dict[i]["_btn_label5"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -1838,15 +1949,15 @@ class MsgDetailScreen(Screen): msg_detail_title = lv.label(msg_detail_screen) msg_detail_title.set_pos(0, 10) - msg_detail_title.set_size(240, 40) - msg_detail_title.set_long_mode(lv.label.LONG.WRAP) + msg_detail_title.set_size(LCD_X, 20) + msg_detail_title.set_long_mode(lv.label.LONG.DOT) msg_detail_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) msg_detail_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) msg_detail_cont = lv.label(msg_detail_screen) - msg_detail_cont.set_pos(0, 50) - msg_detail_cont.set_size(240, 270) - msg_detail_cont.set_long_mode(lv.label.LONG.WRAP) + msg_detail_cont.set_pos(0, 30) + msg_detail_cont.set_size(LCD_X, LCD_Y-30) + msg_detail_cont.set_long_mode(lv.label.LONG.DOT) msg_detail_cont.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) msg_detail_cont.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) self.meta = msg_detail_screen @@ -2245,41 +2356,77 @@ class ToolboxScreen(Screen): toolbox_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) toolbox_screen.set_scrollbar_mode(0) - toolbox_text_img = lv.img(toolbox_screen) - toolbox_text_img.set_pos(75, 10) - 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_text_img = lv.img(toolbox_screen) + # toolbox_text_img.set_pos(75, 10) + # 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_cont = lv.obj(toolbox_screen) - toolbox_cont.set_pos(0, 50) - toolbox_cont.set_size(240, 270) + toolbox_cont.set_pos(0, 25) + toolbox_cont.set_size(128, 128-25) toolbox_cont.add_style(toolbox_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT) toolbox_step_img = lv.img(toolbox_cont) - toolbox_step_img.set_pos(4, tool_set_y) - toolbox_step_img.set_size(232, 80) + toolbox_step_img.set_pos(5, tool_set_y) + toolbox_step_img.set_size(25, 25) toolbox_step_img.add_flag(lv.obj.FLAG.CLICKABLE) - toolbox_step_img.set_src("U:/static/tool/IMAGE_SECMENU_STEP.png") + toolbox_step_img.set_src("U:/static/IMAGE_SECMENU_STEP.png") toolbox_step_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - tool_set_y+=90 + + toolbox_step_img_label = lv.label(toolbox_cont) + toolbox_step_img_label.set_pos(35, tool_set_y+5) + toolbox_step_img_label.set_size(128-35, 35) + toolbox_step_img_label.set_text("计步") + toolbox_step_img_label.set_long_mode(lv.label.LONG.WRAP) + toolbox_step_img_label.add_flag(lv.obj.FLAG.CLICKABLE) + toolbox_step_img_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + toolbox_step_img_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + + tool_set_y+=35 toolbox_weather_img = lv.img(toolbox_cont) - toolbox_weather_img.set_pos(4, tool_set_y) - toolbox_weather_img.set_size(232, 80) + toolbox_weather_img.set_pos(5, tool_set_y) + toolbox_weather_img.set_size(25, 25) toolbox_weather_img.add_flag(lv.obj.FLAG.CLICKABLE) - toolbox_weather_img.set_src("U:/static/tool/IMAGE_SECMENU_WEATHER.png") + toolbox_weather_img.set_src("U:/static/IMAGE_SECMENU_WEATHER.png") toolbox_weather_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - tool_set_y+=90 + toolbox_weather_img_label = lv.label(toolbox_cont) + toolbox_weather_img_label.set_pos(35, tool_set_y+5) + toolbox_weather_img_label.set_size(128-35, 35) + toolbox_weather_img_label.set_text("天气") + toolbox_weather_img_label.set_long_mode(lv.label.LONG.WRAP) + toolbox_weather_img_label.add_flag(lv.obj.FLAG.CLICKABLE) + toolbox_weather_img_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + toolbox_weather_img_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + + + tool_set_y+=35 toolbox_alarm_img = lv.img(toolbox_cont) - toolbox_alarm_img.set_pos(4, tool_set_y) - toolbox_alarm_img.set_size(232, 80) + toolbox_alarm_img.set_pos(5, tool_set_y) + toolbox_alarm_img.set_size(25, 25) toolbox_alarm_img.add_flag(lv.obj.FLAG.CLICKABLE) - toolbox_alarm_img.set_src("U:/static/tool/IMAGE_SECMENU_ALARM.png") + toolbox_alarm_img.set_src("U:/static/IMAGE_SECMENU_ALARM.png") toolbox_alarm_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + toolbox_alarm_img_label = lv.label(toolbox_cont) + toolbox_alarm_img_label.set_pos(35, tool_set_y+5) + toolbox_alarm_img_label.set_size(128-35, 35) + toolbox_alarm_img_label.set_text("闹钟") + toolbox_alarm_img_label.set_long_mode(lv.label.LONG.WRAP) + toolbox_alarm_img_label.add_flag(lv.obj.FLAG.CLICKABLE) + toolbox_alarm_img_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + toolbox_alarm_img_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + # tool_set_y+=90 # toolbox_sms_img = lv.img(toolbox_cont) @@ -2289,28 +2436,56 @@ class ToolboxScreen(Screen): # toolbox_sms_img.set_src("U:/static/tool/sms_setting.png") # toolbox_sms_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - tool_set_y+=90 + tool_set_y+=35 toolbox_countdown_img = lv.img(toolbox_cont) - toolbox_countdown_img.set_pos(4, tool_set_y) - toolbox_countdown_img.set_size(232, 80) + toolbox_countdown_img.set_pos(5, tool_set_y) + toolbox_countdown_img.set_size(25, 25) toolbox_countdown_img.add_flag(lv.obj.FLAG.CLICKABLE) - toolbox_countdown_img.set_src("U:/static/tool/IMAGE_SECMENU_COUNTDOWN.png") + toolbox_countdown_img.set_src("U:/static/IMAGE_SECMENU_COUNTDOWN.png") toolbox_countdown_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - tool_set_y+=90 + toolbox_countdown_img_label = lv.label(toolbox_cont) + toolbox_countdown_img_label.set_pos(35, tool_set_y+5) + toolbox_countdown_img_label.set_size(128-35, 35) + toolbox_countdown_img_label.set_text("倒计时") + toolbox_countdown_img_label.set_long_mode(lv.label.LONG.WRAP) + toolbox_countdown_img_label.add_flag(lv.obj.FLAG.CLICKABLE) + toolbox_countdown_img_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + toolbox_countdown_img_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + + + tool_set_y+=35 toolbox_stopwatch_img = lv.img(toolbox_cont) - toolbox_stopwatch_img.set_pos(4, tool_set_y) - toolbox_stopwatch_img.set_size(232, 80) + toolbox_stopwatch_img.set_pos(5, tool_set_y) + toolbox_stopwatch_img.set_size(25, 25) toolbox_stopwatch_img.add_flag(lv.obj.FLAG.CLICKABLE) - toolbox_stopwatch_img.set_src("U:/static/tool/IMAGE_SECMENU_STOPWATCH.png") + toolbox_stopwatch_img.set_src("U:/static/IMAGE_SECMENU_STOPWATCH.png") toolbox_stopwatch_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + toolbox_stopwatch_img_label = lv.label(toolbox_cont) + toolbox_stopwatch_img_label.set_pos(35, tool_set_y+5) + toolbox_stopwatch_img_label.set_size(128-35, 35) + toolbox_stopwatch_img_label.set_text("秒表") + toolbox_stopwatch_img_label.set_long_mode(lv.label.LONG.WRAP) + toolbox_stopwatch_img_label.add_flag(lv.obj.FLAG.CLICKABLE) + toolbox_stopwatch_img_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + toolbox_stopwatch_img_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + toolbox_step_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "step"})), lv.EVENT.CLICKED, None) toolbox_weather_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "weather"})), lv.EVENT.CLICKED, None) toolbox_alarm_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "clk_list"})), lv.EVENT.CLICKED, None) # toolbox_sms_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "popup"})), lv.EVENT.CLICKED, None) toolbox_countdown_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "countdown"})), lv.EVENT.CLICKED, None) toolbox_stopwatch_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "stopwatch"})), lv.EVENT.CLICKED, None) + + toolbox_step_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "step"})), lv.EVENT.CLICKED, None) + toolbox_weather_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "weather"})), lv.EVENT.CLICKED, None) + toolbox_alarm_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "clk_list"})), lv.EVENT.CLICKED, None) + # toolbox_sms_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "popup"})), lv.EVENT.CLICKED, None) + toolbox_countdown_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "countdown"})), lv.EVENT.CLICKED, None) + toolbox_stopwatch_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "stopwatch"})), lv.EVENT.CLICKED, None) + + self.meta = toolbox_screen def done_return(self): @@ -2337,6 +2512,7 @@ class IncomingCallScreen(Screen): super().__init__() self.CALL_LOG_MAX = CALL_LOG_MAX self.read_data = {} + self.meta_type = "popup" self.volum_size = 8 check_volum = ql_fs.path_exists("/usr/static/storage_file/config.json") if check_volum == True : @@ -2376,29 +2552,29 @@ class IncomingCallScreen(Screen): incoming_call_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) incoming_call_img = lv.img(incoming_call_screen) - incoming_call_img.set_pos(80, 20) - incoming_call_img.set_size(64, 64) + incoming_call_img.set_pos(48, 10) + incoming_call_img.set_size(32, 32) incoming_call_img.set_src("U:/static/IMAGE_NOTICE_CALL.png") incoming_call_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) incoming_call_name_label = lv.label(incoming_call_screen) - incoming_call_name_label.set_pos(0, 140) + incoming_call_name_label.set_pos(0, 50) incoming_call_name_label.set_text(" ") - incoming_call_name_label.set_size(240, 50) + incoming_call_name_label.set_size(128, 40) incoming_call_name_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) incoming_call_name_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) incoming_call_answer = lv.img(incoming_call_screen) - incoming_call_answer.set_size(64, 64) + incoming_call_answer.set_size(32, 32) incoming_call_answer.add_flag(lv.obj.FLAG.CLICKABLE) - incoming_call_answer.set_pos(30, 220) + incoming_call_answer.set_pos(84, 85) incoming_call_answer.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) incoming_call_answer.set_src("U:/static/answer.png") incoming_call_hangup = lv.img(incoming_call_screen) - incoming_call_hangup.set_size(64, 64) + incoming_call_hangup.set_size(32, 32) incoming_call_hangup.add_flag(lv.obj.FLAG.CLICKABLE) - incoming_call_hangup.set_pos(150, 220) + incoming_call_hangup.set_pos(11, 85) incoming_call_hangup.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) incoming_call_hangup.set_src("U:/static/hang_up.png") incoming_call_answer.add_event_cb(lambda e: EventMesh.callback_wrapper(self.answer(e)), @@ -2602,6 +2778,7 @@ class OnCallScreen(Screen): def __init__(self): super().__init__() self.meta = None + self.meta_type = "popup" self.count_sec = 0 self.timer = osTimer() self.aud = audio.Audio(0) @@ -2621,31 +2798,37 @@ class OnCallScreen(Screen): on_call_phone_zero ,on_call_phone_hash,on_call_phone_return_btn,\ on_call_screen_tab if on_call_screen ==None : + size_x = 36 #按钮大小 + size_y = 22 + start_x = 5 + start_y = 25 + offset_y = 4 + on_call_screen = lv.obj() on_call_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_obj = lv.obj(on_call_screen) - on_call_obj.set_size(240,320) + on_call_obj.set_size(128,128) on_call_obj.set_pos(0,0) on_call_obj.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) print("on_call_screen") on_call_label_name = lv.label(on_call_obj) - on_call_label_name.set_pos(0, 80) - on_call_label_name.set_size(240, 50) + on_call_label_name.set_pos(0, 5) + on_call_label_name.set_size(128, 40) on_call_label_name.set_text(" ") on_call_label_name.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) on_call_label_name.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_second_label = lv.label(on_call_obj) - on_call_second_label.set_pos(0, 140) - on_call_second_label.set_size(240, 30) + on_call_second_label.set_pos(0, 35) + on_call_second_label.set_size(128, 20) on_call_second_label.set_text("00:00") on_call_second_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) on_call_second_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_bar = lv.bar(on_call_obj) - on_call_bar.set_pos(49, 183) - on_call_bar.set_size(140, 25) + on_call_bar.set_pos(28, 65) + on_call_bar.set_size(72, 12) on_call_bar.set_style_anim_time(1000, lv.PART.INDICATOR | lv.STATE.DEFAULT) on_call_bar.set_mode(lv.bar.MODE.NORMAL) on_call_bar.set_value(50, lv.ANIM.OFF) @@ -2653,28 +2836,43 @@ class OnCallScreen(Screen): on_call_bar.add_style(style_bar_indic, lv.PART.INDICATOR | lv.STATE.DEFAULT) 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.set_size(18, 18) + # on_call_volum_reduce.add_flag(lv.obj.FLAG.CLICKABLE) + on_call_volum_reduce.set_pos(5, 62) on_call_volum_reduce.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_volum_reduce.set_src("U:/static/REDUCE_VOLUM_ICON.png") - on_call_volum_reduce.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_volum_size(e)), + # 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.img(on_call_obj) + on_call_volum_reduce_btn.set_size(80, 40) + on_call_volum_reduce_btn.add_flag(lv.obj.FLAG.CLICKABLE) + on_call_volum_reduce_btn.set_pos(48, 50) + 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.set_size(18, 18) + # on_call_volum_add.add_flag(lv.obj.FLAG.CLICKABLE) + on_call_volum_add.set_pos(105, 62) on_call_volum_add.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_volum_add.set_src("U:/static/VOLUM_ADD_ICON.png") - on_call_volum_add.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_volum_size(e)), + # 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.img(on_call_obj) + on_call_volum_add_btn.set_size(40, 40) + on_call_volum_add_btn.add_flag(lv.obj.FLAG.CLICKABLE) + on_call_volum_add_btn.set_pos(0, 50) + 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) - on_call_volum_label.set_pos(0, 270) + on_call_volum_label.set_pos(0, 100) on_call_volum_label.add_flag(lv.obj.FLAG.CLICKABLE) - on_call_volum_label.set_size(85, 50) + on_call_volum_label.set_size(48, 28) on_call_volum_label.set_text("静音") on_call_volum_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0) on_call_volum_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2682,18 +2880,18 @@ class OnCallScreen(Screen): lv.EVENT.CLICKED, None) on_call_hangup = lv.img(on_call_obj) - on_call_hangup.set_size(64, 64) + on_call_hangup.set_size(32, 32) on_call_hangup.add_flag(lv.obj.FLAG.CLICKABLE) - on_call_hangup.set_pos(85, 245) + on_call_hangup.set_pos(48, 90) on_call_hangup.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_hangup.set_src("U:/static/hang_up.png") on_call_hangup.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), lv.EVENT.CLICKED, None) on_call_tab_label = lv.label(on_call_obj) - on_call_tab_label.set_pos(150, 270) + on_call_tab_label.set_pos(80, 100) on_call_tab_label.add_flag(lv.obj.FLAG.CLICKABLE) - on_call_tab_label.set_size(90, 50) + on_call_tab_label.set_size(48, 28) on_call_tab_label.set_text("键盘") on_call_tab_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0) on_call_tab_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2701,14 +2899,14 @@ class OnCallScreen(Screen): lv.EVENT.CLICKED, None) on_call_screen_tab = lv.obj(on_call_screen) - on_call_screen_tab.set_size(240,320) + on_call_screen_tab.set_size(128,128) on_call_screen_tab.set_pos(0,0) on_call_screen_tab.add_flag(lv.obj.FLAG.HIDDEN) on_call_screen_tab.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_screen_tab_label = lv.label(on_call_screen_tab) - on_call_screen_tab_label.set_pos(40, 34) - on_call_screen_tab_label.set_size(0, 30) + on_call_screen_tab_label.set_pos(40, 5) + on_call_screen_tab_label.set_size(0, 20) on_call_screen_tab_label.set_text(" ") on_call_screen_tab_label.set_long_mode(lv.label.LONG.CLIP) on_call_screen_tab_label.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2717,104 +2915,114 @@ class OnCallScreen(Screen): on_call_phone_return = lv.img(on_call_screen_tab) on_call_phone_return.set_src("U:/static/RED_RETURN_PNG.png") on_call_phone_return.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_return.set_pos(0, 30) - on_call_phone_return.set_size(36, 36) + on_call_phone_return.set_pos(0, 5) + on_call_phone_return.set_size(18, 18) on_call_phone_return_btn = lv.img(on_call_screen_tab) on_call_phone_return_btn.add_flag(lv.obj.FLAG.CLICKABLE) on_call_phone_return_btn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_phone_return_btn.set_pos(0, 0) - on_call_phone_return_btn.set_size(50, 100) + on_call_phone_return_btn.set_size(50, 25) on_call_phone_return_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.on_return_show(e)), lv.EVENT.CLICKED, None) - on_call_phone_one = lv.img(on_call_screen_tab) on_call_phone_one.set_src("U:/static/IMAGE_NUMBER_KEY1_ICON.png") on_call_phone_one.add_flag(lv.obj.FLAG.CLICKABLE) on_call_phone_one.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_one.set_pos(3, 110) - on_call_phone_one.set_size(76, 50) + on_call_phone_one.set_pos(start_x, start_y) + on_call_phone_one.set_size(size_x, size_y) on_call_phone_two = lv.img(on_call_screen_tab) - on_call_phone_two.set_size(76, 50) + on_call_phone_two.set_size(size_x, size_y) on_call_phone_two.set_src("U:/static/IMAGE_NUMBER_KEY2_ICON.png") on_call_phone_two.add_flag(lv.obj.FLAG.CLICKABLE) on_call_phone_two.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_two.set_pos(82, 110) + on_call_phone_two.set_pos(start_x+size_x+5*1, start_y) on_call_phone_three = lv.img(on_call_screen_tab) - on_call_phone_three.set_size(76, 50) + on_call_phone_three.set_size(size_x, size_y) on_call_phone_three.set_src("U:/static/IMAGE_NUMBER_KEY3_ICON.png") on_call_phone_three.add_flag(lv.obj.FLAG.CLICKABLE) on_call_phone_three.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_three.set_pos(161, 110)#1 + on_call_phone_three.set_pos(start_x+size_x*2+5*2, start_y) on_call_phone_four = lv.img(on_call_screen_tab) - on_call_phone_four.set_size(76, 50) + on_call_phone_four.set_size(size_x, size_y) on_call_phone_four.set_src("U:/static/IMAGE_NUMBER_KEY4_ICON.png") on_call_phone_four.add_flag(lv.obj.FLAG.CLICKABLE) on_call_phone_four.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_four.set_pos(3, 162) + on_call_phone_four.set_pos(start_x, start_y+size_y+offset_y) on_call_phone_five = lv.img(on_call_screen_tab) - on_call_phone_five.set_size(76, 50) + on_call_phone_five.set_size(size_x, size_y) on_call_phone_five.set_src("U:/static/IMAGE_NUMBER_KEY5_ICON.png") on_call_phone_five.add_flag(lv.obj.FLAG.CLICKABLE) on_call_phone_five.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_five.set_pos(82, 162) + on_call_phone_five.set_pos(start_x+size_x+5*1, start_y+size_y+offset_y) on_call_phone_six = lv.img(on_call_screen_tab) - on_call_phone_six.set_size(76, 50) + on_call_phone_six.set_size(size_x, size_y) on_call_phone_six.set_src("U:/static/IMAGE_NUMBER_KEY6_ICON.png") on_call_phone_six.add_flag(lv.obj.FLAG.CLICKABLE) on_call_phone_six.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_six.set_pos(161, 162)#2 + on_call_phone_six.set_pos(start_x+size_x*2+5*2, start_y+size_y+offset_y) on_call_phone_seven = lv.img(on_call_screen_tab) - on_call_phone_seven.set_size(76, 50) - on_call_phone_seven.set_src("U:/static/IMAGE_NUMBER_KEY7_ICON.png") + on_call_phone_seven.set_size(size_x, size_y) + on_call_phone_seven.set_src("U:/static/phone_seven_icon.png") on_call_phone_seven.add_flag(lv.obj.FLAG.CLICKABLE) on_call_phone_seven.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_seven.set_pos(3, 214) + on_call_phone_seven.set_pos(start_x, start_y+size_y*2+offset_y*2) on_call_phone_eight = lv.img(on_call_screen_tab) - on_call_phone_eight.set_size(76, 50) + on_call_phone_eight.set_size(size_x, size_y) on_call_phone_eight.set_src("U:/static/IMAGE_NUMBER_KEY8_ICON.png") on_call_phone_eight.add_flag(lv.obj.FLAG.CLICKABLE) on_call_phone_eight.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_eight.set_pos(82, 214) + on_call_phone_eight.set_pos(start_x+size_x+5*1, start_y+size_y*2+offset_y*2) on_call_phone_nine = lv.img(on_call_screen_tab) - on_call_phone_nine.set_size(76, 50) - on_call_phone_nine.set_src("U:/static/IMAGE_NUMBER_KEY9_ICON.png") + on_call_phone_nine.set_size(size_x, size_y) + on_call_phone_nine.set_src("U:/static/phnone_nine_icon.png") on_call_phone_nine.add_flag(lv.obj.FLAG.CLICKABLE) on_call_phone_nine.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_nine.set_pos(161, 214) + on_call_phone_nine.set_pos(start_x+size_x*2+5*2, start_y+size_y*2+offset_y*2) + + + on_call_phone_xing = lv.img(on_call_screen_tab) + on_call_phone_xing.set_size(size_x, size_y) + on_call_phone_xing.set_src("U:/static/xing_icon.png") + on_call_phone_xing.add_flag(lv.obj.FLAG.CLICKABLE) + on_call_phone_xing.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + on_call_phone_xing.set_pos(start_x, start_y+size_y*3+offset_y*3) - on_call_phone_start = lv.img(on_call_screen_tab) - on_call_phone_start.set_size(76, 50) - on_call_phone_start.set_src("U:/static/IMAGE_NUMBER_KEYSTAR_ICON.png") - on_call_phone_start.add_flag(lv.obj.FLAG.CLICKABLE) - on_call_phone_start.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_start.set_pos(3, 266) on_call_phone_zero = lv.img(on_call_screen_tab) - on_call_phone_zero.set_size(76, 50) + on_call_phone_zero.set_size(size_x, size_y) on_call_phone_zero.set_src("U:/static/IMAGE_NUMBER_KEY0_ICON.png") on_call_phone_zero.add_flag(lv.obj.FLAG.CLICKABLE) on_call_phone_zero.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_zero.set_pos(82, 266) + on_call_phone_zero.set_pos(start_x+size_x+5*1, start_y+size_y*3+offset_y*3) + + + on_call_phone_jing = lv.img(on_call_screen_tab) + on_call_phone_jing.set_size(size_x, size_y) + on_call_phone_jing.set_src("U:/static/jing_icon.png") + on_call_phone_jing.add_flag(lv.obj.FLAG.CLICKABLE) + on_call_phone_jing.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + on_call_phone_jing.set_pos(start_x+size_x*2+5*2, start_y+size_y*3+offset_y*3) + + + - on_call_phone_hash = lv.img(on_call_screen_tab) - on_call_phone_hash.set_size(76, 50) - on_call_phone_hash.set_src("U:/static/IMAGE_NUMBER_KEYHASH_ICON.png") - on_call_phone_hash.add_flag(lv.obj.FLAG.CLICKABLE) - on_call_phone_hash.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - on_call_phone_hash.set_pos(161, 266) self.meta = on_call_screen + on_call_phone_jing.add_event_cb(lambda e: EventMesh.callback_wrapper(self.jingpressed_start(e)), + lv.EVENT.CLICKED, None) + on_call_phone_xing.add_event_cb(lambda e: EventMesh.callback_wrapper(self.xingpressed_start(e)), + lv.EVENT.CLICKED, None) on_call_phone_one.add_event_cb(lambda e: EventMesh.callback_wrapper(self.one(e)), lv.EVENT.CLICKED, None) @@ -2828,26 +3036,29 @@ class OnCallScreen(Screen): lv.EVENT.CLICKED, None) on_call_phone_six.add_event_cb(lambda e: EventMesh.callback_wrapper(self.six(e)), lv.EVENT.CLICKED, None) - on_call_phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.seven(e)), + on_call_phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.endpressed_start(e)), lv.EVENT.CLICKED, None) + on_call_phone_eight.add_event_cb(lambda e: EventMesh.callback_wrapper(self.eight(e)), lv.EVENT.CLICKED, None) - on_call_phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.nine(e)), - lv.EVENT.CLICKED, None) - on_call_phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero(e)), - lv.EVENT.CLICKED, None) - on_call_phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), - lv.EVENT.CLICKED, None)#短按显示* + on_call_phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.nine_endpressed_start(e)), + lv.EVENT.CLICKED, None) + + # phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero(e)), + # lv.EVENT.CLICKED, None) - on_call_phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), + on_call_phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + lv.EVENT.CLICKED, None)#短按显示* + + on_call_phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), lv.EVENT.LONG_PRESSED, None)#长按显示+ - on_call_phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.endpressed_start(e)), - lv.EVENT.RELEASED, None)#释放按键 - - on_call_phone_hash.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hash(e)), - lv.EVENT.CLICKED, None) + on_call_phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero_endpressed_start(e)), + lv.EVENT.RELEASED, None)#释放按键 + + + name = EventMesh.publish("get_phonename") on_call_label_name.set_text(name) # on_call_label.set_text(str(self.meta_info)) @@ -2860,7 +3071,8 @@ class OnCallScreen(Screen): def show_num(self): global on_call_screen_tab_label #print("phone self.phone_num ",self.phone_num,self.phone_list) - on_call_screen_tab_label.set_size(200, 30) + on_call_screen_tab_label.set_size(128-30, 20) + on_call_screen_tab_label.set_pos(20, 5) on_call_screen_tab_label.set_text(self.phone_num) def one(self,e): if len(self.phone_list) >= ON_CALL_MAX_DATA: @@ -2951,6 +3163,35 @@ class OnCallScreen(Screen): self.phone_num = ''.join(self.phone_list) self.show_num() + def zero_endpressed_start(self,e): + if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 + #self.phone_list.pop(0) + return + + if self.button == 1:#长按 + self.phone_list.append("+") + voiceCall.startDtmf("+",100) + else:#短按 + self.phone_list.append("0") + voiceCall.startDtmf("0",100) + + self.phone_num = ''.join(self.phone_list) + self.show_num() + + def nine_endpressed_start(self,e): + if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 + #self.phone_list.pop(0) + return + + # if self.button == 1:#长按 + # self.phone_list.append("#") + # voiceCall.startDtmf("#",100) + # else:#短按 + self.phone_list.append("9") + voiceCall.startDtmf("9",100) + self.phone_num = ''.join(self.phone_list) + self.show_num() + def start(self,e): self.button = 0 @@ -2960,20 +3201,50 @@ class OnCallScreen(Screen): self.timer_cb = 0 self.timer.stop() - def endpressed_start(self,e): + def xingpressed_start(self,e): if len(self.phone_list) >= ON_CALL_MAX_DATA:#限制拨号数量20个数字 self.phone_list.pop(0) #return # if self.button == 1:#长按 - # voiceCall.startDtmf("+",100) - # self.phone_list.append("+") + # voiceCall.startDtmf("*",100) + # self.phone_list.append("*") # else:#短按 voiceCall.startDtmf("*",100) self.phone_list.append("*") self.phone_num = ''.join(self.phone_list) self.show_num() + + def jingpressed_start(self,e): + if len(self.phone_list) >= ON_CALL_MAX_DATA:#限制拨号数量20个数字 + self.phone_list.pop(0) + #return + + # if self.button == 1:#长按 + # voiceCall.startDtmf("*",100) + # self.phone_list.append("*") + # else:#短按 + voiceCall.startDtmf("#",100) + self.phone_list.append("#") + + self.phone_num = ''.join(self.phone_list) + self.show_num() + + def endpressed_start(self,e): + if len(self.phone_list) >= ON_CALL_MAX_DATA:#限制拨号数量20个数字 + self.phone_list.pop(0) + #return + + # if self.button == 1:#长按 + # voiceCall.startDtmf("*",100) + # self.phone_list.append("*") + # else:#短按 + voiceCall.startDtmf("7",100) + self.phone_list.append("7") + + self.phone_num = ''.join(self.phone_list) + self.show_num() def hash(self,e): if len(self.phone_list) >= ON_CALL_MAX_DATA:#限制拨号数量20个数字 @@ -3125,24 +3396,24 @@ class StepScreen(Screen): step_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) step_label = lv.label(step_screen) - step_label.set_pos(10, 30) - step_label.set_size(230, 50) + step_label.set_pos(10, 10) + step_label.set_size(128-10, 20) step_label.set_text("今日步数") step_label.set_long_mode(lv.label.LONG.WRAP) step_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) step_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) step_label_01 = lv.label(step_screen) - step_label_01.set_pos(0, 100) - step_label_01.set_size(240, 50) + step_label_01.set_pos(0, 50) + step_label_01.set_size(128, 20) step_label_01.set_text("0æ­¥") step_label_01.set_long_mode(lv.label.LONG.WRAP) step_label_01.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) step_label_01.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) step_img = lv.img(step_screen) - step_img.set_pos(100, 150) - step_img.set_size(40, 65) + step_img.set_pos(49, 80) + step_img.set_size(20, 33) step_img.set_src("U:/static/IMAGE_STEP.png") step_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) self.meta = step_screen @@ -3199,57 +3470,56 @@ class WeatherScreen(Screen): weather_img = lv.img(weather_screen) weather_img.set_pos(10, 10) - weather_img.set_size(135, 120) - + weather_img.set_size(45, 40) weather_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) no_weather_img = lv.img(weather_screen) no_weather_img.set_pos(10, 10) - no_weather_img.set_size(135, 120) + no_weather_img.set_size(45, 40) no_weather_img.set_src("U:/static/update.png") no_weather_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) weather_tem_label = lv.label(weather_screen) - weather_tem_label.set_pos(155, 44) - weather_tem_label.set_size(60, 50) + weather_tem_label.set_pos(65, 11) + weather_tem_label.set_size(45, 20) weather_tem_label.set_text("_ _") weather_tem_label.set_long_mode(lv.label.LONG.WRAP) - weather_tem_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + weather_tem_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) weather_tem_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) no_weather_degree = lv.img(weather_screen) - no_weather_degree.set_pos(200, 40) - no_weather_degree.set_size(22, 22) + no_weather_degree.set_pos(88, 15) + no_weather_degree.set_size(11, 11) no_weather_degree.set_src("U:/static/degree.png") no_weather_degree.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) weather_detail_label = lv.label(weather_screen) - weather_detail_label.set_pos(155, 80) - weather_detail_label.set_size(85, 50) + weather_detail_label.set_pos(65, 30) + weather_detail_label.set_size(50, 50) weather_detail_label.set_text("-/-") weather_detail_label.set_long_mode(lv.label.LONG.WRAP) - weather_detail_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + weather_detail_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) weather_detail_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - weather_location_label = lv.label(weather_screen) - weather_location_label.set_pos(0, 200) - weather_location_label.set_size(240, 50) - weather_location_label.set_text("--") - weather_location_label.set_long_mode(lv.label.LONG.WRAP) - weather_location_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) - weather_location_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + # weather_location_label = lv.label(weather_screen) + # weather_location_label.set_pos(0, 60) + # weather_location_label.set_size(128, 50) + # weather_location_label.set_text("--") + # weather_location_label.set_long_mode(lv.label.LONG.WRAP) + # weather_location_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + # weather_location_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) no_connect_label = lv.label(weather_screen) - no_connect_label.set_pos(0, 200) - no_connect_label.set_size(240, 40) + no_connect_label.set_pos(0, 60) + no_connect_label.set_size(128, 20) no_connect_label.set_text("找不到服务器") no_connect_label.set_long_mode(lv.label.LONG.WRAP) no_connect_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) no_connect_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) no_connect_label1 = lv.label(weather_screen) - no_connect_label1.set_pos(0, 250) - no_connect_label1.set_size(240, 70) + no_connect_label1.set_pos(0, 90) + no_connect_label1.set_size(128, 20) no_connect_label1.set_text("请联网后重试") no_connect_label1.set_long_mode(lv.label.LONG.WRAP) no_connect_label1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -3271,7 +3541,7 @@ class WeatherScreen(Screen): if no_data != 0 : no_weather_img.add_flag(lv.obj.FLAG.HIDDEN) weather_img.clear_flag(lv.obj.FLAG.HIDDEN) - no_connect_label.set_text(" ") + # no_connect_label.set_text(" ") no_connect_label1.set_text(" ") # print("self.weather_data:{}".format(self.weather_data)) type = self.weather_data[3] @@ -3296,11 +3566,11 @@ class WeatherScreen(Screen): city = self.weather_data[7] if city != '{}': - weather_location_label.set_text("{}".format(city))#城市 + no_connect_label.set_text("{}".format(city))#城市 else: - weather_location_label.set_text("--") + no_connect_label.set_text("--") else:#已联网未获取到天气数据 - weather_location_label.set_text(" ") + # no_connect_label.set_text(" ") weather_detail_label.set_text("-/-") weather_tem_label.set_text("_ _") @@ -3308,7 +3578,7 @@ class WeatherScreen(Screen): no_connect_label1.set_text("请稍候重试") else: - weather_location_label.set_text(" ") + weather_detail_label.set_text("-/-") weather_tem_label.set_text("_ _") @@ -3377,14 +3647,14 @@ class ContactsScreen(Screen): contacts_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) contacts_screen_list_screen = lv.obj(contacts_screen) - contacts_screen_list_screen.set_pos(0, 50) - contacts_screen_list_screen.set_size(240, 270) + contacts_screen_list_screen.set_pos(0, 30) + contacts_screen_list_screen.set_size(LCD_X, LCD_Y-30) contacts_screen_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) contacts_screen_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) contacts_top_title = lv.label(contacts_screen) contacts_top_title.set_pos(0, 10) - contacts_top_title.set_size(240, 40) + contacts_top_title.set_size(LCD_X, 20) contacts_top_title.set_text("联系人") contacts_top_title.set_long_mode(lv.label.LONG.WRAP) contacts_top_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -3392,8 +3662,8 @@ class ContactsScreen(Screen): contact_none_label = lv.label(contacts_screen_list_screen) - contact_none_label.set_pos(0, 80) - contact_none_label.set_size(240, 40) + contact_none_label.set_pos(0, (LCD_Y-30)//2) + contact_none_label.set_size(LCD_X, 40) contact_none_label.set_text("空") contact_none_label.set_long_mode(lv.label.LONG.WRAP) contact_none_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -3401,7 +3671,7 @@ class ContactsScreen(Screen): self.contact_detail_list = lv.obj(contacts_screen_list_screen) self.contact_detail_list.set_pos(0, 0) - self.contact_detail_list.set_size(240, 271) + self.contact_detail_list.set_size(LCD_X, LCD_Y-30+1) self.contact_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) self.contact_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) for i in range(self.MXA_phone_num): @@ -3442,13 +3712,7 @@ class ContactsScreen(Screen): print("self.phonebook sorted :{} len(self.phonebook) :{}".format(sorted(self.phonebook.keys()),len(self.phonebook))) phonebook_keys = sorted(self.phonebook.keys()) - # self.contact_detail_list.delete()#先删除一次控件 - # self.contact_detail_list = lv.obj(contacts_screen_list_screen) - # self.contact_detail_list.set_pos(0, 0) - # self.contact_detail_list.set_size(240, 271) - # self.contact_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - # self.contact_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) - # print("self.phonebook sorted :{}".format(len(self.phonebook))) + if len(self.phonebook) > self.MXA_phone_num: j = len(self.phonebook) - self.MXA_phone_num for i in range(self.MXA_phone_num): #字典 key value @@ -3461,16 +3725,16 @@ class ContactsScreen(Screen): print("name :{} key_tmp:{}".format(name,key_tmp)) #contact_btn = lv.btn(self.contact_detail_list) - self.contact_detail_listt_dict[i]["contact_btn"].set_size(230,80) - self.contact_detail_listt_dict[i]["contact_btn"].set_pos(0,82*i ) + self.contact_detail_listt_dict[i]["contact_btn"].set_size(LCD_X,45) + self.contact_detail_listt_dict[i]["contact_btn"].set_pos(0,47*i ) self.contact_detail_listt_dict[i]["contact_btn"].add_style(style_contact_btn, lv.PART.MAIN | lv.STATE.DEFAULT) # contact_btn.add_style(style_contact_btn_pressed, lv.PART.MAIN | lv.STATE.PRESSED) # self.contact_detail_listt_dict[i]["contact_btn"].add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling(e)), # lv.EVENT.CLICKED, None) #contact_btn_label_1 = lv.label(contact_btn) - self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_pos(0, 5) - self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_size(180, 25) + self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_pos(5, 4) + self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_size(LCD_X-15, 20) self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_text(key_tmp[4:]) self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_long_mode(lv.label.LONG.DOT) self.contact_detail_listt_dict[i]["contact_btn_label_1"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -3482,8 +3746,8 @@ class ContactsScreen(Screen): #contact_btn_label_3 = lv.label(contact_btn) - self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_pos(0, 30) - self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_size(220, 35) + self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_pos(5, 24) + self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_size(LCD_X-15, 21) self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_text(name) self.contact_detail_listt_dict[i]["contact_btn_label_3"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4661,6 +4925,7 @@ class CountdownScreen(Screen): self.total = 0 self.time_tmp = 0 self.timer_cb = 0 + EventMesh.subscribe("close_count_show_info", self.close_count_show_info) def initialization(self): global countdown_screen ,countdown_title,countdown_hour ,countdown_mao ,countdown_mao ,countdown_mao1 ,\ @@ -4674,24 +4939,24 @@ class CountdownScreen(Screen): countdown_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_title = lv.label(countdown_screen) - countdown_title.set_pos(0, 20) - countdown_title.set_size(240, 20) + countdown_title.set_pos(0, 5) + countdown_title.set_size(128, 20) countdown_title.set_text("倒计时") countdown_title.set_long_mode(lv.label.LONG.WRAP) countdown_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) countdown_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_hour = lv.label(countdown_screen) - countdown_hour.set_pos(30, 140) - countdown_hour.set_size(60, 30) + countdown_hour.set_pos(19, 50) + countdown_hour.set_size(40, 30) countdown_hour.set_text("00") countdown_hour.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_hour.set_long_mode(lv.label.LONG.WRAP) countdown_hour.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) countdown_mao = lv.label(countdown_screen) - countdown_mao.set_pos(82, 138) - countdown_mao.set_size(30, 30) + countdown_mao.set_pos(45, 50) + countdown_mao.set_size(20, 20) countdown_mao.set_text(":") countdown_mao.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_mao.set_long_mode(lv.label.LONG.WRAP) @@ -4699,16 +4964,16 @@ class CountdownScreen(Screen): countdown_min = lv.label(countdown_screen) - countdown_min.set_pos(95, 140) - countdown_min.set_size(60, 30) + countdown_min.set_pos(55, 50) + countdown_min.set_size(40, 30) countdown_min.set_text("00") countdown_min.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_min.set_long_mode(lv.label.LONG.WRAP) countdown_min.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) countdown_mao1 = lv.label(countdown_screen) - countdown_mao1.set_pos(146, 138) - countdown_mao1.set_size(30, 30) + countdown_mao1.set_pos(81, 50) + countdown_mao1.set_size(20, 20) countdown_mao1.set_text(":") countdown_mao1.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_mao1.set_long_mode(lv.label.LONG.WRAP) @@ -4716,122 +4981,125 @@ class CountdownScreen(Screen): countdown_sec = lv.label(countdown_screen) - countdown_sec.set_pos(160, 140) - countdown_sec.set_size(60, 30) + countdown_sec.set_pos(91, 50) + countdown_sec.set_size(128-91, 20) countdown_sec.set_text("00") countdown_sec.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_sec.set_long_mode(lv.label.LONG.WRAP) countdown_sec.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) countdown_hour_up = lv.img(countdown_screen) - countdown_hour_up.set_size(34, 30) - countdown_hour_up.set_pos(36, 100) + countdown_hour_up.set_size(17, 15) + countdown_hour_up.set_pos(19, 30) countdown_hour_up.set_src("U:/static/time_up.png") + countdown_hour_up.add_flag(lv.obj.FLAG.CLICKABLE) countdown_hour_up.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_hour_up_btn= lv.img(countdown_screen) - countdown_hour_up_btn.set_size(62, 70) - countdown_hour_up_btn.set_pos(20, 80) + countdown_hour_up_btn.set_size(45, 40) + countdown_hour_up_btn.set_pos(0, 25) countdown_hour_up_btn.add_flag(lv.obj.FLAG.CLICKABLE) countdown_hour_down = lv.img(countdown_screen) - countdown_hour_down.set_size(34, 30) - countdown_hour_down.set_pos(36, 180) + countdown_hour_down.set_size(17, 15) + countdown_hour_down.set_pos(19, 70) countdown_hour_down.set_src("U:/static/time_down.png") countdown_hour_down.add_flag(lv.obj.FLAG.CLICKABLE) countdown_hour_down.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_hour_down_btn= lv.img(countdown_screen) - countdown_hour_down_btn.set_size(62, 80) - countdown_hour_down_btn.set_pos(20, 150) + countdown_hour_down_btn.set_size(45, 40) + countdown_hour_down_btn.set_pos(0, 65) countdown_hour_down_btn.add_flag(lv.obj.FLAG.CLICKABLE) countdown_min_up = lv.img(countdown_screen) - countdown_min_up.set_size(34, 30) - countdown_min_up.set_pos(99, 100) + countdown_min_up.set_size(17, 15) + countdown_min_up.set_pos(53+2, 30) countdown_min_up.set_src("U:/static/time_up.png") countdown_min_up.add_flag(lv.obj.FLAG.CLICKABLE) countdown_min_up.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_min_up_btn= lv.img(countdown_screen) - countdown_min_up_btn.set_size(64, 70) - countdown_min_up_btn.set_pos(82, 80) + countdown_min_up_btn.set_size(36, 40) + countdown_min_up_btn.set_pos(45, 25) countdown_min_up_btn.add_flag(lv.obj.FLAG.CLICKABLE) countdown_min_down = lv.img(countdown_screen) - countdown_min_down.set_size(34, 30) - countdown_min_down.set_pos(99, 180) + countdown_min_down.set_size(17, 15) + countdown_min_down.set_pos(53+2, 70) countdown_min_down.set_src("U:/static/time_down.png") countdown_min_down.add_flag(lv.obj.FLAG.CLICKABLE) countdown_min_down.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_min_down_btn= lv.img(countdown_screen) - countdown_min_down_btn.set_size(64, 80) - countdown_min_down_btn.set_pos(82, 150) + countdown_min_down_btn.set_size(36, 40) + countdown_min_down_btn.set_pos(45, 65) countdown_min_down_btn.add_flag(lv.obj.FLAG.CLICKABLE) countdown_sec_up = lv.img(countdown_screen) - countdown_sec_up.set_size(34, 30) - countdown_sec_up.set_pos(165, 100) + countdown_sec_up.set_size(17, 15) + countdown_sec_up.set_pos(91, 30) countdown_sec_up.set_src("U:/static/time_up.png") + countdown_sec_up.add_flag(lv.obj.FLAG.CLICKABLE) countdown_sec_up.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_sec_up_btn = lv.img(countdown_screen) - countdown_sec_up_btn.set_size(64, 70) - countdown_sec_up_btn.set_pos(146, 80) + countdown_sec_up_btn.set_size(128-81, 40) + countdown_sec_up_btn.set_pos(81, 25) countdown_sec_up_btn.add_flag(lv.obj.FLAG.CLICKABLE) countdown_sec_down = lv.img(countdown_screen) - countdown_sec_down.set_size(34, 30) - countdown_sec_down.set_pos(165, 180) + countdown_sec_down.set_size(17, 15) + countdown_sec_down.set_pos(91, 70) countdown_sec_down.set_src("U:/static/time_down.png") countdown_sec_down.add_flag(lv.obj.FLAG.CLICKABLE) countdown_sec_down.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_sec_down_btn = lv.img(countdown_screen) - countdown_sec_down_btn.set_size(64, 80) - countdown_sec_down_btn.set_pos(146, 150) + countdown_sec_down_btn.set_size(128-81, 40) + countdown_sec_down_btn.set_pos(81, 65) countdown_sec_down_btn.add_flag(lv.obj.FLAG.CLICKABLE) countdown_reset_img = lv.img(countdown_screen) - countdown_reset_img.set_size(99, 36) + countdown_reset_img.set_size(50, 18) countdown_reset_img.set_src("U:/static/stopwatch_reset.png") countdown_reset_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - countdown_reset_img.set_pos(10, 260) + countdown_reset_img.set_pos(8, 100) countdown_reset_imgbtn = lv.img(countdown_screen) - countdown_reset_imgbtn.set_size(99, 70) + countdown_reset_imgbtn.set_size(66, 23) countdown_reset_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) countdown_reset_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - countdown_reset_imgbtn.set_pos(10, 240) + countdown_reset_imgbtn.set_pos(0, 105) countdown_start_img = lv.img(countdown_screen) - countdown_start_img.set_size(99, 36) + countdown_start_img.set_size(50, 18) countdown_start_img.set_src("U:/static/stopwatch_play.png") countdown_start_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - countdown_start_img.set_pos(120, 260) + countdown_start_img.set_pos(66, 100) countdown_start_imgbtn = lv.img(countdown_screen) - countdown_start_imgbtn.set_size(99, 70) + countdown_start_imgbtn.set_size(128-66, 23) countdown_start_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) countdown_start_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - countdown_start_imgbtn.set_pos(120, 240) + countdown_start_imgbtn.set_pos(66, 105) countdown_stop_img = lv.img(countdown_screen) - countdown_stop_img.set_size(99, 36) + countdown_stop_img.set_size(50, 18) countdown_stop_img.set_src("U:/static/stopwatch_stop.png") countdown_stop_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - countdown_stop_img.set_pos(120, 260) + countdown_stop_img.set_pos(66, 100) countdown_stop_img.add_flag(lv.obj.FLAG.HIDDEN) + countdown_start_img.clear_flag(lv.obj.FLAG.HIDDEN) countdown_stop_img.add_flag(lv.obj.FLAG.HIDDEN) @@ -5042,6 +5310,9 @@ class CountdownScreen(Screen): self.g_state = msg_tmp[1] EventMesh.publish("set_countdown_off_state", [0,self.g_state]) + def close_count_show_info(self, event, msg): + self.reset(0) + def reset(self,e): global countdown_screen ,countdown_title,countdown_hour ,countdown_mao ,countdown_mao ,countdown_mao1 ,\ countdown_sec ,countdown_hour_up ,countdown_hour_up_btn ,countdown_hour_down ,countdown_hour_down_btn ,\ @@ -5158,6 +5429,7 @@ class CountdownEndScreen(Screen): self.FIND_timer=osTimer() self.aud = audio.Audio(0) self.FIND_timer_count = 0 + self.meta_type = "popup" def initialization(self): global countdown_end_screen ,countdown_end_img ,countdown_end_label @@ -5166,22 +5438,23 @@ class CountdownEndScreen(Screen): print("countdown_end_screen") countdown_end_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_end_img = lv.img(countdown_end_screen) - countdown_end_img.set_size(140, 140) - countdown_end_img.set_pos(50, 60) + countdown_end_img.set_size(38, 57) + countdown_end_img.set_pos(45, 20) countdown_end_img.set_src("U:/static/time_finish.png") countdown_end_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_end_label = lv.label(countdown_end_screen) - countdown_end_label.set_pos(0, 240) - countdown_end_label.set_size(240, 40) + countdown_end_label.set_pos(0, 90) + countdown_end_label.set_size(128, 38) countdown_end_label.set_text("时间到") countdown_end_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) countdown_end_label.set_long_mode(lv.label.LONG.WRAP) countdown_end_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) self.meta = countdown_end_screen self.FIND_timer_count = 0 - self.FIND_timer.start(3000, 1, self.FIND_timer_cb) - self.aud.play(1, 1, 'U:/static/audio_audio_haixiu.mp3') #播放声音 + EventMesh.publish("close_count_show_info") + self.FIND_timer.start(2000, 1, self.FIND_timer_cb) + self.aud.play(1, 1, 'U:/static/R_VOLUME_SET_1.mp3') #播放声音 def FIND_timer_cb(self, *args): EventMesh.publish("system_sleep_rest")#防止黑屏 @@ -5190,7 +5463,7 @@ class CountdownEndScreen(Screen): self.stop_FIND() EventMesh.publish("load_screen", {"screen": "countdown"}) return - self.aud.play(1, 1, 'U:/static/audio_audio_haixiu.mp3') + self.aud.play(1, 1, 'U:/static/R_VOLUME_SET_1.mp3') def stop_FIND(self) : self.FIND_timer.stop() @@ -5262,7 +5535,7 @@ class StopwatchScreen(Screen): def initialization(self): global stopwatch_screen,stopwatch_title,stopwatch_label_min,stopwatch_mao,stopwatch_label_sec ,\ - stopwatch_mao1 ,stopwatch_label_ms,stopwatch_reset_img ,topwatch_reset_imgbtn ,stopwatch_start_img ,\ + stopwatch_mao1 ,stopwatch_label_ms,stopwatch_reset_img,stopwatch_start_img ,\ stopwatch_start_imgbtn, stopwatch_stop_img if stopwatch_screen == None : stopwatch_screen = lv.obj() @@ -5270,88 +5543,88 @@ class StopwatchScreen(Screen): stopwatch_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) stopwatch_title = lv.label(stopwatch_screen) - stopwatch_title.set_pos(0, 20) - stopwatch_title.set_size(240, 20) + stopwatch_title.set_pos(0, 5) + stopwatch_title.set_size(128, 20) stopwatch_title.set_text("秒表") stopwatch_title.set_long_mode(lv.label.LONG.WRAP) stopwatch_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) stopwatch_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - stopwatch_label_min = lv.label(stopwatch_screen) - stopwatch_label_min.set_pos(30, 140) - stopwatch_label_min.set_size(60, 30) - stopwatch_label_min.set_text("00") - stopwatch_label_min.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) - stopwatch_label_min.set_long_mode(lv.label.LONG.WRAP) - stopwatch_label_min.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + # stopwatch_label_min = lv.label(stopwatch_screen) + # stopwatch_label_min.set_pos(30, 140) + # stopwatch_label_min.set_size(60, 30) + # stopwatch_label_min.set_text("00") + # stopwatch_label_min.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) + # stopwatch_label_min.set_long_mode(lv.label.LONG.WRAP) + # stopwatch_label_min.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) - stopwatch_mao = lv.label(stopwatch_screen) - stopwatch_mao.set_pos(82, 138) - stopwatch_mao.set_size(30, 30) - stopwatch_mao.set_text(":") - stopwatch_mao.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) - stopwatch_mao.set_long_mode(lv.label.LONG.WRAP) - stopwatch_mao.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + # stopwatch_mao = lv.label(stopwatch_screen) + # stopwatch_mao.set_pos(82, 138) + # stopwatch_mao.set_size(30, 30) + # stopwatch_mao.set_text(":") + # stopwatch_mao.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) + # stopwatch_mao.set_long_mode(lv.label.LONG.WRAP) + # stopwatch_mao.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) stopwatch_label_sec = lv.label(stopwatch_screen) - stopwatch_label_sec.set_pos(95, 140) - stopwatch_label_sec.set_size(60, 30) - stopwatch_label_sec.set_text("00") + stopwatch_label_sec.set_pos(0, 50) + stopwatch_label_sec.set_size(128, 30) + stopwatch_label_sec.set_text("00:00.0") stopwatch_label_sec.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) stopwatch_label_sec.set_long_mode(lv.label.LONG.WRAP) - stopwatch_label_sec.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + stopwatch_label_sec.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) - stopwatch_mao1 = lv.label(stopwatch_screen) - stopwatch_mao1.set_pos(146, 138) - stopwatch_mao1.set_size(30, 30) - stopwatch_mao1.set_text(".") - stopwatch_mao1.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) - stopwatch_mao1.set_long_mode(lv.label.LONG.WRAP) - stopwatch_mao1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + # stopwatch_mao1 = lv.label(stopwatch_screen) + # stopwatch_mao1.set_pos(146, 138) + # stopwatch_mao1.set_size(30, 30) + # stopwatch_mao1.set_text(".") + # stopwatch_mao1.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) + # stopwatch_mao1.set_long_mode(lv.label.LONG.WRAP) + # stopwatch_mao1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) - stopwatch_label_ms = lv.label(stopwatch_screen) - stopwatch_label_ms.set_pos(160, 140) - stopwatch_label_ms.set_size(60, 30) - stopwatch_label_ms.set_text("0") - stopwatch_label_ms.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) - stopwatch_label_ms.set_long_mode(lv.label.LONG.WRAP) - stopwatch_label_ms.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + # stopwatch_label_ms = lv.label(stopwatch_screen) + # stopwatch_label_ms.set_pos(160, 140) + # stopwatch_label_ms.set_size(60, 30) + # stopwatch_label_ms.set_text("0") + # stopwatch_label_ms.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) + # stopwatch_label_ms.set_long_mode(lv.label.LONG.WRAP) + # stopwatch_label_ms.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) stopwatch_reset_img = lv.img(stopwatch_screen) - stopwatch_reset_img.set_size(99, 36) + stopwatch_reset_img.set_size(50, 18) stopwatch_reset_img.set_src("U:/static/stopwatch_reset.png") stopwatch_reset_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - stopwatch_reset_img.set_pos(10, 210) + stopwatch_reset_img.set_pos(8, 90) stopwatch_reset_imgbtn = lv.img(stopwatch_screen) - stopwatch_reset_imgbtn.set_size(99, 76) + stopwatch_reset_imgbtn.set_size(62, 33) stopwatch_reset_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) - stopwatch_reset_imgbtn.set_pos(10, 190) + stopwatch_reset_imgbtn.set_pos(0, 85) stopwatch_start_img = lv.img(stopwatch_screen) - stopwatch_start_img.set_size(99, 36) + stopwatch_start_img.set_size(50, 18) stopwatch_start_img.set_src("U:/static/stopwatch_play.png") stopwatch_start_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - stopwatch_start_img.set_pos(115, 210) + stopwatch_start_img.set_pos(66, 90) stopwatch_start_imgbtn = lv.img(stopwatch_screen) - stopwatch_start_imgbtn.set_size(99, 76) + stopwatch_start_imgbtn.set_size(128-62, 33) stopwatch_start_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) - stopwatch_start_imgbtn.set_pos(115, 190) + stopwatch_start_imgbtn.set_pos(62, 85) stopwatch_stop_img = lv.img(stopwatch_screen) - stopwatch_stop_img.set_size(99, 36) + stopwatch_stop_img.set_size(50, 18) stopwatch_stop_img.set_src("U:/static/stopwatch_stop.png") stopwatch_stop_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - stopwatch_stop_img.set_pos(115, 210) + stopwatch_stop_img.set_pos(66, 90) stopwatch_stop_img.add_flag(lv.obj.FLAG.HIDDEN) stopwatch_start_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), lv.EVENT.CLICKED, None) @@ -5379,7 +5652,7 @@ class StopwatchScreen(Screen): def start(self, e): global stopwatch_screen,stopwatch_title,stopwatch_label_min,stopwatch_mao,stopwatch_label_sec ,\ - stopwatch_mao1 ,stopwatch_label_ms,stopwatch_reset_img ,topwatch_reset_imgbtn ,stopwatch_start_img ,\ + stopwatch_mao1 ,stopwatch_label_ms,stopwatch_reset_img ,stopwatch_start_img ,\ stopwatch_start_imgbtn, stopwatch_stop_img print("stopwatch start:{}".format(self.s_state)) #self.timer.start(100, 1, self._fun) @@ -5406,7 +5679,7 @@ class StopwatchScreen(Screen): def paused(self): global stopwatch_screen,stopwatch_title,stopwatch_label_min,stopwatch_mao,stopwatch_label_sec ,\ - stopwatch_mao1 ,stopwatch_label_ms,stopwatch_reset_img ,topwatch_reset_imgbtn ,stopwatch_start_img ,\ + stopwatch_mao1 ,stopwatch_label_ms,stopwatch_reset_img ,stopwatch_start_img ,\ stopwatch_start_imgbtn, stopwatch_stop_img print("stopwatch pause") stopwatch_start_img.clear_flag(lv.obj.FLAG.HIDDEN) @@ -5416,7 +5689,7 @@ class StopwatchScreen(Screen): def reset(self,e): global stopwatch_screen,stopwatch_title,stopwatch_label_min,stopwatch_mao,stopwatch_label_sec ,\ - stopwatch_mao1 ,stopwatch_label_ms,stopwatch_reset_img ,topwatch_reset_imgbtn ,stopwatch_start_img ,\ + stopwatch_mao1 ,stopwatch_label_ms,stopwatch_reset_img ,stopwatch_start_img ,\ stopwatch_start_imgbtn, stopwatch_stop_img print("stopwatch reset") @@ -5448,7 +5721,7 @@ class StopwatchScreen(Screen): def show_value(self): global stopwatch_screen,stopwatch_title,stopwatch_label_min,stopwatch_mao,stopwatch_label_sec ,\ - stopwatch_mao1 ,stopwatch_label_ms,stopwatch_reset_img ,topwatch_reset_imgbtn ,stopwatch_start_img ,\ + stopwatch_mao1 ,stopwatch_label_ms,stopwatch_reset_img ,stopwatch_start_img ,\ stopwatch_start_imgbtn, stopwatch_stop_img if self.total_time >= 99*60: self.total_time = 99*60 @@ -5456,9 +5729,10 @@ class StopwatchScreen(Screen): test_m = self.total_time//60 # print("test_s:{} test_m:{} self.total_time:{}".format(test_s,test_m,self.total_time)) - stopwatch_label_ms.set_text(str("%d"%(self.ms_value))) - stopwatch_label_sec.set_text(str("%02d"%(test_s))) - stopwatch_label_min.set_text(str("%02d"%(test_m))) + # stopwatch_label_ms.set_text(str("%d"%(self.ms_value))) + + stopwatch_label_sec.set_text("{}:{}.{}".format("%02d"%(test_m),"%02d"%(test_s),"%d"%(self.ms_value))) + # stopwatch_label_min.set_text(str("%02d"%(test_m))) def Close(self): if self.s_state == 1: @@ -5525,6 +5799,7 @@ class UIFINDScreen(Screen): super().__init__() self.read_data = {} self.volum_size = 8 + check_volum = ql_fs.path_exists("/usr/static/storage_file/config.json") if check_volum == True : with open("/usr/static/storage_file/config.json","r") as fd:#音频文件编号 @@ -5544,11 +5819,11 @@ class UIFINDScreen(Screen): self.aud.setVolume(self.volum_size) self.FIND_timer = osTimer() self.FIND_timer_count = 0 - self.meta = None + self.meta_type = "popup" def initialization(self): - global FIND_screen ,watchface_mpsignal_img + global FIND_screen ,findphone_img if FIND_screen ==None: FIND_screen = lv.obj() @@ -5557,13 +5832,21 @@ class UIFINDScreen(Screen): # add style for watchface FIND_screen.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) #进入图片 - watchface_mpsignal_img = lv.img(FIND_screen) - watchface_mpsignal_img.set_pos(int(40),int(45)) - watchface_mpsignal_img.set_size(160,230) - watchface_mpsignal_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - watchface_mpsignal_img.add_flag(lv.obj.FLAG.CLICKABLE) - watchface_mpsignal_img.set_src("U:/static/find_phone.png") - watchface_mpsignal_img.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) + findphone_img = lv.img(FIND_screen) + findphone_img.set_pos(int(15),int(10)) + findphone_img.set_size(98,66) + findphone_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + findphone_img.add_flag(lv.obj.FLAG.CLICKABLE) + findphone_img.set_src("U:/static/find_phone.png") + findphone_img.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) + + findphone_img_label = lv.label(FIND_screen) + findphone_img_label.set_pos(int(0),int(90)) + findphone_img_label.set_size(128,66) + findphone_img_label.set_text("点击关闭屏幕") + findphone_img_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0) + + self.meta = FIND_screen @@ -5571,12 +5854,12 @@ class UIFINDScreen(Screen): utime.sleep_ms(200)#不加延时会切屏 self.FIND_timer_count = 0 print("self.FIND_timer_count:{}".format(self.FIND_timer_count)) - self.FIND_timer.start(3000, 1, self.FIND_timer_cb) - self.aud.play(1, 1, 'U:/static/audio_audio_haixiu.mp3') #播放声音 + self.FIND_timer.start(2000, 1, self.FIND_timer_cb) + self.aud.play(1, 1, 'U:/static/R_VOLUME_SET_1.mp3') #播放声音 def FIND_timer_cb(self, *args): EventMesh.publish("system_sleep_rest") - self.aud.play(1, 1, 'U:/static/audio_audio_haixiu.mp3') + self.aud.play(1, 1, 'U:/static/R_VOLUME_SET_1.mp3') self.FIND_timer_count += 1 if self.FIND_timer_count > 20: #120秒 self.stop_FIND() @@ -5682,34 +5965,36 @@ class LowOnePowerScreen(Screen): #0%的电池电量 LowOnePower_screen.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) #进入图片 LowOnePower_screen_img = lv.img(LowOnePower_screen) - LowOnePower_screen_img.set_pos(int(86),int(30)) - LowOnePower_screen_img.set_size(68,110) + LowOnePower_screen_img.set_pos(int(47),int(10)) + LowOnePower_screen_img.set_size(34,55) LowOnePower_screen_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) LowOnePower_screen_img.add_flag(lv.obj.FLAG.CLICKABLE) LowOnePower_screen_img.set_src("U:/static/0_BAT.png") LowOnePower_screen_img.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) LowOnePower_screen_label1 = lv.label(LowOnePower_screen) - LowOnePower_screen_label1.set_pos(0, 180) - LowOnePower_screen_label1.set_size(240, 60) - LowOnePower_screen_label1.set_text("电池电量过低，请及时充电") + LowOnePower_screen_label1.set_pos(0, 90) + LowOnePower_screen_label1.set_size(128, 20) + LowOnePower_screen_label1.set_text("电池电量过低") LowOnePower_screen_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) LowOnePower_screen_label1.set_long_mode(lv.label.LONG.WRAP) LowOnePower_screen_label1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) - LowOnePower_screen_label2 = lv.label(LowOnePower_screen) - LowOnePower_screen_label2.set_pos(0, 250) - LowOnePower_screen_label2.set_size(240, 60) - LowOnePower_screen_label2.set_text("继续使用，5s过后强制关机") - LowOnePower_screen_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - LowOnePower_screen_label2.set_long_mode(lv.label.LONG.WRAP) - LowOnePower_screen_label2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + # LowOnePower_screen_label2 = lv.label(LowOnePower_screen) + # LowOnePower_screen_label2.set_pos(0, 100) + # LowOnePower_screen_label2.set_size(128, 20) + # LowOnePower_screen_label2.set_text("继续使用，5s过后强制关机") + # LowOnePower_screen_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + # LowOnePower_screen_label2.set_long_mode(lv.label.LONG.WRAP) + # LowOnePower_screen_label2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) self.meta = LowOnePower_screen def post_processor_after_initialization(self): self.timer.start(5000,0,self.fun) + + def fun(self,e): EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) @@ -6017,7 +6302,7 @@ class UI(object): self.system_sleep_timer = osTimer() self.system_sleep_timer_count = 0 self.sleep_flag = 1 - self.level = 6 + self.level = 60 self.read_data = {} self.aud = audio.Audio(0) self.level = EventMesh.publish("get_brightness_level") @@ -6036,17 +6321,17 @@ class UI(object): if b == True: self.level = self.read_data["brightness_level"] else: - self.level = 6 + self.level = 60 self.read_data["brightness_level"] = self.level EventMesh.publish("set_storage_data", self.read_data) with open("/usr/static/storage_file/config.json","w",encoding="utf-8") as fd: ujson.dump(self.read_data,fd) else: - self.level = 6 #默认是6级别 + self.level = 60 #默认是6级别 if self.level == None: - self.level = 6 - self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, self.level, 10) + self.level = 60 + self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, self.level, 100) self.PWM_backlight.open() self.sleep_lock = 0 @@ -6240,15 +6525,15 @@ class UI(object): utime.sleep_ms(60) self.level = EventMesh.publish("get_brightness_level") if self.level == None: - self.level = 6 - elif self.level > 10: - self.level = 10 + self.level = 60 + elif self.level > 100: + self.level = 100 elif self.level <= 0: - self.level = 1 - self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, self.level, 10) + self.level = 10 + print("__lcd_on self.level:",self.level) + self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, self.level, 100) self.PWM_backlight.open() self.sleep_lock = 0 - def publish_call_in(self, event, msg): EventMesh.publish("load_screen", {"screen": "dialing", "meta": msg}) @@ -6262,7 +6547,7 @@ class UI(object): utime.sleep_ms(200) self.sleep_lock = 1 self.sleep_flag = 0 - self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, 0, 1) + self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, 0, 100) self.PWM_backlight.open() #lcd_ctrl.write(0) # @@ -6314,7 +6599,7 @@ class UI(object): EventMesh.publish("publish_message_event_ui",{"func":self.load_screen,"data":msg}) def load_screen(self, msg): - print("msg1={}".format(msg)) + print("msg1={} self.UI_high_priority_flag:{}".format(msg,self.UI_high_priority_flag)) if self.UI_high_priority_flag == 1:#电话界面屏蔽其他界面 return if self.screen : diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py index 01abb7f2..34189f22 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py @@ -192,27 +192,27 @@ MainMenu2_num+=1 MainMenu2x+=1 #健康测量 -MainMenu2_heartrate = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) -label_text = lv.label(MainMenu2_heartrate) -label_text.set_pos(0, 0) -label_text.set_size(0, 0) -label_text.set_text("{}".format(MainMenu2_num)) -MainMenu2_img_health = lv.img(MainMenu2_heartrate) -MainMenu2_img_health.set_size(80,80) -MainMenu2_img_health.set_pos(24,10) -MainMenu2_img_health.set_src("U:/static/IMAGE_ONE_PAGE_HEALTH.png") -MainMenu2_img_health.add_flag(lv.obj.FLAG.CLICKABLE) -MainMenu2_img_health.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) - -MainMenu2_img_health_txt = lv.label(MainMenu2_heartrate) -MainMenu2_img_health_txt.set_pos(int(0),int(100)) -MainMenu2_img_health_txt.set_size(128,20) -MainMenu2_img_health_txt.add_flag(lv.obj.FLAG.CLICKABLE) -MainMenu2_img_health_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -MainMenu2_img_health_txt.set_text("健康测量") -MainMenu2_img_health_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) -MainMenu2_num+=1 -MainMenu2x+=1 +# MainMenu2_heartrate = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) +# label_text = lv.label(MainMenu2_heartrate) +# label_text.set_pos(0, 0) +# label_text.set_size(0, 0) +# label_text.set_text("{}".format(MainMenu2_num)) +# MainMenu2_img_health = lv.img(MainMenu2_heartrate) +# MainMenu2_img_health.set_size(80,80) +# MainMenu2_img_health.set_pos(24,10) +# MainMenu2_img_health.set_src("U:/static/IMAGE_ONE_PAGE_HEALTH.png") +# MainMenu2_img_health.add_flag(lv.obj.FLAG.CLICKABLE) +# MainMenu2_img_health.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + +# MainMenu2_img_health_txt = lv.label(MainMenu2_heartrate) +# MainMenu2_img_health_txt.set_pos(int(0),int(100)) +# MainMenu2_img_health_txt.set_size(128,20) +# MainMenu2_img_health_txt.add_flag(lv.obj.FLAG.CLICKABLE) +# MainMenu2_img_health_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +# MainMenu2_img_health_txt.set_text("健康测量") +# MainMenu2_img_health_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) +# MainMenu2_num+=1 +# MainMenu2x+=1 @@ -281,7 +281,7 @@ class MainMenuScreen(Screen): MainMenu2_img_phone.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "Phone")), lv.EVENT.CLICKED, None) MainMenu2_img_toolbox.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "toolbox")), lv.EVENT.CLICKED, None) MainMenu2_img_setting.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "setting")), lv.EVENT.CLICKED, None) - MainMenu2_img_health.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "health")), lv.EVENT.CLICKED, None) + #MainMenu2_img_health.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "health")), lv.EVENT.CLICKED, None) MainMenu2_img_contacts.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "contacts")), lv.EVENT.CLICKED, None) MainMenu2_img_wechat.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "wechat")), lv.EVENT.CLICKED, None) # MainMenu2_img_spo2.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "spo2")), lv.EVENT.CLICKED, None) 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 3e553b1f..31f63f37 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 @@ -12,7 +12,8 @@ import ujson # -------------------------------------------setting screen---------------------------------------------------------- - +set_icon_x = 25 +set_icon_y = 25 style_volume_btn = lv.style_t() style_volume_btn.init() @@ -27,18 +28,19 @@ setting_screen = lv.obj() print("setting_screen") setting_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_imei_img = lv.img(setting_screen) -setting_imei_img.set_pos(75, 10) -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) -# setting_title.set_pos(0, 10) -# setting_title.set_size(240, 40) -# 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_imei_img = lv.img(setting_screen) +# setting_imei_img.set_pos(75, 10) +# 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_cont_style = lv.style_t() setting_cont_style.init() setting_cont_style.set_radius(0) @@ -54,8 +56,8 @@ setting_cont_style.set_pad_bottom(0) setting_cont = lv.obj(setting_screen) -setting_cont.set_pos(0, 50) -setting_cont.set_size(240, 270) +setting_cont.set_pos(0, 25) +setting_cont.set_size(128, 128-25) setting_cont.add_style(setting_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT) # setting_language = lv.btn(setting_cont) @@ -79,20 +81,23 @@ setting_cont.add_style(setting_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT) setting_dialswitch = lv.btn(setting_cont) setting_dialswitch.set_pos(0, setting_cont_y) setting_dialswitch.set_size(0, 0) -setting_dialswitch_label = lv.label(setting_dialswitch) +setting_dialswitch_label = lv.label(setting_cont) setting_dialswitch_label.set_text("表盘切换") setting_dialswitch.set_style_pad_all(0, lv.STATE.DEFAULT) -setting_dialswitch_label.align(lv.ALIGN.LEFT_MID, 70, 0) +setting_dialswitch_label.set_pos(34, setting_cont_y+5) +setting_dialswitch_label.set_size(128-34, 35) +setting_dialswitch_label.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_dialswitch_label.set_text_align(lv.ALIGN.LEFT_MID, 30, setting_cont_y) setting_dialswitch_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) setting_dialswitch_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) setting_dialswitch.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT) setting_dialswitch_img = lv.img(setting_cont) -setting_dialswitch_img.set_pos(0, setting_cont_y) -setting_dialswitch_img.set_size(232, 80) +setting_dialswitch_img.set_pos(4, setting_cont_y) +setting_dialswitch_img.set_size(set_icon_x, set_icon_y) setting_dialswitch_img.add_flag(lv.obj.FLAG.CLICKABLE) -setting_dialswitch_img.set_src("U:/static/setting/menu_watch_switch.png") +setting_dialswitch_img.set_src("U:/static/menu_watch_switch.png") setting_dialswitch_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=90 +setting_cont_y+=35 # setting_themeswitch = lv.btn(setting_cont) @@ -116,144 +121,160 @@ setting_cont_y+=90 setting_imei = lv.btn(setting_cont) setting_imei.set_pos(0, setting_cont_y) setting_imei.set_size(0, 0) -setting_imei_label = lv.label(setting_imei) +setting_imei_label = lv.label(setting_cont) setting_imei_label.set_text("设备IMEI号") setting_imei.set_style_pad_all(0, lv.STATE.DEFAULT) -setting_imei_label.align(lv.ALIGN.LEFT_MID, 70, 0) +setting_imei_label.set_pos(34, setting_cont_y+5) +setting_imei_label.set_size(128-34, 35) +setting_imei_label.add_flag(lv.obj.FLAG.CLICKABLE) setting_imei_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) setting_imei_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) setting_imei.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT) setting_imei_img = lv.img(setting_cont) -setting_imei_img.set_pos(0, setting_cont_y) -setting_imei_img.set_size(232, 80) +setting_imei_img.set_pos(4, setting_cont_y) +setting_imei_img.set_size(set_icon_x, set_icon_y) setting_imei_img.add_flag(lv.obj.FLAG.CLICKABLE) -setting_imei_img.set_src("U:/static/setting/menu_imei_qrcode.png") +setting_imei_img.set_src("U:/static/menu_imei_qrcode.png") setting_imei_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=90 +setting_cont_y+=35 setting_app = lv.btn(setting_cont) setting_app.set_pos(0, setting_cont_y) setting_app.set_size(0, 0) -setting_app_label = lv.label(setting_app) +setting_app_label = lv.label(setting_cont) setting_app_label.set_text("手机安装APP") setting_app.set_style_pad_all(0, lv.STATE.DEFAULT) -setting_app_label.align(lv.ALIGN.LEFT_MID, 70, 0) +setting_app_label.set_pos(34, setting_cont_y+5) +setting_app_label.set_size(128-34, 35) +setting_app_label.add_flag(lv.obj.FLAG.CLICKABLE) setting_app_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) setting_app_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) setting_app.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT) setting_app_img = lv.img(setting_cont) -setting_app_img.set_pos(0, setting_cont_y) -setting_app_img.set_size(232, 80) +setting_app_img.set_pos(4, setting_cont_y) +setting_app_img.set_size(set_icon_x, set_icon_y) setting_app_img.add_flag(lv.obj.FLAG.CLICKABLE) -setting_app_img.set_src("U:/static/setting/menu_app_qrcode.png") +setting_app_img.set_src("U:/static/menu_app_qrcode.png") setting_app_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=90 +setting_cont_y+=35 setting_bright = lv.btn(setting_cont) setting_bright.set_pos(0, setting_cont_y) setting_bright.set_size(0, 0) -setting_bright_label = lv.label(setting_bright) +setting_bright_label = lv.label(setting_cont) setting_bright_label.set_text("屏幕调节") +setting_bright_label.add_flag(lv.obj.FLAG.CLICKABLE) +setting_bright_label.set_size(128-34, 35) setting_bright.set_style_pad_all(0, lv.STATE.DEFAULT) -setting_bright_label.align(lv.ALIGN.LEFT_MID, 70, 0) +setting_bright_label.set_pos(34, setting_cont_y+5) setting_bright_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) setting_bright_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) setting_bright.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT) setting_bright_img = lv.img(setting_cont) -setting_bright_img.set_pos(0, setting_cont_y) -setting_bright_img.set_size(232, 80) +setting_bright_img.set_pos(4, setting_cont_y) +setting_bright_img.set_size(set_icon_x, set_icon_y) setting_bright_img.add_flag(lv.obj.FLAG.CLICKABLE) -setting_bright_img.set_src("U:/static/setting/menu_bright.png") +setting_bright_img.set_src("U:/static/menu_bright.png") setting_bright_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=90 +setting_cont_y+=35 setting_volume = lv.btn(setting_cont) setting_volume.set_pos(0, setting_cont_y) setting_volume.set_size(0, 0) -setting_volume_label = lv.label(setting_volume) +setting_volume_label = lv.label(setting_cont) setting_volume_label.set_text("铃声") +setting_volume_label.add_flag(lv.obj.FLAG.CLICKABLE) +setting_volume_label.set_size(128-34, 35) setting_volume.set_style_pad_all(0, lv.STATE.DEFAULT) -setting_volume_label.align(lv.ALIGN.LEFT_MID, 70, 0) +setting_volume_label.set_pos(34, setting_cont_y+5) setting_volume_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) setting_volume_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) setting_volume.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT) setting_volume_img = lv.img(setting_cont) -setting_volume_img.set_pos(0, setting_cont_y) -setting_volume_img.set_size(232, 80) +setting_volume_img.set_pos(4, setting_cont_y) +setting_volume_img.set_size(set_icon_x, set_icon_y) setting_volume_img.add_flag(lv.obj.FLAG.CLICKABLE) -setting_volume_img.set_src("U:/static/setting/menu_volume.png") +setting_volume_img.set_src("U:/static/menu_volume.png") setting_volume_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=90 +setting_cont_y+=35 setting_restore = lv.btn(setting_cont) setting_restore.set_pos(0, setting_cont_y) setting_restore.set_size(0, 0) -setting_restore_label = lv.label(setting_restore) +setting_restore_label = lv.label(setting_cont) setting_restore_label.set_text("恢复出厂设置") +setting_restore_label.add_flag(lv.obj.FLAG.CLICKABLE) +setting_restore_label.set_size(128-34, 35) setting_restore.set_style_pad_all(0, lv.STATE.DEFAULT) -setting_restore_label.align(lv.ALIGN.LEFT_MID, 70, 0) +setting_restore_label.set_pos(34, setting_cont_y+5) setting_restore_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) setting_restore_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) setting_restore.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT) setting_restore_img = lv.img(setting_cont) -setting_restore_img.set_pos(0, setting_cont_y) -setting_restore_img.set_size(232, 80) +setting_restore_img.set_pos(4, setting_cont_y) +setting_restore_img.set_size(set_icon_x, set_icon_y) setting_restore_img.add_flag(lv.obj.FLAG.CLICKABLE) -setting_restore_img.set_src("U:/static/setting/menu_restore.png") +setting_restore_img.set_src("U:/static/menu_restore.png") setting_restore_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=90 +setting_cont_y+=35 setting_poweroff = lv.btn(setting_cont) setting_poweroff.set_pos(0, setting_cont_y) setting_poweroff.set_size(0, 0) -setting_poweroff_label = lv.label(setting_poweroff) +setting_poweroff_label = lv.label(setting_cont) setting_poweroff_label.set_text("关机") +setting_poweroff_label.add_flag(lv.obj.FLAG.CLICKABLE) +setting_poweroff_label.set_size(128-34, 35) setting_poweroff.set_style_pad_all(0, lv.STATE.DEFAULT) -setting_poweroff_label.align(lv.ALIGN.LEFT_MID, 70, 0) +setting_poweroff_label.set_pos(34, setting_cont_y+5) setting_poweroff_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) setting_poweroff_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) setting_poweroff.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT) setting_poweroff_img = lv.img(setting_cont) -setting_poweroff_img.set_pos(0, setting_cont_y) -setting_poweroff_img.set_size(232, 80) +setting_poweroff_img.set_pos(4, setting_cont_y) +setting_poweroff_img.set_size(set_icon_x, set_icon_y) setting_poweroff_img.add_flag(lv.obj.FLAG.CLICKABLE) -setting_poweroff_img.set_src("U:/static/setting/menu_poweroff.png") +setting_poweroff_img.set_src("U:/static/menu_poweroff.png") setting_poweroff_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=90 +setting_cont_y+=35 setting_version = lv.btn(setting_cont) setting_version.set_pos(0, setting_cont_y) setting_version.set_size(0, 0) -setting_version_label = lv.label(setting_version) +setting_version_label = lv.label(setting_cont) setting_version_label.set_text("关于设备") +setting_version_label.add_flag(lv.obj.FLAG.CLICKABLE) +setting_version_label.set_size(128-34, 35) setting_version.set_style_pad_all(0, lv.STATE.DEFAULT) -setting_version_label.align(lv.ALIGN.LEFT_MID, 70, 0) +setting_version_label.set_pos(34, setting_cont_y+5) setting_version_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) setting_version_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) setting_version.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT) setting_version_img = lv.img(setting_cont) -setting_version_img.set_pos(0, setting_cont_y) -setting_version_img.set_size(232, 80) +setting_version_img.set_pos(4, setting_cont_y) +setting_version_img.set_size(set_icon_x, set_icon_y) setting_version_img.add_flag(lv.obj.FLAG.CLICKABLE) -setting_version_img.set_src("U:/static/setting/menu_version.png") +setting_version_img.set_src("U:/static/menu_version.png") setting_version_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=90 +setting_cont_y+=35 setting_update = lv.btn(setting_cont) setting_update.set_pos(0, setting_cont_y) setting_update.set_size(0, 0) -setting_update_label = lv.label(setting_update) +setting_update_label = lv.label(setting_cont) setting_update_label.set_text("系统升级") +setting_update_label.add_flag(lv.obj.FLAG.CLICKABLE) +setting_update_label.set_size(128-34, 35) setting_update.set_style_pad_all(0, lv.STATE.DEFAULT) -setting_update_label.align(lv.ALIGN.LEFT_MID, 70, 0) +setting_update_label.set_pos(34, setting_cont_y+5) setting_update_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) setting_update_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) setting_update.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT) setting_update_img = lv.img(setting_cont) -setting_update_img.set_pos(0, setting_cont_y) -setting_update_img.set_size(232, 80) +setting_update_img.set_pos(4, setting_cont_y) +setting_update_img.set_size(set_icon_x, set_icon_y) setting_update_img.add_flag(lv.obj.FLAG.CLICKABLE) -setting_update_img.set_src("U:/static/setting/menu_upgrade.png") +setting_update_img.set_src("U:/static/menu_upgrade.png") setting_update_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) class SettingScreen(Screen): @@ -263,16 +284,16 @@ class SettingScreen(Screen): super().__init__() self.meta = setting_screen # setting_language.add_event_cb(lambda e: self.load_screen(e, {"screen": "language"}), lv.EVENT.CLICKED, None) - setting_dialswitch.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "dialswitch"})), lv.EVENT.CLICKED, None) + setting_dialswitch_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "dialswitch"})), lv.EVENT.CLICKED, None) # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.CLICKED, None) - setting_imei.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "imei"})), lv.EVENT.CLICKED, None) - setting_app.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "app"})), lv.EVENT.CLICKED, None) - setting_bright.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "brightness"})), lv.EVENT.CLICKED, None) - setting_volume.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "totalvolume"})), lv.EVENT.CLICKED, None) - setting_restore.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "restore"})), lv.EVENT.CLICKED, None) - setting_poweroff.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "poweroff"})), lv.EVENT.CLICKED, None) - setting_update.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "update"})), lv.EVENT.CLICKED, None) - setting_version.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "version"})), lv.EVENT.CLICKED, None) + setting_imei_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "imei"})), lv.EVENT.CLICKED, None) + setting_app_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "app"})), lv.EVENT.CLICKED, None) + setting_bright_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "brightness"})), lv.EVENT.CLICKED, None) + setting_volume_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "totalvolume"})), lv.EVENT.CLICKED, None) + setting_restore_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "restore"})), lv.EVENT.CLICKED, None) + setting_poweroff_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "poweroff"})), lv.EVENT.CLICKED, None) + setting_update_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "update"})), lv.EVENT.CLICKED, None) + setting_version_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "version"})), lv.EVENT.CLICKED, None) # img regist btton # setting_language.add_event_cb(lambda e: self.load_screen(e, {"screen": "language"}), lv.EVENT.CLICKED, None) @@ -464,8 +485,8 @@ app_screen.set_size(240, 320) app_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) app_img = lv.img(app_screen) -app_img.set_pos(int(20),int(40)) -app_img.set_size(200,200) +app_img.set_pos(int(24),int(5)) +app_img.set_size(80,80) app_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) app_img.add_flag(lv.obj.FLAG.CLICKABLE) app_img.set_src("U:/static/IMAGE_APP_QR_CODE.png") @@ -473,14 +494,15 @@ app_img.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) # app_qr = lv.qrcode(imei, 150, fg_color, bg_color) # app_qr.center() # Add a border with bg_color + # app_qr.set_style_border_color(bg_color, 0) # app_qr.set_style_border_width(5, 0) # app_qr_data = str("https://fangzoudiu.xcloudtech.com/xiao_jian") # app_qr.update(app_qr_data,len(app_qr_data)) app_label = lv.label(app_screen) -app_label.set_pos(0, 280) -app_label.set_size(240, 20) +app_label.set_pos(0, 90) +app_label.set_size(128, 38) app_label.set_text(" ") app_label.set_long_mode(lv.label.LONG.WRAP) app_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -562,7 +584,7 @@ phonering_reduce_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) phonering_add_imgbtn = lv.img(phonering_screen) phonering_add_imgbtn.set_pos(120, 150) -phonering_add_imgbtn.set_size(110, 46) +phonering_add_imgbtn.set_size(55, 23) phonering_add_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) phonering_add_imgbtn.set_src("U:/static/add_btn.png") @@ -612,7 +634,7 @@ alarmvolume_reduce_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) alarmvolume_add_imgbtn = lv.img(alarmvolume_screen) alarmvolume_add_imgbtn.set_pos(125, 150) -alarmvolume_add_imgbtn.set_size(110, 46) +alarmvolume_add_imgbtn.set_size(55, 23) alarmvolume_add_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) alarmvolume_add_imgbtn.set_src("U:/static/add_btn.png") @@ -662,7 +684,7 @@ msgvolume_reduce_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) msgvolume_add_imgbtn = lv.img(msgvolume_screen) msgvolume_add_imgbtn.set_pos(125, 150) -msgvolume_add_imgbtn.set_size(110, 46) +msgvolume_add_imgbtn.set_size(55, 23) msgvolume_add_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) msgvolume_add_imgbtn.set_src("U:/static/add_btn.png") @@ -676,8 +698,8 @@ print("restore_screen") restore_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) restore_label = lv.label(restore_screen) -restore_label.set_pos(0, 100) -restore_label.set_size(240, 40) +restore_label.set_pos(0, 20) +restore_label.set_size(128, 20) restore_label.set_text("恢复出厂设置?") restore_label.set_long_mode(lv.label.LONG.WRAP) restore_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -686,28 +708,28 @@ restore_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) restore_confirm_label = lv.label(restore_screen) restore_confirm_label.set_text("确认") restore_confirm_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -restore_confirm_label.set_size(120, 60) -restore_confirm_label.set_pos(0,180) +restore_confirm_label.set_size(64, 20) +restore_confirm_label.set_pos(0,60) restore_confirm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) restore_confirm = lv.label(restore_screen) restore_confirm.set_text(" ") -restore_confirm.set_size(120, 80) -restore_confirm.set_pos(0,160) +restore_confirm.set_size(64, 40) +restore_confirm.set_pos(0,60) restore_confirm.add_flag(lv.obj.FLAG.CLICKABLE) restore_cancel_label = lv.label(restore_screen) restore_cancel_label.set_text("返回") -restore_cancel_label.set_size(120, 60) +restore_cancel_label.set_size(64, 20) restore_cancel_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -restore_cancel_label.set_pos(120,180) +restore_cancel_label.set_pos(64,60) restore_cancel_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) restore_cancel = lv.label(restore_screen) restore_cancel.set_text(" ") -restore_cancel.set_size(120, 80) -restore_cancel.set_pos(120,160) +restore_cancel.set_size(64, 40) +restore_cancel.set_pos(64,60) restore_cancel.add_flag(lv.obj.FLAG.CLICKABLE) @@ -718,7 +740,7 @@ restore_cancel.add_flag(lv.obj.FLAG.CLICKABLE) version_screen = lv.obj() print("version_screen") version_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) - +version_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) version_msg = "Software Version:\n\ MMI\n\ Version:UIX8910_C55_V\n\ @@ -731,8 +753,8 @@ IMEI:\n\ import versions version_label1 = lv.label(version_screen) -version_label1.set_pos(0, 30) -version_label1.set_size(240, 30) +version_label1.set_pos(0, 5) +version_label1.set_size(128, 40) version_label1.set_long_mode(lv.label.LONG.WRAP) version_label1.set_text("Software Version:") version_label1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -740,24 +762,24 @@ version_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) version_label2 = lv.label(version_screen) -version_label2.set_pos(0, 60) -version_label2.set_size(240, 30) +version_label2.set_pos(0, 45) +version_label2.set_size(128, 20) version_label2.set_long_mode(lv.label.LONG.WRAP) version_label2.set_text("Python Lvgl") version_label2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) version_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) version_label3 = lv.label(version_screen) -version_label3.set_pos(0, 90) -version_label3.set_size(240, 30) +version_label3.set_pos(0, 65) +version_label3.set_size(128, 20) version_label3.set_long_mode(lv.label.LONG.WRAP) version_label3.set_text("Version:") version_label3.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) version_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) version_label3 = lv.label(version_screen) -version_label3.set_pos(0, 120) -version_label3.set_size(240, 30) +version_label3.set_pos(0, 90) +version_label3.set_size(128, 20) version_label3.set_long_mode(lv.label.LONG.WRAP) version_label3.set_text(versions.Version) version_label3.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -772,16 +794,16 @@ version_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) # version_label4.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) version_label5 = lv.label(version_screen) -version_label5.set_pos(0, 150) -version_label5.set_size(240, 30) +version_label5.set_pos(0, 115) +version_label5.set_size(128, 20) version_label5.set_long_mode(lv.label.LONG.WRAP) version_label5.set_text("Build Time:") version_label5.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) version_label5.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) version_label6 = lv.label(version_screen) -version_label6.set_pos(0, 180) -version_label6.set_size(240, 30) +version_label6.set_pos(0, 140) +version_label6.set_size(128, 40) version_label6.set_long_mode(lv.label.LONG.WRAP) version_label6.set_text(versions.Build_Time) version_label6.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -796,17 +818,16 @@ version_label6.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) # version_label7.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) version_label8 = lv.label(version_screen) -version_label8.set_pos(0, 210) -version_label8.set_size(240, 30) +version_label8.set_pos(0, 180) +version_label8.set_size(128, 20) version_label8.set_long_mode(lv.label.LONG.WRAP) version_label8.set_text("IMEI:") version_label8.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) version_label8.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) version_label9 = lv.label(version_screen) -version_label9.set_pos(20, 240) -version_label9.set_size(220, 30) -version_label9.set_long_mode(lv.label.LONG.WRAP) +version_label9.set_pos(0, 200) +version_label9.set_size(128, 38) version_label9.set_text(" ") version_label9.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) version_label9.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -820,24 +841,24 @@ update_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) update_title = lv.label(update_screen) update_title.set_pos(0, 10) -update_title.set_size(240, 40) +update_title.set_size(128, 20) update_title.set_text("系统更新") update_title.set_long_mode(lv.label.LONG.WRAP) update_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) 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_text("已经是最新版本") 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.set_size(128, 20) +update_label.set_pos(0,40) update_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) update_return = lv.label(update_screen) update_return.set_text("返回") -update_return.set_size(240, 40) +update_return.set_size(128, 40) update_return.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -update_return.set_pos(0,240) +update_return.set_pos(0,70) update_return.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) update_return.add_flag(lv.obj.FLAG.CLICKABLE) @@ -857,7 +878,10 @@ class RestoreScreen(Screen): if ret == True: ql_fs.rmdirs("/usr/static/storage_file") ql_fs.mkdirs("/usr/static/storage_file") - EventMesh.publish(constants.PROTOCOL.DLT_SEND) + if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:#已连接服务器发指令恢复出厂 + EventMesh.publish(constants.PROTOCOL.DLT_SEND) + else: + Power.powerRestart() def concel(self, e): EventMesh.publish("load_screen", {"screen": "setting"}) @@ -904,7 +928,8 @@ class VersionScreen(Screen): self.btn_count = 0 def initialization(self): imei = EventMesh.publish(constants.EVENT.GET_IMEI) - version_label9.set_text(imei) + print("imei",imei) + version_label9.set_text("{}".format(imei)) def Close(self): self.btn_count = 0 @@ -935,39 +960,51 @@ print("poweroff_screen") poweroff_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) poweroff_img = lv.img(poweroff_screen) -poweroff_img.set_pos(100, 30) -poweroff_img.set_size(61, 61) +poweroff_img.set_pos(49, 5) +poweroff_img.set_size(30, 30) poweroff_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) poweroff_img.set_src("U:/static/poweroff_icon.png") poweroff_label = lv.label(poweroff_screen) poweroff_label.set_text("是否关机？") poweroff_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -poweroff_label.set_size(240, 20) -poweroff_label.set_pos(0,120) +poweroff_label.set_size(128, 20) +poweroff_label.set_pos(0,40) poweroff_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) poweroff_confirm_img = lv.img(poweroff_screen) -poweroff_confirm_img.set_size(176, 46) -poweroff_confirm_img.set_pos(32, 150) +poweroff_confirm_img.set_size(88, 23) +poweroff_confirm_img.set_pos(24, 65) poweroff_confirm_img.set_src("U:/static/off_icon.png") -poweroff_confirm_img.add_flag(lv.obj.FLAG.CLICKABLE) poweroff_confirm_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) +poweroff_confirm_imgbtn = lv.img(poweroff_screen) +poweroff_confirm_imgbtn.set_size(128, 35) +poweroff_confirm_imgbtn.set_pos(0, 60) +poweroff_confirm_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) +poweroff_confirm_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + + poweroff_confirm_label = lv.label(poweroff_confirm_img) poweroff_confirm_label.set_text("关机") -poweroff_confirm_label.align(lv.ALIGN.CENTER, 0, 5) +poweroff_confirm_label.align(lv.ALIGN.CENTER, 0, 0) poweroff_confirm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) poweroff_return = lv.img(poweroff_screen) -poweroff_return.set_size(176, 46) -poweroff_return.set_pos(32, 210) +poweroff_return.set_size(88, 23) +poweroff_return.set_pos(24, 100) poweroff_return.set_src("U:/static/cancel_icon.png") -poweroff_return.add_flag(lv.obj.FLAG.CLICKABLE) poweroff_return.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +poweroff_return_btn = lv.img(poweroff_screen) +poweroff_return_btn.set_size(128, 33) +poweroff_return_btn.set_pos(0, 95) +poweroff_return_btn.add_flag(lv.obj.FLAG.CLICKABLE) +poweroff_return_btn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + poweroff_return_label = lv.label(poweroff_return) poweroff_return_label.set_text("返回") -poweroff_return_label.align(lv.ALIGN.CENTER, 0, 5) +poweroff_return_label.align(lv.ALIGN.CENTER, 0, 0) poweroff_return_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) poweroff_return.set_ext_click_area(20) @@ -978,8 +1015,8 @@ class PoweroffScreen(Screen): def __init__(self): super().__init__() self.meta = poweroff_screen - poweroff_confirm_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)),lv.EVENT.CLICKED, None) - poweroff_return.add_event_cb(lambda e: EventMesh.callback_wrapper(self.concel(e)),lv.EVENT.CLICKED, None) + poweroff_confirm_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)),lv.EVENT.CLICKED, None) + poweroff_return_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.concel(e)),lv.EVENT.CLICKED, None) def initialization(self): pass @@ -988,8 +1025,8 @@ class PoweroffScreen(Screen): EventMesh.publish("load_screen", {"screen": "setting"}) def confirm(self, e): - EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) - + # EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) + EventMesh.publish("load_screen", {"screen": "no_sim_power_screen"}) def concel(self, e): EventMesh.publish("load_screen", {"screen": "setting"}) @@ -1010,7 +1047,7 @@ poweroff_confirm_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) poweroff_confirm_label = lv.label(poweroff_confirm_screen) poweroff_confirm_label.set_text("Goodbye") poweroff_confirm_label.align(lv.ALIGN.CENTER, 0, 0) -#poweroff_confirm_label.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) +poweroff_confirm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) import utime class PoweroffConfirmScreen(Screen): @@ -1031,11 +1068,17 @@ class PoweroffConfirmScreen(Screen): #print("self.read_data:{}".format(self.read_data)) with open("/usr/static/storage_file/config.json","w",encoding="utf-8") as fd: ujson.dump(self.read_data,fd) - self.timer.start(3*1000,0,self.power_off) + self.count = 0 + self.timer.start(1*1000,1,self.power_off) def power_off(self,*args): - - Power.powerDown() + self.count+=1 + EventMesh.publish("system_sleep_rest")#防止黑屏 + # print("power off!!!!!!!",self.count) + if self.count > 5:#在上一个界面在播放音频时切换界面则关闭 以免一直播放 + self.count = 0 + self.timer.stop() + Power.powerDown() def done_return(self): pass @@ -1249,16 +1292,16 @@ imei_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) bg_color = lv.palette_lighten(lv.PALETTE.LIGHT_BLUE, 5) fg_color = lv.palette_darken(lv.PALETTE.BLUE, 4) -imei_qr = lv.qrcode(imei_screen, 150, fg_color, bg_color) -imei_qr.center() +imei_qr = lv.qrcode(imei_screen, 80, fg_color, bg_color) +imei_qr.set_pos(24, 4) # Add a border with bg_color imei_qr.set_style_border_color(bg_color, 0) -imei_qr.set_style_border_width(5, 0) +imei_qr.set_style_border_width(2, 0) imei_label = lv.label(imei_screen) -imei_label.set_pos(0, 280) -imei_label.set_size(240, 20) +imei_label.set_pos(0, 90) +imei_label.set_size(128, 38) imei_label.set_text(" ") imei_label.set_long_mode(lv.label.LONG.WRAP) imei_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -1314,24 +1357,24 @@ brightness_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_title = lv.label(brightness_screen) -brightness_title.set_pos(0, 10) -brightness_title.set_size(240, 40) +brightness_title.set_pos(0, 5) +brightness_title.set_size(120, 20) brightness_title.set_text("屏幕调节") brightness_title.set_long_mode(lv.label.LONG.WRAP) brightness_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) brightness_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_label1 = lv.label(brightness_screen) -brightness_label1.set_pos(10, 70) -brightness_label1.set_size(230, 40) +brightness_label1.set_pos(5, 30) +brightness_label1.set_size(128-5, 20) brightness_label1.set_text("亮度:") brightness_label1.set_long_mode(lv.label.LONG.WRAP) brightness_label1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) brightness_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_bar = lv.bar(brightness_screen) -brightness_bar.set_pos(20, 100) -brightness_bar.set_size(200, 25) +brightness_bar.set_pos(10, 55) +brightness_bar.set_size(108, 12) brightness_bar.set_style_anim_time(1000, lv.PART.INDICATOR | lv.STATE.DEFAULT) brightness_bar.set_mode(lv.bar.MODE.NORMAL) brightness_bar.set_value(50, lv.ANIM.OFF) @@ -1339,57 +1382,57 @@ brightness_bar.add_style(style_bar, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_bar.add_style(style_bar_indic, lv.PART.INDICATOR | lv.STATE.DEFAULT) brightness_reduce_imgbtn = lv.img(brightness_screen) -brightness_reduce_imgbtn.set_pos(5, 195) -brightness_reduce_imgbtn.set_size(110, 46) +brightness_reduce_imgbtn.set_pos(6, 70) +brightness_reduce_imgbtn.set_size(55, 23) brightness_reduce_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) brightness_reduce_imgbtn.set_src("U:/static/reduce_btn.png") brightness_reduce_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_add_imgbtn = lv.img(brightness_screen) -brightness_add_imgbtn.set_pos(125, 195) -brightness_add_imgbtn.set_size(110, 46) +brightness_add_imgbtn.set_pos(67, 70) +brightness_add_imgbtn.set_size(55, 23) brightness_add_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) brightness_add_imgbtn.set_src("U:/static/add_btn.png") brightness_add_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_label_time = lv.label(brightness_screen) -brightness_label_time.set_pos(10, 150) -brightness_label_time.set_size(80, 30) +brightness_label_time.set_pos(5, 97) +brightness_label_time.set_size(45, 20) brightness_label_time.set_text("时间:") brightness_label_time.set_long_mode(lv.label.LONG.WRAP) brightness_label_time.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) brightness_label_time.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_time_reduce_img = lv.img(brightness_screen) -brightness_time_reduce_img.set_pos(90, 145) -brightness_time_reduce_img.set_size(30, 34) +brightness_time_reduce_img.set_pos(50, 97) +brightness_time_reduce_img.set_size(15, 17) brightness_time_reduce_img.set_src("U:/static/time_up2.png") brightness_time_reduce_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_time_reduce_imgbtn= lv.img(brightness_screen) -brightness_time_reduce_imgbtn.set_size(80, 45) -brightness_time_reduce_imgbtn.set_pos(90, 140) +brightness_time_reduce_imgbtn.set_size(49, 32) +brightness_time_reduce_imgbtn.set_pos(79, 96) brightness_time_reduce_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) brightness_label_time_text = lv.label(brightness_screen) -brightness_label_time_text.set_pos(130, 152) -brightness_label_time_text.set_size(60, 30) -brightness_label_time_text.set_text("5秒") +brightness_label_time_text.set_pos(65, 98) +brightness_label_time_text.set_size(45, 20) +brightness_label_time_text.set_text("5s") brightness_label_time_text.set_long_mode(lv.label.LONG.WRAP) -brightness_label_time_text.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) +brightness_label_time_text.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) brightness_label_time_text.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_time_add_img = lv.img(brightness_screen) -brightness_time_add_img.set_pos(190, 145) -brightness_time_add_img.set_size(30, 34) +brightness_time_add_img.set_pos(110, 97) +brightness_time_add_img.set_size(15, 17) brightness_time_add_img.set_src("U:/static/time_up1.png") brightness_time_add_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_time_add_imgbtn= lv.img(brightness_screen) -brightness_time_add_imgbtn.set_size(70, 45) -brightness_time_add_imgbtn.set_pos(170, 140) +brightness_time_add_imgbtn.set_size(49, 32) +brightness_time_add_imgbtn.set_pos(30, 96) brightness_time_add_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) @@ -1399,7 +1442,7 @@ class BrightnessScreen(Screen): def __init__(self): super().__init__() - self.level = 6 + self.level = 60 self.time = 10 self.read_data = {} self.meta = brightness_screen @@ -1408,10 +1451,10 @@ class BrightnessScreen(Screen): brightness_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_level(e)), lv.EVENT.CLICKED, None) - brightness_time_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_time_level(e)), + brightness_time_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_time_level(e)), lv.EVENT.CLICKED, None) - brightness_time_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_time_level(e)), + brightness_time_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_time_level(e)), lv.EVENT.CLICKED, None) def initialization(self): self.level = EventMesh.publish("get_brightness_level") @@ -1424,7 +1467,7 @@ class BrightnessScreen(Screen): def add_level(self, e): EventMesh.publish("push_add_brightness_level") self.level = EventMesh.publish("get_brightness_level") - print("self.level:{}".format(self.level)) + # print("self.level:{}".format(self.level)) self.show_bar() def reduce_level(self, e): @@ -1463,8 +1506,8 @@ class BrightnessScreen(Screen): def show_bar(self): if self.level == None: - self.level = 6 - brightness_bar.set_value((100 // 10) * self.level, lv.ANIM.OFF) + self.level = 60 + brightness_bar.set_value((100 // 100) * self.level, lv.ANIM.OFF) @@ -1634,24 +1677,24 @@ print("volume_adjust_screen") volume_adjust_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) totalvolume_title = lv.label(volume_adjust_screen) -totalvolume_title.set_pos(0, 10) -totalvolume_title.set_size(240, 40) +totalvolume_title.set_pos(0, 5) +totalvolume_title.set_size(128, 20) totalvolume_title.set_text("铃声调节") totalvolume_title.set_long_mode(lv.label.LONG.WRAP) totalvolume_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) totalvolume_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) totalvolume_label1 = lv.label(volume_adjust_screen) -totalvolume_label1.set_pos(10, 70) -totalvolume_label1.set_size(230, 40) +totalvolume_label1.set_pos(5, 30) +totalvolume_label1.set_size(128-5, 20) totalvolume_label1.set_text("铃声:") totalvolume_label1.set_long_mode(lv.label.LONG.WRAP) totalvolume_label1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) totalvolume_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) totalvolume_bar = lv.bar(volume_adjust_screen) -totalvolume_bar.set_pos(20, 100) -totalvolume_bar.set_size(200, 25) +totalvolume_bar.set_pos(10, 55) +totalvolume_bar.set_size(108, 12) totalvolume_bar.set_style_anim_time(1000, lv.PART.INDICATOR | lv.STATE.DEFAULT) totalvolume_bar.set_mode(lv.bar.MODE.NORMAL) totalvolume_bar.set_value(50, lv.ANIM.OFF) @@ -1659,16 +1702,16 @@ totalvolume_bar.add_style(style_bar, lv.PART.MAIN | lv.STATE.DEFAULT) totalvolume_bar.add_style(style_bar_indic, lv.PART.INDICATOR | lv.STATE.DEFAULT) totalvolume_reduce_imgbtn = lv.img(volume_adjust_screen) -totalvolume_reduce_imgbtn.set_pos(5, 145) -totalvolume_reduce_imgbtn.set_size(110, 46) +totalvolume_reduce_imgbtn.set_pos(6, 70) +totalvolume_reduce_imgbtn.set_size(55, 23) totalvolume_reduce_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) totalvolume_reduce_imgbtn.set_src("U:/static/reduce_btn.png") totalvolume_reduce_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) totalvolume_add_imgbtn = lv.img(volume_adjust_screen) -totalvolume_add_imgbtn.set_pos(125, 145) -totalvolume_add_imgbtn.set_size(110, 46) +totalvolume_add_imgbtn.set_pos(67, 70) +totalvolume_add_imgbtn.set_size(55, 23) totalvolume_add_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) totalvolume_add_imgbtn.set_src("U:/static/add_btn.png") totalvolume_add_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -1723,7 +1766,7 @@ class totalvolumeScreen(Screen): # print("self.read_data:size :{}".format(self.read_data)) with open("/usr/static/storage_file/config.json","w",encoding="utf-8") as fd: ujson.dump(self.read_data,fd) - self.aud.play(1, 1, 'U:/static/audio_audio_haixiu.mp3') #播放声音 + self.aud.play(1, 1, 'U:/static/R_VOLUME_SET_1.mp3') #播放声音 def Close(self): self.aud.stop() diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/versions.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/versions.py index 3590f062..b0d0a347 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/versions.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/versions.py @@ -1,2 +1,2 @@ Version="810M_K01_V1.0" -Build_Time="2023-07-26 20:31:41" +Build_Time="2023-08-10 18:13:45" diff --git a/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip b/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip index 993b7498..865248c2 100644 Binary files a/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip and b/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip differ diff --git a/2.sdk/project/K01/usr/static/0_BAT.png b/2.sdk/project/K01/usr/static/0_BAT.png new file mode 100644 index 00000000..ee2bc695 Binary files /dev/null and b/2.sdk/project/K01/usr/static/0_BAT.png differ diff --git a/2.sdk/project/K01/usr/static/0_weather.png b/2.sdk/project/K01/usr/static/0_weather.png new file mode 100644 index 00000000..1429545f Binary files /dev/null and b/2.sdk/project/K01/usr/static/0_weather.png differ diff --git a/2.sdk/project/K01/usr/static/1_weather.png b/2.sdk/project/K01/usr/static/1_weather.png new file mode 100644 index 00000000..df11b7e7 Binary files /dev/null and b/2.sdk/project/K01/usr/static/1_weather.png differ diff --git a/2.sdk/project/K01/usr/static/3_weather.png b/2.sdk/project/K01/usr/static/3_weather.png new file mode 100644 index 00000000..149adb85 Binary files /dev/null and b/2.sdk/project/K01/usr/static/3_weather.png differ diff --git a/2.sdk/project/K01/usr/static/DIAL_PREV01.png b/2.sdk/project/K01/usr/static/DIAL_PREV01.png deleted file mode 100644 index 51037c5f..00000000 Binary files a/2.sdk/project/K01/usr/static/DIAL_PREV01.png and /dev/null differ diff --git a/2.sdk/project/K01/usr/static/DIAL_PREV02.png b/2.sdk/project/K01/usr/static/DIAL_PREV02.png deleted file mode 100644 index ea2197ff..00000000 Binary files a/2.sdk/project/K01/usr/static/DIAL_PREV02.png and /dev/null differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_APP_QR_CODE.png b/2.sdk/project/K01/usr/static/IMAGE_APP_QR_CODE.png new file mode 100644 index 00000000..88de1187 Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_APP_QR_CODE.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_BUTTON_DELKEY.png b/2.sdk/project/K01/usr/static/IMAGE_BUTTON_DELKEY.png index b2952aae..9bde723a 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_BUTTON_DELKEY.png and b/2.sdk/project/K01/usr/static/IMAGE_BUTTON_DELKEY.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_BUTTON_DIAL.png b/2.sdk/project/K01/usr/static/IMAGE_BUTTON_DIAL.png index bb369936..0f6b4151 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_BUTTON_DIAL.png and b/2.sdk/project/K01/usr/static/IMAGE_BUTTON_DIAL.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_BUTTON_DIAL_CONTACT.png b/2.sdk/project/K01/usr/static/IMAGE_BUTTON_DIAL_CONTACT.png deleted file mode 100644 index 868e5b15..00000000 Binary files a/2.sdk/project/K01/usr/static/IMAGE_BUTTON_DIAL_CONTACT.png and /dev/null differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_IDLE_SCREEN_ALARM_POPUP_02.png b/2.sdk/project/K01/usr/static/IMAGE_IDLE_SCREEN_ALARM_POPUP_02.png new file mode 100644 index 00000000..5150641b Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_IDLE_SCREEN_ALARM_POPUP_02.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NOTICE_CALL.png b/2.sdk/project/K01/usr/static/IMAGE_NOTICE_CALL.png new file mode 100644 index 00000000..638c12a6 Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_NOTICE_CALL.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NOTICE_NONE.png b/2.sdk/project/K01/usr/static/IMAGE_NOTICE_NONE.png new file mode 100644 index 00000000..4b7db49d Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_NOTICE_NONE.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY0_ICON.png b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY0_ICON.png index 9e4635c1..502ff78c 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY0_ICON.png and b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY0_ICON.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY1_ICON.png b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY1_ICON.png index af7fe837..4c01263a 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY1_ICON.png and b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY1_ICON.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY2_ICON.png b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY2_ICON.png index 25f1e8e6..d017c483 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY2_ICON.png and b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY2_ICON.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY3_ICON.png b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY3_ICON.png index 38c7793d..3a9e0559 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY3_ICON.png and b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY3_ICON.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY4_ICON.png b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY4_ICON.png index e424632e..d5fd3954 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY4_ICON.png and b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY4_ICON.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY5_ICON.png b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY5_ICON.png index d98acab3..39aea823 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY5_ICON.png and b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY5_ICON.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY6_ICON.png b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY6_ICON.png index 243e35e9..fa0c0ec7 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY6_ICON.png and b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY6_ICON.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY7_ICON.png b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY7_ICON.png index d8dc2b48..726fd751 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY7_ICON.png and b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY7_ICON.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY8_ICON.png b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY8_ICON.png index fe32415a..d157f880 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY8_ICON.png and b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY8_ICON.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY9_ICON.png b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY9_ICON.png index d3c0be57..e9ce23a8 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY9_ICON.png and b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEY9_ICON.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEYHASH_ICON.png b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEYHASH_ICON.png deleted file mode 100644 index c6dff243..00000000 Binary files a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEYHASH_ICON.png and /dev/null differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEYSTAR_ICON.png b/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEYSTAR_ICON.png deleted file mode 100644 index 1f35dde0..00000000 Binary files a/2.sdk/project/K01/usr/static/IMAGE_NUMBER_KEYSTAR_ICON.png and /dev/null differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_CALL.png b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_CALL.png index 5bc4d2f6..11399086 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_CALL.png and b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_CALL.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_CONTACTS.png b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_CONTACTS.png index 921572a0..bd4df367 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_CONTACTS.png and b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_CONTACTS.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_HEALTH.png b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_HEALTH.png deleted file mode 100644 index 124035c2..00000000 Binary files a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_HEALTH.png and /dev/null differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_SETTINGS.png b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_SETTINGS.png index 10f337ce..97e31cc5 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_SETTINGS.png and b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_SETTINGS.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_SMS.png b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_SMS.png index cb4dcb5e..f1e7f8d9 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_SMS.png and b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_SMS.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_TOOLS.png b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_TOOLS.png index 26d97457..c2953abf 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_TOOLS.png and b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_TOOLS.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_WECHAT.png b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_WECHAT.png index 8a23f0f2..76f20efc 100644 Binary files a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_WECHAT.png and b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_WECHAT.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_SECMENU_ALARM.png b/2.sdk/project/K01/usr/static/IMAGE_SECMENU_ALARM.png new file mode 100644 index 00000000..148edc47 Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_SECMENU_ALARM.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_SECMENU_COUNTDOWN.png b/2.sdk/project/K01/usr/static/IMAGE_SECMENU_COUNTDOWN.png new file mode 100644 index 00000000..ed6a9b66 Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_SECMENU_COUNTDOWN.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_SECMENU_STEP.png b/2.sdk/project/K01/usr/static/IMAGE_SECMENU_STEP.png new file mode 100644 index 00000000..ee45af53 Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_SECMENU_STEP.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_SECMENU_STOPWATCH.png b/2.sdk/project/K01/usr/static/IMAGE_SECMENU_STOPWATCH.png new file mode 100644 index 00000000..1048f7ee Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_SECMENU_STOPWATCH.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_SECMENU_WEATHER.png b/2.sdk/project/K01/usr/static/IMAGE_SECMENU_WEATHER.png new file mode 100644 index 00000000..a7fa7dc0 Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_SECMENU_WEATHER.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_STEP.png b/2.sdk/project/K01/usr/static/IMAGE_STEP.png new file mode 100644 index 00000000..85288c3d Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_STEP.png differ diff --git a/2.sdk/project/K01/usr/static/vbat_20.png b/2.sdk/project/K01/usr/static/REDUCE_VOLUM_ICON.png similarity index 53% rename from 2.sdk/project/K01/usr/static/vbat_20.png rename to 2.sdk/project/K01/usr/static/REDUCE_VOLUM_ICON.png index e76eb8af..a5140fb6 100644 Binary files a/2.sdk/project/K01/usr/static/vbat_20.png and b/2.sdk/project/K01/usr/static/REDUCE_VOLUM_ICON.png differ diff --git a/2.sdk/project/K01/usr/static/RED_RETURN_PNG.png b/2.sdk/project/K01/usr/static/RED_RETURN_PNG.png new file mode 100644 index 00000000..2def6f42 Binary files /dev/null and b/2.sdk/project/K01/usr/static/RED_RETURN_PNG.png differ diff --git a/2.sdk/project/K01/usr/static/R_1.png b/2.sdk/project/K01/usr/static/R_1.png new file mode 100644 index 00000000..4181128b Binary files /dev/null and b/2.sdk/project/K01/usr/static/R_1.png differ diff --git a/2.sdk/project/K01/usr/static/R_2.png b/2.sdk/project/K01/usr/static/R_2.png new file mode 100644 index 00000000..306ee598 Binary files /dev/null and b/2.sdk/project/K01/usr/static/R_2.png differ diff --git a/2.sdk/project/K01/usr/static/R_3.png b/2.sdk/project/K01/usr/static/R_3.png new file mode 100644 index 00000000..50740e14 Binary files /dev/null and b/2.sdk/project/K01/usr/static/R_3.png differ diff --git a/2.sdk/project/K01/usr/static/R_VOLUME_SET_1.mp3 b/2.sdk/project/K01/usr/static/R_VOLUME_SET_1.mp3 new file mode 100644 index 00000000..3fd8ed2c Binary files /dev/null and b/2.sdk/project/K01/usr/static/R_VOLUME_SET_1.mp3 differ diff --git a/2.sdk/project/K01/usr/static/S_1.png b/2.sdk/project/K01/usr/static/S_1.png new file mode 100644 index 00000000..3e2569fa Binary files /dev/null and b/2.sdk/project/K01/usr/static/S_1.png differ diff --git a/2.sdk/project/K01/usr/static/S_2.png b/2.sdk/project/K01/usr/static/S_2.png new file mode 100644 index 00000000..e9121ab6 Binary files /dev/null and b/2.sdk/project/K01/usr/static/S_2.png differ diff --git a/2.sdk/project/K01/usr/static/S_3.png b/2.sdk/project/K01/usr/static/S_3.png new file mode 100644 index 00000000..c8459595 Binary files /dev/null and b/2.sdk/project/K01/usr/static/S_3.png differ diff --git a/2.sdk/project/K01/usr/static/VOLUM_ADD_ICON.png b/2.sdk/project/K01/usr/static/VOLUM_ADD_ICON.png new file mode 100644 index 00000000..a9aef5f5 Binary files /dev/null and b/2.sdk/project/K01/usr/static/VOLUM_ADD_ICON.png differ diff --git a/2.sdk/project/K01/usr/static/add_btn.png b/2.sdk/project/K01/usr/static/add_btn.png new file mode 100644 index 00000000..777b41b3 Binary files /dev/null and b/2.sdk/project/K01/usr/static/add_btn.png differ diff --git a/2.sdk/project/K01/usr/static/answer.png b/2.sdk/project/K01/usr/static/answer.png new file mode 100644 index 00000000..63d2e014 Binary files /dev/null and b/2.sdk/project/K01/usr/static/answer.png differ diff --git a/2.sdk/project/K01/usr/static/cancel_icon.png b/2.sdk/project/K01/usr/static/cancel_icon.png new file mode 100644 index 00000000..a65d24d0 Binary files /dev/null and b/2.sdk/project/K01/usr/static/cancel_icon.png differ diff --git a/2.sdk/project/K01/usr/static/charge_in.png b/2.sdk/project/K01/usr/static/charge_in.png deleted file mode 100644 index f33a6ea5..00000000 Binary files a/2.sdk/project/K01/usr/static/charge_in.png and /dev/null differ diff --git a/2.sdk/project/K01/usr/static/degree.png b/2.sdk/project/K01/usr/static/degree.png index 62b467f5..8738d7b1 100644 Binary files a/2.sdk/project/K01/usr/static/degree.png and b/2.sdk/project/K01/usr/static/degree.png differ diff --git a/2.sdk/project/K01/usr/static/find_phone.png b/2.sdk/project/K01/usr/static/find_phone.png new file mode 100644 index 00000000..4efc00ba Binary files /dev/null and b/2.sdk/project/K01/usr/static/find_phone.png differ diff --git a/2.sdk/project/K01/usr/static/hang_up.png b/2.sdk/project/K01/usr/static/hang_up.png new file mode 100644 index 00000000..73eeda86 Binary files /dev/null and b/2.sdk/project/K01/usr/static/hang_up.png differ diff --git a/2.sdk/project/K01/usr/static/jia_icon.png b/2.sdk/project/K01/usr/static/jia_icon.png new file mode 100644 index 00000000..cdc33e32 Binary files /dev/null and b/2.sdk/project/K01/usr/static/jia_icon.png differ diff --git a/2.sdk/project/K01/usr/static/jing_icon.png b/2.sdk/project/K01/usr/static/jing_icon.png new file mode 100644 index 00000000..6725c9d0 Binary files /dev/null and b/2.sdk/project/K01/usr/static/jing_icon.png differ diff --git a/2.sdk/project/K01/usr/static/menu_app_qrcode.png b/2.sdk/project/K01/usr/static/menu_app_qrcode.png new file mode 100644 index 00000000..bbc70c39 Binary files /dev/null and b/2.sdk/project/K01/usr/static/menu_app_qrcode.png differ diff --git a/2.sdk/project/K01/usr/static/menu_bright.png b/2.sdk/project/K01/usr/static/menu_bright.png new file mode 100644 index 00000000..12249660 Binary files /dev/null and b/2.sdk/project/K01/usr/static/menu_bright.png differ diff --git a/2.sdk/project/K01/usr/static/menu_imei_qrcode.png b/2.sdk/project/K01/usr/static/menu_imei_qrcode.png new file mode 100644 index 00000000..d7955659 Binary files /dev/null and b/2.sdk/project/K01/usr/static/menu_imei_qrcode.png differ diff --git a/2.sdk/project/K01/usr/static/menu_poweroff.png b/2.sdk/project/K01/usr/static/menu_poweroff.png new file mode 100644 index 00000000..b5c4c580 Binary files /dev/null and b/2.sdk/project/K01/usr/static/menu_poweroff.png differ diff --git a/2.sdk/project/K01/usr/static/menu_restore.png b/2.sdk/project/K01/usr/static/menu_restore.png new file mode 100644 index 00000000..384225d3 Binary files /dev/null and b/2.sdk/project/K01/usr/static/menu_restore.png differ diff --git a/2.sdk/project/K01/usr/static/menu_upgrade.png b/2.sdk/project/K01/usr/static/menu_upgrade.png new file mode 100644 index 00000000..4950c319 Binary files /dev/null and b/2.sdk/project/K01/usr/static/menu_upgrade.png differ diff --git a/2.sdk/project/K01/usr/static/menu_version.png b/2.sdk/project/K01/usr/static/menu_version.png new file mode 100644 index 00000000..c930ad60 Binary files /dev/null and b/2.sdk/project/K01/usr/static/menu_version.png differ diff --git a/2.sdk/project/K01/usr/static/menu_volume.png b/2.sdk/project/K01/usr/static/menu_volume.png new file mode 100644 index 00000000..9ca10118 Binary files /dev/null and b/2.sdk/project/K01/usr/static/menu_volume.png differ diff --git a/2.sdk/project/K01/usr/static/menu_watch_switch.png b/2.sdk/project/K01/usr/static/menu_watch_switch.png new file mode 100644 index 00000000..e4f70533 Binary files /dev/null and b/2.sdk/project/K01/usr/static/menu_watch_switch.png differ diff --git a/2.sdk/project/K01/usr/static/off_icon.png b/2.sdk/project/K01/usr/static/off_icon.png index 44f1bbfa..0aa18c72 100644 Binary files a/2.sdk/project/K01/usr/static/off_icon.png and b/2.sdk/project/K01/usr/static/off_icon.png differ diff --git a/2.sdk/project/K01/usr/static/phnone_nine_icon.png b/2.sdk/project/K01/usr/static/phnone_nine_icon.png new file mode 100644 index 00000000..2436cb4c Binary files /dev/null and b/2.sdk/project/K01/usr/static/phnone_nine_icon.png differ diff --git a/2.sdk/project/K01/usr/static/phone_seven_icon.png b/2.sdk/project/K01/usr/static/phone_seven_icon.png new file mode 100644 index 00000000..5965beb5 Binary files /dev/null and b/2.sdk/project/K01/usr/static/phone_seven_icon.png differ diff --git a/2.sdk/project/K01/usr/static/poweroff_icon.png b/2.sdk/project/K01/usr/static/poweroff_icon.png new file mode 100644 index 00000000..0aca766d Binary files /dev/null and b/2.sdk/project/K01/usr/static/poweroff_icon.png differ diff --git a/2.sdk/project/K01/usr/static/reduce_btn.png b/2.sdk/project/K01/usr/static/reduce_btn.png new file mode 100644 index 00000000..ba93fc18 Binary files /dev/null and b/2.sdk/project/K01/usr/static/reduce_btn.png differ diff --git a/2.sdk/project/K01/usr/static/stopwatch_play.png b/2.sdk/project/K01/usr/static/stopwatch_play.png new file mode 100644 index 00000000..028b3e14 Binary files /dev/null and b/2.sdk/project/K01/usr/static/stopwatch_play.png differ diff --git a/2.sdk/project/K01/usr/static/stopwatch_reset.png b/2.sdk/project/K01/usr/static/stopwatch_reset.png new file mode 100644 index 00000000..c5d70833 Binary files /dev/null and b/2.sdk/project/K01/usr/static/stopwatch_reset.png differ diff --git a/2.sdk/project/K01/usr/static/stopwatch_stop.png b/2.sdk/project/K01/usr/static/stopwatch_stop.png new file mode 100644 index 00000000..f4100c71 Binary files /dev/null and b/2.sdk/project/K01/usr/static/stopwatch_stop.png differ diff --git a/2.sdk/project/K01/usr/static/time_down.png b/2.sdk/project/K01/usr/static/time_down.png new file mode 100644 index 00000000..a5d13a35 Binary files /dev/null and b/2.sdk/project/K01/usr/static/time_down.png differ diff --git a/2.sdk/project/K01/usr/static/time_finish.png b/2.sdk/project/K01/usr/static/time_finish.png new file mode 100644 index 00000000..227e30d9 Binary files /dev/null and b/2.sdk/project/K01/usr/static/time_finish.png differ diff --git a/2.sdk/project/K01/usr/static/time_up.png b/2.sdk/project/K01/usr/static/time_up.png new file mode 100644 index 00000000..3c7d2bb8 Binary files /dev/null and b/2.sdk/project/K01/usr/static/time_up.png differ diff --git a/2.sdk/project/K01/usr/static/time_up1.png b/2.sdk/project/K01/usr/static/time_up1.png new file mode 100644 index 00000000..f5a9284f Binary files /dev/null and b/2.sdk/project/K01/usr/static/time_up1.png differ diff --git a/2.sdk/project/K01/usr/static/time_up2.png b/2.sdk/project/K01/usr/static/time_up2.png new file mode 100644 index 00000000..1e1edf07 Binary files /dev/null and b/2.sdk/project/K01/usr/static/time_up2.png differ diff --git a/2.sdk/project/K01/usr/static/update.png b/2.sdk/project/K01/usr/static/update.png new file mode 100644 index 00000000..8f33d015 Binary files /dev/null and b/2.sdk/project/K01/usr/static/update.png differ diff --git a/2.sdk/project/K01/usr/static/vbat_0.png b/2.sdk/project/K01/usr/static/vbat_0.png deleted file mode 100644 index eea15437..00000000 Binary files a/2.sdk/project/K01/usr/static/vbat_0.png and /dev/null differ diff --git a/2.sdk/project/K01/usr/static/vbat_100.png b/2.sdk/project/K01/usr/static/vbat_100.png deleted file mode 100644 index 195b82ab..00000000 Binary files a/2.sdk/project/K01/usr/static/vbat_100.png and /dev/null differ diff --git a/2.sdk/project/K01/usr/static/vbat_40.png b/2.sdk/project/K01/usr/static/vbat_40.png deleted file mode 100644 index f432c8bd..00000000 Binary files a/2.sdk/project/K01/usr/static/vbat_40.png and /dev/null differ diff --git a/2.sdk/project/K01/usr/static/vbat_60.png b/2.sdk/project/K01/usr/static/vbat_60.png deleted file mode 100644 index d3955e3e..00000000 Binary files a/2.sdk/project/K01/usr/static/vbat_60.png and /dev/null differ diff --git a/2.sdk/project/K01/usr/static/vbat_80.png b/2.sdk/project/K01/usr/static/vbat_80.png deleted file mode 100644 index 20a9b812..00000000 Binary files a/2.sdk/project/K01/usr/static/vbat_80.png and /dev/null differ diff --git a/2.sdk/project/K01/usr/static/xing_icon.png b/2.sdk/project/K01/usr/static/xing_icon.png new file mode 100644 index 00000000..2350f545 Binary files /dev/null and b/2.sdk/project/K01/usr/static/xing_icon.png differ