From: d15521469561 Date: Thu, 20 Apr 2023 06:51:48 +0000 (+0800) Subject: 字体调整 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=69a3c35e9fdf2f239e215edbbf0aa504f13d9c2f;p=mirrors%2FASR1603_G5.git 字体调整 一级界面调整 --- diff --git a/3.code/1.watch/2.code/alarm.py b/3.code/1.watch/2.code/alarm.py index de339a57..02dc74b2 100644 --- a/3.code/1.watch/2.code/alarm.py +++ b/3.code/1.watch/2.code/alarm.py @@ -41,7 +41,7 @@ style_cont_alarm.set_pad_bottom(0) # style_font_white = lv.style_t() # style_font_white.init() # style_font_white.set_text_color(lv.color_make(0xff, 0xff, 0xff)) -# style_font_white.set_text_font_v2("font_20.bin",18,0) +# style_font_white.set_text_font_v2("font_22.bin",22,0) # style_font_white.set_border_width(0) # style_font_white.set_pad_left(0) # style_font_white.set_pad_right(0) @@ -51,7 +51,7 @@ style_cont_alarm.set_pad_bottom(0) style_font_yellow = lv.style_t() style_font_yellow.init() style_font_yellow.set_text_color(lv.color_make(0xF1, 0xA3, 0x3B)) -style_font_yellow.set_text_font_v2("font_20.bin",18,0) +style_font_yellow.set_text_font_v2("font_22.bin",22,0) #背景样式 style_alarm_screen_default = lv.style_t() diff --git a/3.code/1.watch/2.code/appAlipay.py b/3.code/1.watch/2.code/appAlipay.py index 0a893591..b5e25fed 100644 --- a/3.code/1.watch/2.code/appAlipay.py +++ b/3.code/1.watch/2.code/appAlipay.py @@ -15,7 +15,7 @@ from ext.ui import Screen style_font_youyuan_20 = lv.style_t() style_font_youyuan_20.init() style_font_youyuan_20.set_text_color(lv.color_make(0xff, 0xff, 0xff)) -style_font_youyuan_20.set_text_font_v2("font_20.bin",20,0) +style_font_youyuan_20.set_text_font_v2("font_22.bin",22,0) style_btn_alipay = lv.style_t() style_btn_alipay.init() diff --git a/3.code/1.watch/2.code/mgr.py b/3.code/1.watch/2.code/mgr.py index 877a0a10..e904384a 100644 --- a/3.code/1.watch/2.code/mgr.py +++ b/3.code/1.watch/2.code/mgr.py @@ -435,29 +435,25 @@ class ConfigStoreManager(Abstract): def voice_callback(args): print('voicecall iinfo:{}'.format(args)) if args[0] == 10: - # print('voicecall incoming call, PhoneNO.: ', args[6]) + print('voicecall incoming call, PhoneNO.: ', args[6]) size_len = len(str(args[6])) tmp = [] tmp = args[6] find_num = tmp[0] - # print("tmp:{} find_num:{}".format(tmp,find_num)) b = tmp.isdigit()#判断是否不是数字开头 暂时不用 因为截取了+判断不了 if find_num != 0 and size_len > 11: tmp = tmp[size_len-11:] - # print('tmp end', tmp) EventMesh.publish("load_screen", {"screen": "incoming_call","meta":str(tmp)}) elif args[0] == 11: - # print('voicecall connected, PhoneNO.: ', args[6]) + print('voicecall connected, PhoneNO.: ', args[6]) size_len = len(str(args[6])) tmp = [] tmp = args[6] find_num = tmp[0] - # print("tmp:{} find_num:{}".format(tmp,find_num)) b = tmp.isdigit()#判断是否不是数字开头 暂时不用 因为截取了+判断不了 if find_num != 0 and size_len > 11: tmp = tmp[size_len-11:] - # print('tmp end', tmp) EventMesh.publish("load_screen", {"screen": "on_call","meta":str(tmp)}) elif args[0] == 12: diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL.png index 0cfd0673..3ddd503a 100644 Binary files a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL.png and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL_TEXT.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL_TEXT.png new file mode 100644 index 00000000..96827d4e Binary files /dev/null and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL_TEXT.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS.png index 8364c04b..8af90be3 100644 Binary files a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS.png and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS_TEXT.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS_TEXT.png new file mode 100644 index 00000000..40c23b2f Binary files /dev/null and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS_TEXT.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT.png index 47cd1dd5..21844e2c 100644 Binary files a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT.png and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT_TEXT.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT_TEXT.png new file mode 100644 index 00000000..fd242ea1 Binary files /dev/null and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT_TEXT.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS.png index ba6eb680..0d6a188f 100644 Binary files a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS.png and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS_TEXT.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS_TEXT.png new file mode 100644 index 00000000..a007052d Binary files /dev/null and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS_TEXT.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT.png index dbef69b6..5c6f17eb 100644 Binary files a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT.png and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT_TEXT.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT_TEXT.png new file mode 100644 index 00000000..4f286504 Binary files /dev/null and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT_TEXT.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE.png index d9e7fd03..f3c579ba 100644 Binary files a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE.png and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE_TEXT.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE_TEXT.png new file mode 100644 index 00000000..8f781c8c Binary files /dev/null and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE_TEXT.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS.png index 6055104d..457394ae 100644 Binary files a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS.png and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS_TEXT.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS_TEXT.png new file mode 100644 index 00000000..17bda1e8 Binary files /dev/null and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS_TEXT.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT.png index 316d84da..9b9a37f9 100644 Binary files a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT.png and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT_TEXT.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT_TEXT.png new file mode 100644 index 00000000..e960d2c3 Binary files /dev/null and b/3.code/1.watch/2.code/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT_TEXT.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/alipay_.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/alipay_.png index 78624e86..d4f435d0 100644 Binary files a/3.code/1.watch/2.code/static/main_menu/main_menu2/alipay_.png and b/3.code/1.watch/2.code/static/main_menu/main_menu2/alipay_.png differ diff --git a/3.code/1.watch/2.code/static/main_menu/main_menu2/alipay_TEXT.png b/3.code/1.watch/2.code/static/main_menu/main_menu2/alipay_TEXT.png new file mode 100644 index 00000000..347d6492 Binary files /dev/null and b/3.code/1.watch/2.code/static/main_menu/main_menu2/alipay_TEXT.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_app_qrcode.png b/3.code/1.watch/2.code/static/setting/menu_app_qrcode.png index c3bc579a..5f2d1559 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_app_qrcode.png and b/3.code/1.watch/2.code/static/setting/menu_app_qrcode.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_bright.png b/3.code/1.watch/2.code/static/setting/menu_bright.png index fec820d1..a95706b0 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_bright.png and b/3.code/1.watch/2.code/static/setting/menu_bright.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_imei_qrcode.png b/3.code/1.watch/2.code/static/setting/menu_imei_qrcode.png index 2e6a3797..8de9e4ee 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_imei_qrcode.png and b/3.code/1.watch/2.code/static/setting/menu_imei_qrcode.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_language.png b/3.code/1.watch/2.code/static/setting/menu_language.png index eea06312..f86bbf29 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_language.png and b/3.code/1.watch/2.code/static/setting/menu_language.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_poweroff.png b/3.code/1.watch/2.code/static/setting/menu_poweroff.png index c8bc1a9f..16862bed 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_poweroff.png and b/3.code/1.watch/2.code/static/setting/menu_poweroff.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_restore.png b/3.code/1.watch/2.code/static/setting/menu_restore.png index 4f790aa7..da81cc6f 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_restore.png and b/3.code/1.watch/2.code/static/setting/menu_restore.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_theme_switch.png b/3.code/1.watch/2.code/static/setting/menu_theme_switch.png index 186bf8c7..bba9bd1f 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_theme_switch.png and b/3.code/1.watch/2.code/static/setting/menu_theme_switch.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_upgrade.png b/3.code/1.watch/2.code/static/setting/menu_upgrade.png index 01202406..bc1ccea4 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_upgrade.png and b/3.code/1.watch/2.code/static/setting/menu_upgrade.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_version.png b/3.code/1.watch/2.code/static/setting/menu_version.png index 0b961822..6444f5c2 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_version.png and b/3.code/1.watch/2.code/static/setting/menu_version.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_volume.png b/3.code/1.watch/2.code/static/setting/menu_volume.png index db3848e8..d500a8bc 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_volume.png and b/3.code/1.watch/2.code/static/setting/menu_volume.png differ diff --git a/3.code/1.watch/2.code/static/setting/menu_watch_switch.png b/3.code/1.watch/2.code/static/setting/menu_watch_switch.png index bbdf05bb..0cfd3228 100644 Binary files a/3.code/1.watch/2.code/static/setting/menu_watch_switch.png and b/3.code/1.watch/2.code/static/setting/menu_watch_switch.png differ diff --git a/3.code/1.watch/2.code/static/setting/setting_text.png b/3.code/1.watch/2.code/static/setting/setting_text.png index da32b21c..2a03c470 100644 Binary files a/3.code/1.watch/2.code/static/setting/setting_text.png and b/3.code/1.watch/2.code/static/setting/setting_text.png differ diff --git a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_ALARM.png b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_ALARM.png index 43a640a7..9be00872 100644 Binary files a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_ALARM.png and b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_ALARM.png differ diff --git a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_COUNTDOWN.png b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_COUNTDOWN.png index 783242a0..71e7b980 100644 Binary files a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_COUNTDOWN.png and b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_COUNTDOWN.png differ diff --git a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STEP.png b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STEP.png index 13444069..af0acbe2 100644 Binary files a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STEP.png and b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STEP.png differ diff --git a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STOPWATCH.png b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STOPWATCH.png index ad52858d..0d8e1ade 100644 Binary files a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STOPWATCH.png and b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_STOPWATCH.png differ diff --git a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_WEATHER.png b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_WEATHER.png index afd87172..e869cb6c 100644 Binary files a/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_WEATHER.png and b/3.code/1.watch/2.code/static/tool/IMAGE_SECMENU_WEATHER.png differ diff --git a/3.code/1.watch/2.code/static/tool/tool_text.png b/3.code/1.watch/2.code/static/tool/tool_text.png index cfc75d23..cbed113c 100644 Binary files a/3.code/1.watch/2.code/static/tool/tool_text.png and b/3.code/1.watch/2.code/static/tool/tool_text.png differ diff --git a/3.code/1.watch/2.code/ui.py b/3.code/1.watch/2.code/ui.py index 51fd43b3..84e9afb4 100644 --- a/3.code/1.watch/2.code/ui.py +++ b/3.code/1.watch/2.code/ui.py @@ -33,7 +33,7 @@ style_screen.set_pad_bottom(0) style_font_youyuan_20 = lv.style_t() style_font_youyuan_20.init() style_font_youyuan_20.set_text_color(lv.color_make(0xff, 0xff, 0xff)) -style_font_youyuan_20.set_text_font_v2("font_20.bin",20,0) +style_font_youyuan_20.set_text_font_v2("font_22.bin",22,0) style_font_youyuan_40 = lv.style_t() style_font_youyuan_40.init() @@ -43,7 +43,7 @@ style_font_youyuan_40.set_text_font_v2("font_40.bin",40,0) style_font_youyuan_20_black = lv.style_t() style_font_youyuan_20_black.init() style_font_youyuan_20_black.set_text_color(lv.color_make(0x00, 0x00, 0x00)) -style_font_youyuan_20_black.set_text_font_v2("font_20.bin",20,0) +style_font_youyuan_20_black.set_text_font_v2("font_22.bin",22,0) class LabelStyle(object): diff --git a/3.code/1.watch/2.code/ui_WatchFaceScreen.py b/3.code/1.watch/2.code/ui_WatchFaceScreen.py index a4c4f906..e6c39bba 100644 --- a/3.code/1.watch/2.code/ui_WatchFaceScreen.py +++ b/3.code/1.watch/2.code/ui_WatchFaceScreen.py @@ -11,7 +11,7 @@ import ujson style_font_youyuan_20 = lv.style_t() style_font_youyuan_20.init() style_font_youyuan_20.set_text_color(lv.color_make(0xff, 0xff, 0xff)) -style_font_youyuan_20.set_text_font_v2("font_20.bin",20,0) +style_font_youyuan_20.set_text_font_v2("font_22.bin",22,0) class Watchface1(): @@ -84,210 +84,123 @@ class Watchface1(): #时间 x = 40 y = 80 - self.watchface1_time1_img = lv.img(self.meta) - self.watchface1_time1_img.set_pos(int(x),int(y)) - self.watchface1_time1_img.set_size(36,44) - self.watchface1_time1_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_time1_img.add_flag(lv.obj.FLAG.CLICKABLE) - self.watchface1_time1_img.set_src("E:/static/watch_plate/style_1/time/1.png") - self.watchface1_time1_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) + # self.watchface1_time1_img = lv.img(self.meta) + # self.watchface1_time1_img.set_pos(int(x),int(y)) + # self.watchface1_time1_img.set_size(36,44) + # self.watchface1_time1_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # self.watchface1_time1_img.add_flag(lv.obj.FLAG.CLICKABLE) + # self.watchface1_time1_img.set_src("E:/static/watch_plate/style_1/time/1.png") + # self.watchface1_time1_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) - self.watchface1_time2_img = lv.img(self.meta) - self.watchface1_time2_img.set_pos(int(x+36),int(y)) - self.watchface1_time2_img.set_size(36,44) - self.watchface1_time2_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_time2_img.add_flag(lv.obj.FLAG.CLICKABLE) - self.watchface1_time2_img.set_src("E:/static/watch_plate/style_1/time/3.png") - self.watchface1_time2_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) - - self.watchface1_time3_img = lv.img(self.meta) - self.watchface1_time3_img.set_pos(int(x+36+36+4),int(y+11)) - self.watchface1_time3_img.set_size(8,24) - self.watchface1_time3_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_time3_img.add_flag(lv.obj.FLAG.CLICKABLE) - self.watchface1_time3_img.set_src("E:/static/watch_plate/style_1/time/colon.png") - self.watchface1_time3_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) - - self.watchface1_time4_img = lv.img(self.meta) - self.watchface1_time4_img.set_pos(int(x+36+36+4+12),int(y)) - self.watchface1_time4_img.set_size(36,44) - self.watchface1_time4_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_time4_img.add_flag(lv.obj.FLAG.CLICKABLE) - self.watchface1_time4_img.set_src("E:/static/watch_plate/style_1/time/2.png") - self.watchface1_time4_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) - - self.watchface1_time5_img = lv.img(self.meta) - self.watchface1_time5_img.set_pos(int(x+36+36+4+12+36),int(y)) - self.watchface1_time5_img.set_size(36,44) - self.watchface1_time5_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_time5_img.add_flag(lv.obj.FLAG.CLICKABLE) - self.watchface1_time5_img.set_src("E:/static/watch_plate/style_1/time/3.png") - self.watchface1_time5_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) + # self.watchface1_time2_img = lv.img(self.meta) + # self.watchface1_time2_img.set_pos(int(x+36),int(y)) + # self.watchface1_time2_img.set_size(36,44) + # self.watchface1_time2_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # self.watchface1_time2_img.add_flag(lv.obj.FLAG.CLICKABLE) + # self.watchface1_time2_img.set_src("E:/static/watch_plate/style_1/time/3.png") + # self.watchface1_time2_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) + + # self.watchface1_time3_img = lv.img(self.meta) + # self.watchface1_time3_img.set_pos(int(x+36+36+4),int(y+11)) + # self.watchface1_time3_img.set_size(8,24) + # self.watchface1_time3_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # self.watchface1_time3_img.add_flag(lv.obj.FLAG.CLICKABLE) + # self.watchface1_time3_img.set_src("E:/static/watch_plate/style_1/time/colon.png") + # self.watchface1_time3_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) + + # self.watchface1_time4_img = lv.img(self.meta) + # self.watchface1_time4_img.set_pos(int(x+36+36+4+12),int(y)) + # self.watchface1_time4_img.set_size(36,44) + # self.watchface1_time4_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # self.watchface1_time4_img.add_flag(lv.obj.FLAG.CLICKABLE) + # self.watchface1_time4_img.set_src("E:/static/watch_plate/style_1/time/2.png") + # self.watchface1_time4_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) + + # self.watchface1_time5_img = lv.img(self.meta) + # self.watchface1_time5_img.set_pos(int(x+36+36+4+12+36),int(y)) + # self.watchface1_time5_img.set_size(36,44) + # self.watchface1_time5_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # self.watchface1_time5_img.add_flag(lv.obj.FLAG.CLICKABLE) + # self.watchface1_time5_img.set_src("E:/static/watch_plate/style_1/time/3.png") + # self.watchface1_time5_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) # create style self.watchface1_style_default - self.watchface1_style_default = lv.style_t() - self.watchface1_style_default.init() - self.watchface1_style_default.set_radius(0) - self.watchface1_style_default.set_bg_color(lv.color_make(0x21,0x95,0xf6)) - self.watchface1_style_default.set_bg_grad_color(lv.color_make(0x21,0x95,0xf6)) - self.watchface1_style_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) - self.watchface1_style_default.set_bg_opa(0) - self.watchface1_style_default.set_border_color(lv.color_make(0x00,0x00,0x00)) - self.watchface1_style_default.set_border_width(0) - self.watchface1_style_default.set_border_opa(255) - self.watchface1_style_default.set_pad_left(0) - self.watchface1_style_default.set_pad_right(0) - self.watchface1_style_default.set_pad_top(0) - self.watchface1_style_default.set_pad_bottom(0) - self.watchface1_style_default.set_text_font_v2("font_20.bin",20,0) #将外部字体库与该style对象绑定 + style_font_youyuan_70_black = lv.style_t() style_font_youyuan_70_black.init() style_font_youyuan_70_black.set_text_color(lv.color_make(0x32, 0xc8, 0xdb)) - style_font_youyuan_70_black.set_text_font_v2("font_70.bin",70,0) + style_font_youyuan_70_black.set_text_font(lv.font_70_bold) - # self.watchface1_time1_text = lv.label(self.meta) - # self.watchface1_time1_text.set_pos(44, 60) - # self.watchface1_time1_text.set_size(190, 100) - # self.watchface1_time1_text.set_align(lv.TEXT_ALIGN.LEFT) - # self.watchface1_time1_text.set_text("12:00") - # self.watchface1_time1_text.add_style(style_font_youyuan_70_black, lv.PART.MAIN|lv.STATE.DEFAULT) - # self.watchface1_time1 = lv.spangroup(self.meta) - # self.watchface1_time1.set_pos(int(24),int(60)) - # self.watchface1_time1.set_size(216,100) - # self.watchface1_time1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - # self.watchface1_time1.set_overflow(lv.SPAN_OVERFLOW.CLIP) - # self.watchface1_time1.set_mode(lv.SPAN_MODE.BREAK) - # self.watchface1_time1_span = self.watchface1_time1.new_span() - # self.watchface1_time1_span.set_text("12:00") - # self.watchface1_time1_span.style.set_text_color(lv.color_make(0x32,0xc8,0xdb)) - # self.watchface1_time1_span.style.set_text_decor(lv.TEXT_DECOR.NONE) - # self.watchface1_time1.refr_mode() - # # add style for main_style_1_spangroup_week - # self.watchface1_time1.add_style(self.watchface1_styletime_default, lv.PART.MAIN|lv.STATE.DEFAULT) + self.watchface1_time1_text = lv.label(self.meta) + self.watchface1_time1_text.set_pos(20, 60) + self.watchface1_time1_text.set_size(190, 71) + self.watchface1_time1_text.set_align(lv.TEXT_ALIGN.LEFT) + self.watchface1_time1_text.set_text("12:00") + self.watchface1_time1_text.add_style(style_font_youyuan_70_black, lv.PART.MAIN|lv.STATE.DEFAULT) #日期 - self.watchface1_date = lv.spangroup(self.meta) - self.watchface1_date.set_pos(int(24),int(131)) - self.watchface1_date.set_size(84,25) - self.watchface1_date.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_date.set_align(lv.TEXT_ALIGN.LEFT) - self.watchface1_date.set_overflow(lv.SPAN_OVERFLOW.CLIP) - self.watchface1_date.set_mode(lv.SPAN_MODE.BREAK) - self.watchface1_date_span = self.watchface1_date.new_span() + self.watchface1_date_span = lv.label(self.meta) + self.watchface1_date_span.set_pos(24, 131) + self.watchface1_date_span.set_size(84, 30) + self.watchface1_date_span.set_align(lv.TEXT_ALIGN.LEFT) self.watchface1_date_span.set_text("12月9日") - self.watchface1_date_span.style.set_text_color(lv.color_make(0xe0,0xd7,0xd7)) - self.watchface1_date_span.style.set_text_decor(lv.TEXT_DECOR.NONE) - self.watchface1_date_span.style.set_size(100) - self.watchface1_date.refr_mode() - - # add style for main_style_1_spangroup_date - self.watchface1_date.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT) + self.watchface1_date_span.add_style(style_font_youyuan_20, lv.PART.MAIN|lv.STATE.DEFAULT) #星期 - self.watchface1_week = lv.spangroup(self.meta) - self.watchface1_week.set_pos(int(29),int(166)) - self.watchface1_week.set_size(80,25) - self.watchface1_week.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_week.set_align(lv.TEXT_ALIGN.LEFT) - self.watchface1_week.set_overflow(lv.SPAN_OVERFLOW.CLIP) - self.watchface1_week.set_mode(lv.SPAN_MODE.BREAK) - self.watchface1_week_span = self.watchface1_week.new_span() + self.watchface1_week_span = lv.label(self.meta) + self.watchface1_week_span.set_pos(24, 163) + self.watchface1_week_span.set_size(70, 30) + self.watchface1_week_span.set_align(lv.TEXT_ALIGN.LEFT) self.watchface1_week_span.set_text("星期四") - self.watchface1_week_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7)) - self.watchface1_week_span.style.set_text_decor(lv.TEXT_DECOR.NONE) - self.watchface1_week.refr_mode() - # add style for main_style_1_spangroup_week - self.watchface1_week.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT) - - # #阴历 - # self.watchface1_lunar_calendar = lv.spangroup(self.meta) - # self.watchface1_lunar_calendar.set_pos(int(124),int(131)) - # self.watchface1_lunar_calendar.set_size(110,17) - # self.watchface1_lunar_calendar.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - # self.watchface1_lunar_calendar.set_align(lv.TEXT_ALIGN.LEFT) - # self.watchface1_lunar_calendar.set_overflow(lv.SPAN_OVERFLOW.CLIP) - # self.watchface1_lunar_calendar.set_mode(lv.SPAN_MODE.BREAK) - # self.watchface1_lunar_calendar_span = self.watchface1_lunar_calendar.new_span() - # self.watchface1_lunar_calendar_span.set_text("三月初三") - # self.watchface1_lunar_calendar_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7)) - # self.watchface1_lunar_calendar_span.style.set_text_decor(lv.TEXT_DECOR.NONE) - # self.watchface1_lunar_calendar.refr_mode() - # # add style for main_style_1_spangroup_week - # self.watchface1_lunar_calendar.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT) + self.watchface1_week_span.add_style(style_font_youyuan_20, lv.PART.MAIN|lv.STATE.DEFAULT) #计步 - self.watchface1_step_img = lv.img(self.meta) - self.watchface1_step_img.set_pos(int(130),int(160)) - self.watchface1_step_img.set_size(26,24) - self.watchface1_step_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_step_img.add_flag(lv.obj.FLAG.CLICKABLE) - self.watchface1_step_img.set_src("E:/static/watch_plate/style_1/step.png") - self.watchface1_step_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) - - self.watchface1_step_txt = lv.spangroup(self.meta) - self.watchface1_step_txt.set_pos(int(170),int(163)) - self.watchface1_step_txt.set_size(70,25) - self.watchface1_step_txt.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_step_txt.set_align(lv.TEXT_ALIGN.LEFT) - self.watchface1_step_txt.set_overflow(lv.SPAN_OVERFLOW.CLIP) - self.watchface1_step_txt.set_mode(lv.SPAN_MODE.BREAK) - self.watchface1_step_span = self.watchface1_step_txt.new_span() + # self.watchface1_step_img = lv.img(self.meta) + # self.watchface1_step_img.set_pos(int(130),int(160)) + # self.watchface1_step_img.set_size(26,24) + # self.watchface1_step_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # self.watchface1_step_img.add_flag(lv.obj.FLAG.CLICKABLE) + # self.watchface1_step_img.set_src("E:/static/watch_plate/style_1/step.png") + # self.watchface1_step_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) + + self.watchface1_step_span = lv.label(self.meta) + self.watchface1_step_span.set_pos(170, 163) + self.watchface1_step_span.set_size(70, 30) + self.watchface1_step_span.set_align(lv.TEXT_ALIGN.LEFT) self.watchface1_step_span.set_text("0") - self.watchface1_step_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7)) - self.watchface1_step_span.style.set_text_decor(lv.TEXT_DECOR.NONE) - #self.watchface1_week_step_span.style.set_text_font(lv.font_harmony_19) - self.watchface1_step_txt.refr_mode() - # add style for main_style_1_spangroup_week - self.watchface1_step_txt.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT) + self.watchface1_step_span.add_style(style_font_youyuan_20, lv.PART.MAIN|lv.STATE.DEFAULT) #心律 - self.watchface1_HB_img = lv.img(self.meta) - self.watchface1_HB_img.set_pos(int(53),int(198)) - self.watchface1_HB_img.set_size(30,27) - self.watchface1_HB_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_HB_img.add_flag(lv.obj.FLAG.CLICKABLE) - self.watchface1_HB_img.set_src("E:/static/watch_plate/style_1/heart.png") - self.watchface1_HB_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) - - self.watchface1_HB_txt = lv.spangroup(self.meta) - self.watchface1_HB_txt.set_pos(int(55),int(235)) - self.watchface1_HB_txt.set_size(80,25) - self.watchface1_HB_txt.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_HB_txt.set_align(lv.TEXT_ALIGN.LEFT) - self.watchface1_HB_txt.set_overflow(lv.SPAN_OVERFLOW.CLIP) - self.watchface1_HB_txt.set_mode(lv.SPAN_MODE.BREAK) - self.watchface1_HB_span = self.watchface1_HB_txt.new_span() + # self.watchface1_HB_img = lv.img(self.meta) + # self.watchface1_HB_img.set_pos(int(53),int(198)) + # self.watchface1_HB_img.set_size(30,27) + # self.watchface1_HB_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # self.watchface1_HB_img.add_flag(lv.obj.FLAG.CLICKABLE) + # self.watchface1_HB_img.set_src("E:/static/watch_plate/style_1/heart.png") + # self.watchface1_HB_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) + + self.watchface1_HB_span = lv.label(self.meta) + self.watchface1_HB_span.set_pos(55, 235) + self.watchface1_HB_span.set_size(80, 30) + self.watchface1_HB_span.set_align(lv.TEXT_ALIGN.LEFT) self.watchface1_HB_span.set_text("0") - self.watchface1_HB_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7)) - self.watchface1_HB_span.style.set_text_decor(lv.TEXT_DECOR.NONE) - #self.watchface1_week_HB_span.style.set_text_font(lv.font_harmony_19) - self.watchface1_HB_txt.refr_mode() - # add style for main_style_1_spangroup_week - self.watchface1_HB_txt.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT) + self.watchface1_HB_span.add_style(style_font_youyuan_20, lv.PART.MAIN|lv.STATE.DEFAULT) #血氧 - self.watchface1_SPO2_img = lv.img(self.meta) - self.watchface1_SPO2_img.set_pos(int(161),int(193)) - self.watchface1_SPO2_img.set_size(23,32) - self.watchface1_SPO2_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_SPO2_img.add_flag(lv.obj.FLAG.CLICKABLE) - self.watchface1_SPO2_img.set_src("E:/static/watch_plate/style_1/blood.png") - self.watchface1_SPO2_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) + # self.watchface1_SPO2_img = lv.img(self.meta) + # self.watchface1_SPO2_img.set_pos(int(161),int(193)) + # self.watchface1_SPO2_img.set_size(23,32) + # self.watchface1_SPO2_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # self.watchface1_SPO2_img.add_flag(lv.obj.FLAG.CLICKABLE) + # self.watchface1_SPO2_img.set_src("E:/static/watch_plate/style_1/blood.png") + # self.watchface1_SPO2_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT) - self.watchface1_SPO2_txt = lv.spangroup(self.meta) - self.watchface1_SPO2_txt.set_pos(int(160),int(235)) - self.watchface1_SPO2_txt.set_size(80,25) - self.watchface1_SPO2_txt.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) - self.watchface1_SPO2_txt.set_align(lv.TEXT_ALIGN.LEFT) - self.watchface1_SPO2_txt.set_overflow(lv.SPAN_OVERFLOW.CLIP) - self.watchface1_SPO2_txt.set_mode(lv.SPAN_MODE.BREAK) - self.watchface1_SPO2_span = self.watchface1_SPO2_txt.new_span() + self.watchface1_SPO2_span = lv.label(self.meta) + self.watchface1_SPO2_span.set_pos(160, 235) + self.watchface1_SPO2_span.set_size(80, 30) + self.watchface1_SPO2_span.set_align(lv.TEXT_ALIGN.LEFT) self.watchface1_SPO2_span.set_text("0") - self.watchface1_SPO2_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7)) - self.watchface1_SPO2_span.style.set_text_decor(lv.TEXT_DECOR.NONE) - #self.watchface1_week_SPO2_span.style.set_text_font(lv.font_harmony_19) - self.watchface1_SPO2_txt.refr_mode() - # add style for main_style_1_spangroup_week - self.watchface1_SPO2_txt.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT) + self.watchface1_SPO2_span.add_style(style_font_youyuan_20, lv.PART.MAIN|lv.STATE.DEFAULT) + @@ -342,11 +255,11 @@ class Watchface1(): hour2_chose = (msg[0][0])%10 min1_chose = (msg[0][1])//10%10 min2_chose = (msg[0][1])%10 - # self.watchface1_time1_text.set_text("{}:{}".format("%02d"%(msg[0][0]),"%02d"%(msg[0][1]))) - self.watchface1_time1_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(hour1_chose)) - self.watchface1_time2_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(hour2_chose)) - self.watchface1_time4_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(min1_chose)) - self.watchface1_time5_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(min2_chose)) + self.watchface1_time1_text.set_text("{}:{}".format("%02d"%(msg[0][0]),"%02d"%(msg[0][1]))) + # self.watchface1_time1_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(hour1_chose)) + # self.watchface1_time2_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(hour2_chose)) + # self.watchface1_time4_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(min1_chose)) + # self.watchface1_time5_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(min2_chose)) self.watchface1_date_span.set_text(msg[2])#日期 self.watchface1_week_span.set_text(msg[3]) #星期 @@ -499,7 +412,7 @@ class Watchface2(): self.watchface1_style_default.set_pad_right(0) self.watchface1_style_default.set_pad_top(0) self.watchface1_style_default.set_pad_bottom(0) - self.watchface1_style_default.set_text_font_v2("font_20.bin",20,0) #将外部字体库与该style对象绑定 + self.watchface1_style_default.set_text_font_v2("font_22.bin",22,0) #将外部字体库与该style对象绑定 # self.watchface1_time1_text = lv.label(self.meta) # self.watchface1_time1_text.set_pos(44, 60) diff --git a/3.code/1.watch/2.code/ui_main_menu.py b/3.code/1.watch/2.code/ui_main_menu.py index aa1d2ac8..b64b4022 100644 --- a/3.code/1.watch/2.code/ui_main_menu.py +++ b/3.code/1.watch/2.code/ui_main_menu.py @@ -30,12 +30,12 @@ style_MainMenu_img_default.set_img_opa(255) style_font_youyuan_20 = lv.style_t() style_font_youyuan_20.init() style_font_youyuan_20.set_text_color(lv.color_make(0xff, 0xff, 0xff)) -style_font_youyuan_20.set_text_font_v2("font_20.bin",20,0) +style_font_youyuan_20.set_text_font_v2("font_22.bin",22,0) style_font_youyuan_25 = lv.style_t() style_font_youyuan_25.init() style_font_youyuan_25.set_text_color(lv.color_make(0xff, 0xff, 0xff)) -style_font_youyuan_25.set_text_font_v2("font_20.bin",20,0) +style_font_youyuan_25.set_text_font_v2("font_22.bin",22,0) style_btn = lv.style_t() style_btn.init() @@ -378,12 +378,18 @@ class MainMenu2(): label_text.set_size(0, 0) label_text.set_text("1") self.MainMenu2_img_alipay = lv.img(self.MainMenu2_alipay) - self.MainMenu2_img_alipay.set_size(160,230) + self.MainMenu2_img_alipay.set_size(160,160) self.MainMenu2_img_alipay.set_pos(40,20) self.MainMenu2_img_alipay.set_src("E:/static/main_menu/main_menu2/alipay_.png") self.MainMenu2_img_alipay.add_flag(lv.obj.FLAG.CLICKABLE) self.MainMenu2_img_alipay.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + self.MainMenu2_img_alipay_text = lv.img(self.MainMenu2_alipay) + self.MainMenu2_img_alipay_text.set_size(160,39) + self.MainMenu2_img_alipay_text.set_pos(40,210) + self.MainMenu2_img_alipay_text.set_src("E:/static/main_menu/main_menu2/alipay_TEXT.png") + self.MainMenu2_img_alipay_text.add_flag(lv.obj.FLAG.CLICKABLE) + self.MainMenu2_img_alipay_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) # self.label_alipay.set_long_mode(lv.label.LONG.WRAP) # self.label_alipay.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) # self.label_alipay.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -394,12 +400,18 @@ class MainMenu2(): label_text.set_size(0, 0) label_text.set_text("2") self.MainMenu2_img_phone = lv.img(self.MainMenu2_phone) - self.MainMenu2_img_phone.set_size(160,230) + self.MainMenu2_img_phone.set_size(160,160) self.MainMenu2_img_phone.set_pos(40,20) self.MainMenu2_img_phone.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL.png") self.MainMenu2_img_phone.add_flag(lv.obj.FLAG.CLICKABLE) self.MainMenu2_img_phone.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + self.MainMenu2_img_phone_text = lv.img(self.MainMenu2_phone) + self.MainMenu2_img_phone_text.set_size(160,39) + self.MainMenu2_img_phone_text.set_pos(40,210) + self.MainMenu2_img_phone_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL_TEXT.png") + self.MainMenu2_img_phone_text.add_flag(lv.obj.FLAG.CLICKABLE) + self.MainMenu2_img_phone_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) # self.label_phone = lv.label(self.MainMenu2_phone) # self.label_phone.set_pos(0, 240) # self.label_phone.set_size(240, 80) @@ -415,12 +427,18 @@ class MainMenu2(): label_text.set_size(0, 0) label_text.set_text("3") self.MainMenu2_img_contacts = lv.img(self.MainMenu2_contacts) - self.MainMenu2_img_contacts.set_size(160,230) + self.MainMenu2_img_contacts.set_size(160,160) self.MainMenu2_img_contacts.set_pos(40,20) self.MainMenu2_img_contacts.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS.png") self.MainMenu2_img_contacts.add_flag(lv.obj.FLAG.CLICKABLE) self.MainMenu2_img_contacts.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + self.MainMenu2_img_contacts_text = lv.img(self.MainMenu2_contacts) + self.MainMenu2_img_contacts_text.set_size(160,39) + self.MainMenu2_img_contacts_text.set_pos(40,210) + self.MainMenu2_img_contacts_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS_TEXT.png") + self.MainMenu2_img_contacts_text.add_flag(lv.obj.FLAG.CLICKABLE) + self.MainMenu2_img_contacts_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) # self.label_contacts = lv.label(self.MainMenu2_contacts) # self.label_contacts.set_pos(0, 240) # self.label_contacts.set_size(240, 80) @@ -436,12 +454,18 @@ class MainMenu2(): label_text.set_size(0, 0) label_text.set_text("4") self.MainMenu2_img_heartrate = lv.img(self.MainMenu2_heartrate) - self.MainMenu2_img_heartrate.set_size(160,230) + self.MainMenu2_img_heartrate.set_size(160,160) self.MainMenu2_img_heartrate.set_pos(40,20) self.MainMenu2_img_heartrate.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT.png") self.MainMenu2_img_heartrate.add_flag(lv.obj.FLAG.CLICKABLE) self.MainMenu2_img_heartrate.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + self.MainMenu2_img_heartrate_text = lv.img(self.MainMenu2_heartrate) + self.MainMenu2_img_heartrate_text.set_size(160,39) + self.MainMenu2_img_heartrate_text.set_pos(40,210) + self.MainMenu2_img_heartrate_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT_TEXT.png") + self.MainMenu2_img_heartrate_text.add_flag(lv.obj.FLAG.CLICKABLE) + self.MainMenu2_img_heartrate_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) # self.label_heartrate = lv.label(self.MainMenu2_heartrate) # self.label_heartrate.set_pos(0, 240) # self.label_heartrate.set_size(240, 80) @@ -457,12 +481,18 @@ class MainMenu2(): label_text.set_size(0, 0) label_text.set_text("5") self.MainMenu2_img_spo2 = lv.img(self.MainMenu2_spo2) - self.MainMenu2_img_spo2.set_size(160,230) + self.MainMenu2_img_spo2.set_size(160,160) self.MainMenu2_img_spo2.set_pos(40,20) self.MainMenu2_img_spo2.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT.png") self.MainMenu2_img_spo2.add_flag(lv.obj.FLAG.CLICKABLE) self.MainMenu2_img_spo2.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + self.MainMenu2_img_spo2_text = lv.img(self.MainMenu2_spo2) + self.MainMenu2_img_spo2_text.set_size(160,39) + self.MainMenu2_img_spo2_text.set_pos(40,210) + self.MainMenu2_img_spo2_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT_TEXT.png") + self.MainMenu2_img_spo2_text.add_flag(lv.obj.FLAG.CLICKABLE) + self.MainMenu2_img_spo2_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) # self.label_spo2 = lv.label(self.MainMenu2_spo2) # self.label_spo2.set_pos(0, 240) # self.label_spo2.set_size(240, 80) @@ -478,12 +508,18 @@ class MainMenu2(): label_text.set_size(0, 0) label_text.set_text("6") self.MainMenu2_img_toolbox = lv.img(self.MainMenu2_toolbox) - self.MainMenu2_img_toolbox.set_size(160,230) + self.MainMenu2_img_toolbox.set_size(160,160) self.MainMenu2_img_toolbox.set_pos(40,20) self.MainMenu2_img_toolbox.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS.png") self.MainMenu2_img_toolbox.add_flag(lv.obj.FLAG.CLICKABLE) self.MainMenu2_img_toolbox.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + self.MainMenu2_img_toolbox_text = lv.img(self.MainMenu2_toolbox) + self.MainMenu2_img_toolbox_text.set_size(160,39) + self.MainMenu2_img_toolbox_text.set_pos(40,210) + self.MainMenu2_img_toolbox_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS_TEXT.png") + self.MainMenu2_img_toolbox_text.add_flag(lv.obj.FLAG.CLICKABLE) + self.MainMenu2_img_toolbox_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) # self.label_toolbox = lv.label(self.MainMenu2_toolbox) # self.label_toolbox.set_pos(0, 240) # self.label_toolbox.set_size(240, 80) @@ -499,12 +535,18 @@ class MainMenu2(): label_text.set_size(0, 0) label_text.set_text("7") self.MainMenu2_img_setting = lv.img(self.MainMenu2_setting) - self.MainMenu2_img_setting.set_size(160,230) + self.MainMenu2_img_setting.set_size(160,160) self.MainMenu2_img_setting.set_pos(40,20) self.MainMenu2_img_setting.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS.png") self.MainMenu2_img_setting.add_flag(lv.obj.FLAG.CLICKABLE) self.MainMenu2_img_setting.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + self.MainMenu2_img_setting_text = lv.img(self.MainMenu2_setting) + self.MainMenu2_img_setting_text.set_size(160,39) + self.MainMenu2_img_setting_text.set_pos(40,210) + self.MainMenu2_img_setting_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS_TEXT.png") + self.MainMenu2_img_setting_text.add_flag(lv.obj.FLAG.CLICKABLE) + self.MainMenu2_img_setting_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) # self.label_setting = lv.label(self.MainMenu2_setting) # self.label_setting.set_pos(0, 240) # self.label_setting.set_size(240, 80) @@ -520,12 +562,18 @@ class MainMenu2(): label_text.set_size(0, 0) label_text.set_text("8") self.MainMenu2_img_temperature = lv.img(self.MainMenu2_temperature) - self.MainMenu2_img_temperature.set_size(160,230) + self.MainMenu2_img_temperature.set_size(160,160) self.MainMenu2_img_temperature.set_pos(40,20) self.MainMenu2_img_temperature.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE.png") self.MainMenu2_img_temperature.add_flag(lv.obj.FLAG.CLICKABLE) self.MainMenu2_img_temperature.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + self.MainMenu2_img_temperature_text = lv.img(self.MainMenu2_temperature) + self.MainMenu2_img_temperature_text.set_size(160,39) + self.MainMenu2_img_temperature_text.set_pos(40,210) + self.MainMenu2_img_temperature_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE_TEXT.png") + self.MainMenu2_img_temperature_text.add_flag(lv.obj.FLAG.CLICKABLE) + self.MainMenu2_img_temperature_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) # self.label_temperature = lv.label(self.MainMenu2_temperature) # self.label_temperature.set_pos(0, 240) # self.label_temperature.set_size(240, 80) @@ -541,11 +589,18 @@ class MainMenu2(): label_text.set_size(0, 0) label_text.set_text("9") self.MainMenu2_img_wechat = lv.img(self.MainMenu2_wechat) - self.MainMenu2_img_wechat.set_size(160,230) + self.MainMenu2_img_wechat.set_size(160,160) self.MainMenu2_img_wechat.set_pos(40,20) self.MainMenu2_img_wechat.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT.png") self.MainMenu2_img_wechat.add_flag(lv.obj.FLAG.CLICKABLE) self.MainMenu2_img_wechat.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + + self.MainMenu2_img_wechat_text = lv.img(self.MainMenu2_wechat) + self.MainMenu2_img_wechat_text.set_size(160,39) + self.MainMenu2_img_wechat_text.set_pos(40,210) + self.MainMenu2_img_wechat_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT_TEXT.png") + self.MainMenu2_img_wechat_text.add_flag(lv.obj.FLAG.CLICKABLE) + self.MainMenu2_img_wechat_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) # self.label_wechat = lv.label(self.MainMenu2_wechat) # self.label_wechat.set_pos(0, 240)