From: dxy15521469561 <1731678236@qq.com> Date: Tue, 14 Nov 2023 08:16:41 +0000 (+0800) Subject: K01: X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9fcc1b4c7426dd564fcf3cc4d62d60be45396d19;p=mirrors%2FASR1603_G5.git K01: 界面优化 --- 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 48cab250..f6f27e19 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 @@ -122,282 +122,7 @@ no_add_alarm.set_text("请在app上设置") no_add_alarm.set_long_mode(lv.label.LONG.WRAP) no_add_alarm.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) no_add_alarm.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -# -------------------------------------------clk_edit screen---------------------------------------------------------- - -clk_edit_screen = lv.obj() -print("clk_edit_screen") -clk_edit_screen.add_style(style_alarm_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT) - -clk_edit_title = lv.label(clk_edit_screen) -clk_edit_title.set_pos(0, 0) -clk_edit_title.set_size(240, TITLE_HEIGHT) -clk_edit_title.set_text("编辑闹钟") -clk_edit_title.set_long_mode(lv.label.LONG.WRAP) -clk_edit_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -clk_edit_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - -clk_edit_time = lv.btn(clk_edit_screen) -clk_edit_time.set_size(224,75) -clk_edit_time.set_pos(8,58) -clk_edit_time.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_edit_time_label = lv.label(clk_edit_time) -clk_edit_time_label.set_pos(60, 15) -clk_edit_time_label.set_size(100, 40) -clk_edit_time_label.set_text("编辑时间") -clk_edit_time_label.set_long_mode(lv.label.LONG.WRAP) -clk_edit_time_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -clk_edit_time_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - -clk_edit_weekday = lv.btn(clk_edit_screen) -clk_edit_weekday.set_size(224,75) -clk_edit_weekday.set_pos(8,137) -clk_edit_weekday.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_edit_weekday_label = lv.label(clk_edit_weekday) -clk_edit_weekday_label.set_pos(60, 15) -clk_edit_weekday_label.set_size(100, 40) -clk_edit_weekday_label.set_text("编辑星期") -clk_edit_weekday_label.set_long_mode(lv.label.LONG.WRAP) -clk_edit_weekday_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -clk_edit_weekday_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - -clk_delete_alarm = lv.btn(clk_edit_screen) -clk_delete_alarm.set_size(224,75) -clk_delete_alarm.set_pos(8,216) -clk_delete_alarm.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_delete_alarm_label = lv.label(clk_delete_alarm) -clk_delete_alarm_label.set_pos(60, 15) -clk_delete_alarm_label.set_size(100, 40) -clk_delete_alarm_label.set_text("删除闹钟") -clk_delete_alarm_label.set_long_mode(lv.label.LONG.WRAP) -clk_delete_alarm_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -clk_delete_alarm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - -# -------------------------------------------clk_repeat screen---------------------------------------------------------- -clk_repeat_screen = lv.obj() -print("clk_repeat_screen") -clk_repeat_screen.set_scrollbar_mode(0) -clk_repeat_screen.add_style(style_alarm_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT) - -clk_repeat_btn = lv.btn(clk_repeat_screen) -clk_repeat_btn.set_size(224,40) -clk_repeat_btn.set_pos(9,40) -clk_repeat_btn.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) - -clk_repeat_label = lv.label(clk_repeat_btn) -clk_repeat_label.set_pos(8, 10) -clk_repeat_label.set_size(103, 40) -clk_repeat_label.set_text("星期一") -clk_repeat_label.set_long_mode(lv.label.LONG.DOT) -clk_repeat_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_repeat_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) - -clk_repeat_switch = lv.switch(clk_repeat_btn) -clk_repeat_switch.set_pos(191, 5) -clk_repeat_switch.set_size(24, 24) -clk_repeat_switch.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.MAIN) -clk_repeat_switch.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR) -clk_repeat_switch.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.KNOB) -clk_repeat_switch.set_style_bg_color(lv.color_make(0xf1, 0xa3, 0x3b),lv.PART.KNOB| lv.STATE.CHECKED) -clk_repeat_switch.set_ext_click_area(20) -clk_repeat_switch.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR| lv.STATE.CHECKED) - -clk_repeat_btn1 = lv.btn(clk_repeat_screen) -clk_repeat_btn1.set_size(224,40) -clk_repeat_btn1.set_pos(9,90) -clk_repeat_btn1.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) - -clk_repeat_label1 = lv.label(clk_repeat_btn1) -clk_repeat_label1.set_pos(8, 10) -clk_repeat_label1.set_size(103, 40) -clk_repeat_label1.set_text("星期二") -clk_repeat_label1.set_long_mode(lv.label.LONG.DOT) -clk_repeat_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_repeat_label1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) - -clk_repeat_switch1 = lv.switch(clk_repeat_btn1) -clk_repeat_switch1.set_pos(191, 5) -clk_repeat_switch1.set_size(24, 24) -clk_repeat_switch1.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.MAIN) -clk_repeat_switch1.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR) -clk_repeat_switch1.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.KNOB) -clk_repeat_switch1.set_style_bg_color(lv.color_make(0xf1, 0xa3, 0x3b),lv.PART.KNOB| lv.STATE.CHECKED) -clk_repeat_switch1.set_ext_click_area(20) -clk_repeat_switch1.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR| lv.STATE.CHECKED) - - -clk_repeat_btn2 = lv.btn(clk_repeat_screen) -clk_repeat_btn2.set_size(224,40) -clk_repeat_btn2.set_pos(9,140) -clk_repeat_btn2.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) - -clk_repeat_label2 = lv.label(clk_repeat_btn2) -clk_repeat_label2.set_pos(8, 10) -clk_repeat_label2.set_size(103, 40) -clk_repeat_label2.set_text("星期三") -clk_repeat_label2.set_long_mode(lv.label.LONG.DOT) -clk_repeat_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_repeat_label2.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) - - -clk_repeat_switch2 = lv.switch(clk_repeat_btn2) -clk_repeat_switch2.set_pos(191, 5) -clk_repeat_switch2.set_size(24, 24) -clk_repeat_switch2.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.MAIN) -clk_repeat_switch2.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR) -clk_repeat_switch2.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.KNOB) -clk_repeat_switch2.set_style_bg_color(lv.color_make(0xf1, 0xa3, 0x3b),lv.PART.KNOB| lv.STATE.CHECKED) -clk_repeat_switch2.set_ext_click_area(20) -clk_repeat_switch2.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR| lv.STATE.CHECKED) - -clk_repeat_btn3 = lv.btn(clk_repeat_screen) -clk_repeat_btn3.set_size(224,40) -clk_repeat_btn3.set_pos(9,190) -clk_repeat_btn3.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) - -clk_repeat_label3 = lv.label(clk_repeat_btn3) -clk_repeat_label3.set_pos(8, 10) -clk_repeat_label3.set_size(103, 40) -clk_repeat_label3.set_text("星期四") -clk_repeat_label3.set_long_mode(lv.label.LONG.DOT) -clk_repeat_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_repeat_label3.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) - -clk_repeat_switch3 = lv.switch(clk_repeat_btn3) -clk_repeat_switch3.set_pos(191, 5) -clk_repeat_switch3.set_size(24, 24) -clk_repeat_switch3.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.MAIN) -clk_repeat_switch3.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR) -clk_repeat_switch3.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.KNOB) -clk_repeat_switch3.set_style_bg_color(lv.color_make(0xf1, 0xa3, 0x3b),lv.PART.KNOB| lv.STATE.CHECKED) -clk_repeat_switch3.set_ext_click_area(20) -clk_repeat_switch3.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR| lv.STATE.CHECKED) - -clk_repeat_btn4 = lv.btn(clk_repeat_screen) -clk_repeat_btn4.set_size(224,40) -clk_repeat_btn4.set_pos(9,240) -clk_repeat_btn4.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) - -clk_repeat_label4 = lv.label(clk_repeat_btn4) -clk_repeat_label4.set_pos(8, 10) -clk_repeat_label4.set_size(103, 40) -clk_repeat_label4.set_text("星期五") -clk_repeat_label4.set_long_mode(lv.label.LONG.DOT) -clk_repeat_label4.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_repeat_label4.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) - -clk_repeat_switch4 = lv.switch(clk_repeat_btn4) -clk_repeat_switch4.set_pos(191, 5) -clk_repeat_switch4.set_size(24, 24) -clk_repeat_switch4.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.MAIN) -clk_repeat_switch4.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR) -clk_repeat_switch4.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.KNOB) -clk_repeat_switch4.set_style_bg_color(lv.color_make(0xf1, 0xa3, 0x3b),lv.PART.KNOB| lv.STATE.CHECKED) -clk_repeat_switch4.set_ext_click_area(20) -clk_repeat_switch4.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR| lv.STATE.CHECKED) - -clk_repeat_btn5 = lv.btn(clk_repeat_screen) -clk_repeat_btn5.set_size(224,40) -clk_repeat_btn5.set_pos(9,290) -clk_repeat_btn5.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) - -clk_repeat_label5 = lv.label(clk_repeat_btn5) -clk_repeat_label5.set_pos(8, 10) -clk_repeat_label5.set_size(103, 40) -clk_repeat_label5.set_text("星期六") -clk_repeat_label5.set_long_mode(lv.label.LONG.DOT) -clk_repeat_label5.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_repeat_label5.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) - -clk_repeat_switch5 = lv.switch(clk_repeat_btn5) -clk_repeat_switch5.set_pos(191, 5) -clk_repeat_switch5.set_size(24, 24) -clk_repeat_switch5.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.MAIN) -clk_repeat_switch5.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR) -clk_repeat_switch5.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR| lv.STATE.CHECKED) -clk_repeat_switch5.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.KNOB) -clk_repeat_switch5.set_style_bg_color(lv.color_make(0xf1, 0xa3, 0x3b),lv.PART.KNOB| lv.STATE.CHECKED) -clk_repeat_switch5.set_ext_click_area(20) - -clk_repeat_btn6 = lv.btn(clk_repeat_screen) -clk_repeat_btn6.set_size(224,40) -clk_repeat_btn6.set_pos(9,340) -clk_repeat_btn6.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) - -clk_repeat_label6 = lv.label(clk_repeat_btn6) -clk_repeat_label6.set_pos(8, 10) -clk_repeat_label6.set_size(103, 40) -clk_repeat_label6.set_text("星期日") -clk_repeat_label6.set_long_mode(lv.label.LONG.DOT) -clk_repeat_label6.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_repeat_label6.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) - -clk_repeat_switch6 = lv.switch(clk_repeat_btn6) -clk_repeat_switch6.set_pos(191, 5) -clk_repeat_switch6.set_size(24, 24) -clk_repeat_switch6.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.MAIN) -clk_repeat_switch6.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR) -clk_repeat_switch6.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.KNOB) -clk_repeat_switch6.set_style_bg_color(lv.color_make(0xf1, 0xa3, 0x3b),lv.PART.KNOB| lv.STATE.CHECKED) -clk_repeat_switch6.set_ext_click_area(20) -clk_repeat_switch6.set_style_bg_color(lv.color_make(0xFF, 0xFF, 0xFF),lv.PART.INDICATOR| lv.STATE.CHECKED) - -# -------------------------------------------clk_repeat screen---------------------------------------------------------- -clk_time_screen = lv.obj() -print("clk_time_screen") -clk_time_screen.set_scrollbar_mode(0) -clk_time_screen.add_style(style_alarm_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT) - -#hour的样式 -style_roller_hour_main = lv.style_t() -style_roller_hour_main.init() -style_roller_hour_main.set_radius(6) -style_roller_hour_main.set_bg_color(lv.color_make(0x00, 0x00, 0x00)) -style_roller_hour_main.set_bg_opa(102) -style_roller_hour_main.set_border_width(0) - -style_roller_hour_selected = lv.style_t() -style_roller_hour_selected.init() -style_roller_hour_selected.set_radius(6) -style_roller_hour_selected.set_bg_color(lv.color_make(0x2c, 0x2c, 0x2f)) -style_roller_hour_selected.set_border_width(0) - -#创建hour的roller -clk_time_roller_1 = lv.roller(clk_time_screen) -clk_time_roller_1.set_width(50) -clk_time_roller_1.set_pos(60, 50) -clk_time_roller_1.set_options( - "00\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23", - lv.roller.MODE.NORMAL) -clk_time_roller_1.set_visible_row_count(5) -clk_time_roller_1.add_style(style_roller_hour_main, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_time_roller_1.add_style(style_roller_hour_selected, lv.PART.SELECTED | lv.STATE.DEFAULT) - -#min的样式 -#创建min的roller -clk_time_roller_2 = lv.roller(clk_time_screen) -clk_time_roller_2.set_width(50) -clk_time_roller_2.set_pos(130, 50) -clk_time_roller_2.set_options( - "00\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30\n31\n30\n31\n32\n33\n34\n35\n36\n37\n38\n39\n40\n41\n42\n43\n44\n45\n46\n47\n48\n49\n50\n51\n52\n53\n54\n55\n56\n57\n58\n59", - lv.roller.MODE.NORMAL) -clk_time_roller_2.set_visible_row_count(5) -clk_time_roller_2.add_style(style_roller_hour_main, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_time_roller_2.add_style(style_roller_hour_selected, lv.PART.SELECTED | lv.STATE.DEFAULT) - -#完成按钮 -alarm_ok= lv.btn(clk_time_screen) -alarm_ok.set_size(150,40) -alarm_ok.set_pos(45,250) -alarm_ok.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) -alarm_ok.set_ext_click_area(20) - -label_ok = lv.label(alarm_ok) -label_ok.set_pos(30, 20) -label_ok.set_size(100, 40) -label_ok.set_text("完成") -label_ok.set_long_mode(lv.label.LONG.DOT) -label_ok.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -label_ok.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + #闹钟信息 alarm_list = [{'hour': 16, 'repeart': 10, 'idx': 0, 'enabled': 0, 'days': [0,1,2,3,4,5,6], 'minute': 39}, diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py index 448a2cb5..c4043158 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py @@ -790,43 +790,24 @@ class REMIND_ProtoCol(ProtoCol): # alarm_new = [] # for i in range(5): # alarm_new.append({'hour': 8, 'repeart': 10, 'idx': i, 'enabled': 0, 'days': [], 'minute': 39}) - # print("len",len(alarm_new),alarm_new) - if len(alarm_new) > 2: - for i in range(0,len(alarm_new)-2): - # print("alarm_new_tmp",alarm_new) - del alarm_new[2] - # print("alarm_new:{}",alarm_new) - for j in range(2,2+k):#0 1是开关机，234是闹钟 - alarm_day = [] - alarm_week = [] - alarm_total_data = [] - # print("j!!!!!!!!!!",j) - if k == 1: - if len(msg_tmp) != 0: - alarm_data = msg_tmp.split('-')#-作为分隔符 - alarm_switch = int(alarm_data[1])#开关 - alarm_day_num = int(alarm_data[2])#天 - alarm_time = alarm_data[0]#时间 - alarm_time_tmp = alarm_time.split(':')#冒号分隔时间 时 分 - alarm_time_hour = int(alarm_time_tmp[0]) - alarm_time_min = int(alarm_time_tmp[1]) - if alarm_day_num == 3: - alarm_week = alarm_data[3]#星期 - - if alarm_day_num == 2:#每一天 - alarm_day = [1,2,3,4,5,6,0] - elif alarm_day_num == 3:#自定义 - for i in range(0,7): - if alarm_week[i] != '0': - alarm_day.append(i) - alarm_new.append({"idx": j, "hour": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":alarm_day_num}) - else: - if len(msg_tmp) != 0: - alarm_total_data = msg_tmp.split(',')[count] - count+=1 - b = alarm_total_data.find('-') - if b != -1: - alarm_data = alarm_total_data.split('-')#-作为分隔符 + # print("msg_tmp",len(msg_tmp),msg_tmp) + if len(msg_tmp) > 0: + if len(alarm_new) > 2: + for i in range(0,len(alarm_new)-2): + # print("alarm_new_tmp",alarm_new) + del alarm_new[2] + # print("alarm_new:{}",alarm_new) + if k > 3: + k = 3 + + for j in range(2,2+k):#0 1是开关机，234是闹钟 + alarm_day = [] + alarm_week = [] + alarm_total_data = [] + # print("j!!!!!!!!!!",j) + if k == 1: + if len(msg_tmp) != 0: + alarm_data = msg_tmp.split('-')#-作为分隔符 alarm_switch = int(alarm_data[1])#开关 alarm_day_num = int(alarm_data[2])#天 alarm_time = alarm_data[0]#时间 @@ -843,12 +824,35 @@ class REMIND_ProtoCol(ProtoCol): if alarm_week[i] != '0': alarm_day.append(i) alarm_new.append({"idx": j, "hour": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":alarm_day_num}) - - # print("alarm_new end:{}",alarm_new) - - with open("/usr/static/storage_file/alarm_msg.json", 'w',encoding='utf-8') as fd: - ujson.dump(alarm_new,fd) - EventMesh.publish("push_update_alarm_show") + else: + if len(msg_tmp) != 0: + alarm_total_data = msg_tmp.split(',')[count] + count+=1 + b = alarm_total_data.find('-') + if b != -1: + alarm_data = alarm_total_data.split('-')#-作为分隔符 + alarm_switch = int(alarm_data[1])#开关 + alarm_day_num = int(alarm_data[2])#天 + alarm_time = alarm_data[0]#时间 + alarm_time_tmp = alarm_time.split(':')#冒号分隔时间 时 分 + alarm_time_hour = int(alarm_time_tmp[0]) + alarm_time_min = int(alarm_time_tmp[1]) + if alarm_day_num == 3: + alarm_week = alarm_data[3]#星期 + + if alarm_day_num == 2:#每一天 + alarm_day = [1,2,3,4,5,6,0] + elif alarm_day_num == 3:#自定义 + for i in range(0,7): + if alarm_week[i] != '0': + alarm_day.append(i) + alarm_new.append({"idx": j, "hour": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":alarm_day_num}) + + # print("alarm_new end:{}",alarm_new) + + with open("/usr/static/storage_file/alarm_msg.json", 'w',encoding='utf-8') as fd: + ujson.dump(alarm_new,fd) + EventMesh.publish("push_update_alarm_show") # EventMesh.publish("add_alarm",[0,msg_tmp]) EventMesh.publish(constants.PROTOCOL.REMIND_SEND) diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py index ce8a0a0d..70ef0534 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py @@ -3977,7 +3977,6 @@ class StepScreen(Screen): step_label_01.set_pos(0, 50) step_label_01.set_size(128, 20) step_label_01.set_text("0æ­¥") - step_label_01.set_long_mode(lv.label.LONG.WRAP) step_label_01.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) step_label_01.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -7413,10 +7412,10 @@ up_show_bg_img_label.set_text("计步") up_show_bg_img_label.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT) up_show_bg_img_label1 = lv.label(up_show_screen) -up_show_bg_img_label1.set_pos(0, 100) +up_show_bg_img_label1.set_pos(0, 108) up_show_bg_img_label1.set_size(128, 20) up_show_bg_img_label1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -up_show_bg_img_label1.set_text("0") +up_show_bg_img_label1.set_text("0æ­¥") up_show_bg_img_label1.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT) @@ -7446,9 +7445,9 @@ class up_Screen(Screen):#上滑界面 def __stepValue(self, event, msg): if msg == None: - up_show_bg_img_label1.set_text("0") + up_show_bg_img_label1.set_text("0æ­¥") else: - up_show_bg_img_label1.set_text(str(msg)) + up_show_bg_img_label1.set_text(str(msg)+"æ­¥") def Close(self):