From: dxy15521469561 <1731678236@qq.com> Date: Wed, 20 Sep 2023 03:03:41 +0000 (+0800) Subject: k5: X-Git-Url: http://git.snicker.com.cn/css/static/script.js?a=commitdiff_plain;h=961b8227c147eef0bc5d7db371166d889a3485f8;p=mirrors%2FASR1603_G5.git k5: 闹钟删除显示问题 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 93ec878d..1e440b68 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 @@ -947,14 +947,19 @@ class ClkListScreen(Screen): num = 0 count = 0 - clock_nums = len(self.clock_list)-2 - for i ,each in enumerate(self.clock_list): + clock_nums = len(self.clock_list)-2#3-2 = 1 0 + # for i ,each in enumerate(self.clock_list): + for i in range(0,self.MXA_clk_num): + if i >= clock_nums: + self.contact_detail_listt_dict[i]["_btn"].add_flag(lv.obj.FLAG.HIDDEN) + continue + each = self.clock_list[2+i] num = each["idx"] + if count >= 3: break repeart = each["repeart"]# - if repeart >= 10 or count >= clock_nums: - self.contact_detail_listt_dict[count]["_btn"].add_flag(lv.obj.FLAG.HIDDEN) + if repeart >= 10: continue print("alarm!!!!!!!!!!") #_btn = lv.btn(self.alarm_show_list) diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/alarm.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/alarm.py index c5d5a518..22814c3e 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/alarm.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/alarm.py @@ -397,10 +397,7 @@ label_ok.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) #闹钟信息 alarm_list = [{'hour': 16, 'repeart': 10, 'idx': 0, 'enabled': 0, 'days': [], 'minute': 39}, - {'hour': 16, 'repeart': 10, 'idx': 1, 'enabled': 0, 'days': [], 'minute': 39}, - {'hour': 15, 'repeart': 15, 'idx': 2, 'enabled': 0, 'days': [], 'minute': 13}, - {'hour': 16, 'repeart': 15, 'idx': 3, 'enabled': 0, 'days': [], 'minute': 39}, - {'hour': 15, 'repeart': 15, 'idx': 4, 'enabled': 0, 'days': [], 'minute': 13}] + {'hour': 16, 'repeart': 10, 'idx': 1, 'enabled': 0, 'days': [], 'minute': 39}] #用于显示闹钟列表不包含开关机信息 class ClockManager(Abstract): @@ -881,7 +878,7 @@ class ClkListScreen(Screen): super().__init__() self.meta = clk_list_screen self.clock_list = [] - self.MXA_clk_num = 5#有两个开关机隐藏的 + self.MXA_clk_num = 3#有两个开关机隐藏的 self.contact_detail_listt_dict = [] # clk_list_add_btn.add_event_cb(lambda e: self.add_alarm_btn(e), # lv.EVENT.PRESSED, None) @@ -942,23 +939,24 @@ class ClkListScreen(Screen): #print("菜单的孩子个数:",clk_list_screen1.get_child_cnt()) num = 0 count = 0 - clock_nums = len(self.clock_list) - print("len(self.clock_list):{}".format(len(self.clock_list))) - #for i ,each in enumerate(self.clock_list): - for i in range(self.MXA_clk_num): - each = self.clock_list[i] + clock_nums = len(self.clock_list)-2#3-2 = 1 0 + # for i ,each in enumerate(self.clock_list): + for i in range(0,self.MXA_clk_num): + if i >= clock_nums: + self.contact_detail_listt_dict[i]["_btn"].add_flag(lv.obj.FLAG.HIDDEN) + continue + each = self.clock_list[2+i] num = each["idx"] - print("count0:{}".format(count)) + if count >= 3: break - repeart = each["repeart"] - if count >= clock_nums or repeart >= 10: - self.contact_detail_listt_dict[i]["_btn"].add_flag(lv.obj.FLAG.HIDDEN) + repeart = each["repeart"]# + if repeart >= 10: continue print("count1:{}".format(count)) #_btn = lv.btn(self.alarm_show_list) - self.contact_detail_listt_dict[i]["_btn"].set_size(230,75) - self.contact_detail_listt_dict[i]["_btn"].set_pos(8,79*count) + 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[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) @@ -966,37 +964,37 @@ class ClkListScreen(Screen): # print("------刷新闹钟列表噢:{} num:{}",each,num) #_btn_label1 = lv.label(_btn) - self.contact_detail_listt_dict[i]["_btn_label1"].set_pos(50, 0) - self.contact_detail_listt_dict[i]["_btn_label1"].set_size(0, 0) - self.contact_detail_listt_dict[i]["_btn_label1"].set_text(str(num)) + self.contact_detail_listt_dict[count]["_btn_label1"].set_pos(50, 0) + self.contact_detail_listt_dict[count]["_btn_label1"].set_size(0, 0) + self.contact_detail_listt_dict[count]["_btn_label1"].set_text(str(num)) #_btn_label2 = lv.label(_btn) - self.contact_detail_listt_dict[i]["_btn_label2"].set_pos(8, 10) - self.contact_detail_listt_dict[i]["_btn_label2"].set_size(97, 40) - self.contact_detail_listt_dict[i]["_btn_label2"].set_text("%02d" % each["hour"] + ":"+"%02d" % each["minute"]) + 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_text("%02d" % each["hour"] + ":"+"%02d" % each["minute"]) # _btn_label2.set_text(str(each["days"])) # _btn_label2.set_long_mode(lv.label.LONG.DOT) # _btn_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - self.contact_detail_listt_dict[i]["_btn_label2"].set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + self.contact_detail_listt_dict[count]["_btn_label2"].set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) _new_list = sorted(each["days"]) repeart = each["repeart"] _output = [self.weekdays_list[x] for x in _new_list] #_btn_label3 = lv.label(_btn) - self.contact_detail_listt_dict[i]["_btn_label3"].set_pos(5, 44) - self.contact_detail_listt_dict[i]["_btn_label3"].set_size(200, 40) + self.contact_detail_listt_dict[count]["_btn_label3"].set_pos(5, 44) + self.contact_detail_listt_dict[count]["_btn_label3"].set_size(200, 40) print("_new_list:{} repeart:{}".format(_new_list,repeart)) if repeart == 1: - self.contact_detail_listt_dict[i]["_btn_label3"].set_text("一次") + self.contact_detail_listt_dict[count]["_btn_label3"].set_text("一次") elif repeart == 2: - self.contact_detail_listt_dict[i]["_btn_label3"].set_text("每天") + self.contact_detail_listt_dict[count]["_btn_label3"].set_text("每天") else: - self.contact_detail_listt_dict[i]["_btn_label3"].set_text(",".join(_output)) + self.contact_detail_listt_dict[count]["_btn_label3"].set_text(",".join(_output)) # _btn_label3.set_long_mode(lv.label.LONG.DOT) # _btn_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - self.contact_detail_listt_dict[i]["_btn_label3"].set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) - self.contact_detail_listt_dict[i]["_btn"].clear_flag(lv.obj.FLAG.HIDDEN) + 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) diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py index a7ea472f..a67dd15b 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py @@ -749,7 +749,6 @@ class WT_ProtoCol(ProtoCol): EventMesh.publish("set_weather_data",[msg_date,msg_time,msg_weather_content,msg_type,msg_temp,msg_min_temp,msg_max_temp,msg_city,1]) EventMesh.publish("updata_weather_show") - class REMIND_ProtoCol(ProtoCol): """闹钟数据""" TYPE = "REMIND" @@ -779,19 +778,17 @@ class REMIND_ProtoCol(ProtoCol): msg_tmp = msg_tmp[1] alarm_new = EventMesh.publish("read_alarminjson") - print("alarm_list:{} msg_tmp:{}",alarm_new,msg_tmp) - - + # print("alarm_list:{} msg_tmp:{}",alarm_new,msg_tmp) k=1 count = 0 for i in range(len(str(msg_tmp))):#寻找有多少个,号 - if msg_tmp[i] == ',': + if msg_tmp[i] == ',':#, , , k+=1 - if len(alarm_new) < 5 : - alarm_new = [] - for i in range(5): - alarm_new.append({'hour': 8, 'repeart': 10, 'idx': i, 'enabled': 0, 'days': [], 'minute': 39}) + if len(alarm_new) > 2: + for i in range(0,len(alarm_new)-2): + del alarm_new[2] + # print("alarm_new:{}",alarm_new) for j in range(2,2+k):#0 1是开关机,234是闹钟 alarm_day = [] alarm_week = [] @@ -814,7 +811,7 @@ class REMIND_ProtoCol(ProtoCol): for i in range(0,7): if alarm_week[i] != '0': alarm_day.append(i) - alarm_new[j] = {"idx": j, "hour": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":alarm_day_num} + 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] @@ -837,9 +834,9 @@ class REMIND_ProtoCol(ProtoCol): for i in range(0,7): if alarm_week[i] != '0': alarm_day.append(i) - alarm_new[j] = {"idx": j, "hour": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":alarm_day_num} + alarm_new.append({"idx": j, "hour": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":alarm_day_num}) - # print("k",k,alarm_new) + # print("alarm_new end:{}",alarm_new) with open("/ext/static/storage_file/alarm_msg.json", 'w',encoding='utf-8') as fd: ujson.dump(alarm_new,fd) @@ -848,6 +845,7 @@ class REMIND_ProtoCol(ProtoCol): # EventMesh.publish("add_alarm",[0,msg_tmp]) EventMesh.publish(constants.PROTOCOL.REMIND_SEND) + class HRSTART_ProtoCol(ProtoCol): """心率频率数据""" TYPE = "hrtstart"