From: dxy15521469561 <1731678236@qq.com> Date: Fri, 20 Oct 2023 09:57:01 +0000 (+0800) Subject: C06S: X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=db33c334eb98449d562334b4e2b05199e66c5185;p=mirrors%2FASR1603_G5.git C06S: UI界面调整 --- diff --git a/2.sdk/project/C06S/ext/static/IMAGE_APP_QR_CODE.png b/2.sdk/project/C06S/ext/static/IMAGE_APP_QR_CODE.png index 546c32b9..f0098880 100644 Binary files a/2.sdk/project/C06S/ext/static/IMAGE_APP_QR_CODE.png and b/2.sdk/project/C06S/ext/static/IMAGE_APP_QR_CODE.png differ diff --git a/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEY00_ICON.png b/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEY00_ICON.png new file mode 100644 index 00000000..15b6108a Binary files /dev/null and b/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEY00_ICON.png differ diff --git a/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEY07_ICON.png b/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEY07_ICON.png new file mode 100644 index 00000000..86893a4b Binary files /dev/null and b/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEY07_ICON.png differ diff --git a/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEY09_ICON.png b/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEY09_ICON.png new file mode 100644 index 00000000..4bc6134c Binary files /dev/null and b/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEY09_ICON.png differ diff --git a/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEYHASH00_ICON.png b/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEYHASH00_ICON.png new file mode 100644 index 00000000..b3803db8 Binary files /dev/null and b/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEYHASH00_ICON.png differ diff --git a/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEYSTAR00_ICON.png b/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEYSTAR00_ICON.png new file mode 100644 index 00000000..c3e133f2 Binary files /dev/null and b/2.sdk/project/C06S/ext/static/IMAGE_NUMBER_KEYSTAR00_ICON.png differ diff --git a/2.sdk/project/C06S/ext/static/list_bg.png b/2.sdk/project/C06S/ext/static/list_bg.png new file mode 100644 index 00000000..1df9b00e Binary files /dev/null and b/2.sdk/project/C06S/ext/static/list_bg.png differ diff --git a/2.sdk/project/C06S/ext/static/spo2_gif01.png b/2.sdk/project/C06S/ext/static/spo2_gif01.png index 69e124e1..c53c815e 100644 Binary files a/2.sdk/project/C06S/ext/static/spo2_gif01.png and b/2.sdk/project/C06S/ext/static/spo2_gif01.png differ diff --git a/2.sdk/project/C06S/ext/static/spo2_gif02.png b/2.sdk/project/C06S/ext/static/spo2_gif02.png index 8fffc671..10783e1c 100644 Binary files a/2.sdk/project/C06S/ext/static/spo2_gif02.png and b/2.sdk/project/C06S/ext/static/spo2_gif02.png differ diff --git a/2.sdk/project/C06S/ext/static/spo2_gif03.png b/2.sdk/project/C06S/ext/static/spo2_gif03.png index 23ee5d31..3e60471c 100644 Binary files a/2.sdk/project/C06S/ext/static/spo2_gif03.png and b/2.sdk/project/C06S/ext/static/spo2_gif03.png differ diff --git a/2.sdk/project/C06S/ext/static/spo2_gif04.png b/2.sdk/project/C06S/ext/static/spo2_gif04.png index 60af6830..9dc7362a 100644 Binary files a/2.sdk/project/C06S/ext/static/spo2_gif04.png and b/2.sdk/project/C06S/ext/static/spo2_gif04.png differ diff --git a/2.sdk/project/C06S/ext/static/temp_gif01.png b/2.sdk/project/C06S/ext/static/temp_gif01.png index b1585cdf..b97b09ed 100644 Binary files a/2.sdk/project/C06S/ext/static/temp_gif01.png and b/2.sdk/project/C06S/ext/static/temp_gif01.png differ diff --git a/2.sdk/project/C06S/ext/static/temp_gif02.png b/2.sdk/project/C06S/ext/static/temp_gif02.png index 6065cbba..e8d94e81 100644 Binary files a/2.sdk/project/C06S/ext/static/temp_gif02.png and b/2.sdk/project/C06S/ext/static/temp_gif02.png differ diff --git a/2.sdk/project/C06S/ext/static/temp_gif03.png b/2.sdk/project/C06S/ext/static/temp_gif03.png index 4833bc5d..feab0c71 100644 Binary files a/2.sdk/project/C06S/ext/static/temp_gif03.png and b/2.sdk/project/C06S/ext/static/temp_gif03.png differ diff --git a/2.sdk/project/C06S/ext/static/temp_high.png b/2.sdk/project/C06S/ext/static/temp_high.png index d18ab2fa..301e9593 100644 Binary files a/2.sdk/project/C06S/ext/static/temp_high.png and b/2.sdk/project/C06S/ext/static/temp_high.png differ diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/alarm.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/alarm.py index 22814c3e..a9f28e79 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/alarm.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/alarm.py @@ -11,7 +11,7 @@ import ujson import ql_fs from misc import Power import audio -from ui import style_img,style_screen,style_font_youyuan_20 +from ui import style_img,style_screen,style_font_youyuan_20,LCD_SIZE_H,LCD_SIZE_W import ntptime #ntptime.settime(timezone=8) @@ -32,8 +32,8 @@ 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_radius(0) +style_cont_alarm.set_bg_color(lv.color_make(51, 51,51)) +style_cont_alarm.set_radius(5) style_cont_alarm.set_pad_left(0) style_cont_alarm.set_pad_right(0) style_cont_alarm.set_pad_top(0) @@ -55,6 +55,10 @@ style_font_yellow.init() style_font_yellow.set_text_color(lv.color_make(0xF1, 0xA3, 0x3B)) style_font_yellow.set_text_font_v2("font_28.bin",28,0) +alarm_style_font_youyuan_20_gray = lv.style_t() +alarm_style_font_youyuan_20_gray.init() +alarm_style_font_youyuan_20_gray.set_text_color(lv.color_make(100, 100, 100)) +alarm_style_font_youyuan_20_gray.set_text_font_v2("font_28.bin",28,0) #背景样式 style_alarm_screen_default = lv.style_t() style_alarm_screen_default.init() @@ -74,11 +78,10 @@ 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.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_list_title_bg.set_ext_click_area(40) 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(0, 12) +clk_list_title.set_size(240, 38) 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,8 +101,8 @@ 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, 60) +clk_list_screen1_1.set_size(240, LCD_SIZE_H-60) clk_list_screen1_1.add_style(style_alarm_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -113,7 +116,7 @@ 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_size(240, (LCD_SIZE_H-65)-170) no_add_alarm.set_text("闹钟暂未设置") no_add_alarm.set_long_mode(lv.label.LONG.WRAP) no_add_alarm.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -871,6 +874,7 @@ class PopupAlarmScreen(Screen): self.close_timer() EventMesh.publish("load_screen", {"screen": "main_menu"}) +ALARM_LIST_SIZE = 70 #闹钟列表 class ClkListScreen(Screen): NAME = "clk_list" @@ -885,8 +889,8 @@ class ClkListScreen(Screen): self.weekdays_list = ["日","一","二","三","四","五","六"] EventMesh.subscribe("push_update_alarm_show", self.update_show_info) 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.set_pos(0, 60) + self.alarm_show_list.set_size(240, LCD_SIZE_H-60) 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) self.timer=osTimer() @@ -904,7 +908,7 @@ class ClkListScreen(Screen): _btn_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) _btn_label3 = lv.label(_btn) _btn_label3.set_long_mode(lv.label.LONG.DOT) - _btn_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + _btn_label3.add_style(alarm_style_font_youyuan_20_gray, lv.PART.MAIN | lv.STATE.DEFAULT) self.contact_detail_listt_dict.append({"_btn":_btn,"_btn_label1":_btn_label1,"_btn_label2":_btn_label2,"_btn_label3":_btn_label3}) def initialization(self): @@ -930,13 +934,6 @@ class ClkListScreen(Screen): # print("nalarm_list:{}".format(alarm_list)) 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.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()) num = 0 count = 0 clock_nums = len(self.clock_list)-2#3-2 = 1 0 @@ -955,8 +952,8 @@ class ClkListScreen(Screen): continue print("count1:{}".format(count)) #_btn = lv.btn(self.alarm_show_list) - self.contact_detail_listt_dict[count]["_btn"].set_size(230,75) - self.contact_detail_listt_dict[count]["_btn"].set_pos(8,79*count) + self.contact_detail_listt_dict[count]["_btn"].set_size(230,ALARM_LIST_SIZE) + self.contact_detail_listt_dict[count]["_btn"].set_pos(5,(ALARM_LIST_SIZE+4)*count) # self.contact_detail_listt_dict[i]["_btn"].add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) # self.contact_detail_listt_dict[i]["_btn"].add_event_cb(lambda e: EventMesh.callback_wrapper(self.edit_alarm(e)), # lv.EVENT.CLICKED, None) @@ -969,8 +966,8 @@ class ClkListScreen(Screen): self.contact_detail_listt_dict[count]["_btn_label1"].set_text(str(num)) #_btn_label2 = lv.label(_btn) - self.contact_detail_listt_dict[count]["_btn_label2"].set_pos(8, 10) - self.contact_detail_listt_dict[count]["_btn_label2"].set_size(97, 40) + self.contact_detail_listt_dict[count]["_btn_label2"].set_pos(20, 8) + self.contact_detail_listt_dict[count]["_btn_label2"].set_size(97, 28) self.contact_detail_listt_dict[count]["_btn_label2"].set_text("%02d" % each["hour"] + ":"+"%02d" % each["minute"]) # _btn_label2.set_text(str(each["days"])) @@ -982,8 +979,8 @@ class ClkListScreen(Screen): repeart = each["repeart"] _output = [self.weekdays_list[x] for x in _new_list] #_btn_label3 = lv.label(_btn) - self.contact_detail_listt_dict[count]["_btn_label3"].set_pos(5, 44) - self.contact_detail_listt_dict[count]["_btn_label3"].set_size(200, 40) + self.contact_detail_listt_dict[count]["_btn_label3"].set_pos(20, 40) + self.contact_detail_listt_dict[count]["_btn_label3"].set_size(200, 28) print("_new_list:{} repeart:{}".format(_new_list,repeart)) if repeart == 1: self.contact_detail_listt_dict[count]["_btn_label3"].set_text("一次") @@ -995,24 +992,6 @@ class ClkListScreen(Screen): # _btn_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) self.contact_detail_listt_dict[count]["_btn_label3"].set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) self.contact_detail_listt_dict[count]["_btn"].clear_flag(lv.obj.FLAG.HIDDEN) - # _btn_switch = lv.switch(_btn) - # _btn_switch.set_pos(178, 29) - # _btn_switch.set_size(50, 25) - # _btn_switch.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.INDICATOR) - # _btn_switch.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.INDICATOR| lv.STATE.CHECKED) - # _btn_switch.add_event_cb(lambda e: - # self.switch_event_cb(e), - # lv.EVENT.VALUE_CHANGED, - # None) - - # _btn_switch.set_style_bg_color(lv.color_make(0xf1, 0xa3, 0x3b),lv.PART.KNOB| lv.STATE.CHECKED) - # _btn_switch.set_style_bg_color(lv.color_make(0x3d, 0x3d, 0x3d),lv.PART.KNOB) - - # _btn_switch.set_ext_click_area(40) - # if each["enabled"]: - # _btn_switch.add_state(lv.STATE.CHECKED) - # else: - # _btn_switch.clear_state(lv.STATE.CHECKED) count+=1 if count == 0: no_add_alarm_img.clear_flag(lv.obj.FLAG.HIDDEN) @@ -1064,9 +1043,11 @@ class ClkListScreen(Screen): # EventMesh.publish("set_rtc_alarm") # print("sw_event_cb ~~~") - - def done_return(self): + def done_left_to_right(self): EventMesh.publish("load_screen", {"screen": "toolbox"}) + + # def done_return(self): + # EventMesh.publish("load_screen", {"screen": "toolbox"}) def btn1_release(self): EventMesh.publish("load_screen", {"screen": "toolbox"}) diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/appFactoryMode.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/appFactoryMode.py index ee21b2e0..10b43b41 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/appFactoryMode.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/appFactoryMode.py @@ -125,12 +125,48 @@ class FactoryModeScreen(Screen): NAME = "factorymode" def __init__(self): super().__init__() + self.is_sliding = 0 self.meta = factorymode_screen - factorymode_location.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModeLocation"})), lv.EVENT.CLICKED, None) + factorymode_location.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeLocation")), lv.EVENT.CLICKED, None) #factorymode_alipay_init.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModeAlipayInit"})), lv.EVENT.CLICKED, None) - factorymode_bat_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModeBatTest"})), lv.EVENT.CLICKED, None) - factorymode_hsensor_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModeHsensorTest"})), lv.EVENT.CLICKED, None) - factorymode_log.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModeLog"})), lv.EVENT.CLICKED, None) + factorymode_bat_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeBatTest")), lv.EVENT.CLICKED, None) + factorymode_hsensor_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeHsensorTest")), lv.EVENT.CLICKED, None) + factorymode_log.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeLog")), lv.EVENT.CLICKED, None) + + factorymode_location.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeLocation")), lv.EVENT.PRESSING, None) + #factorymode_alipay_init.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModeAlipayInit"})), lv.EVENT.CLICKED, None) + factorymode_bat_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeBatTest")), lv.EVENT.PRESSING, None) + factorymode_hsensor_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeHsensorTest")), lv.EVENT.PRESSING, None) + factorymode_log.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeLog")), lv.EVENT.PRESSING, None) + + def initialization(self): + self.is_sliding = 0 + pass + + def location_mode(self, e, msg): + code = e.get_code() + EventMesh.publish("publish_message_event_ui",{"func":self.location_mode_do,"data":[code,msg]}) + def location_mode_do(self, data): + #code = e.get_code() + + code = data[0] + msg = data[1] + + #print("code!!!!!!!!",code,msg) + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) + print("2self.is_sliding",self.is_sliding) + + self.is_sliding =0 + def done_return(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) @@ -156,7 +192,7 @@ FactoryModeLog_label_obj.set_pos(0, 0) FactoryModeLog_label = lv.label(FactoryModeLog_label_obj) FactoryModeLog_label.set_text("") FactoryModeLog_label.set_size(240, lv.SIZE.CONTENT) -FactoryModeLog_label.set_pos(0, 0) +FactoryModeLog_label.set_pos(0, 10) FactoryModeLog_label.set_long_mode(lv.label.LONG.WRAP) FactoryModeLog_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) FactoryModeLog_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -235,6 +271,9 @@ class FactoryModeLogScreen(Screen): self.log_data = "" pass + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "factorymode"}) + def done_return(self): EventMesh.publish("load_screen", {"screen": "factorymode"}) @@ -247,7 +286,7 @@ class FactoryModeLogScreen(Screen): #hsensor测试 FactoryModeHsensorTest_screen = lv.obj() FactoryModeHsensorTest_screen.center() -FactoryModeHsensorTest_screen.set_size(240, 320) +FactoryModeHsensorTest_screen.set_size(240, 284) FactoryModeHsensorTest_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) FactoryModeHsensorTest_label = lv.label(FactoryModeHsensorTest_screen) @@ -346,6 +385,9 @@ class FactoryModeHsensorTestScreen(Screen): def done_return(self): EventMesh.publish("load_screen", {"screen": "factorymode"}) + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "factorymode"}) + def btn1_release(self): EventMesh.publish("load_screen", {"screen": "factorymode"}) @@ -356,13 +398,14 @@ class FactoryModeHsensorTestScreen(Screen): #电池测试 FactoryModeBatTest_screen = lv.obj() FactoryModeBatTest_screen.center() -FactoryModeBatTest_screen.set_size(240, 320) +FactoryModeBatTest_screen.set_size(240, 284) FactoryModeBatTest_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) FactoryModeBatTest_label = lv.label(FactoryModeBatTest_screen) FactoryModeBatTest_label.set_text("Vbat:0V") FactoryModeBatTest_label.set_size(240, 100) -FactoryModeBatTest_label.set_pos(50, 100) +FactoryModeBatTest_label.set_pos(0, 100) +FactoryModeBatTest_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) FactoryModeBatTest_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) FactoryModeBatTest_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -389,6 +432,8 @@ class FactoryModeBatTestScreen(Screen): def Close(self): self.BatTest_timer.stop() pass + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "factorymode"}) def done_return(self): EventMesh.publish("load_screen", {"screen": "factorymode"}) @@ -464,7 +509,7 @@ FactoryModeLocation_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAU FactoryModeLocation_GNSS_label = lv.label(FactoryModeLocation_screen) FactoryModeLocation_GNSS_label.set_text("GNSS:\n") FactoryModeLocation_GNSS_label.set_size(240, lv.SIZE.CONTENT) -FactoryModeLocation_GNSS_label.set_pos(0, 0) +FactoryModeLocation_GNSS_label.set_pos(0, 10) FactoryModeLocation_GNSS_label.set_long_mode(lv.label.LONG.WRAP) FactoryModeLocation_GNSS_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) FactoryModeLocation_GNSS_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -569,6 +614,8 @@ class FactoryModeLocationScreen(Screen): EventMesh.publish(constants.EVENT.CLOSE_LOCATION) self.timer_FactoryModeLocation.stop() + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "factorymode"}) def done_return(self): EventMesh.publish("load_screen", {"screen": "factorymode"}) diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/appWechat.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/appWechat.py index 404efffe..02ec3bbe 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/appWechat.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/appWechat.py @@ -7,7 +7,7 @@ import ujson import ql_fs import audio from machine import Pin -from ui import style_font_youyuan_20,style_screen,Screen,style_font_youyuan_20_black,style_img +from ui import style_font_youyuan_20,style_screen,Screen,style_font_youyuan_20_black,style_img,LCD_SIZE_H,LCD_SIZE_W import audio from machine import Pin import utime @@ -56,37 +56,37 @@ 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_size(LCD_SIZE_W, LCD_SIZE_H-60) 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, (LCD_SIZE_H-60)+4) +wechat_press_btn.set_size(LCD_SIZE_W-20, 56) wechat_press_btn.add_style(style_wechat_btn, lv.PART.MAIN | lv.STATE.DEFAULT) wechat_press_btn.add_style(style_common_bg_rect_btn_pressed, lv.PART.MAIN | lv.STATE.PRESSED) wechat_press_btn.set_style_radius(30,0) wechat_press_label = lv.label(wechat_screen) wechat_press_label.set_text("请按住说话") -wechat_press_label.set_size(240, 38) -wechat_press_label.set_pos(0,282) +wechat_press_label.set_size(LCD_SIZE_W, 38) +wechat_press_label.set_pos(0,(LCD_SIZE_H-60)+22) 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, (LCD_SIZE_H//2)-10) +wechat_label.set_size(LCD_SIZE_W, 40) 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, ((LCD_SIZE_H//2)-10)-40) +wechat_press_label_countdown.set_size(LCD_SIZE_W, 40) 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) @@ -284,7 +284,7 @@ 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 if value.find("S:") != -1 or value.find("R:") != -1: @@ -595,7 +595,7 @@ class WechatScreen(Screen): self.countdown = 15 wechat_press_label_countdown.set_text("{}S".format(str(self.countdown))) - def done_return(self): + def done_left_to_right(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn1_release(self): @@ -609,12 +609,12 @@ class WechatScreen(Screen): wechat_popup_screen = lv.obj() print("wechat_popup_screen") wechat_popup_screen.center() -wechat_popup_screen.set_size(240, 320) +wechat_popup_screen.set_size(LCD_SIZE_W, LCD_SIZE_H) wechat_popup_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) wechat_popup_title = lv.label(wechat_popup_screen) -wechat_popup_title.set_pos(0, 150) -wechat_popup_title.set_size(240, 40) +wechat_popup_title.set_pos(0, (LCD_SIZE_H//2)-10) +wechat_popup_title.set_size(LCD_SIZE_W, 40) wechat_popup_title.set_text("你有新的微聊消息") wechat_popup_title.set_long_mode(lv.label.LONG.WRAP) wechat_popup_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/mgr.py index 970e8b50..891be474 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/mgr.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/mgr.py @@ -2246,7 +2246,7 @@ class LocationManager(Abstract): #检查基站数据 if self.cell_data == []: data_tmp = net.getCellInfo() - if(len(data_tmp)>=2): + if(len(str(data_tmp))>=2): for cell in data_tmp: if cell and cell[0][0] == 0 and len(cell[0]) > 1: self.cell_data = cell diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/protocol.py index 7588d8f3..e117ed9d 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/protocol.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/protocol.py @@ -1090,7 +1090,7 @@ class btemp2_ProtoCol(ProtoCol):#上传体温数据 send_data = self.PID+"*%s*%04X*btemp2"%(self.imei,len_size) MD5_head_data = self.PID+"*%s*%04X*%s"%(self.imei,len_size,"btemp2") MD5_SIGN = self.pack_MD5_head(MD5_head_data) - data = "[%s%s,%d,%f]"%(str(MD5_SIGN),send_data,1,msg[1]) + data = "[%s%s,%d,%s]"%(str(MD5_SIGN),send_data,1,msg[1]) # print("btemp2:data:%s"%(data)) # 通过socket发送到服务器端 EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py index 7983609f..155398f2 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py @@ -312,7 +312,8 @@ class PhoneScreen(Screen): self.timer = osTimer() self.timer_cb = 0 self.count = 0 - + self.zero_button = 0 + self.is_sliding = 0 def initialization(self): @@ -320,7 +321,7 @@ class PhoneScreen(Screen): self.phone_list = [] 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 - + self.is_sliding = 0 if phone_screen == None: phone_screen = lv.obj() @@ -329,13 +330,13 @@ class PhoneScreen(Screen): phone_line = lv.line(phone_screen) phone_line.set_points(phone_line_points,2) - phone_line.set_pos(235,14) - phone_line.set_size(2,40) + phone_line.set_pos(220,20) + phone_line.set_size(2,30) 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, 20) + phone_label.set_pos(0, 24) phone_label.set_size(0, 48) phone_label.set_text(" ") phone_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -346,7 +347,7 @@ class PhoneScreen(Screen): phone_one.set_src("E:/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(3, 60) + phone_one.set_pos(3, 78) phone_one.set_size(76, 50) phone_two = lv.img(phone_screen)#2 @@ -354,77 +355,77 @@ class PhoneScreen(Screen): phone_two.set_src("E:/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(82, 60) + phone_two.set_pos(82, 78) phone_three = lv.img(phone_screen)#3 phone_three.set_size(76, 50) phone_three.set_src("E:/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(161, 60) + phone_three.set_pos(161, 78) phone_four = lv.img(phone_screen)#4 phone_four.set_size(76, 50) phone_four.set_src("E:/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(3, 112) + phone_four.set_pos(3, 130) phone_five = lv.img(phone_screen)#5 phone_five.set_size(76, 50) phone_five.set_src("E:/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(82, 112) + phone_five.set_pos(82, 130) phone_six = lv.img(phone_screen)#6 phone_six.set_size(76, 50) phone_six.set_src("E:/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(161, 112) + phone_six.set_pos(161, 130) phone_seven = lv.img(phone_screen)#7 phone_seven.set_size(76, 50) phone_seven.set_src("E:/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(3, 164) + phone_seven.set_pos(3, 182) phone_eight = lv.img(phone_screen)#8 phone_eight.set_size(76, 50) phone_eight.set_src("E:/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(82, 164) + phone_eight.set_pos(82, 182) phone_nine = lv.img(phone_screen)#9 phone_nine.set_size(76, 50) phone_nine.set_src("E:/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(161, 164) + phone_nine.set_pos(161, 182) phone_call = lv.img(phone_screen)#拨号 phone_call.set_size(76, 50) phone_call.set_src("E:/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(3, 216) + phone_call.set_pos(3, 234) phone_zero = lv.img(phone_screen)#0 phone_zero.set_size(76, 50) phone_zero.set_src("E:/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(82, 216) + phone_zero.set_pos(82, 234) phone_delete = lv.img(phone_screen)#删除 phone_delete.set_size(76, 50) phone_delete.set_src("E:/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(161, 216) + phone_delete.set_pos(161, 234) # phone_call = lv.img(phone_screen) # phone_call.set_size(76, 50) @@ -434,9 +435,9 @@ class PhoneScreen(Screen): # phone_call.set_pos(3, 270) phone_call_btn = lv.img(phone_screen) - phone_call_btn.set_size(76, 68) + phone_call_btn.set_size(76, 50) phone_call_btn.add_flag(lv.obj.FLAG.CLICKABLE) - phone_call_btn.set_pos(3, 216) + phone_call_btn.set_pos(3, 234) # phone_contact = lv.img(phone_screen) # phone_contact.set_size(64, 50) @@ -458,47 +459,85 @@ class PhoneScreen(Screen): # phone_delete.set_pos(161, 216) phone_delete_btn = lv.img(phone_screen) - phone_delete_btn.set_size(76, 68) + phone_delete_btn.set_size(76, 50) phone_delete_btn.add_flag(lv.obj.FLAG.CLICKABLE) - phone_delete_btn.set_pos(161, 216) + phone_delete_btn.set_pos(161, 234) self.meta = phone_screen phone_one.add_event_cb(lambda e: EventMesh.callback_wrapper(self.one(e)), - lv.EVENT.CLICKED, None) + lv.EVENT.SHORT_CLICKED, None) + # phone_one.add_event_cb(lambda e: EventMesh.callback_wrapper(self.one(e)), + # lv.EVENT.PRESSING, None) + phone_two.add_event_cb(lambda e: EventMesh.callback_wrapper(self.two(e)), - lv.EVENT.CLICKED, None) + lv.EVENT.SHORT_CLICKED, None) + # phone_two.add_event_cb(lambda e: EventMesh.callback_wrapper(self.two(e)), + # lv.EVENT.PRESSING, None) + phone_three.add_event_cb(lambda e: EventMesh.callback_wrapper(self.three(e)), - lv.EVENT.CLICKED, None) + lv.EVENT.SHORT_CLICKED, None) + # phone_three.add_event_cb(lambda e: EventMesh.callback_wrapper(self.three(e)), + # lv.EVENT.PRESSING, None) + phone_four.add_event_cb(lambda e: EventMesh.callback_wrapper(self.four(e)), - lv.EVENT.CLICKED, None) + lv.EVENT.SHORT_CLICKED, None) + # phone_four.add_event_cb(lambda e: EventMesh.callback_wrapper(self.four(e)), + # lv.EVENT.PRESSING, None) + phone_five.add_event_cb(lambda e: EventMesh.callback_wrapper(self.five(e)), - lv.EVENT.CLICKED, None) + lv.EVENT.SHORT_CLICKED, None) + # phone_five.add_event_cb(lambda e: EventMesh.callback_wrapper(self.five(e)), + # lv.EVENT.PRESSING, 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)), - lv.EVENT.CLICKED, None) + lv.EVENT.SHORT_CLICKED, None) + # phone_six.add_event_cb(lambda e: EventMesh.callback_wrapper(self.six(e)), + # lv.EVENT.PRESSING, None) + phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.seven(e)), + lv.EVENT.SHORT_CLICKED, None) + phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.seven_longpress(e)), lv.EVENT.LONG_PRESSED, None) + phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.seven_release(e)), + lv.EVENT.RELEASED, None) + # phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.seven(e)), + # lv.EVENT.PRESSING, 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) + lv.EVENT.SHORT_CLICKED, None) + # phone_eight.add_event_cb(lambda e: EventMesh.callback_wrapper(self.eight(e)), + # lv.EVENT.PRESSING, None) + phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.nine(e)), + lv.EVENT.SHORT_CLICKED, None) + phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.nine_longpress(e)), lv.EVENT.LONG_PRESSED, None) + phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.nine_release(e)), + lv.EVENT.RELEASED, None) + # phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.nine(e)), + # lv.EVENT.PRESSING, None) 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.zero(e)), + lv.EVENT.SHORT_CLICKED, None) + phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero_longpress(e)), lv.EVENT.LONG_PRESSED, None) + phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero_release(e)), + lv.EVENT.RELEASED, None) + # phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero(e)), + # lv.EVENT.PRESSING, None) phone_call_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.call(e)), - lv.EVENT.CLICKED, None) + lv.EVENT.SHORT_CLICKED, None) + phone_call_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.call(e)), + lv.EVENT.PRESSING, None) # # phone_contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.contact(e)), # lv.EVENT.CLICKED, None) phone_delete_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.delete(e)), - lv.EVENT.CLICKED, None) + lv.EVENT.SHORT_CLICKED, None) + phone_delete_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.delete(e)), + lv.EVENT.PRESSING, None) + # # phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), # lv.EVENT.CLICKED, None)#短按显示* @@ -526,7 +565,7 @@ class PhoneScreen(Screen): if self.timer_cb == 0: self.timer_cb = 1 self.timer.start(1000,1,self.refresh_line) - + self.zero_button = 0 def refresh_line(self,e): if self.count > 2 : @@ -536,13 +575,16 @@ class PhoneScreen(Screen): else: phone_line.add_flag(lv.obj.FLAG.HIDDEN) self.count+=1 + def one(self,e): - if len(self.phone_list) >= PHONE_CALL_MAX_DATA: - #self.phone_list.pop(0) - return - self.phone_list.append("1") - self.phone_num = ''.join(self.phone_list) - self.show_num() + code = e.get_code() + if code == lv.EVENT.SHORT_CLICKED: + if len(self.phone_list) >= PHONE_CALL_MAX_DATA: + #self.phone_list.pop(0) + return + self.phone_list.append("1") + self.phone_num = ''.join(self.phone_list) + self.show_num() def two(self,e): if len(self.phone_list) >= PHONE_CALL_MAX_DATA: @@ -585,10 +627,21 @@ class PhoneScreen(Screen): self.show_num() def seven(self,e): - if len(self.phone_list) >= PHONE_CALL_MAX_DATA: - #self.phone_list.pop(0) + self.zero_button = 0 + + + def seven_longpress(self,e): + self.zero_button = 1 + + def seven_release(self,e): + if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 + self.zero_button = 0 return - self.phone_list.append("7") + if self.zero_button == 1: + self.phone_list.append("*") + else: + self.phone_list.append("7") + self.zero_button = 0 self.phone_num = ''.join(self.phone_list) self.show_num() @@ -601,26 +654,47 @@ class PhoneScreen(Screen): self.show_num() def nine(self,e): - if len(self.phone_list) >= PHONE_CALL_MAX_DATA: - #self.phone_list.pop(0) + self.zero_button = 0 + + def nine_longpress(self,e): + self.zero_button = 1 + pass + def nine_release(self,e): + if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 + self.zero_button = 0 return - self.phone_list.append("9") + if self.zero_button == 1: + self.phone_list.append("#") + else: + self.phone_list.append("9") + self.zero_button = 0 self.phone_num = ''.join(self.phone_list) self.show_num() def zero(self,e): + self.zero_button = 0 + + def zero_longpress(self,e): + self.zero_button = 1 + pass + + def zero_release(self,e): if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 - #self.phone_list.pop(0) + self.zero_button = 0 return - self.phone_list.append("0") + if self.zero_button == 1: + self.phone_list.append("+") + else: + self.phone_list.append("0") + self.zero_button = 0 self.phone_num = ''.join(self.phone_list) self.show_num() - - def start(self,e): - self.button = 0 + def pressed_start(self,e): self.button = 1 + + def Close(self): self.timer_cb = 0 self.timer.stop() @@ -657,55 +731,66 @@ class PhoneScreen(Screen): EventMesh.publish("load_screen", {"screen": "contacts"}) def call(self,e): - if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1: - self.name = None - self.phonebook = {} - self.number_tmp = {} - if len(self.phone_list) != 0: - data = EventMesh.publish("get_phonebook_list") - if data != None: - check = data[0] - self.phonebook = data[1] - # print("check :{}".format(check)) - if check == 1:#检查通讯录 - phonebook_keys = sorted(self.phonebook.keys()) - b = str(self.phone_num) in self.phonebook.values()#查找key中是否包含content电话号码 True 包含在里面 False不包含在里面 - j = 0 - if b == True: - for i in range(len(self.phonebook)): #字典 key value - #'001:张三':15521469561 - name = self.phonebook[phonebook_keys[j]] - name_value = phonebook_keys[j] - number_tmp = str(self.phone_num) - # print("name :{} number_tmp:{}".format(name,number_tmp)) - if name.find(number_tmp) != -1:#查找电话号码是否在通讯录里面 - number_f= name_value - name_s = number_f.split(':') - name_s = name_s[1] - self.name = name_s - break - j+=1 - else: - self.name = self.phone_num - else: - self.name = self.phone_num + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 - EventMesh.publish("save_phonenum",self.phone_num) - EventMesh.publish("save_phonename",self.name)# - EventMesh.publish("load_screen", {"screen": "dialing_noplay_popup"}) - else: - EventMesh.publish("load_screen", {"screen": "no_valied_num_screen"}) - else:#未插卡 - EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) - + elif code == lv.EVENT.SHORT_CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1: + self.name = None + self.phonebook = {} + self.number_tmp = {} + if len(self.phone_list) != 0: + data = EventMesh.publish("get_phonebook_list") + if data != None: + check = data[0] + self.phonebook = data[1] + # print("check :{}".format(check)) + if check == 1:#检查通讯录 + phonebook_keys = sorted(self.phonebook.keys()) + b = str(self.phone_num) in self.phonebook.values()#查找key中是否包含content电话号码 True 包含在里面 False不包含在里面 + j = 0 + if b == True: + for i in range(len(self.phonebook)): #字典 key value + #'001:张三':15521469561 + name = self.phonebook[phonebook_keys[j]] + name_value = phonebook_keys[j] + number_tmp = str(self.phone_num) + # print("name :{} number_tmp:{}".format(name,number_tmp)) + if name.find(number_tmp) != -1:#查找电话号码是否在通讯录里面 + number_f= name_value + name_s = number_f.split(':') + name_s = name_s[1] + self.name = name_s + break + j+=1 + else: + self.name = self.phone_num + else: + self.name = self.phone_num + + EventMesh.publish("save_phonenum",self.phone_num) + EventMesh.publish("save_phonename",self.name)# + EventMesh.publish("load_screen", {"screen": "dialing_noplay_popup"}) + else: + EventMesh.publish("load_screen", {"screen": "no_valied_num_screen"}) + else:#未插卡 + EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) + + self.is_sliding = 0 def show_num(self): #print("self.phone_num ",self.phone_num,self.phone_list) len_t = len(self.phone_list)*40 - if len_t > 230: - len_t = 230 + if len_t > 215: + len_t = 215 phone_label.set_size(len_t,48) - phone_label.set_pos(230-len_t,20) + phone_label.set_pos(215-len_t,24) phone_label.set_text(self.phone_num) def lcd_on(self): @@ -718,7 +803,7 @@ class PhoneScreen(Screen): self.timer.stop() - def done_return(self): + def done_left_to_right(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn1_release(self): @@ -849,26 +934,19 @@ class CallLogScreen(Screen): global call_log_screen,contacts_cont_list ,call_log_title ,none_call_log_title ,call_log_cont_list_screen h = 0 if call_log_screen != None: - self.check_json = True - if self.check_json == True: - # if self.check_json == True and len(self.read_call_log) != 0: + if self.check_json == True and len(self.read_call_log) != 0: none_call_log_title.set_text(" ") - # sort_tmp = self.read_call_log.values() - # sort_new = sorted(sort_tmp, key = lambda i: i['timesec'],reverse = True)#按照时间戳进行排序 去掉最旧的一次数据如果满了五十条 + sort_tmp = self.read_call_log.values() + sort_new = sorted(sort_tmp, key = lambda i: i['timesec'],reverse = True)#按照时间戳进行排序 去掉最旧的一次数据如果满了五十条 # print("self.call_log :{} \r\n sort_new:{}\r\n".format(self.read_call_log,sort_new)) self.call_log_detail_list.clear_flag(lv.obj.FLAG.HIDDEN)#隐藏空文本 - for i in range(6): #字典 key value - # 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"]#获取电话号码 - # num_time = sort_new_tmp["time"]#获取电话号码 - - num_count = "6"#获取通话次数 - num_name = "邓雪英hi的话提高速度速度速度速"#获取名称 - num_phonnum = "129392849839483948038"#获取电话号码 - num_time = "time"# + + 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"]#获取电话号码 + num_time = sort_new_tmp["time"]#获取电话号码 # print("num_count :{} num_name:{} num_time:{}".format(num_count,num_name,num_time)) #_btn = lv.btn(self.call_log_detail_list) @@ -989,6 +1067,9 @@ class CallLogScreen(Screen): def done_return(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + def btn1_release(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) @@ -1014,8 +1095,10 @@ class DialingScreen(Screen): self.call_log_value = {} self.read_call_log = {} self.number_tmp = {} + self.is_sliding =0 self.CALL_LOG_MAX = CALL_LOG_MAX def initialization(self): + self.is_sliding =0 EventMesh.publish("set_UI_high_priority", 1) global dialing_screen,dialing_img,dialing_name ,hangup_imgbtn if dialing_screen == None: @@ -1024,20 +1107,20 @@ class DialingScreen(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_pos(80, 10) dialing_img.set_size(64, 64) dialing_img.set_src("E:/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, 110) + dialing_name.set_pos(0, 90) dialing_name.set_size(LCD_SIZE_W, 50) dialing_name.set_text(" ") 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, 170) + dialing_call_label.set_pos(0, 150) dialing_call_label.set_size(LCD_SIZE_W, 50) dialing_call_label.set_text("正在等待对方接\n听电话") dialing_call_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -1051,6 +1134,8 @@ class DialingScreen(Screen): hangup_imgbtn.set_pos(80, 210) hangup_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), lv.EVENT.CLICKED, None) + hangup_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), + lv.EVENT.PRESSING, None) self.meta = dialing_screen if dialing_name != None: name = EventMesh.publish("get_phonename")#获取拨打电话名称 @@ -1061,17 +1146,30 @@ class DialingScreen(Screen): def hangup(self,e): - EventMesh.publish("set_UI_high_priority", 0) - EventMesh.publish("set_hangup_mode", 1) - voiceCall.callEnd() - EventMesh.publish("set_interrup_incall",0) - EventMesh.publish("set_UI_high_priority",0) - + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 - screen_NAME = EventMesh.publish("get_screen_NAME") - if screen_NAME != None: - if screen_NAME != "dialing_noplay_popup": - EventMesh.publish("load_screen", {"screen": "main_menu"}) + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + EventMesh.publish("set_UI_high_priority", 0) + EventMesh.publish("set_hangup_mode", 1) + voiceCall.callEnd() + EventMesh.publish("set_interrup_incall",0) + EventMesh.publish("set_UI_high_priority",0) + + + screen_NAME = EventMesh.publish("get_screen_NAME") + if screen_NAME != None: + if screen_NAME != "dialing_noplay_popup": + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + self.is_sliding =0 + def Close(self): self.timer.stop() @@ -1119,14 +1217,14 @@ 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_pos(0, 100) no_sim_popup_screen_title1.set_size(LCD_SIZE_W, 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_pos(0, 150) no_sim_popup_screen_title2.set_size(LCD_SIZE_W, 40) no_sim_popup_screen_title2.set_text("无网络") no_sim_popup_screen_title2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -1178,19 +1276,19 @@ class NovaliedNumScreen(Screen):# no_valied_num_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) no_valied_num_screen_title1 = lv.label(no_valied_num_screen) - no_valied_num_screen_title1.set_pos(0, 140) - no_valied_num_screen_title1.set_size(LCD_SIZE_W, 40) - no_valied_num_screen_title1.set_text("无效的号码,") + no_valied_num_screen_title1.set_pos(0, 120) + no_valied_num_screen_title1.set_size(LCD_SIZE_W, 60) + no_valied_num_screen_title1.set_text("无效的号码,请重新输入") no_valied_num_screen_title1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) no_valied_num_screen_title1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - no_valied_num_screen_title2 = lv.label(no_valied_num_screen) - no_valied_num_screen_title2.set_pos(0, 190) - no_valied_num_screen_title2.set_size(LCD_SIZE_W, 40) - no_valied_num_screen_title2.set_text("请重新输入") - no_valied_num_screen_title2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) - no_valied_num_screen_title2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + # no_valied_num_screen_title2 = lv.label(no_valied_num_screen) + # no_valied_num_screen_title2.set_pos(0, 190) + # no_valied_num_screen_title2.set_size(LCD_SIZE_W, 40) + # no_valied_num_screen_title2.set_text("请重新输入") + # no_valied_num_screen_title2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + # no_valied_num_screen_title2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) self.meta = no_valied_num_screen def post_processor_after_initialization(self): @@ -1243,8 +1341,10 @@ class NoSimPowerScreen(Screen):# super().__init__() self.meta = None self.meta_type = "popup" + self.is_sliding =0 def initialization(self): + self.is_sliding =0 global no_sim_power_screen,no_sim_power_screen_img,no_sim_power_screen_title,no_sim_power_screen_comfirm,no_sim_power_screen_cancel,no_sim_power_screen_label if no_sim_power_screen == None : no_sim_power_screen = lv.obj() @@ -1252,7 +1352,7 @@ 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_pos(0, 15) no_sim_power_screen_title.set_size(LCD_SIZE_W, 40) no_sim_power_screen_title.set_text("无SIM卡,无法拨打") no_sim_power_screen_title.set_long_mode(lv.label.LONG.WRAP) @@ -1260,14 +1360,14 @@ class NoSimPowerScreen(Screen):# 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_pos(89, 55) 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("E:/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_pos(0, 135) no_sim_power_screen_label.set_size(LCD_SIZE_W, 40) no_sim_power_screen_label.set_text("是否关机?") no_sim_power_screen_label.set_long_mode(lv.label.LONG.WRAP) @@ -1277,7 +1377,7 @@ 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_pos(32, 175) no_sim_power_screen_comfirm.set_src("E:/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) @@ -1289,7 +1389,7 @@ class NoSimPowerScreen(Screen):# 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, 265) + no_sim_power_screen_cancel.set_pos(32, 235) no_sim_power_screen_cancel.set_src("E:/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) @@ -1305,9 +1405,29 @@ class NoSimPowerScreen(Screen):# no_sim_power_screen_cancel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.cancel(e)), lv.EVENT.CLICKED, None) + + no_sim_power_screen_comfirm.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)), + lv.EVENT.PRESSING, None) + + no_sim_power_screen_cancel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.cancel(e)), + lv.EVENT.PRESSING, None) + def confirm(self,e): - EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) + + self.is_sliding =0 + def cancel(self,e): EventMesh.publish("return_prev_screen") @@ -1324,10 +1444,6 @@ class NoSimPowerScreen(Screen):# def done_top_to_bottom(self): EventMesh.publish("return_prev_screen") - def done_return(self): - EventMesh.publish("return_prev_screen") - - def btn8_press(self): EventMesh.publish("return_prev_screen") @@ -1348,8 +1464,10 @@ class NoSimAutoScreen(Screen):#无sim卡是否关机 self.meta_type = "popup" self.timer = osTimer() self.count = 0 + self.is_sliding = 0 def initialization(self): + self.is_sliding = 0 global no_sim_auto_screen,no_sim_confirm_label,no_sim_cancel_label,no_sim_auto_screen_img,no_sim_auto_screen_title,no_sim_auto_screen_comfirm,no_sim_auto_screen_cancel,no_sim_auto_screen_label if no_sim_auto_screen == None : no_sim_auto_screen = lv.obj() @@ -1365,7 +1483,7 @@ class NoSimAutoScreen(Screen):#无sim卡是否关机 no_sim_auto_screen_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) no_sim_auto_screen_img = lv.img(no_sim_auto_screen) - no_sim_auto_screen_img.set_pos(100, 70) + no_sim_auto_screen_img.set_pos(89, 70) no_sim_auto_screen_img.set_size(61, 61) no_sim_auto_screen_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) no_sim_auto_screen_img.set_src("E:/static/poweroff_icon.png") @@ -1382,7 +1500,7 @@ class NoSimAutoScreen(Screen):#无sim卡是否关机 no_sim_auto_screen_comfirm = lv.img(no_sim_auto_screen) no_sim_auto_screen_comfirm.set_size(176, 46) - no_sim_auto_screen_comfirm.set_pos(32, 190) + no_sim_auto_screen_comfirm.set_pos(32, 185) no_sim_auto_screen_comfirm.set_src("E:/static/off_icon.png") no_sim_auto_screen_comfirm.add_flag(lv.obj.FLAG.CLICKABLE) no_sim_auto_screen_comfirm.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -1394,7 +1512,7 @@ class NoSimAutoScreen(Screen):#无sim卡是否关机 no_sim_auto_screen_cancel = lv.img(no_sim_auto_screen) no_sim_auto_screen_cancel.set_size(176, 46) - no_sim_auto_screen_cancel.set_pos(32, 265) + no_sim_auto_screen_cancel.set_pos(32, 238) no_sim_auto_screen_cancel.set_src("E:/static/cancel_icon.png") no_sim_auto_screen_cancel.add_flag(lv.obj.FLAG.CLICKABLE) no_sim_auto_screen_cancel.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -1410,6 +1528,13 @@ class NoSimAutoScreen(Screen):#无sim卡是否关机 no_sim_auto_screen_cancel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.cancel(e)), lv.EVENT.CLICKED, None) + + no_sim_auto_screen_comfirm.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)), + lv.EVENT.PRESSING, None) + + no_sim_auto_screen_cancel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.cancel(e)), + lv.EVENT.PRESSING, None) + self.timer.start(1*1000,1,self.fun) self.count = 0 def fun(self,*argc): @@ -1426,7 +1551,21 @@ class NoSimAutoScreen(Screen):#无sim卡是否关机 self.timer.stop() def confirm(self,e): - EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) + print("2self.is_sliding",self.is_sliding) + + self.is_sliding =0 + def cancel(self,e): EventMesh.publish("return_prev_screen") @@ -1462,8 +1601,10 @@ class DialingNoPlayPopupScreen(Screen):#正在拨号中...未打出 self.read_call_log = {} self.number_tmp = {} self.CALL_LOG_MAX = CALL_LOG_MAX + self.is_sliding =0 def initialization(self): + self.is_sliding =0 EventMesh.publish("set_UI_high_priority", 1) global dialing_popup_screen,dialing_popup_img,dialing_popup_name ,dialing_popup_call,dialing_popup_hangup_imgbtn if dialing_popup_screen == None: @@ -1499,12 +1640,15 @@ class DialingNoPlayPopupScreen(Screen):#正在拨号中...未打出 dialing_popup_hangup_imgbtn.set_pos(80, 210) dialing_popup_hangup_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), lv.EVENT.CLICKED, None) + dialing_popup_hangup_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), + lv.EVENT.PRESSING, None) self.meta = dialing_popup_screen if dialing_popup_name != None: name = EventMesh.publish("get_phonename")#获取拨打电话名称 dialing_popup_name.set_text(name)#名称 def post_processor_after_initialization(self): + self.is_sliding =0 self.time_count = 0 #获取字符串 name = EventMesh.publish("get_phonename")#获取拨打电话名称 @@ -1576,21 +1720,35 @@ class DialingNoPlayPopupScreen(Screen):#正在拨号中...未打出 self.time_count = 0 EventMesh.publish("set_UI_high_priority", 0) EventMesh.publish("set_sos_info_call") - EventMesh.publish("load_screen", {"screen": "dialing"}) - # EventMesh.publish("load_screen", {"screen": "dial_no_connect_popup"}) + # EventMesh.publish("load_screen", {"screen": "dialing"}) + EventMesh.publish("load_screen", {"screen": "dial_no_connect_popup"}) def hangup(self,e): - EventMesh.publish("set_UI_high_priority", 0) - voiceCall.callEnd() - sos_flag = EventMesh.publish("get_sos_flag") - if sos_flag == 1: - EventMesh.publish("set_sos_flag",0) - EventMesh.publish("set_sos_num",0) - EventMesh.publish("set_hangup_mode",0) - EventMesh.publish("set_interrup_incall",0) - EventMesh.publish("set_UI_high_priority",0) + code = e.get_code() + #print("code!!!!!!!!",code,msg) + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 - EventMesh.publish("load_screen", {"screen": "main_menu"}) + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + EventMesh.publish("set_UI_high_priority", 0) + voiceCall.callEnd() + sos_flag = EventMesh.publish("get_sos_flag") + if sos_flag == 1: + EventMesh.publish("set_sos_flag",0) + EventMesh.publish("set_sos_num",0) + EventMesh.publish("set_hangup_mode",0) + EventMesh.publish("set_interrup_incall",0) + EventMesh.publish("set_UI_high_priority",0) + + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + self.is_sliding =0 + def Close(self): self.timer1.stop() @@ -1631,8 +1789,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(LCD_SIZE_W, 150) + dialing_connect_call.set_pos(0, (LCD_SIZE_H//2)-10) + dialing_connect_call.set_size(LCD_SIZE_W, LCD_SIZE_H - ((LCD_SIZE_H//2)-10)) 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) @@ -1694,7 +1852,7 @@ class chargefullScreen(Screen):#充电已满弹窗提示 charge_full_screen_title = lv.label(charge_full_screen) - charge_full_screen_title.set_pos(0, 150) + charge_full_screen_title.set_pos(0, (LCD_SIZE_H//2)-10) charge_full_screen_title.set_size(LCD_SIZE_W, 40) charge_full_screen_title.set_text("充电已满") charge_full_screen_title.set_long_mode(lv.label.LONG.WRAP) @@ -1722,6 +1880,8 @@ class chargefullScreen(Screen):#充电已满弹窗提示 def done_return(self): EventMesh.publish("return_prev_screen") + def done_left_to_right(self): + EventMesh.publish("return_prev_screen") def btn1_release(self): EventMesh.publish("return_prev_screen") @@ -1750,7 +1910,7 @@ 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_pos(0, (LCD_SIZE_H//2)-10) message_popup_title.set_size(LCD_SIZE_W, 40) message_popup_title.set_text("你有新的信息") message_popup_title.set_long_mode(lv.label.LONG.WRAP) @@ -1804,7 +1964,7 @@ class RemoveMessageScreen(Screen):#删除短信弹窗框 remove_message_popup_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) message_popup_title = lv.label(remove_message_popup_screen) - message_popup_title.set_pos(0, 150) + message_popup_title.set_pos(0, (LCD_SIZE_W//2)-10) message_popup_title.set_size(LCD_SIZE_W, 50) message_popup_title.set_text("正在删除中...\n请稍候") message_popup_title.set_long_mode(lv.label.LONG.WRAP) @@ -1856,7 +2016,10 @@ class MessageFullScreen(Screen): self.meta = None self.meta_type = "popup" EventMesh.subscribe("remove_all_sms_cb",self.remove_all_sms_cb) + self.is_sliding = 0 + def initialization(self): + self.is_sliding = 0 global message_full_screen,message_full_label,message_full_confirm,message_full_cancel if message_full_screen == None : message_full_screen = lv.obj() @@ -1893,14 +2056,31 @@ class MessageFullScreen(Screen): message_full_confirm.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)),lv.EVENT.CLICKED, None) message_full_cancel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.concel(e)),lv.EVENT.CLICKED, None) + message_full_confirm.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)),lv.EVENT.PRESSING, None) + message_full_cancel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.concel(e)),lv.EVENT.PRESSING, None) + + def remove_all_sms_cb(self, event, msg): sms.deleteMsg(1,4) def confirm(self, e): - print("sms confirm!!!!!!!!") - # self.timer.start(2*1000,0,self.clear_data) - EventMesh.publish("load_screen", {"screen": "remove_message_popup"}) - EventMesh.publish_async("remove_all_sms_cb","",1*1024) + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + print("sms confirm!!!!!!!!") + # self.timer.start(2*1000,0,self.clear_data) + EventMesh.publish("load_screen", {"screen": "remove_message_popup"}) + EventMesh.publish_async("remove_all_sms_cb","",1*1024) + + self.is_sliding =0 + def concel(self, e): @@ -2335,9 +2515,10 @@ class PopupScreen(Screen): EventMesh.publish("load_screen", {"screen": "msg_detail"}) self.is_sliding =0 - - def done_return(self): + def done_left_to_right(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) + + def btn1_release(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn8_press(self): @@ -2399,14 +2580,14 @@ class MsgDetailScreen(Screen): def post_processor_after_initialization(self): - size = msg_detail_cont.get_height() - print("size:",size) + pass + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "popup"}) + def done_return(self): EventMesh.publish("load_screen", {"screen": "popup"}) - def hangup(self,e): - EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn1_release(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn8_press(self): @@ -2448,8 +2629,10 @@ class HeartrateScreen(Screen): self.timer = osTimer() self.point = 0 self.heart_value = 0 + self.is_sliding =0 def initialization(self): + self.is_sliding =0 global heartrate_screen,heartrate_label,heartrate_reset_btn_img,hr_line1,hr_line2,hr_line3,hr_line4,hr_line5,hr_line6,hr_line7,heartrate_line_bg_img,heartrate_done_img ,heartrate_start_label,heartrate_bpm_label ,heartrate_done_label if heartrate_screen == None: heartrate_screen = lv.obj() @@ -2457,7 +2640,7 @@ class HeartrateScreen(Screen): heartrate_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) heartrate_label = lv.label(heartrate_screen) - heartrate_label.set_pos(0, 20) + heartrate_label.set_pos(0, 10) heartrate_label.set_size(LCD_SIZE_W, 40) heartrate_label.set_text("心率") heartrate_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0) @@ -2465,24 +2648,24 @@ class HeartrateScreen(Screen): heartrate_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) heartrate_line_bg_img = lv.img(heartrate_screen) - heartrate_line_bg_img.set_pos(5, 60) + heartrate_line_bg_img.set_pos(5, 45) heartrate_line_bg_img.set_size(230, 120) heartrate_line_bg_img.set_src("E:/static/hr_line_bg.png") heartrate_done_img = lv.img(heartrate_screen) - heartrate_done_img.set_pos(20, 249) + heartrate_done_img.set_pos(20, 229) heartrate_done_img.set_src("E:/static/hr_gif_03.png") heartrate_reset_btn_img = lv.img(heartrate_screen) - heartrate_reset_btn_img.set_pos(0, 192) + heartrate_reset_btn_img.set_pos(0, 172) heartrate_reset_btn_img.set_src("E:/static/reset_hr_btn.png") heartrate_reset_btn_img.add_flag(lv.obj.FLAG.HIDDEN) heartrate_reset_btn_img.add_flag(lv.obj.FLAG.CLICKABLE) heartrate_start_label = lv.label(heartrate_screen) heartrate_start_label.set_size(LCD_SIZE_W,40) - heartrate_start_label.set_pos(0,200) + heartrate_start_label.set_pos(0,182) heartrate_start_label.set_text("正在测量中.") heartrate_start_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0) heartrate_start_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2491,56 +2674,56 @@ class HeartrateScreen(Screen): hr_line1 = lv.line(heartrate_screen) hr_line1.set_points(hr_line_points,2) - hr_line1.set_pos(25,60) + hr_line1.set_pos(25,45) hr_line1.set_size(10,0) hr_line1.add_style(style_line_red,0) hr_line2 = lv.line(heartrate_screen) hr_line2.set_points(hr_line_points,2) - hr_line2.set_pos(53,60) + hr_line2.set_pos(53,45) hr_line2.set_size(10,0) hr_line2.add_style(style_line_red,0) hr_line3 = lv.line(heartrate_screen) hr_line3.set_points(hr_line_points,2) - hr_line3.set_pos(80,60) + hr_line3.set_pos(80,45) hr_line3.set_size(10,0) hr_line3.add_style(style_line_red,0) hr_line4 = lv.line(heartrate_screen) hr_line4.set_points(hr_line_points,2) - hr_line4.set_pos(109,60) + hr_line4.set_pos(109,45) hr_line4.set_size(10,0) hr_line4.add_style(style_line_red,0) hr_line5 = lv.line(heartrate_screen) hr_line5.set_points(hr_line_points,2) - hr_line5.set_pos(136,60) + hr_line5.set_pos(136,45) hr_line5.set_size(10,0) hr_line5.add_style(style_line_red,0) hr_line6 = lv.line(heartrate_screen) hr_line6.set_points(hr_line_points,2) - hr_line6.set_pos(164,60) + hr_line6.set_pos(164,45) hr_line6.set_size(10,0) hr_line6.add_style(style_line_red,0) hr_line7 = lv.line(heartrate_screen) hr_line7.set_points(hr_line_points,2) - hr_line7.set_pos(192,60) + hr_line7.set_pos(192,45) hr_line7.set_size(10,0) hr_line7.add_style(style_line_red,0) heartrate_bpm_label = lv.label(heartrate_screen) - heartrate_bpm_label.set_size(120, 40) - heartrate_bpm_label.set_pos(120, 270) + heartrate_bpm_label.set_size(120, 34) + heartrate_bpm_label.set_pos(120, 250) heartrate_bpm_label.set_text("-- bpm") heartrate_bpm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) heartrate_bpm_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) heartrate_done_label = lv.label(heartrate_screen) - heartrate_done_label.set_size(LCD_SIZE_W, 40) - heartrate_done_label.set_pos(0, 270) + heartrate_done_label.set_size(LCD_SIZE_W, 34) + heartrate_done_label.set_pos(0, 250) heartrate_done_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) heartrate_done_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) heartrate_done_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) @@ -2548,6 +2731,9 @@ class HeartrateScreen(Screen): self.meta = heartrate_screen heartrate_reset_btn_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.restart_up(e)), lv.EVENT.CLICKED, None) + heartrate_reset_btn_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.restart_up(e)), + lv.EVENT.PRESSING, None) + heartrate_done_label.set_text(" ") heartrate_bpm_label.set_text("-- bpm") heartrate_start_label.set_text("正在测量中.") @@ -2557,82 +2743,113 @@ class HeartrateScreen(Screen): def post_processor_after_initialization(self): self.point = 0 + self.is_sliding = 0 self.heart_value = 0 self.show_history_data() - self.restart_up(0) + self.start_init() def restart_up(self,e): global heartrate_done_label,heartrate_bpm_label,heartrate_start_label,heartrate_reset_btn_img + + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + self.point = 0 + self.timer.start(1*500, 1, self.start_measure) + heartrate_bpm_label.set_text("-- bpm") + if heartrate_reset_btn_img != None: + heartrate_reset_btn_img.add_flag(lv.obj.FLAG.HIDDEN) + + self.heart_value = 0 + + heartrate_done_label.set_text(" ") + heartrate_bpm_label.set_text("-- bpm") + heartrate_start_label.set_text("正在测量中.") + EventMesh.publish("set_hr_state",1)#1代表手动进入测试界面 + + EventMesh.publish(constants.EVENT.START_HEART) + + self.is_sliding =0 + def start_init(self): + self.point = 0 self.timer.start(1*500, 1, self.start_measure) heartrate_bpm_label.set_text("-- bpm") if heartrate_reset_btn_img != None: heartrate_reset_btn_img.add_flag(lv.obj.FLAG.HIDDEN) - self.point = 0 self.heart_value = 0 - heartrate_done_label.set_text(" ") heartrate_bpm_label.set_text("-- bpm") heartrate_start_label.set_text("正在测量中.") EventMesh.publish("set_hr_state",1)#1代表手动进入测试界面 EventMesh.publish(constants.EVENT.START_HEART) + def show_history_data(self): global hr_line1,hr_line2,hr_line3,hr_line4,hr_line5,hr_line6,hr_line7 read_data = {} read_data = EventMesh.publish("get_history_hr_value") - if len(read_data) != 0: - sort_new = {} - sort_new = sorted(read_data, key = lambda i: i['timeSec'],reverse = False)#按照时间戳进行排序 去掉最旧的一次数据如果满了五十条 - # print("hr history sort_new",sort_new) - if sort_new != []: - for i in range(len(sort_new)): - print(int(sort_new[i]["hr"])) - # print("hr history read_data",read_data) - value = int(sort_new[i]["hr"]) - if value < 30: - value = 30 - if value >= 210: - value = 210 - line_value = value - 30 #180-80 = 100 160-100 = 60 - line_value = int(line_value*0.58)+1 - if line_value >= 100: - line_value = 100 - #print("hr hist",line_value) - hr_line_points = [{"x":0,"y":0},{"x":0,"y":line_value}] - if i == 0: - hr_line1.set_points(hr_line_points,2) - hr_line1.set_pos(25,160-line_value) - hr_line1.set_size(10,line_value) - if i == 1: - hr_line2.set_points(hr_line_points,2) - hr_line2.set_pos(53,160-line_value) - hr_line2.set_size(10,line_value) - - if i == 2: - hr_line3.set_points(hr_line_points,2) - hr_line3.set_pos(80,160-line_value) - hr_line3.set_size(10,line_value) - - if i == 3: - hr_line4.set_points(hr_line_points,2) - hr_line4.set_pos(109,160-line_value) - hr_line4.set_size(10,line_value) - - if i == 4: - hr_line5.set_points(hr_line_points,2) - hr_line5.set_pos(136,160-line_value) - hr_line5.set_size(10,line_value) - - if i == 5: - hr_line6.set_points(hr_line_points,2) - hr_line6.set_pos(164,160-line_value) - hr_line6.set_size(10,line_value) - - if i == 6: - hr_line7.set_points(hr_line_points,2) - hr_line7.set_pos(192,160-line_value) - hr_line7.set_size(10,line_value) + if read_data != None: + if len(read_data) != 0: + sort_new = {} + sort_new = sorted(read_data, key = lambda i: i['timeSec'],reverse = False)#按照时间戳进行排序 去掉最旧的一次数据如果满了五十条 + # print("hr history sort_new",sort_new) + if sort_new != []: + for i in range(len(sort_new)): + print(int(sort_new[i]["hr"])) + # print("hr history read_data",read_data) + value = int(sort_new[i]["hr"]) + if value < 30: + value = 30 + if value >= 210: + value = 210 + + line_value = value - 30 #180-80 = 100 160-100 = 60 + line_value = int(line_value*0.58)+1 + if line_value >= 100: + line_value = 100 + #print("hr hist",line_value) + hr_line_points = [{"x":0,"y":0},{"x":0,"y":line_value}] + if i == 0: + hr_line1.set_points(hr_line_points,2) + hr_line1.set_pos(25,145-line_value) + hr_line1.set_size(10,line_value) + if i == 1: + hr_line2.set_points(hr_line_points,2) + hr_line2.set_pos(53,145-line_value) + hr_line2.set_size(10,line_value) + + if i == 2: + hr_line3.set_points(hr_line_points,2) + hr_line3.set_pos(80,145-line_value) + hr_line3.set_size(10,line_value) + + if i == 3: + hr_line4.set_points(hr_line_points,2) + hr_line4.set_pos(109,145-line_value) + hr_line4.set_size(10,line_value) + + if i == 4: + hr_line5.set_points(hr_line_points,2) + hr_line5.set_pos(136,145-line_value) + hr_line5.set_size(10,line_value) + + if i == 5: + hr_line6.set_points(hr_line_points,2) + hr_line6.set_pos(164,145-line_value) + hr_line6.set_size(10,line_value) + + if i == 6: + hr_line7.set_points(hr_line_points,2) + hr_line7.set_pos(192,145-line_value) + hr_line7.set_size(10,line_value) def start_measure(self,*args): EventMesh.publish("publish_message_event_ui",{"func":self.start_measure_do,"data":0}) def start_measure_do(self,data): @@ -2708,6 +2925,15 @@ class HeartrateScreen(Screen): def done_return(self): EventMesh.publish("load_screen", {"screen": "health"}) + def done_left_to_right(self): + self.timer.stop() + get_hr_state = EventMesh.publish("get_hr_state") + get_spo2_state = EventMesh.publish("get_spo2_state") + if get_hr_state == 1 or get_spo2_state == 1: + EventMesh.publish("set_hr_state",0)#0代表关闭测试 + print("stop debug10") + EventMesh.publish(constants.EVENT.STOP_HEART) + def btn1_release(self): EventMesh.publish("load_screen", {"screen": "health"}) @@ -2837,7 +3063,7 @@ class ToolboxScreen(Screen): toolbox_countdown_bg_img = lv.img(toolbox_cont) toolbox_countdown_bg_img.set_pos(0, tool_set_y) toolbox_countdown_bg_img.set_size(TOOL_BG_ICON_W_SIZE, TOOL_BG_ICON_H_SIZE) - # toolbox_countdown_bg_img.add_flag(lv.obj.FLAG.CLICKABLE) + toolbox_countdown_bg_img.add_flag(lv.obj.FLAG.CLICKABLE) toolbox_countdown_bg_img.set_src("E:/static/list_bg.png") toolbox_countdown_bg_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2894,7 +3120,7 @@ class ToolboxScreen(Screen): self.is_sliding =0 - def done_return(self): + def done_left_to_right(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn1_release(self): @@ -2926,13 +3152,14 @@ class IncomingCallScreen(Screen): self.pro_state = 0 self.meta = None - + self.is_sliding =0 self.call_log = {} self.call_log_value = {} self.read_call_log = {} self.number_tmp = {} def initialization(self): + self.is_sliding =0 global incoming_call_screen,incoming_call_img,incoming_call_name_label,incoming_call_answer ,incoming_call_hangup if incoming_call_screen == None : # -------------------------------------------incoming_call screen---------------------------------------------------------- @@ -2956,14 +3183,14 @@ class IncomingCallScreen(Screen): incoming_call_answer = lv.img(incoming_call_screen) incoming_call_answer.set_size(64, 64) incoming_call_answer.add_flag(lv.obj.FLAG.CLICKABLE) - incoming_call_answer.set_pos(150, 220) + incoming_call_answer.set_pos(150, 210) incoming_call_answer.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) incoming_call_answer.set_src("E:/static/answer.png") incoming_call_hangup = lv.img(incoming_call_screen) incoming_call_hangup.set_size(64, 64) incoming_call_hangup.add_flag(lv.obj.FLAG.CLICKABLE) - incoming_call_hangup.set_pos(30, 220) + incoming_call_hangup.set_pos(30, 210) incoming_call_hangup.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) incoming_call_hangup.set_src("E:/static/hang_up.png") @@ -2971,11 +3198,16 @@ class IncomingCallScreen(Screen): lv.EVENT.CLICKED, None) incoming_call_hangup.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), lv.EVENT.CLICKED, None) + incoming_call_answer.add_event_cb(lambda e: EventMesh.callback_wrapper(self.answer(e)), + lv.EVENT.PRESSING, None) + incoming_call_hangup.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), + lv.EVENT.PRESSING, None) self.meta = incoming_call_screen EventMesh.publish("set_UI_high_priority", 1) def post_processor_after_initialization(self): + self.is_sliding =0 global incoming_call_screen,incoming_call_img,incoming_call_name_label,incoming_call_answer ,incoming_call_hangup utime.sleep_ms(200)#不加延时会切屏 data = EventMesh.publish("get_phonebook_list") @@ -3092,28 +3324,54 @@ class IncomingCallScreen(Screen): self.aud.play(1, 1, 'U:/static/R_CALL_mp3.mp3') #播放来电铃声 def answer(self,e): - self.call_timer.stop() - self.aud.stop() - EventMesh.publish("set_UI_high_priority", 0) - voiceCall.callAnswer() + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + self.call_timer.stop() + self.aud.stop() + EventMesh.publish("set_UI_high_priority", 0) + voiceCall.callAnswer() + + self.is_sliding =0 + def Close(self): self.call_timer.stop() self.aud.stop() def hangup(self,e): - EventMesh.publish("set_UI_high_priority", 0) - self.aud.stop() - self.call_timer.stop() - voiceCall.callEnd() - EventMesh.publish("set_interrup_incall",0) - EventMesh.publish("set_UI_high_priority",0) - + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 - screen_NAME = EventMesh.publish("get_screen_NAME") - if screen_NAME != None: - if screen_NAME != "dialing_noplay_popup": - EventMesh.publish("load_screen", {"screen": "main_menu"}) + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + EventMesh.publish("set_UI_high_priority", 0) + self.aud.stop() + self.call_timer.stop() + voiceCall.callEnd() + EventMesh.publish("set_interrup_incall",0) + EventMesh.publish("set_UI_high_priority",0) + + + screen_NAME = EventMesh.publish("get_screen_NAME") + if screen_NAME != None: + if screen_NAME != "dialing_noplay_popup": + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + self.is_sliding =0 + def btn1_release(self): pass @@ -3184,8 +3442,10 @@ class OnCallScreen(Screen): self.phone_list = [] self.button = 0 self.mute_btn = 0 + self.is_sliding = 0 def initialization(self): + self.is_sliding = 0 EventMesh.publish("set_UI_high_priority", 1) global on_call_screen,on_call_label_name,on_call_second_label ,on_call_hangup ,on_call_volum_label,on_call_tab_label,on_call_bar,on_call_obj,\ on_call_volum_reduce,on_call_volum_add,on_call_phone_one ,on_call_phone_two ,on_call_phone_three,on_call_phone_four,on_call_phone_five,\ @@ -3202,21 +3462,21 @@ class OnCallScreen(Screen): 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_pos(0, 70) on_call_label_name.set_size(LCD_SIZE_W, 50) 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_pos(0, 130) on_call_second_label.set_size(LCD_SIZE_W, 30) 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_pos(49, 173) on_call_bar.set_size(140, 25) on_call_bar.set_style_anim_time(1000, lv.PART.INDICATOR | lv.STATE.DEFAULT) on_call_bar.set_mode(lv.bar.MODE.NORMAL) @@ -3226,82 +3486,92 @@ class OnCallScreen(Screen): on_call_volum_reduce = lv.img(on_call_obj) on_call_volum_reduce.set_size(36, 36) - on_call_volum_reduce.set_pos(4, 178) + on_call_volum_reduce.set_pos(4, 168) on_call_volum_reduce.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_volum_reduce.set_src("E:/static/REDUCE_VOLUM_ICON.png") on_call_volum_reduce_btn = lv.label(on_call_obj) - on_call_volum_reduce_btn.set_pos(0, 170) + on_call_volum_reduce_btn.set_pos(0, 160) on_call_volum_reduce_btn.add_flag(lv.obj.FLAG.CLICKABLE) on_call_volum_reduce_btn.set_size(60, 50) on_call_volum_reduce_btn.set_text(" ") on_call_volum_reduce_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_volum_size(e)), lv.EVENT.CLICKED, None) + on_call_volum_reduce_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_volum_size(e)), + lv.EVENT.PRESSING, None) on_call_volum_add = lv.img(on_call_obj) on_call_volum_add.set_size(36, 36) - on_call_volum_add.set_pos(194, 178) + on_call_volum_add.set_pos(194, 168) on_call_volum_add.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_volum_add.set_src("E:/static/VOLUM_ADD_ICON.png") on_call_volum_add_btn = lv.label(on_call_obj) - on_call_volum_add_btn.set_pos(180, 170) + on_call_volum_add_btn.set_pos(180, 160) on_call_volum_add_btn.add_flag(lv.obj.FLAG.CLICKABLE) on_call_volum_add_btn.set_size(60, 50) on_call_volum_add_btn.set_text(" ") on_call_volum_add_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_volum_size(e)), lv.EVENT.CLICKED, None) + on_call_volum_add_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_volum_size(e)), + lv.EVENT.PRESSING, 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, 240) on_call_volum_label.add_flag(lv.obj.FLAG.CLICKABLE) - on_call_volum_label.set_size(85, 50) + on_call_volum_label.set_size(85, 34) 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) on_call_volum_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.open_volum_show(e)), lv.EVENT.CLICKED, None) + on_call_volum_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.open_volum_show(e)), + lv.EVENT.PRESSING, None) on_call_hangup = lv.img(on_call_obj) on_call_hangup.set_size(64, 64) on_call_hangup.add_flag(lv.obj.FLAG.CLICKABLE) - on_call_hangup.set_pos(85, 245) + on_call_hangup.set_pos(85, 215) on_call_hangup.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_hangup.set_src("E:/static/hang_up.png") on_call_hangup.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), lv.EVENT.CLICKED, None) + on_call_hangup.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), + lv.EVENT.PRESSING, None) on_call_tab_label = lv.label(on_call_obj) - on_call_tab_label.set_pos(150, 270) + on_call_tab_label.set_pos(150, 240) on_call_tab_label.add_flag(lv.obj.FLAG.CLICKABLE) - on_call_tab_label.set_size(90, 50) + on_call_tab_label.set_size(90, 34) 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) on_call_tab_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.on_call_tab_show(e)), lv.EVENT.CLICKED, None) + on_call_tab_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.on_call_tab_show(e)), + lv.EVENT.PRESSING, None) on_call_screen_tab = lv.obj(on_call_screen) - on_call_screen_tab.set_size(LCD_SIZE_W,320) + on_call_screen_tab.set_size(LCD_SIZE_W,LCD_SIZE_H) 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_pos(40, 25) on_call_screen_tab_label.set_size(0, 30) 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) + on_call_screen_tab_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) on_call_screen_tab_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) on_call_phone_return = lv.img(on_call_screen_tab) on_call_phone_return.set_src("E:/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_pos(0, 15) on_call_phone_return.set_size(36, 36) on_call_phone_return_btn = lv.img(on_call_screen_tab) @@ -3317,7 +3587,7 @@ class OnCallScreen(Screen): on_call_phone_one.set_src("E:/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_pos(3, 60) on_call_phone_one.set_size(76, 50) on_call_phone_two = lv.img(on_call_screen_tab) @@ -3325,77 +3595,77 @@ class OnCallScreen(Screen): on_call_phone_two.set_src("E:/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(82, 60) on_call_phone_three = lv.img(on_call_screen_tab) on_call_phone_three.set_size(76, 50) on_call_phone_three.set_src("E:/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(161, 60)#1 on_call_phone_four = lv.img(on_call_screen_tab) on_call_phone_four.set_size(76, 50) on_call_phone_four.set_src("E:/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(3, 112) on_call_phone_five = lv.img(on_call_screen_tab) on_call_phone_five.set_size(76, 50) on_call_phone_five.set_src("E:/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(82, 112) on_call_phone_six = lv.img(on_call_screen_tab) on_call_phone_six.set_size(76, 50) on_call_phone_six.set_src("E:/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(161, 112)#2 on_call_phone_seven = lv.img(on_call_screen_tab) on_call_phone_seven.set_size(76, 50) - on_call_phone_seven.set_src("E:/static/IMAGE_NUMBER_KEY7_ICON.png") + on_call_phone_seven.set_src("E:/static/IMAGE_NUMBER_KEY07_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(3, 164) on_call_phone_eight = lv.img(on_call_screen_tab) on_call_phone_eight.set_size(76, 50) on_call_phone_eight.set_src("E:/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(82, 164) on_call_phone_nine = lv.img(on_call_screen_tab) on_call_phone_nine.set_size(76, 50) - on_call_phone_nine.set_src("E:/static/IMAGE_NUMBER_KEY9_ICON.png") + on_call_phone_nine.set_src("E:/static/IMAGE_NUMBER_KEY09_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(161, 164) on_call_phone_start = lv.img(on_call_screen_tab) on_call_phone_start.set_size(76, 50) - on_call_phone_start.set_src("E:/static/IMAGE_BUTTON_DIAL.png") + on_call_phone_start.set_src("E:/static/IMAGE_NUMBER_KEYSTAR00_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_start.set_pos(3, 216) on_call_phone_zero = lv.img(on_call_screen_tab) on_call_phone_zero.set_size(76, 50) - on_call_phone_zero.set_src("E:/static/IMAGE_NUMBER_KEY0_ICON.png") + on_call_phone_zero.set_src("E:/static/IMAGE_NUMBER_KEY00_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(82, 216) on_call_phone_hash = lv.img(on_call_screen_tab) on_call_phone_hash.set_size(76, 50) - on_call_phone_hash.set_src("E:/static/IMAGE_BUTTON_DELKEY.png") + on_call_phone_hash.set_src("E:/static/IMAGE_NUMBER_KEYHASH00_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) + on_call_phone_hash.set_pos(161, 216) self.meta = on_call_screen @@ -3414,10 +3684,13 @@ class OnCallScreen(Screen): lv.EVENT.CLICKED, None) on_call_phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.seven(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) @@ -3441,6 +3714,7 @@ class OnCallScreen(Screen): self.phone_list = [] self.button = 0 self.mute_btn = 0 + self.is_sliding = 0 voiceCall.mute(2,0,0) def show_num(self): @@ -3550,14 +3824,13 @@ class OnCallScreen(Screen): 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("*") - + if self.button == 1:#长按 + voiceCall.startDtmf("+",100) + self.phone_list.append("+") + else:#短按 + voiceCall.startDtmf("*",100) + self.phone_list.append("*") + self.button = 0 self.phone_num = ''.join(self.phone_list) self.show_num() @@ -3582,34 +3855,49 @@ class OnCallScreen(Screen): def open_volum_show(self, e): global on_call_screen_tab,on_call_screen,on_call_obj - if self.mute_btn == 0:#默认是开启 - self.mute_btn = 1 - voiceCall.mute(2,1,0) - on_call_volum_label.set_style_text_color(lv.color_make(0, 169, 242), lv.STATE.DEFAULT) - else: + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 - on_call_volum_label.set_style_text_color(lv.color_make(255, 255, 255), lv.STATE.DEFAULT) - self.mute_btn = 0 - voiceCall.mute(2,0,0) - # self.aud.setVolume(0) - # if self.open_volum_state == 1: - # self.open_volum_state = 0 - # else: - # self.open_volum_state = 1 - # if self.open_volum_state == 1: - # self.add_show_hidden() - # else: - # self.clear_show_hidden() - + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + if self.mute_btn == 0:#默认是开启 + self.mute_btn = 1 + voiceCall.mute(2,1,0) + on_call_volum_label.set_style_text_color(lv.color_make(0, 169, 242), lv.STATE.DEFAULT) + else: + + on_call_volum_label.set_style_text_color(lv.color_make(255, 255, 255), lv.STATE.DEFAULT) + self.mute_btn = 0 + voiceCall.mute(2,0,0) + + self.is_sliding =0 def on_call_tab_show(self, e): global on_call_screen_tab,on_call_screen,on_call_obj - if on_call_screen_tab != None: - self.phone_num = '' - self.phone_list = [] - self.show_num() - on_call_screen_tab.clear_flag(lv.obj.FLAG.HIDDEN) - on_call_obj.add_flag(lv.obj.FLAG.HIDDEN) + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + if on_call_screen_tab != None: + self.phone_num = '' + self.phone_list = [] + self.show_num() + on_call_screen_tab.clear_flag(lv.obj.FLAG.HIDDEN) + on_call_obj.add_flag(lv.obj.FLAG.HIDDEN) + + self.is_sliding =0 + def on_return_show(self, e): @@ -3619,17 +3907,42 @@ class OnCallScreen(Screen): on_call_obj.clear_flag(lv.obj.FLAG.HIDDEN) def add_volum_size(self, e): - self.volum_size+=2 - if self.volum_size >= 11: - self.volum_size = 11 - self.show_bar(1) + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 - def reduce_volum_size(self, e): + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + self.volum_size+=2 + if self.volum_size >= 11: + self.volum_size = 11 + self.show_bar(1) + + self.is_sliding =0 - self.volum_size -= 2 - if self.volum_size < 0: - self.volum_size = 0 - self.show_bar(1) + + def reduce_volum_size(self, e): + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + self.volum_size -= 2 + if self.volum_size < 0: + self.volum_size = 0 + self.show_bar(1) + + self.is_sliding =0 + def show_bar(self,msg): on_call_bar.set_value((100 // 11) * self.volum_size, lv.ANIM.OFF) @@ -3674,17 +3987,30 @@ class OnCallScreen(Screen): self.count_sec+=1 def hangup(self,e): - EventMesh.publish("set_UI_high_priority", 0) - self.timer.stop() - voiceCall.callEnd() - EventMesh.publish("set_interrup_incall",0) - EventMesh.publish("set_UI_high_priority",0) - + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 - screen_NAME = EventMesh.publish("get_screen_NAME") - if screen_NAME != None: - if screen_NAME != "dialing_noplay_popup": - EventMesh.publish("load_screen", {"screen": "main_menu"}) + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + EventMesh.publish("set_UI_high_priority", 0) + self.timer.stop() + voiceCall.callEnd() + EventMesh.publish("set_interrup_incall",0) + EventMesh.publish("set_UI_high_priority",0) + + + screen_NAME = EventMesh.publish("get_screen_NAME") + if screen_NAME != None: + if screen_NAME != "dialing_noplay_popup": + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + self.is_sliding =0 + def Close(self): self.timer.stop() @@ -3756,9 +4082,12 @@ class StepScreen(Screen): def Close(self): self.timer.stop() - def done_return(self): + def done_left_to_right(self): EventMesh.publish("load_screen", {"screen": "toolbox"}) + # def done_return(self): + # EventMesh.publish("load_screen", {"screen": "toolbox"}) + def btn1_release(self): EventMesh.publish("load_screen", {"screen": "toolbox"}) @@ -3829,7 +4158,7 @@ class WeatherScreen(Screen): 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_pos(0, 180) weather_location_label.set_size(LCD_SIZE_W, 50) weather_location_label.set_text("--") weather_location_label.set_long_mode(lv.label.LONG.WRAP) @@ -3837,7 +4166,7 @@ class WeatherScreen(Screen): 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_pos(0, 180) no_connect_label.set_size(LCD_SIZE_W, 40) no_connect_label.set_text("找不到服务器") no_connect_label.set_long_mode(lv.label.LONG.WRAP) @@ -3845,8 +4174,8 @@ class WeatherScreen(Screen): 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(LCD_SIZE_W, 70) + no_connect_label1.set_pos(0, 230) + no_connect_label1.set_size(LCD_SIZE_W, 54) 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) @@ -3923,9 +4252,12 @@ class WeatherScreen(Screen): no_connect_label.set_text("找不到服务器") no_connect_label1.set_text("请联网后重试") - def done_return(self): + def done_left_to_right(self): EventMesh.publish("load_screen", {"screen": "toolbox"}) + # def done_return(self): + # EventMesh.publish("load_screen", {"screen": "toolbox"}) + def btn1_release(self): EventMesh.publish("load_screen", {"screen": "toolbox"}) @@ -3947,6 +4279,8 @@ contacts_cont = None contacts_top_title = None contact_none_label = None contacts_screen_list_screen = None +CONTACTS_LIST_SIZE = 80 +CONTACTS_LIST_LABEL = 28 #文本控件的高度大小 class ContactsScreen(Screen): NAME = "contacts" @@ -3966,6 +4300,7 @@ class ContactsScreen(Screen): self.MXA_phone_num = 50 #最大显示号码个数 self.contact_detail_listt_dict = [] self.calling_btn = [] + self.is_sliding = 0 def post_processor_before_initialization(self): data = EventMesh.publish("get_phonebook_list") @@ -3975,6 +4310,7 @@ class ContactsScreen(Screen): self.count = 0 def initialization(self): + self.is_sliding = 0 global contacts_screen,contacts_cont,contacts_top_title,contact_none_label,contacts_screen_list_screen if contacts_screen == None: contacts_screen = lv.obj() @@ -4015,6 +4351,8 @@ class ContactsScreen(Screen): contact_btn.add_flag(lv.obj.FLAG.CLICKABLE) contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e)), lv.EVENT.CLICKED, None) + contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e)), + lv.EVENT.PRESSING, None) contact_btn.add_flag(lv.obj.FLAG.HIDDEN) contact_btn_label_1 = lv.label(contact_btn) @@ -4045,20 +4383,13 @@ class ContactsScreen(Screen): if contacts_screen == None: return #读取json文件中的键作为label文本; + if self.check_json == True and len(self.phonebook) != 0: self.contact_detail_list.clear_flag(lv.obj.FLAG.HIDDEN) contact_none_label.add_flag(lv.obj.FLAG.HIDDEN)#隐藏空文本 j =0 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(LCD_SIZE_W, 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 @@ -4066,23 +4397,23 @@ class ContactsScreen(Screen): self.contact_detail_listt_dict[i]["contact_btn"].add_flag(lv.obj.FLAG.HIDDEN) continue name = self.phonebook[phonebook_keys[j]] - key_tmp = phonebook_keys[j] + key_tmp =phonebook_keys[j] 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(LCD_SIZE_W-10,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_SIZE_W-10,CONTACTS_LIST_SIZE) + self.contact_detail_listt_dict[i]["contact_btn"].set_pos(0,(CONTACTS_LIST_SIZE+6)*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, 0) - self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_size(180, 30) + self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_pos(0, 8) + self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_size(LCD_SIZE_W-20, CONTACTS_LIST_LABEL) 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"].set_long_mode(lv.label.LONG.CLIP) #self.contact_detail_listt_dict[i]["contact_btn_label_1"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) #contact_btn_label_2 = lv.label(contact_btn) @@ -4092,9 +4423,10 @@ class ContactsScreen(Screen): #contact_btn_label_3 = lv.label(contact_btn) - self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_pos(0, 35) - self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_size(LCD_SIZE_W-20, 35) + self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_pos(0, 45) + self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_size(LCD_SIZE_W-20, CONTACTS_LIST_LABEL) self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_text(name) + self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_long_mode(lv.label.LONG.CLIP) #self.contact_detail_listt_dict[i]["contact_btn_label_3"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4110,16 +4442,25 @@ class ContactsScreen(Screen): contact_none_label.clear_flag(lv.obj.FLAG.HIDDEN) #显示空文本 if self.contact_detail_list != None: self.contact_detail_list.add_flag(lv.obj.FLAG.HIDDEN)#隐藏空文本 - def calling_cb(self,e): code = e.get_code() - if code == lv.EVENT.CLICKED: - if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:#有卡时触发sos报警 无卡时自动关机 - msg_text = e.get_target().get_child(1).get_text() - EventMesh.publish("publish_message_event_ui",{"func":self.calling,"data":msg_text}) - else: - EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:#有卡时触发sos报警 无卡时自动关机 + msg_text = e.get_target().get_child(1).get_text() + EventMesh.publish("publish_message_event_ui",{"func":self.calling,"data":msg_text}) + else: + EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) + + self.is_sliding =0 + def calling(self,msg_text): _msg = msg_text @@ -4138,7 +4479,7 @@ class ContactsScreen(Screen): EventMesh.publish("load_screen", {"screen": "dialing_noplay_popup"}) - def done_return(self): + def done_left_to_right(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn1_release(self): @@ -4190,10 +4531,12 @@ class TemperatureScreen(Screen): self.timer = osTimer() self.point = 0 self.temp_value = 0 + self.is_sliding =0 def initialization(self): + self.is_sliding =0 global temperature_screen,temperature_keep_label,temperature_label,temp_reset_btn_img,temp_line1,temp_line2,temp_line3,temp_line4,temp_line5,\ - temp_line6,temp_line7,temperature_line_bg_img,temperature_done_img ,temperature_start_label,temperature_bpm_label ,temperature_done_label + temp_line6,temp_line7,temperature_degree_img,temperature_line_bg_img,temperature_done_img ,temperature_start_label,temperature_bpm_label ,temperature_done_label if temperature_screen == None: temperature_screen = lv.obj() print("temp_screen") @@ -4208,24 +4551,24 @@ class TemperatureScreen(Screen): temperature_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) temperature_line_bg_img = lv.img(temperature_screen) - temperature_line_bg_img.set_pos(5, 50) + temperature_line_bg_img.set_pos(5, 45) temperature_line_bg_img.set_size(230, 120) temperature_line_bg_img.set_src("E:/static/temp_line_bg.png") temperature_done_img = lv.img(temperature_screen) - temperature_done_img.set_pos(20, 226) + temperature_done_img.set_pos(30, 218) temperature_done_img.set_src("E:/static/temp_gif03.png") temp_reset_btn_img = lv.img(temperature_screen) - temp_reset_btn_img.set_pos(0, 182) + temp_reset_btn_img.set_pos(0, 177) temp_reset_btn_img.set_src("E:/static/reset_hr_btn.png") temp_reset_btn_img.add_flag(lv.obj.FLAG.HIDDEN) temp_reset_btn_img.add_flag(lv.obj.FLAG.CLICKABLE) temperature_start_label = lv.label(temperature_screen) temperature_start_label.set_size(LCD_SIZE_W,40) - temperature_start_label.set_pos(0,190) + temperature_start_label.set_pos(0,185) temperature_start_label.set_text("正在测量中.") temperature_start_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0) temperature_start_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4283,21 +4626,22 @@ class TemperatureScreen(Screen): temperature_bpm_label = lv.label(temperature_screen) temperature_bpm_label.set_size(120, 40) - temperature_bpm_label.set_pos(100, 244) + temperature_bpm_label.set_pos(100, 238) temperature_bpm_label.set_text("- -") temperature_bpm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) temperature_bpm_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) temperature_keep_label = lv.label(temperature_screen) - temperature_keep_label.set_size(140, 40) - temperature_keep_label.set_pos(100, 280) + temperature_keep_label.set_size(140, 30) + temperature_keep_label.set_pos(100, 254) temperature_keep_label.set_text("未出值") + temperature_keep_label.add_flag(lv.obj.FLAG.HIDDEN) temperature_keep_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) temperature_keep_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) temperature_degree_img = lv.img(temperature_screen) - temperature_degree_img.set_pos(156, 242) + temperature_degree_img.set_pos(156, 237) temperature_degree_img.set_size(22, 22) temperature_degree_img.set_src("U:/static/degree.png") temperature_degree_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4306,20 +4650,58 @@ class TemperatureScreen(Screen): self.meta = temperature_screen temp_reset_btn_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.restart_up(e)), lv.EVENT.CLICKED, None) - + temp_reset_btn_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.restart_up(e)), + lv.EVENT.PRESSING, None) + size_x = len(str("- -"))*14 + temperature_degree_img.set_pos(100+size_x, 237) temperature_bpm_label.set_text("- -") temperature_start_label.set_text("正在测量中.") def post_processor_after_initialization(self): - self.restart_up(0) + self.is_sliding =0 + self.start_init() def restart_up(self,e): - global temperature_done_label,temperature_keep_label,temperature_bpm_label,temperature_start_label,temp_reset_btn_img + + global temperature_done_label,temperature_keep_label,temperature_bpm_label,temperature_start_label,temp_reset_btn_img,temperature_degree_img + code = e.get_code() + + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + temperature_bpm_label.set_text("- -") + size_x = len(str("- -"))*14 + temperature_degree_img.set_pos(100+size_x, 237) + temperature_keep_label.set_text("未出值") + temp_reset_btn_img.add_flag(lv.obj.FLAG.HIDDEN) + self.point = 0 + size_x = len(str("- -"))*14 + temperature_degree_img.set_pos(100+size_x, 237) + temperature_bpm_label.set_text("- -") + temperature_start_label.set_text("正在测量中.") + EventMesh.publish("set_temp_state",1) + EventMesh.publish(constants.EVENT.START_TEMP) + self.show_history_data() + self.timer.start(1*500, 1, self.start_measure) + + self.is_sliding =0 + + def start_init(self): temperature_bpm_label.set_text("- -") + size_x = len(str("- -"))*14 + temperature_degree_img.set_pos(100+size_x, 237) temperature_keep_label.set_text("未出值") temp_reset_btn_img.add_flag(lv.obj.FLAG.HIDDEN) self.point = 0 + size_x = len(str("- -"))*14 + temperature_degree_img.set_pos(100+size_x, 237) temperature_bpm_label.set_text("- -") temperature_start_label.set_text("正在测量中.") EventMesh.publish("set_temp_state",1) @@ -4332,93 +4714,94 @@ class TemperatureScreen(Screen): read_data = {} read_data = EventMesh.publish("get_history_temp_value") # print("hr get_history_temp_value",read_data) - if len(read_data) != 0: - sort_new = {} - sort_new = sorted(read_data, key = lambda i: i['timeSec'],reverse = False)#按照时间戳进行排序 去掉最旧的一次数据如果满了五 - count = len(sort_new) - if count != 0: - for i in range(count): - # print(int(sort_new[i]["temp"])) - # print("hr history read_data",read_data) - value = int(sort_new[i]["temp"]) - value_temp = int(value) - if value <= 30: - line_value = int(value_temp) - elif value <= 34: - line_value = int((value_temp-30)*4.25)+30 - elif value <= 38: - line_value = int((value_temp-34)*5)+47 - elif value <= 42: - line_value = int((value_temp-38)*4)+67 - elif value < 46: - line_value = int((value_temp-42)*3.75)+85 - else: - value = 46 - line_value = 100 - - if line_value >= 100: - line_value = 100 - #print("hr hist",line_value) - temp_line_points = [{"x":0,"y":0},{"x":0,"y":line_value}] - if i == 0: - temp_line1.set_points(temp_line_points,2) - temp_line1.set_pos(29,150-line_value) - temp_line1.set_size(10,line_value) - if value >= 37.3: - temp_line1.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) - else: - temp_line1.set_style_line_color(lv.color_make(35,141,255),0) - if i == 1: - temp_line2.set_points(temp_line_points,2) - temp_line2.set_pos(57,150-line_value) - temp_line2.set_size(10,line_value) - if value >= 37.3: - temp_line2.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) - else: - temp_line2.set_style_line_color(lv.color_make(35,141,255),0) - - if i == 2: - temp_line3.set_points(temp_line_points,2) - temp_line3.set_pos(84,150-line_value) - temp_line3.set_size(10,line_value) - if value >= 37.3: - temp_line3.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) - else: - temp_line3.set_style_line_color(lv.color_make(35,141,255),0) - if i == 3: - temp_line4.set_points(temp_line_points,2) - temp_line4.set_pos(112,150-line_value) - temp_line4.set_size(10,line_value) - if value >= 37.3: - temp_line4.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) - else: - temp_line4.set_style_line_color(lv.color_make(35,141,255),0) - if i == 4: - temp_line5.set_points(temp_line_points,2) - temp_line5.set_pos(140,150-line_value) - temp_line5.set_size(10,line_value) - if value >= 37.3: - temp_line5.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) - else: - temp_line5.set_style_line_color(lv.color_make(35,141,255),0) - - if i == 5: - temp_line6.set_points(temp_line_points,2) - temp_line6.set_pos(167,150-line_value) - temp_line6.set_size(10,line_value) - if value >= 37.3: - temp_line6.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) + if read_data != None: + if len(read_data) != 0: + sort_new = {} + sort_new = sorted(read_data, key = lambda i: i['timeSec'],reverse = False)#按照时间戳进行排序 去掉最旧的一次数据如果满了五 + count = len(sort_new) + if count != 0: + for i in range(count): + # print(int(sort_new[i]["temp"])) + # print("hr history read_data",read_data) + value = int(sort_new[i]["temp"]) + value_temp = int(value) + if value <= 30: + line_value = int(value_temp) + elif value <= 34: + line_value = int((value_temp-30)*4.25)+30 + elif value <= 38: + line_value = int((value_temp-34)*5)+47 + elif value <= 42: + line_value = int((value_temp-38)*4)+67 + elif value < 46: + line_value = int((value_temp-42)*3.75)+85 else: - temp_line6.set_style_line_color(lv.color_make(35,141,255),0) - - if i == 6: - temp_line7.set_points(temp_line_points,2) - temp_line7.set_pos(195,150-line_value) - temp_line7.set_size(10,line_value) - if value >= 37.3: - temp_line7.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) - else: - temp_line7.set_style_line_color(lv.color_make(35,141,255),0) + value = 46 + line_value = 100 + + if line_value >= 100: + line_value = 100 + #print("hr hist",line_value) + temp_line_points = [{"x":0,"y":0},{"x":0,"y":line_value}] + if i == 0: + temp_line1.set_points(temp_line_points,2) + temp_line1.set_pos(29,145-line_value) + temp_line1.set_size(10,line_value) + if value >= 37.3: + temp_line1.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) + else: + temp_line1.set_style_line_color(lv.color_make(35,141,255),0) + if i == 1: + temp_line2.set_points(temp_line_points,2) + temp_line2.set_pos(57,145-line_value) + temp_line2.set_size(10,line_value) + if value >= 37.3: + temp_line2.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) + else: + temp_line2.set_style_line_color(lv.color_make(35,141,255),0) + + if i == 2: + temp_line3.set_points(temp_line_points,2) + temp_line3.set_pos(84,145-line_value) + temp_line3.set_size(10,line_value) + if value >= 37.3: + temp_line3.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) + else: + temp_line3.set_style_line_color(lv.color_make(35,141,255),0) + if i == 3: + temp_line4.set_points(temp_line_points,2) + temp_line4.set_pos(112,145-line_value) + temp_line4.set_size(10,line_value) + if value >= 37.3: + temp_line4.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) + else: + temp_line4.set_style_line_color(lv.color_make(35,141,255),0) + if i == 4: + temp_line5.set_points(temp_line_points,2) + temp_line5.set_pos(140,145-line_value) + temp_line5.set_size(10,line_value) + if value >= 37.3: + temp_line5.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) + else: + temp_line5.set_style_line_color(lv.color_make(35,141,255),0) + + if i == 5: + temp_line6.set_points(temp_line_points,2) + temp_line6.set_pos(167,145-line_value) + temp_line6.set_size(10,line_value) + if value >= 37.3: + temp_line6.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) + else: + temp_line6.set_style_line_color(lv.color_make(35,141,255),0) + + if i == 6: + temp_line7.set_points(temp_line_points,2) + temp_line7.set_pos(195,145-line_value) + temp_line7.set_size(10,line_value) + if value >= 37.3: + temp_line7.set_style_line_color(lv.color_make(0xff,0x00,0x00),0) + else: + temp_line7.set_style_line_color(lv.color_make(35,141,255),0) def start_measure(self,*args): EventMesh.publish("publish_message_event_ui",{"func":self.start_measure_do,"data":0}) @@ -4429,14 +4812,22 @@ class TemperatureScreen(Screen): WEAR = EventMesh.publish(constants.EVENT.GET_WEAR)#佩戴数据 temp = EventMesh.publish(constants.EVENT.GET_TEMP) temp += 0.5 - tmp = str(temp).split('.')[0] + '.' + str(temp).split('.')[1][:1]#获取小数点后一位 舍去小数点最后一位 if temp < 25 or temp > 42: temp = 0 + if str(temp).find(".") != -1: + tmp = str(temp).split('.')[0] + '.' + str(temp).split('.')[1][:1]#获取小数点后一位 舍去小数点最后一位 + else: + tmp = temp#获取小数点后一位 舍去小数点最后一位 + # print("self.temp:{}".format(temp)) if self.point >= 2: if temp != 0: + size_x = len(str(tmp))*14 + temperature_degree_img.set_pos(100+size_x, 237) temperature_bpm_label.set_text("{}".format(tmp)) else: + size_x = len(str("- -"))*14 + temperature_degree_img.set_pos(100+size_x, 237) temperature_bpm_label.set_text("- -") if self.point%4 == 0 : @@ -4465,7 +4856,6 @@ class TemperatureScreen(Screen): tmp_f_tmp = temp if self.point >= 2: - if temp >= 37.3: temperature_keep_label.set_text("体温偏高") temperature_keep_label.set_style_text_color(lv.color_make(0xff, 0x00, 0x00), lv.STATE.DEFAULT) @@ -4481,15 +4871,18 @@ class TemperatureScreen(Screen): if WEAR == 0: temp = 0 temperature_start_label.set_text("佩戴异常,点击重测") + size_x = len(str("- -"))*14 + temperature_degree_img.set_pos(100+size_x, 237) temperature_bpm_label.set_text("- -") temperature_keep_label.set_text(" ") temperature_keep_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) else : temperature_start_label.set_text("测量结束,点击重测") - EventMesh.publish("set_history_temp_value",temp) - EventMesh.publish(constants.PROTOCOL.TEMP_SEND,[tmp_f_tmp,tmp_d_tmp]) - num = str(tmp_f_tmp)+"."+ str(tmp_d_tmp) - EventMesh.publish(constants.PROTOCOL.BTEMP2_SEND,[1,num]) + if temp > 0: + EventMesh.publish("set_history_temp_value",temp) + EventMesh.publish(constants.PROTOCOL.TEMP_SEND,[tmp_f_tmp,tmp_d_tmp]) + num = str(tmp_f_tmp)+"."+ str(tmp_d_tmp) + EventMesh.publish(constants.PROTOCOL.BTEMP2_SEND,[1,num]) if temp >= 37.3: temperature_done_img.set_src("E:/static/temp_high.png") else: @@ -4511,6 +4904,12 @@ class TemperatureScreen(Screen): EventMesh.publish("set_temp_state",0) EventMesh.publish(constants.EVENT.STOP_TEMP) + def done_left_to_right(self): + self.timer.stop() + EventMesh.publish("set_temp_state",0) + EventMesh.publish(constants.EVENT.STOP_TEMP) + EventMesh.publish("load_screen", {"screen": "health"}) + def done_return(self): EventMesh.publish("load_screen", {"screen": "health"}) @@ -4564,8 +4963,10 @@ class Spo2Screen(Screen): self.timer = osTimer() self.point = 0 self.spo2_value = 0 + self.is_sliding = 0 #self.Hsensor = None def initialization(self): + self.is_sliding = 0 global spo2_screen,spo2_label,spo2_value_label,spo2_reset_btn_img,spo2_done_img,spo2_line_bg_img,spo2_line1,spo2_line2,\ spo2_line3,spo2_line4,spo2_line5,spo2_line6,spo2_line7,spo2_line_bg_img ,spo2_start_label ,spo2_done_label if spo2_screen == None: @@ -4574,7 +4975,7 @@ class Spo2Screen(Screen): spo2_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) spo2_label = lv.label(spo2_screen) - spo2_label.set_pos(0, 20) + spo2_label.set_pos(0, 10) spo2_label.set_size(LCD_SIZE_W, 40) spo2_label.set_text("血氧") spo2_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0) @@ -4582,24 +4983,24 @@ class Spo2Screen(Screen): spo2_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) spo2_line_bg_img = lv.img(spo2_screen) - spo2_line_bg_img.set_pos(5, 60) + spo2_line_bg_img.set_pos(5, 45) spo2_line_bg_img.set_size(230, 120) spo2_line_bg_img.set_src("E:/static/spo2_line_bg.png") spo2_done_img = lv.img(spo2_screen) - spo2_done_img.set_pos(20, LCD_SIZE_W) + spo2_done_img.set_pos(30, 220) spo2_done_img.set_src("E:/static/spo2_gif04.png") spo2_reset_btn_img = lv.img(spo2_screen) - spo2_reset_btn_img.set_pos(0, 192) + spo2_reset_btn_img.set_pos(0, 177) spo2_reset_btn_img.set_src("E:/static/reset_hr_btn.png") spo2_reset_btn_img.add_flag(lv.obj.FLAG.HIDDEN) spo2_reset_btn_img.add_flag(lv.obj.FLAG.CLICKABLE) spo2_start_label = lv.label(spo2_screen) spo2_start_label.set_size(LCD_SIZE_W,40) - spo2_start_label.set_pos(0,200) + spo2_start_label.set_pos(0,185) spo2_start_label.set_text("正在测量中.") spo2_start_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0) spo2_start_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4608,49 +5009,49 @@ class Spo2Screen(Screen): spo2_line1 = lv.line(spo2_screen) spo2_line1.set_points(spo2_line_points,2) - spo2_line1.set_pos(25,60) + spo2_line1.set_pos(25,45) spo2_line1.set_size(10,0) spo2_line1.add_style(style_line_red,0) spo2_line2 = lv.line(spo2_screen) spo2_line2.set_points(spo2_line_points,2) - spo2_line2.set_pos(53,60) + spo2_line2.set_pos(53,45) spo2_line2.set_size(10,0) spo2_line2.add_style(style_line_red,0) spo2_line3 = lv.line(spo2_screen) spo2_line3.set_points(spo2_line_points,2) - spo2_line3.set_pos(80,60) + spo2_line3.set_pos(80,45) spo2_line3.set_size(10,0) spo2_line3.add_style(style_line_red,0) spo2_line4 = lv.line(spo2_screen) spo2_line4.set_points(spo2_line_points,2) - spo2_line4.set_pos(109,60) + spo2_line4.set_pos(109,45) spo2_line4.set_size(10,0) spo2_line4.add_style(style_line_red,0) spo2_line5 = lv.line(spo2_screen) spo2_line5.set_points(spo2_line_points,2) - spo2_line5.set_pos(136,60) + spo2_line5.set_pos(136,45) spo2_line5.set_size(10,0) spo2_line5.add_style(style_line_red,0) spo2_line6 = lv.line(spo2_screen) spo2_line6.set_points(spo2_line_points,2) - spo2_line6.set_pos(164,60) + spo2_line6.set_pos(164,45) spo2_line6.set_size(10,0) spo2_line6.add_style(style_line_red,0) spo2_line7 = lv.line(spo2_screen) spo2_line7.set_points(spo2_line_points,2) - spo2_line7.set_pos(192,60) + spo2_line7.set_pos(192,45) spo2_line7.set_size(10,0) spo2_line7.add_style(style_line_red,0) spo2_value_label = lv.label(spo2_screen) - spo2_value_label.set_size(110, 40) - spo2_value_label.set_pos(130, 270) + spo2_value_label.set_size(110, 34) + spo2_value_label.set_pos(110, 240) spo2_value_label.set_text("- -%") spo2_value_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) spo2_value_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) @@ -4659,15 +5060,44 @@ class Spo2Screen(Screen): self.meta = spo2_screen spo2_reset_btn_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.restart_up(e)), lv.EVENT.CLICKED, None) + spo2_reset_btn_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.restart_up(e)), + lv.EVENT.PRESSING, None) def post_processor_after_initialization(self): self.point = 0 + self.is_sliding= 0 self.spo2_value = 0 self.show_history_data() - self.restart_up(0) + self.start_init() def restart_up(self,e): + global spo2_value_label,heartrate_bpm_label,spo2_start_label,spo2_reset_btn_img + code = e.get_code() + + #print("code!!!!!!!!",code,msg) + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding = 0 + self.point = 0 + self.timer.start(1*500, 1, self.start_measure) + if spo2_reset_btn_img != None: + spo2_reset_btn_img.add_flag(lv.obj.FLAG.HIDDEN) + + + spo2_value_label.set_text("- -%") + spo2_start_label.set_text("正在测量中.") + EventMesh.publish("set_spo2_state",1)#2代表后台进入血氧测试 + EventMesh.publish(constants.EVENT.START_BLOOD_OXYGEN) + self.is_sliding =0 + + def start_init(self): self.point = 0 self.timer.start(1*500, 1, self.start_measure) if spo2_reset_btn_img != None: @@ -4684,70 +5114,71 @@ class Spo2Screen(Screen): read_data = {} read_data = EventMesh.publish("get_history_spo2_value") # print("hr get_history_spo2_value",read_data) - if len(read_data) != 0: - sort_new = {} - sort_new = sorted(read_data, key = lambda i: i['timeSec'],reverse = False)#按照时间戳进行排序 去掉最旧的一次数据如果满了五 - count = len(sort_new) - if count != 0: - for i in range(count): - print(int(sort_new[i]["spo2"])) - # print("hr history read_data",read_data) - value = int(sort_new[i]["spo2"]) - if value < 80: - value = 80 - if value >= 100: - value = 100 - if value <= 85: - value = value - 80 - line_value = int(value*6) - elif value <= 90: - value = value-85 - line_value = int((17/5)*value)+30 - elif value <= 95: - value = value-90 - line_value = int((21/5)*value)+47 - elif value <= 100: - value = value-95 - line_value = int((16/5)*value)+68 - - - if line_value >= 100: - line_value = 100 - #print("hr hist",line_value) - hr_line_points = [{"x":0,"y":0},{"x":0,"y":line_value}] - if i == 0: - spo2_line1.set_points(hr_line_points,2) - spo2_line1.set_pos(25,160-line_value) - spo2_line1.set_size(10,line_value) - if i == 1: - spo2_line2.set_points(hr_line_points,2) - spo2_line2.set_pos(53,160-line_value) - spo2_line2.set_size(10,line_value) - - if i == 2: - spo2_line3.set_points(hr_line_points,2) - spo2_line3.set_pos(80,160-line_value) - spo2_line3.set_size(10,line_value) - - if i == 3: - spo2_line4.set_points(hr_line_points,2) - spo2_line4.set_pos(109,160-line_value) - spo2_line4.set_size(10,line_value) - - if i == 4: - spo2_line5.set_points(hr_line_points,2) - spo2_line5.set_pos(136,160-line_value) - spo2_line5.set_size(10,line_value) - - if i == 5: - spo2_line6.set_points(hr_line_points,2) - spo2_line6.set_pos(164,160-line_value) - spo2_line6.set_size(10,line_value) - - if i == 6: - spo2_line7.set_points(hr_line_points,2) - spo2_line7.set_pos(192,160-line_value) - spo2_line7.set_size(10,line_value) + if read_data != None: + if len(read_data) != 0: + sort_new = {} + sort_new = sorted(read_data, key = lambda i: i['timeSec'],reverse = False)#按照时间戳进行排序 去掉最旧的一次数据如果满了五 + count = len(sort_new) + if count != 0: + for i in range(count): + print(int(sort_new[i]["spo2"])) + # print("hr history read_data",read_data) + value = int(sort_new[i]["spo2"]) + if value < 80: + value = 80 + if value >= 100: + value = 100 + if value <= 85: + value = value - 80 + line_value = int(value*6) + elif value <= 90: + value = value-85 + line_value = int((17/5)*value)+30 + elif value <= 95: + value = value-90 + line_value = int((21/5)*value)+47 + elif value <= 100: + value = value-95 + line_value = int((16/5)*value)+68 + + + if line_value >= 100: + line_value = 100 + #print("hr hist",line_value) + hr_line_points = [{"x":0,"y":0},{"x":0,"y":line_value}] + if i == 0: + spo2_line1.set_points(hr_line_points,2) + spo2_line1.set_pos(25,145-line_value) + spo2_line1.set_size(10,line_value) + if i == 1: + spo2_line2.set_points(hr_line_points,2) + spo2_line2.set_pos(53,145-line_value) + spo2_line2.set_size(10,line_value) + + if i == 2: + spo2_line3.set_points(hr_line_points,2) + spo2_line3.set_pos(80,145-line_value) + spo2_line3.set_size(10,line_value) + + if i == 3: + spo2_line4.set_points(hr_line_points,2) + spo2_line4.set_pos(109,145-line_value) + spo2_line4.set_size(10,line_value) + + if i == 4: + spo2_line5.set_points(hr_line_points,2) + spo2_line5.set_pos(136,145-line_value) + spo2_line5.set_size(10,line_value) + + if i == 5: + spo2_line6.set_points(hr_line_points,2) + spo2_line6.set_pos(164,145-line_value) + spo2_line6.set_size(10,line_value) + + if i == 6: + spo2_line7.set_points(hr_line_points,2) + spo2_line7.set_pos(192,145-line_value) + spo2_line7.set_size(10,line_value) def start_measure(self,*args): EventMesh.publish("publish_message_event_ui",{"func":self.start_measure_do,"data":0}) @@ -4768,7 +5199,7 @@ class Spo2Screen(Screen): if self.spo2_value != 0: spo2_value_label.set_text("{}%".format(self.spo2_value)) else: - spo2_value_label.set_text("- - %") + spo2_value_label.set_text("- -%") if self.point%4 == 0 : spo2_start_label.set_text("正在测量中..") @@ -4810,7 +5241,7 @@ class Spo2Screen(Screen): spo2_value_label.set_text("{}%".format(self.spo2_value)) # heartrate_done_label.set_text("测量完成") else: - spo2_value_label.set_text("- - %") + spo2_value_label.set_text("- -%") self.show_history_data() @@ -4831,6 +5262,15 @@ class Spo2Screen(Screen): def done_return(self): EventMesh.publish("load_screen", {"screen": "health"}) + def done_left_to_right(self): + self.timer.stop() + get_hr_state = EventMesh.publish("get_hr_state") + get_spo2_state = EventMesh.publish("get_spo2_state") + if get_hr_state == 1 or get_spo2_state == 1: + EventMesh.publish("set_spo2_state",0)#0代表关闭测试 + EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN) + EventMesh.publish("load_screen", {"screen": "health"}) + def btn1_release(self): EventMesh.publish("load_screen", {"screen": "health"}) @@ -4888,9 +5328,11 @@ class CountdownScreen(Screen): self.total = 0 self.time_tmp = 0 self.timer_cb = 0 + self.is_sliding =0 EventMesh.subscribe("close_count_show_info", self.close_count_show_info) def initialization(self): + self.is_sliding=0 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 ,\ countdown_min_up,countdown_min_up_btn ,countdown_min_down,countdown_min_down_btn,countdown_sec_up ,\ @@ -4910,7 +5352,7 @@ class CountdownScreen(Screen): 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_pos(30, 130) countdown_hour.set_size(60, 30) countdown_hour.set_text("00") countdown_hour.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4918,7 +5360,7 @@ class CountdownScreen(Screen): 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_pos(82, 128) countdown_mao.set_size(30, 30) countdown_mao.set_text(":") countdown_mao.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4927,7 +5369,7 @@ class CountdownScreen(Screen): countdown_min = lv.label(countdown_screen) - countdown_min.set_pos(95, 140) + countdown_min.set_pos(95, 130) countdown_min.set_size(60, 30) countdown_min.set_text("00") countdown_min.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4935,7 +5377,7 @@ class CountdownScreen(Screen): 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_pos(146, 128) countdown_mao1.set_size(30, 30) countdown_mao1.set_text(":") countdown_mao1.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4944,7 +5386,7 @@ class CountdownScreen(Screen): countdown_sec = lv.label(countdown_screen) - countdown_sec.set_pos(160, 140) + countdown_sec.set_pos(160, 130) countdown_sec.set_size(60, 30) countdown_sec.set_text("00") countdown_sec.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4953,38 +5395,38 @@ class CountdownScreen(Screen): 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_pos(36, 90) countdown_hour_up.set_src("E:/static/time_up.png") 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_size(62, 65) countdown_hour_up_btn.set_pos(20, 80) 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_pos(36, 170) countdown_hour_down.set_src("E:/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(62, 70) + countdown_hour_down_btn.set_pos(20, 145) 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_pos(99, 90) countdown_min_up.set_src("E:/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_size(64, 65) countdown_min_up_btn.set_pos(82, 80) countdown_min_up_btn.add_flag(lv.obj.FLAG.CLICKABLE) @@ -4992,51 +5434,51 @@ class CountdownScreen(Screen): 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_pos(99, 170) countdown_min_down.set_src("E:/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(64, 70) + countdown_min_down_btn.set_pos(82, 145) 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_pos(165, 90) countdown_sec_up.set_src("E:/static/time_up.png") 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_size(64, 65) countdown_sec_up_btn.set_pos(146, 80) 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_pos(165, 170) countdown_sec_down.set_src("E:/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(64, 70) + countdown_sec_down_btn.set_pos(146, 145) 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_src("E:/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(10, 230) countdown_reset_imgbtn = lv.img(countdown_screen) - countdown_reset_imgbtn.set_size(99, 70) + countdown_reset_imgbtn.set_size(99, 54) 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(10, 220) @@ -5044,13 +5486,13 @@ class CountdownScreen(Screen): countdown_start_img.set_size(99, 36) countdown_start_img.set_src("E:/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(120, 230) countdown_start_imgbtn = lv.img(countdown_screen) - countdown_start_imgbtn.set_size(99, 70) + countdown_start_imgbtn.set_size(99, 54) 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(120, 220) @@ -5058,7 +5500,7 @@ class CountdownScreen(Screen): countdown_stop_img.set_size(99, 36) countdown_stop_img.set_src("E:/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(120, 230) countdown_stop_img.add_flag(lv.obj.FLAG.HIDDEN) countdown_start_img.clear_flag(lv.obj.FLAG.HIDDEN) @@ -5083,6 +5525,10 @@ class CountdownScreen(Screen): lv.EVENT.CLICKED, None) countdown_reset_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reset(e)), lv.EVENT.CLICKED, None) + countdown_start_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + lv.EVENT.PRESSING, None) + countdown_reset_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reset(e)), + lv.EVENT.PRESSING, None) # countdown_stop_imgbtn.add_event_cb(lambda e: self.stop(e), # lv.EVENT.CLICKED, None) date_tmp = utime.localtime() @@ -5163,38 +5609,48 @@ class CountdownScreen(Screen): countdown_min_up,countdown_min_up_btn ,countdown_min_down,countdown_min_down_btn,countdown_sec_up ,\ countdown_sec_up_btn,countdown_sec_down ,countdown_sec_down_btn ,countdown_reset_img ,countdown_reset_imgbtn ,\ countdown_start_img,countdown_start_imgbtn,countdown_stop_img ,countdown_min - self.total = self.hour*60*60 + self.min*60 + self.sec - print("--00:",self.total,self.hour,self.min,self.sec,self.g_state) - if self.g_state == 1: - self.g_state = 2 - self.stop() - elif self.g_state == 2: - self.g_state = 1 - if self.total > 0: - date_tmp = utime.localtime() - timeSecond = utime.mktime(date_tmp) - print("start self.timeSecond:{}".format(timeSecond)) - EventMesh.publish("set_countdown_all_time", [self.total,timeSecond]) - if self.g_state != 2: - self.g_state = 1 - self.g_end = 0 - date_tmp = utime.localtime() - self.timeSecond = utime.mktime(date_tmp) - self.show_value() - self.timer.start(1000,1,self.fun) - countdown_hour_up.add_flag(lv.obj.FLAG.HIDDEN) - countdown_hour_down.add_flag(lv.obj.FLAG.HIDDEN) - countdown_hour_up.add_flag(lv.obj.FLAG.HIDDEN) - countdown_hour_down.add_flag(lv.obj.FLAG.HIDDEN) - countdown_min_up.add_flag(lv.obj.FLAG.HIDDEN) - countdown_min_down.add_flag(lv.obj.FLAG.HIDDEN) - countdown_sec_up.add_flag(lv.obj.FLAG.HIDDEN) - countdown_sec_down.add_flag(lv.obj.FLAG.HIDDEN) - countdown_start_img.add_flag(lv.obj.FLAG.HIDDEN) - countdown_stop_img.clear_flag(lv.obj.FLAG.HIDDEN) - countdown_reset_img.clear_flag(lv.obj.FLAG.HIDDEN) - EventMesh.publish("set_countdown_off_state", [0,self.g_state]) + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + self.total = self.hour*60*60 + self.min*60 + self.sec + print("--00:",self.total,self.hour,self.min,self.sec,self.g_state) + if self.g_state == 1: + self.g_state = 2 + self.stop() + elif self.g_state == 2: + self.g_state = 1 + if self.total > 0: + date_tmp = utime.localtime() + timeSecond = utime.mktime(date_tmp) + print("start self.timeSecond:{}".format(timeSecond)) + EventMesh.publish("set_countdown_all_time", [self.total,timeSecond]) + if self.g_state != 2: + self.g_state = 1 + self.g_end = 0 + date_tmp = utime.localtime() + self.timeSecond = utime.mktime(date_tmp) + self.show_value() + self.timer.start(1000,1,self.fun) + countdown_hour_up.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_down.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_up.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_down.add_flag(lv.obj.FLAG.HIDDEN) + countdown_min_up.add_flag(lv.obj.FLAG.HIDDEN) + countdown_min_down.add_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_up.add_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_down.add_flag(lv.obj.FLAG.HIDDEN) + countdown_start_img.add_flag(lv.obj.FLAG.HIDDEN) + countdown_stop_img.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_reset_img.clear_flag(lv.obj.FLAG.HIDDEN) + EventMesh.publish("set_countdown_off_state", [0,self.g_state]) + self.is_sliding =0 def stop(self): 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 ,\ @@ -5279,27 +5735,43 @@ class CountdownScreen(Screen): countdown_min_up,countdown_min_up_btn ,countdown_min_down,countdown_min_down_btn,countdown_sec_up ,\ countdown_sec_up_btn,countdown_sec_down ,countdown_sec_down_btn ,countdown_reset_img ,countdown_reset_imgbtn ,\ countdown_start_img,countdown_start_imgbtn,countdown_stop_img ,countdown_min - # print("in reset") - self.timer.stop() - self.hour = 0 - self.min = 0 - self.sec = 0 - self.g_state = 0 - self.g_end = 0 - self.total = 0 - EventMesh.publish("set_countdown_off_state", [0,self.g_state]) - EventMesh.publish("reset_time_countdown") - countdown_start_img.clear_flag(lv.obj.FLAG.HIDDEN) - countdown_stop_img.add_flag(lv.obj.FLAG.HIDDEN) - countdown_reset_img.clear_flag(lv.obj.FLAG.HIDDEN) + code = e.get_code() - countdown_hour_up.clear_flag(lv.obj.FLAG.HIDDEN) - countdown_hour_down.clear_flag(lv.obj.FLAG.HIDDEN) - countdown_min_up.clear_flag(lv.obj.FLAG.HIDDEN) - countdown_min_down.clear_flag(lv.obj.FLAG.HIDDEN) - countdown_sec_up.clear_flag(lv.obj.FLAG.HIDDEN) - countdown_sec_down.clear_flag(lv.obj.FLAG.HIDDEN) - self.show_value() + + #print("code!!!!!!!!",code,msg) + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + # print("in reset") + self.timer.stop() + self.hour = 0 + self.min = 0 + self.sec = 0 + self.g_state = 0 + self.g_end = 0 + self.total = 0 + EventMesh.publish("set_countdown_off_state", [0,self.g_state]) + EventMesh.publish("reset_time_countdown") + countdown_start_img.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_stop_img.add_flag(lv.obj.FLAG.HIDDEN) + countdown_reset_img.clear_flag(lv.obj.FLAG.HIDDEN) + + countdown_hour_up.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_down.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_min_up.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_min_down.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_up.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_down.clear_flag(lv.obj.FLAG.HIDDEN) + self.show_value() + + self.is_sliding =0 + @@ -5371,6 +5843,11 @@ class CountdownScreen(Screen): else: EventMesh.publish("load_screen", {"screen": "toolbox"}) + def done_left_to_right(self): + if self.g_state == 0: + self.timer.stop() + EventMesh.publish("load_screen", {"screen": "toolbox"}) + def btn1_release(self): if self.g_state == 0: self.timer.stop() @@ -5518,7 +5995,7 @@ class StopwatchScreen(Screen): 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_pos(40, 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) @@ -5526,7 +6003,7 @@ class StopwatchScreen(Screen): 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_pos(92, 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) @@ -5535,7 +6012,7 @@ class StopwatchScreen(Screen): stopwatch_label_sec = lv.label(stopwatch_screen) - stopwatch_label_sec.set_pos(95, 140) + stopwatch_label_sec.set_pos(105, 140) stopwatch_label_sec.set_size(60, 30) stopwatch_label_sec.set_text("00") stopwatch_label_sec.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -5543,7 +6020,7 @@ class StopwatchScreen(Screen): stopwatch_label_sec.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) stopwatch_mao1 = lv.label(stopwatch_screen) - stopwatch_mao1.set_pos(146, 138) + stopwatch_mao1.set_pos(156, 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) @@ -5552,7 +6029,7 @@ class StopwatchScreen(Screen): stopwatch_label_ms = lv.label(stopwatch_screen) - stopwatch_label_ms.set_pos(160, 140) + stopwatch_label_ms.set_pos(170, 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) @@ -5566,32 +6043,32 @@ class StopwatchScreen(Screen): stopwatch_reset_img.set_size(99, 36) stopwatch_reset_img.set_src("E:/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(15, 210) stopwatch_reset_imgbtn = lv.img(stopwatch_screen) stopwatch_reset_imgbtn.set_size(99, 76) stopwatch_reset_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) - stopwatch_reset_imgbtn.set_pos(10, 190) + stopwatch_reset_imgbtn.set_pos(15, 190) stopwatch_start_img = lv.img(stopwatch_screen) stopwatch_start_img.set_size(99, 36) stopwatch_start_img.set_src("E:/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(120, 210) stopwatch_start_imgbtn = lv.img(stopwatch_screen) stopwatch_start_imgbtn.set_size(99, 76) stopwatch_start_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) - stopwatch_start_imgbtn.set_pos(115, 190) + stopwatch_start_imgbtn.set_pos(120, 190) stopwatch_stop_img = lv.img(stopwatch_screen) stopwatch_stop_img.set_size(99, 36) stopwatch_stop_img.set_src("E:/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(120, 210) 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) @@ -5746,6 +6223,11 @@ class StopwatchScreen(Screen): self.timer.stop() EventMesh.publish("load_screen", {"screen": "toolbox"}) + def done_left_to_right(self): + if self.s_state == 0: + self.timer.stop() + EventMesh.publish("load_screen", {"screen": "toolbox"}) + def btn1_release(self): if self.s_state == 0: self.timer.stop() @@ -5773,7 +6255,7 @@ class UIFINDScreen(Screen): def initialization(self): global FIND_screen ,watchface_mpsignal_img - if FIND_screen ==None: + if FIND_screen == None: FIND_screen = lv.obj() print("FIND_screen") FIND_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) @@ -5781,7 +6263,7 @@ class UIFINDScreen(Screen): 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_pos(int(40),int(27)) 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) @@ -5857,7 +6339,7 @@ class LowPowerScreen(Screen): Lowpower_screen.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) #进入图片 Lowpower_screen_img = lv.img(Lowpower_screen) - Lowpower_screen_img.set_pos(int(40),int(45)) + Lowpower_screen_img.set_pos(int(40),int(27)) Lowpower_screen_img.set_size(160,230) Lowpower_screen_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) Lowpower_screen_img.add_flag(lv.obj.FLAG.CLICKABLE) @@ -5905,7 +6387,7 @@ 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_pos(int(86),int(20)) LowOnePower_screen_img.set_size(68,110) LowOnePower_screen_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) LowOnePower_screen_img.add_flag(lv.obj.FLAG.CLICKABLE) @@ -5913,7 +6395,7 @@ class LowOnePowerScreen(Screen): #0%的电池电量 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_pos(0, 150) LowOnePower_screen_label1.set_size(LCD_SIZE_W, 60) LowOnePower_screen_label1.set_text("电池电量过低,请及时充电") LowOnePower_screen_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -5921,7 +6403,7 @@ class LowOnePowerScreen(Screen): #0%的电池电量 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_pos(0, 220) LowOnePower_screen_label2.set_size(LCD_SIZE_W, 60) LowOnePower_screen_label2.set_text("继续使用,5s过后强制关机") LowOnePower_screen_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -5975,9 +6457,11 @@ class sosScreen(Screen): self.timer = osTimer() self.meta_type = "popup" self.count = 0 + self.is_sliding =0 def initialization(self): global sos_screen ,sos_screen_label + self.is_sliding =0 if sos_screen == None : sos_screen = lv.obj() print("SOS_POPUP") @@ -5996,7 +6480,7 @@ class sosScreen(Screen): sos_screen_label = lv.label(sos_screen) - sos_screen_label.set_text("是否拨打紧急\n求助电话?") + sos_screen_label.set_text("是否拨打求助电话?") sos_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) sos_screen_label.set_size(LCD_SIZE_W, 50) sos_screen_label.set_pos(0,65) @@ -6006,13 +6490,13 @@ class sosScreen(Screen): sos_screen_label.set_text("无操作10s后\n自动拨打") sos_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) sos_screen_label.set_size(LCD_SIZE_W, 50) - sos_screen_label.set_pos(0,140) + sos_screen_label.set_pos(0,100) sos_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) sos_screen_confirm_img = lv.img(sos_screen) sos_screen_confirm_img.set_size(176, 46) - sos_screen_confirm_img.set_pos(32, 210) + sos_screen_confirm_img.set_pos(32, 170) sos_screen_confirm_img.set_src("E:/static/off_icon.png") sos_screen_confirm_img.add_flag(lv.obj.FLAG.CLICKABLE) sos_screen_confirm_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -6024,7 +6508,7 @@ class sosScreen(Screen): sos_screen_return = lv.img(sos_screen) sos_screen_return.set_size(176, 46) - sos_screen_return.set_pos(32, 270) + sos_screen_return.set_pos(32, 230) sos_screen_return.set_src("E:/static/cancel_icon.png") sos_screen_return.add_flag(lv.obj.FLAG.CLICKABLE) sos_screen_return.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -6040,22 +6524,42 @@ class sosScreen(Screen): sos_screen_return.add_event_cb(lambda e: EventMesh.callback_wrapper(self.timer_cancel_cb(e)), lv.EVENT.CLICKED, None) + sos_screen_confirm_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.timer_comfirm_cb(e)), + lv.EVENT.PRESSING, None) + + sos_screen_return.add_event_cb(lambda e: EventMesh.callback_wrapper(self.timer_cancel_cb(e)), + lv.EVENT.PRESSING, None) def timer_comfirm_cb(self,e): - EventMesh.publish("set_sos_flag", 1) + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + EventMesh.publish("set_sos_flag", 1) + print("2self.is_sliding",self.is_sliding) + + self.is_sliding =0 + def timer_cancel_cb(self,e): EventMesh.publish("return_prev_screen") def post_processor_before_initialization(self): self.count = 0 - self.timer.start(5000,1,self.timer_cb_onescond) + self.timer.start(1000,1,self.timer_cb_onescond) def timer_cb_onescond(self,e): EventMesh.publish("system_sleep_rest")#防止黑屏 self.count+=1 - if self.count >= 2: + if self.count >= 10: self.count = 0 + self.timer.stop() EventMesh.publish("set_sos_flag", 1) def Close(self): @@ -6409,7 +6913,7 @@ class restore_confirmScreen(Screen): #进入图片 rrestor_confirm_n_screen_label = lv.label(rrestor_confirm_n_screen) - rrestor_confirm_n_screen_label.set_pos(0, 150) + rrestor_confirm_n_screen_label.set_pos(0, (LCD_SIZE_H//2)-10) rrestor_confirm_n_screen_label.set_size(LCD_SIZE_W, 60) rrestor_confirm_n_screen_label.set_text("正在恢复出厂中\n请稍等...") rrestor_confirm_n_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -6539,6 +7043,8 @@ class classMgrPopupScreen(Screen):#上课禁用时间界面 EventMesh.publish(constants.EVENT.SYSTEM_SLEEP) else: EventMesh.publish(constants.EVENT.SYSTEM_UP) + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn8_press(self): state = EventMesh.publish("get_cur_class_time_state") diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_health.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_health.py index 86836efb..a5321e7b 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_health.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_health.py @@ -85,30 +85,30 @@ healt_cont.add_style(setting_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT) # healt_cont.add_style(setting_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT) health_hr_bg_img = lv.img(healt_cont) -health_hr_bg_img.set_pos(0, health_cont_y) +health_hr_bg_img.set_pos(5, health_cont_y) health_hr_bg_img.set_size(HEALTH_BG_ICON_W_SIZE, HEALTH_BG_ICON_H_SIZE) health_hr_bg_img.add_flag(lv.obj.FLAG.CLICKABLE) health_hr_bg_img.set_src("E:/static/list_bg.png") health_hr_bg_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) health_hr_img = lv.img(healt_cont) -health_hr_img.set_pos(8, health_cont_y+6) +health_hr_img.set_pos(13, health_cont_y+6) health_hr_img.set_size(HEALTH_ICON_W_SIZE, HEALTH_ICON_H_SIZE) -health_hr_img.add_flag(lv.obj.FLAG.CLICKABLE) +# health_hr_img.add_flag(lv.obj.FLAG.CLICKABLE) health_hr_img.set_src("E:/static/health/health_hr.png") health_hr_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) health_cont_y+=HEALTH_ICON_OFFSET_SIZE hhealth_spo2_bg_img = lv.img(healt_cont) -hhealth_spo2_bg_img.set_pos(0, health_cont_y) +hhealth_spo2_bg_img.set_pos(5, health_cont_y) hhealth_spo2_bg_img.set_size(HEALTH_BG_ICON_W_SIZE, HEALTH_BG_ICON_H_SIZE) hhealth_spo2_bg_img.add_flag(lv.obj.FLAG.CLICKABLE) hhealth_spo2_bg_img.set_src("E:/static/list_bg.png") hhealth_spo2_bg_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) health_spo2_img = lv.img(healt_cont) -health_spo2_img.set_pos(8, health_cont_y+6) +health_spo2_img.set_pos(13, health_cont_y+6) health_spo2_img.set_size(HEALTH_ICON_W_SIZE, HEALTH_ICON_H_SIZE) # health_spo2_img.add_flag(lv.obj.FLAG.CLICKABLE) health_spo2_img.set_src("E:/static/health/health_spo2.png") @@ -116,16 +116,16 @@ health_spo2_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) health_cont_y+=HEALTH_ICON_OFFSET_SIZE health_temp_bg_img = lv.img(healt_cont) -health_temp_bg_img.set_pos(0, health_cont_y) +health_temp_bg_img.set_pos(5, health_cont_y) health_temp_bg_img.set_size(HEALTH_BG_ICON_W_SIZE, HEALTH_BG_ICON_H_SIZE) health_temp_bg_img.add_flag(lv.obj.FLAG.CLICKABLE) health_temp_bg_img.set_src("E:/static/list_bg.png") health_temp_bg_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) health_temp_img = lv.img(healt_cont) -health_temp_img.set_pos(8, health_cont_y+6) +health_temp_img.set_pos(13, health_cont_y+6) health_temp_img.set_size(HEALTH_ICON_W_SIZE, HEALTH_ICON_H_SIZE) -health_temp_img.add_flag(lv.obj.FLAG.CLICKABLE) +# health_temp_img.add_flag(lv.obj.FLAG.CLICKABLE) health_temp_img.set_src("E:/static/health/health_temp.png") health_temp_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) health_cont_y+=HEALTH_ICON_OFFSET_SIZE @@ -165,9 +165,9 @@ class HealthScreen(Screen):#健康测量 self.is_sliding = 0 EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) - self.is_sliding =0 + self.is_sliding = 0 - def done_return(self): + def done_left_to_right(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn1_release(self): diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_main_menu.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_main_menu.py index 045f032e..4cb52449 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_main_menu.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_main_menu.py @@ -337,6 +337,7 @@ class MainMenuScreen(Screen): self.menu_id = "0" self.menu_new_id = "255" self.menu_old_id = "255" + self.is_sliding = 0 self.scroll_begin_event_count = 0 self.menu_action = 0 # =1左滑 =2右划 print("MainMenu1:__init__") @@ -350,6 +351,15 @@ class MainMenuScreen(Screen): 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) MainMenu2_img_sms.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "popup")), lv.EVENT.CLICKED, None) + + MainMenu2_img_phone.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "Phone")), lv.EVENT.PRESSING, None) + MainMenu2_img_toolbox.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "toolbox")), lv.EVENT.PRESSING, None) + MainMenu2_img_setting.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "setting")), lv.EVENT.PRESSING, None) + MainMenu2_img_health.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "health")), lv.EVENT.PRESSING, None) + MainMenu2_img_contacts.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "contacts")), lv.EVENT.PRESSING, None) + MainMenu2_img_wechat.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "wechat")), lv.EVENT.PRESSING, None) + # MainMenu2_img_spo2.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "spo2")), lv.EVENT.CLICKED, None) + MainMenu2_img_sms.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "popup")), lv.EVENT.PRESSING, None) #MainMenu2_img_alipay.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "alipay_open")), lv.EVENT.CLICKED, None) EventMesh.subscribe("watch_top_show", self.watch_top_show) @@ -359,7 +369,7 @@ class MainMenuScreen(Screen): def initialization(self): self.watchface.initialization(MainMenu2_Watchface) - + self.is_sliding = 0 if self.menu_id =="0": MainMenu2_til.set_tile_id(0,1,lv.ANIM.OFF) # if self.meta_info in globals() : @@ -398,9 +408,18 @@ class MainMenuScreen(Screen): def watch_top_show(self, event, msg): # MainMenu2_til.set_tile_id(0,1,lv.ANIM.OFF) - def img_cb(self, e, msg): - print("MainMenu2:img_cb:{}".format(msg)) - EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) + def img_cb(self,e,msg): + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) + self.is_sliding = 0 def lcd_on(self): self.watchface.watchface_style.timerout_update() diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py index 3763b491..855d1fba 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py @@ -220,19 +220,19 @@ setting_version_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) setting_cont_y+=SETTING_ICON_OFFSET_SIZE -setting_update_bg_img = lv.img(setting_cont) -setting_update_bg_img.set_pos(0, setting_cont_y) -setting_update_bg_img.set_size(TOOL_BG_ICON_W_SIZE, TOOL_BG_ICON_H_SIZE) -setting_update_bg_img.add_flag(lv.obj.FLAG.CLICKABLE) -setting_update_bg_img.set_src("E:/static/list_bg.png") -setting_update_bg_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - -setting_update_img = lv.img(setting_cont) -setting_update_img.set_pos(8, setting_cont_y+6) -setting_update_img.set_size(SETTING_ICON_W_SIZE, SETTING_ICON_H_SIZE) -# setting_update_img.add_flag(lv.obj.FLAG.CLICKABLE) -setting_update_img.set_src("E:/static/setting/menu_upgrade.png") -setting_update_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) +# setting_update_bg_img = lv.img(setting_cont) +# setting_update_bg_img.set_pos(0, setting_cont_y) +# setting_update_bg_img.set_size(TOOL_BG_ICON_W_SIZE, TOOL_BG_ICON_H_SIZE) +# setting_update_bg_img.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_update_bg_img.set_src("E:/static/list_bg.png") +# setting_update_bg_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +# setting_update_img = lv.img(setting_cont) +# setting_update_img.set_pos(8, setting_cont_y+6) +# setting_update_img.set_size(SETTING_ICON_W_SIZE, SETTING_ICON_H_SIZE) +# # setting_update_img.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_update_img.set_src("E:/static/setting/menu_upgrade.png") +# setting_update_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) class SettingScreen(Screen): NAME = "setting" @@ -252,7 +252,7 @@ class SettingScreen(Screen): setting_volume_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "totalvolume")), lv.EVENT.CLICKED, None) setting_restore_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "restore")), lv.EVENT.CLICKED, None) setting_poweroff_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "poweroff")), lv.EVENT.CLICKED, None) - setting_update_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "update")), lv.EVENT.CLICKED, None) + # setting_update_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "update")), lv.EVENT.CLICKED, None) setting_version_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "version")), lv.EVENT.CLICKED, None) setting_dialswitch_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "dialswitch")), lv.EVENT.PRESSING, None) @@ -263,7 +263,7 @@ class SettingScreen(Screen): setting_volume_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "totalvolume")), lv.EVENT.PRESSING, None) setting_restore_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "restore")), lv.EVENT.PRESSING, None) setting_poweroff_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "poweroff")), lv.EVENT.PRESSING, None) - setting_update_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "update")), lv.EVENT.PRESSING, None) + # setting_update_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "update")), lv.EVENT.PRESSING, None) setting_version_bg_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.setting_cb(e, "version")), lv.EVENT.PRESSING, None) def initialization(self): @@ -284,7 +284,7 @@ class SettingScreen(Screen): self.is_sliding =0 - def done_return(self): + def done_left_to_right(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn1_release(self): @@ -294,6 +294,13 @@ class SettingScreen(Screen): def btn8_press(self): EventMesh.publish("watch_top_show") EventMesh.publish("load_screen", {"screen": "main_menu"}) + + def done_DOWN(self):#下滑 + setting_cont.scroll_to_view(lv.ANIM.ON) + pass + def done_UP(self):#上滑 + setting_cont.scroll_to_view(lv.ANIM.ON) + pass ################################################################## # -------------------------------------------language screen---------------------------------------------------------- language_screen = lv.obj() @@ -346,7 +353,7 @@ dialswitch_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAUL dialswitch_img1 = lv.img(dialswitch_screen)#表盘预览图 dialswitch_img1.set_pos(50, 60) -dialswitch_img1.set_size(140, 172) +dialswitch_img1.set_size(140, 162) dialswitch_img1.set_src("U:/static/DIAL_PREV01.png") dialswitch_img1.add_flag(lv.obj.FLAG.CLICKABLE) dialswitch_img1.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -355,19 +362,19 @@ dialswitch_img1.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) dialswitch_btn1_label = lv.label(dialswitch_screen)#显示表盘1 表盘2 dialswitch_btn1_label.set_text(" ") -dialswitch_btn1_label.align(lv.ALIGN.TOP_MID, 0, 260) +dialswitch_btn1_label.align(lv.ALIGN.TOP_MID, 0, 240) dialswitch_btn1_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) dialswitch_butoom_crcile1 = lv.img(dialswitch_screen)#底部显示圆点 -dialswitch_butoom_crcile1.set_pos(95, 300) +dialswitch_butoom_crcile1.set_pos(95, 270) dialswitch_butoom_crcile1.set_size(10, 10) dialswitch_butoom_crcile1.set_src("E:/static/point_white.png") dialswitch_butoom_crcile1.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) dialswitch_butoom_crcile2 = lv.img(dialswitch_screen)#底部显示圆点 -dialswitch_butoom_crcile2.set_pos(140, 300) +dialswitch_butoom_crcile2.set_pos(140, 270) dialswitch_butoom_crcile2.set_size(10, 10) dialswitch_butoom_crcile2.set_src("E:/static/point_black.png") dialswitch_butoom_crcile2.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -459,8 +466,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(30),int(20)) +app_img.set_size(180,180) app_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) app_img.add_flag(lv.obj.FLAG.CLICKABLE) app_img.set_src("E:/static/IMAGE_APP_QR_CODE.png") @@ -474,7 +481,7 @@ app_img.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) # 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_pos(0, 240) app_label.set_size(240, 20) app_label.set_text(" ") app_label.set_long_mode(lv.label.LONG.WRAP) @@ -671,9 +678,9 @@ 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_text("恢复出厂设置?") +restore_label.set_pos(0, 90) +restore_label.set_size(240, 70) +restore_label.set_text("设备所有的数据将会被清除,确定继续吗?") restore_label.set_long_mode(lv.label.LONG.WRAP) restore_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) restore_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -840,22 +847,53 @@ class RestoreScreen(Screen): NAME = "restore" def __init__(self): + self.is_sliding = 0 super().__init__() self.meta = restore_screen restore_confirm.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)),lv.EVENT.CLICKED, None) + restore_confirm.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)),lv.EVENT.PRESSING, None) restore_cancel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.concel(e)),lv.EVENT.CLICKED, None) + restore_cancel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.concel(e)),lv.EVENT.PRESSING, None) - - def confirm(self, e): - EventMesh.publish("load_screen", {"screen": "restore_confirm"}) + def initialization(self): + self.is_sliding = 0 + def confirm(self, e): + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + EventMesh.publish("load_screen", {"screen": "restore_confirm"}) + self.is_sliding =0 def concel(self, e): - EventMesh.publish("load_screen", {"screen": "setting"}) + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + EventMesh.publish("load_screen", {"screen": "setting"}) + self.is_sliding =0 + + def done_return(self): EventMesh.publish("load_screen", {"screen": "setting"}) + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "setting"}) + def btn1_release(self): EventMesh.publish("load_screen", {"screen": "setting"}) @@ -913,6 +951,9 @@ class VersionScreen(Screen): def done_return(self): EventMesh.publish("load_screen", {"screen": "setting"}) + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "setting"}) + def btn1_release(self): EventMesh.publish("load_screen", {"screen": "setting"}) @@ -926,7 +967,7 @@ 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_pos(89, 30) poweroff_img.set_size(61, 61) poweroff_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) poweroff_img.set_src("E:/static/poweroff_icon.png") @@ -952,7 +993,7 @@ poweroff_confirm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE. poweroff_return = lv.img(poweroff_screen) poweroff_return.set_size(176, 46) -poweroff_return.set_pos(32, 240) +poweroff_return.set_pos(32, 230) poweroff_return.set_src("E:/static/cancel_icon.png") poweroff_return.add_flag(lv.obj.FLAG.CLICKABLE) poweroff_return.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -972,20 +1013,38 @@ class PoweroffScreen(Screen): def __init__(self): super().__init__() + self.is_sliding = 0 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_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)),lv.EVENT.PRESSING, None) + poweroff_return.add_event_cb(lambda e: EventMesh.callback_wrapper(self.concel(e)),lv.EVENT.PRESSING, None) def initialization(self): + self.is_sliding = 0 pass def done_return(self): EventMesh.publish("load_screen", {"screen": "setting"}) def confirm(self, e): - EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) + code = e.get_code() + if code == lv.EVENT.PRESSING: + #print("PRESSING") + self.is_sliding += 1 + + elif code == lv.EVENT.CLICKED: + #utime.sleep_ms(10) + print("1self.is_sliding",self.is_sliding) + if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 + EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) + self.is_sliding =0 + #EventMesh.publish("load_screen", {"screen": "no_sim_power_screen"}) + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "setting"}) def concel(self, e): EventMesh.publish("load_screen", {"screen": "setting"}) @@ -1039,7 +1098,7 @@ class PowerOnScreen(Screen): if self.count >= 9:#在上一个界面在播放音频时切换界面则关闭 以免一直播放 self.count = 0 self.timer.stop() - EventMesh.publish("load_screen", {"screen": "health"}) + EventMesh.publish("load_screen", {"screen": "main_menu"}) return self.count+=1 @@ -1254,6 +1313,9 @@ class DialswitchScreen(Screen): def Close(self): self.timer.stop() + # def done_left_to_right(self): + # EventMesh.publish("load_screen", {"screen": "setting"}) + def btn1_release(self): EventMesh.publish("load_screen", {"screen": "setting"}) @@ -1303,7 +1365,12 @@ 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_screen = lv.obj(imei_screen) +imei_qr_screen.set_size(240,200) +imei_qr_screen.set_pos(0,10) +imei_qr_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + +imei_qr = lv.qrcode(imei_qr_screen, 150, fg_color, bg_color) imei_qr.center() # Add a border with bg_color imei_qr.set_style_border_color(bg_color, 0) @@ -1311,7 +1378,7 @@ imei_qr.set_style_border_width(5, 0) imei_label = lv.label(imei_screen) -imei_label.set_pos(0, 280) +imei_label.set_pos(0, 230) imei_label.set_size(240, 20) imei_label.set_text(" ") imei_label.set_long_mode(lv.label.LONG.WRAP) @@ -1337,6 +1404,9 @@ class ImeiScreen(Screen): def btn1_release(self): EventMesh.publish("load_screen", {"screen": "setting"}) + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "setting"}) + def btn8_press(self): EventMesh.publish("watch_top_show") EventMesh.publish("load_screen", {"screen": "main_menu"}) @@ -1352,6 +1422,9 @@ class AppScreen(Screen): imei = EventMesh.publish(constants.EVENT.GET_IMEI) app_label.set_text(imei) + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "setting"}) + def done_return(self): EventMesh.publish("load_screen", {"screen": "setting"}) @@ -1376,7 +1449,7 @@ 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_pos(10, 60) brightness_label1.set_size(230, 40) brightness_label1.set_text("亮度:") brightness_label1.set_long_mode(lv.label.LONG.WRAP) @@ -1384,7 +1457,7 @@ 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_pos(20, 90) brightness_bar.set_size(200, 25) brightness_bar.set_style_anim_time(1000, lv.PART.INDICATOR | lv.STATE.DEFAULT) brightness_bar.set_mode(lv.bar.MODE.NORMAL) @@ -1393,7 +1466,7 @@ 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_pos(5, 185) brightness_reduce_imgbtn.set_size(110, 46) brightness_reduce_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) brightness_reduce_imgbtn.set_src("E:/static/reduce_btn.png") @@ -1401,14 +1474,14 @@ 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_pos(125, 185) brightness_add_imgbtn.set_size(110, 46) brightness_add_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) brightness_add_imgbtn.set_src("E:/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_pos(10, 140) brightness_label_time.set_size(80, 30) brightness_label_time.set_text("时间:") brightness_label_time.set_long_mode(lv.label.LONG.WRAP) @@ -1416,19 +1489,19 @@ 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_pos(90, 135) brightness_time_reduce_img.set_size(30, 34) brightness_time_reduce_img.set_src("E:/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_pos(90, 130) 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_pos(130, 142) brightness_label_time_text.set_size(60, 30) brightness_label_time_text.set_text("5秒") brightness_label_time_text.set_long_mode(lv.label.LONG.WRAP) @@ -1436,30 +1509,30 @@ brightness_label_time_text.set_style_text_align(lv.TEXT_ALIGN.LEFT, 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_pos(190, 135) brightness_time_add_img.set_size(30, 34) brightness_time_add_img.set_src("E:/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_pos(170, 130) brightness_time_add_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) brightness_flip_label = lv.label(brightness_screen) -brightness_flip_label.set_pos(0, 270) -brightness_flip_label.set_size(140, 40) +brightness_flip_label.set_pos(10, 250) +brightness_flip_label.set_size(140, 29) brightness_flip_label.set_text("翻腕亮屏") #brightness_flip_label.set_long_mode(lv.label.LONG.WRAP) brightness_flip_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) brightness_flip_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_flip_sw = lv.switch(brightness_screen) -brightness_flip_sw.set_pos(140, 260) -brightness_flip_sw.set_size(80, 40) +brightness_flip_sw.set_pos(140, 240) +brightness_flip_sw.set_size(80, 39) brightness_flip_label_btn = lv.label(brightness_screen) -brightness_flip_label_btn.set_pos(135, 255) -brightness_flip_label_btn.set_size(105, 65) +brightness_flip_label_btn.set_pos(135, 235) +brightness_flip_label_btn.set_size(105, 44) brightness_flip_label_btn.set_text(" ") brightness_flip_label_btn.add_flag(lv.obj.FLAG.CLICKABLE) @@ -1548,7 +1621,9 @@ class BrightnessScreen(Screen): brightness_bar.set_value((100 // 10) * self.level, lv.ANIM.OFF) - + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "setting"}) + def done_return(self): EventMesh.publish("load_screen", {"screen": "setting"}) @@ -1805,6 +1880,9 @@ class totalvolumeScreen(Screen): self.aud.stop() EventMesh.publish("load_screen", {"screen": "setting"}) + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "setting"}) + def btn1_release(self): EventMesh.publish("load_screen", {"screen": "setting"}) diff --git a/2.sdk/project/C06S/usr/static/DIAL_PREV01.png b/2.sdk/project/C06S/usr/static/DIAL_PREV01.png index 3e6567e9..c7288b8a 100644 Binary files a/2.sdk/project/C06S/usr/static/DIAL_PREV01.png and b/2.sdk/project/C06S/usr/static/DIAL_PREV01.png differ diff --git a/2.sdk/project/C06S/usr/static/DIAL_PREV02.png b/2.sdk/project/C06S/usr/static/DIAL_PREV02.png index a7c9c0ba..0bf65b3d 100644 Binary files a/2.sdk/project/C06S/usr/static/DIAL_PREV02.png and b/2.sdk/project/C06S/usr/static/DIAL_PREV02.png differ 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 6a0c11a3..d5727ee3 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 @@ -963,7 +963,7 @@ class ClkListScreen(Screen): global alarm_list self.clock_list = alarm_list IFEXIST = ql_fs.path_exists("/usr/static/storage_file/alarm_msg.json") - if IFEXIST == False: + if IFEXIST == True: if self.clock_list: no_add_alarm.add_flag(lv.obj.FLAG.HIDDEN) 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 f55e29e3..6e5a033d 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 @@ -443,6 +443,7 @@ class SettingScreen(Screen): #utime.sleep_ms(10) print("1self.is_sliding",self.is_sliding) if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + self.is_sliding =0 EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) print("2self.is_sliding",self.is_sliding)