D10:
authordxy15521469561 <1731678236@qq.com>
Wed, 20 Sep 2023 02:33:25 +0000 (10:33 +0800)
committerdxy15521469561 <1731678236@qq.com>
Wed, 20 Sep 2023 02:33:25 +0000 (10:33 +0800)
修复部分Bug
K01:
闹钟协议更改
K5:
步数不清零问题

2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/led.py
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/alarm.py
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/appWechat.py
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py

index 678f00c..db3e498 100644 (file)
@@ -183,11 +183,11 @@ class ledEventManager(Abstract):#灯事件
                 EventMesh.publish("set_led_time_arg",[1,2,10*70*2,led_mode.FLASH_LIGHT_RED_GREEN,10,5,led_mode.HEALTH_LED_MODE])#測量成功
                 # EventMesh.publish("set_led_time_arg",[1000,200,300,led_mode.FLASH_LIGHT_RED_GREEN,led_mode.DEFAULT_LONG_LIGHT_MODE,led_mode.HEALTH_LED_MODE])#開始測量
             elif msg == 2:
-                EventMesh.publish("set_led_time_arg",[1,1,300,led_mode.FLASH_LIGHT_GREEN,31,10*3,led_mode.OTHER_MEASURE_MODE])#測量成功
+                EventMesh.publish("set_led_time_arg",[1,1,30,led_mode.FLASH_LIGHT_GREEN,31,10*3,led_mode.OTHER_MEASURE_MODE])#測量成功
                 # EventMesh.publish("set_led_time_arg",[3000,1000,1,led_mode.LONG_LIGHT_GREEN,led_mode.DEFAULT_LONG_LIGHT_MODE,led_mode.OTHER_MEASURE_MODE])#測量成功
             elif msg == 3:
-                EventMesh.publish("set_led_time_arg",[1,1,300,led_mode.FLASH_LIGHT_RED,31,10*3,led_mode.OTHER_MEASURE_MODE])#測量成功
-                # EventMesh.publish("set_led_time_arg",[3000,1000,1,led_mode.LONG_LIGHT_RED,led_mode.DEFAULT_LONG_LIGHT_MODE,led_mode.OTHER_MEASURE_MODE])#測量失敗
+                pass
+                # EventMesh.publish("set_led_time_arg",[1,1,30,led_mode.FLASH_LIGHT_RED,31,10*3,led_mode.OTHER_MEASURE_MODE])#测量失败
                 #加音频文件
 
     def set_find_watch_led(self, event, msg): #查找设备
index 413106f..36bd60c 100644 (file)
@@ -3124,32 +3124,30 @@ class getSosFlagManager(Abstract):#设置sos
     def set_sos_flag(self, event, msg): 
         self.sos_flag = msg
        
-        if self.sos_flag == 1:
-            number = EventMesh.publish("get_dial_sos_number")
+        # if self.sos_flag == 1:
+        #     number = EventMesh.publish("get_dial_sos_number")
            
-            if number != None:
-                if len(number) > 0:
-                    EventMesh.publish("save_phonename",number[0])
-                    EventMesh.publish("save_phonenum",number[0])
-                    EventMesh.publish("set_sos_num",0)
-                    phone_num = EventMesh.publish("get_phonenum")  
-                    EventMesh.publish("dial_out_call_center_cb",phone_num)#电话拨出去
-                else:
-                    EventMesh.publish("dial_out_call_center_cb",None)#电话拨出去
+        #     if number != None:
+        #         if len(number) > 0:
+        #             EventMesh.publish("save_phonename",number[0])
+        #             EventMesh.publish("save_phonenum",number[0])
+        #             EventMesh.publish("set_sos_num",0)
+        #             phone_num = EventMesh.publish("get_phonenum")  
+        #             EventMesh.publish("dial_out_call_center_cb",phone_num)#电话拨出去
+        #         else:
+        #             EventMesh.publish("dial_out_call_center_cb",None)#电话拨出去
 
     def set_callnumer_cb(self, event, msg):
         self.callnumer = msg
         self.call_timer.start(10000, 0, self.call_timer_cb)#延迟10S 继续拨打
 
     def call_timer_cb(self, *args, **kwargs):
-        # print("call_timer_cb:{}".format(self.callnumer))
-        EventMesh.publish("save_phonename",str(self.callnumer))
-        EventMesh.publish("save_phonenum",str(self.callnumer))
-        phone_num = EventMesh.publish("get_phonenum")  
-        EventMesh.publish("dial_out_call_center_cb",phone_num)#电话拨出去
-        # phone_num = EventMesh.publish("get_phonenum")  
-        # voiceCall.callStart(phone_num)
-        # self.aud.play(1, 1, 'U:/static/R_SOS_ALERT.mp3')  #电话呼叫启动中 
+        if self.sos_flag == 1:
+            EventMesh.publish("save_phonename",str(self.callnumer))
+            EventMesh.publish("save_phonenum",str(self.callnumer))
+            phone_num = EventMesh.publish("get_phonenum")  
+            EventMesh.publish("dial_out_call_center_cb",phone_num)#电话拨出去
+       
 
     def get_sos_flag(self, event, msg): 
         return self.sos_flag
index 5e9ff75..93ec878 100644 (file)
@@ -401,10 +401,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):
@@ -876,6 +873,19 @@ class PopupAlarmScreen(Screen):
         self.close_timer()
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
+#闹钟列表
+style_common_pressed =  lv.style_t()
+style_common_pressed.init()
+style_common_pressed.set_bg_color(lv.color_make(0x1E, 0x26, 0xff))
+style_common_pressed.set_bg_opa(200)
+style_common_pressed.set_border_width(0)
+style_common_pressed.set_shadow_opa(0)
+style_common_pressed.set_border_width(0)
+style_common_pressed.set_pad_left(0)
+style_common_pressed.set_pad_right(0)
+style_common_pressed.set_pad_top(0)
+style_common_pressed.set_pad_bottom(0)
+
 #闹钟列表
 class ClkListScreen(Screen):
     NAME = "clk_list"
@@ -883,13 +893,34 @@ class ClkListScreen(Screen):
         super().__init__()
         self.meta = clk_list_screen
         self.clock_list = []
+        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)
         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, 35)
+        self.alarm_show_list.set_size(128, 128-35)
+        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()
-
+        for i in range(self.MXA_clk_num):
+        
+            _btn = lv.btn(self.alarm_show_list)
+            _btn.add_flag(lv.obj.FLAG.CLICKABLE)
+            _btn.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT)
+            _btn.add_flag(lv.obj.FLAG.HIDDEN)
+            _btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.edit_alarm(e)),
+                                    lv.EVENT.CLICKED, None)
+            _btn_label1 = lv.label(_btn)
+            _btn_label2 = lv.label(_btn)
+            _btn_label2.set_long_mode(lv.label.LONG.DOT)
+            _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)
+            self.contact_detail_listt_dict.append({"_btn":_btn,"_btn_label1":_btn_label1,"_btn_label2":_btn_label2,"_btn_label3":_btn_label3})
 
     def initialization(self): 
         EventMesh.publish("read_alarminjson")
@@ -911,89 +942,61 @@ class ClkListScreen(Screen):
         IFEXIST = ql_fs.path_exists("/usr/static/storage_file/alarm_msg.json")    
         if IFEXIST == True:
             if self.clock_list:
-                # print("nalarm_list:{}".format(alarm_list))
-                # no_add_alarm_img.add_flag(lv.obj.FLAG.HIDDEN)
+
                 no_add_alarm.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, 35)
-                self.alarm_show_list.set_size(128, 128-35)
-                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
                 for i ,each in enumerate(self.clock_list):
                     num = each["idx"]
                     if count >= 3:
                         break
-                    repeart = each["repeart"]
-                    if repeart >= 10:
+                    repeart = each["repeart"]#
+                    if repeart >= 10 or count >= clock_nums:
+                        self.contact_detail_listt_dict[count]["_btn"].add_flag(lv.obj.FLAG.HIDDEN)
                         continue
-                    _btn = lv.btn(self.alarm_show_list)
-                    _btn.set_size(112,45)
-                    _btn.set_pos(8,49*count)
-                    _btn.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT)
-                    _btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.edit_alarm(e)),
-                                            lv.EVENT.CLICKED, None)
-
-                    
-                    # print("------刷新闹钟列表噢:{} num:{}",each,num)
-                    _btn_label1 = lv.label(_btn)
-                    _btn_label1.set_pos(50, 0)
-                    _btn_label1.set_size(0, 0)
-                    _btn_label1.set_text(str(num))
-
-                    _btn_label2 = lv.label(_btn)
-                    _btn_label2.set_pos(8, 5)
-                    _btn_label2.set_size(97, 20)
-                    _btn_label2.set_text("%02d" % each["hour"] + ":"+"%02d" % each["minute"])
-                    # _btn_label2.set_text(str(each["days"]))
-
-                    _btn_label2.set_long_mode(lv.label.LONG.DOT)
-                    _btn_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-                    _btn_label2.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+                    print("alarm!!!!!!!!!!")
+                    #_btn = lv.btn(self.alarm_show_list)
+                    self.contact_detail_listt_dict[count]["_btn"].set_size(112,45)
+                    self.contact_detail_listt_dict[count]["_btn"].set_pos(8,49*count)
+
+                    #_btn_label1 = lv.label(_btn)
+                    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[count]["_btn_label2"].set_pos(8, 5)
+                    self.contact_detail_listt_dict[count]["_btn_label2"].set_size(97, 20)
+                    self.contact_detail_listt_dict[count]["_btn_label2"].set_text("%02d" % each["hour"] + ":"+"%02d" % each["minute"])
+                    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)
-                    _btn_label3.set_pos(8, 25)
-                    _btn_label3.set_size(128-8, 20)
+                    #_btn_label3 = lv.label(_btn)
+                    self.contact_detail_listt_dict[count]["_btn_label3"].set_pos(8, 25)
+                    self.contact_detail_listt_dict[count]["_btn_label3"].set_size(128-8, 20)
                     print("_new_list:{} repeart:{}".format(_new_list,repeart))
                     if repeart == 1:
-                        _btn_label3.set_text("一次")
+                        self.contact_detail_listt_dict[count]["_btn_label3"].set_text("一次")
                     elif repeart == 2:
-                        _btn_label3.set_text("每天")
+                        self.contact_detail_listt_dict[count]["_btn_label3"].set_text("每天")
                     else:
-                        _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)
-                    _btn_label3.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
-
-                    # _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)
+                        self.contact_detail_listt_dict[count]["_btn_label3"].set_text(",".join(_output))
+
+                    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)
+
                     count+=1
                 if count == 0:
                     # no_add_alarm_img.clear_flag(lv.obj.FLAG.HIDDEN)
                     no_add_alarm.clear_flag(lv.obj.FLAG.HIDDEN) 
                     self.alarm_show_list.add_flag(lv.obj.FLAG.HIDDEN) 
+                else:
+                    no_add_alarm.add_flag(lv.obj.FLAG.HIDDEN) 
+                    self.alarm_show_list.clear_flag(lv.obj.FLAG.HIDDEN) 
             else:
                 # no_add_alarm_img.clear_flag(lv.obj.FLAG.HIDDEN)
                 no_add_alarm.clear_flag(lv.obj.FLAG.HIDDEN) 
@@ -1047,6 +1050,9 @@ class ClkListScreen(Screen):
         EventMesh.publish("watch_top_show")
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
+
+
+
 class NewEditClk(Screen):
     NAME = "new_edit_clk"
 
index 9b8ccb9..02f7572 100644 (file)
@@ -81,16 +81,16 @@ wechat_screen_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAUL
 
 
 wechat_press_btn = lv.btn(wechat_screen)
-wechat_press_btn.set_pos(10, 94)
-wechat_press_btn.set_size(LCD_X-20, 30)
+wechat_press_btn.set_pos(10, 100)
+wechat_press_btn.set_size(LCD_X-20, 26)
 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(33,0)
+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(LCD_X, 20)
-wechat_press_label.set_pos(0,101)
+wechat_press_label.set_pos(0,103)
 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)
 
@@ -193,8 +193,8 @@ class WechatScreen(Screen):
         self.startWidth = 0
         self.check_json = 0
         self.wechat_list = lv.obj(wechat_screen_list_screen)
-        self.wechat_list.set_pos(0, 0)
-        self.wechat_list.set_size(128, 96)
+        self.wechat_list.set_pos(0, 2)
+        self.wechat_list.set_size(128, 94)
         self.wechat_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
         self.wechat_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
         self.wechat_list.set_flex_flow(lv.FLEX_FLOW.COLUMN)#自动排成一列对齐
index cbdeecf..3c3345b 100644 (file)
@@ -3214,6 +3214,7 @@ class setclassTimeManager(Abstract):#设置上课禁用时间
             week2_state = 0
             week3_state = 0
             week4_state = 0
+            print("week4 ",cur_week,week1,week2,week3,week4,enable1,enable2,enable3,enable4)
             # print("end_time1 ",start_time1,end_time1,start_time2,end_time2,start_time3,end_time3,start_time4,end_time4)
             for i in range(0,7):
                 if ((cur_week in week1) and enable1 == 1):
@@ -3226,30 +3227,18 @@ class setclassTimeManager(Abstract):#设置上课禁用时间
                 
                 if ((cur_week in week4) and enable4 == 1):
                     week4_state = 1
-
-                if ((cur_week in week1) and enable1 == 1) or ((cur_week in week2) and enable2 == 1) or\
-                    ((cur_week in week3) and enable3 == 1) or ((cur_week in week4) and enable4 == 1):
-                    if  enable1 == 1 or enable2 == 1 or enable3 == 1 or enable4 == 1:
-                        if week1 != [] or week2 != [] or week3 != [] or week4 != []:
+                # print("week4_state ",cur_week,week1_state,week2_state,week3_state,week4_state,cur_week)
+                if week1 != [] or week2 != [] or week3 != [] or week4 != []:
+                    if ((cur_week in week1) and enable1 == 1 and week1 != []) or ((cur_week in week2) and enable2 == 1 and week2 != []) or\
+                        ((cur_week in week3) and enable3 == 1 and week3 != []) or ((cur_week in week4) and enable4 == 1 and week4 != []):
+                        if  enable1 == 1 or enable2 == 1 or enable3 == 1 or enable4 == 1:
                             if (end_time1 > start_time1  and  enable1 == 1 and week1_state == 1) or (end_time2 > start_time2 and  enable2 == 1 and week2_state == 1) or\
                             (end_time3 > start_time3 and  enable3 == 1 and week3_state == 1) or (end_time4 > start_time4 and  enable4 == 1 and week4_state == 1):
                                 if (cur_total_min <= end_time1 and cur_total_min >= start_time1 and enable1 == 1) or (cur_total_min <= end_time2 and cur_total_min >= start_time2 and enable2 == 1) or\
-                                    (cur_total_min <= end_time3 and cur_total_min >= start_time3 and enable3 == 1) or (cur_total_min <= end_time4 and cur_total_min >= start_time4 and enable3 == 1):
+                                    (cur_total_min <= end_time3 and cur_total_min >= start_time3 and enable3 == 1) or (cur_total_min <= end_time4 and cur_total_min >= start_time4 and enable4 == 1):
                                     self.class_state = 1
                                     print("class_in1")
                                     break
-                            else:#开始时间小于结束时间属于垮天 9:00 -7:00 7*60 6:00
-
-                                # print("end_time1!!!!!!!!!",start_time1,end_time1,start_time2,end_time2,start_time3,end_time3,start_time4,end_time4)
-                                if (((end_time1 >= cur_total_min or cur_total_min >= start_time1) and enable1 == 1 and week1_state == 1)or \
-                                    ((end_time2 >= cur_total_min or cur_total_min >= start_time2) and enable2 == 1 and week2_state == 1) or\
-                                    ((end_time3 >= cur_total_min or cur_total_min >= start_time3) and enable3 == 1 and week3_state == 1) or \
-                                    ((end_time4 >= cur_total_min or cur_total_min >= start_time4) and enable4 == 1 and week4_state == 1)):
-                                        self.class_state = 1
-                                        print("class_in2")
-                                        break
-
-
         return self.class_state
     
     def get_class_in_time_page(self, event, msg):
index ac2625a..9a0a127 100644 (file)
@@ -775,23 +775,28 @@ 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) < 5 :
+        #     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('-')#-作为分隔符
@@ -810,7 +815,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]
@@ -833,9 +838,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("/usr/static/storage_file/alarm_msg.json", 'w',encoding='utf-8') as fd:
             ujson.dump(alarm_new,fd)
@@ -1384,7 +1389,7 @@ class SILENCETIMEFS_ProtoCol(ProtoCol):#云米
             if x >= 4:
                 break
             if count > 1:
-
+                # 0100001
                 msg_data = msg_tmp_d.split(',')[x]
                 print("SILENCETIMEFS count",msg_data)
                 b = msg_data.find('-')
index f9b9270..71ff5a8 100644 (file)
@@ -131,10 +131,20 @@ style_wechat_btn.set_bg_color(lv.color_make(0x1E, 0x26, 0xff))
 style_wechat_btn.set_border_width(0)
 style_wechat_btn.set_shadow_opa(0)
 
+style_press_btn = lv.style_t()
+style_press_btn.init()
+style_press_btn.set_radius(0)
+style_press_btn.set_bg_color(lv.color_make(0xff, 0xff, 0xff))
+style_press_btn.set_bg_opa(255)
+style_press_btn.set_border_width(0)
+style_press_btn.set_pad_left(0)
+style_press_btn.set_pad_right(0)
+style_press_btn.set_pad_top(0)
+style_press_btn.set_pad_bottom(0)
 
 style_contact_btn = lv.style_t()
 style_contact_btn.init()
-style_contact_btn.set_radius(5)
+style_contact_btn.set_radius(0)
 style_contact_btn.set_bg_color(lv.color_make(0xff, 0xff, 0xff))
 style_contact_btn.set_bg_opa(255)
 style_contact_btn.set_border_width(0)
@@ -788,10 +798,13 @@ class CallLogScreen(Screen):
                                         lv.EVENT.CLICKED, None)
                 _btn.add_flag(lv.obj.FLAG.HIDDEN)
                 _btn_label2 = lv.label(_btn)
+               
                 _btn_label3 = lv.label(_btn)
                 _btn_label4 = lv.label(_btn)
+                _btn_label4.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                 _btn_label5 = lv.label(_btn)
                 _btn_label6 = lv.label(_btn)
+                _btn_label6.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                 self.call_log_detail_list_dict.append({"_btn":_btn,"_btn_label2":_btn_label2,"_btn_label3":_btn_label3,
                                               "_btn_label4":_btn_label4,"_btn_label5":_btn_label5,"_btn_label6":_btn_label6})
             self.meta = call_log_screen
@@ -840,7 +853,8 @@ class CallLogScreen(Screen):
                     #_btn = lv.btn(self.call_log_detail_list)
                     self.call_log_detail_list_dict[h]["_btn"].set_size(LCD_X,45)
                     self.call_log_detail_list_dict[h]["_btn"].set_pos(0,47*h)
-                    self.call_log_detail_list_dict[h]["_btn"].add_style(style_contact_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
+                    self.call_log_detail_list_dict[h]["_btn"].set_style_bg_color(lv.color_make(0xff, 0xff, 0xff), lv.PART.MAIN | lv.STATE.DEFAULT)
+                    # self.call_log_detail_list_dict[h]["_btn"].add_style(style_contact_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
                     self.call_log_detail_list_dict[h]["_btn"].add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling(e)),
                                             lv.EVENT.CLICKED, None)
 
@@ -858,11 +872,11 @@ class CallLogScreen(Screen):
                     # _btn_label3.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
 
                     #_btn_label4 = lv.label(_btn)
-                    self.call_log_detail_list_dict[h]["_btn_label4"].set_pos(5, 24)
+                    self.call_log_detail_list_dict[h]["_btn_label4"].set_pos(0, 20)
                     self.call_log_detail_list_dict[h]["_btn_label4"].set_size(LCD_X-15, 21)
                     self.call_log_detail_list_dict[h]["_btn_label4"].set_text(num_phonnum)
                     self.call_log_detail_list_dict[h]["_btn_label4"].set_long_mode(lv.label.LONG.CLIP)
-                    self.call_log_detail_list_dict[h]["_btn_label4"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
+                    # self.call_log_detail_list_dict[h]["_btn_label4"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
 
                     #_btn_label5 = lv.label(_btn)
                     self.call_log_detail_list_dict[h]["_btn_label5"].set_pos(0, 5)
@@ -872,11 +886,11 @@ class CallLogScreen(Screen):
                     # _btn_label5.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
 
                     #_btn_label6 = lv.label(_btn)
-                    self.call_log_detail_list_dict[h]["_btn_label6"].set_pos(5, 4)
+                    self.call_log_detail_list_dict[h]["_btn_label6"].set_pos(0, 0)
                     self.call_log_detail_list_dict[h]["_btn_label6"].set_size(LCD_X-15, 20)
                     self.call_log_detail_list_dict[h]["_btn_label6"].set_text(num_name)
                     self.call_log_detail_list_dict[h]["_btn_label6"].set_long_mode(lv.label.LONG.CLIP)
-                    self.call_log_detail_list_dict[h]["_btn_label6"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
+                    # self.call_log_detail_list_dict[h]["_btn_label6"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                     
                     self.call_log_detail_list_dict[h]["_btn"].clear_flag(lv.obj.FLAG.HIDDEN)
                     #self.call_log_detail_list_dict[h]["_btn"].scroll_to_view(lv.ANIM.OFF)
@@ -1902,7 +1916,9 @@ class PopupScreen(Screen):
                 _btn_label2 = lv.label(msg_btn)
                 _btn_label3 = lv.label(msg_btn)
                 _btn_label4 = lv.label(msg_btn)
+                _btn_label4.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                 _btn_label5 = lv.label(msg_btn)
+                _btn_label5.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                 self.sms_detail_list_dict.append({"msg_btn":msg_btn,"_btn_label2":_btn_label2,"_btn_label3":_btn_label3,
                                               "_btn_label4":_btn_label4,"_btn_label5":_btn_label5})
             self.meta = msg_list_screen
@@ -2125,7 +2141,7 @@ class PopupScreen(Screen):
                     self.sms_detail_list_dict[i]["_btn_label4"].set_size(LCD_X-15, 21)
                     self.sms_detail_list_dict[i]["_btn_label4"].set_text(detail1)
                     self.sms_detail_list_dict[i]["_btn_label4"].set_long_mode(lv.label.LONG.DOT)
-                    self.sms_detail_list_dict[i]["_btn_label4"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
+                    # self.sms_detail_list_dict[i]["_btn_label4"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
 
                     title1 = tmp[0]
                     #_btn_label5 = lv.label(msg_btn)
@@ -2133,7 +2149,7 @@ class PopupScreen(Screen):
                     self.sms_detail_list_dict[i]["_btn_label5"].set_size(LCD_X-15, 20)
                     self.sms_detail_list_dict[i]["_btn_label5"].set_text(title1)
                     self.sms_detail_list_dict[i]["_btn_label5"].set_long_mode(lv.label.LONG.DOT)
-                    self.sms_detail_list_dict[i]["_btn_label5"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
+                    # self.sms_detail_list_dict[i]["_btn_label5"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                     
                     self.sms_detail_list_dict[i]["msg_btn"].clear_flag(lv.obj.FLAG.HIDDEN)
                     #if msg == 1:
@@ -3959,10 +3975,14 @@ class ContactsScreen(Screen):
                 contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e)),
                                         lv.EVENT.CLICKED, None)
                 contact_btn.add_flag(lv.obj.FLAG.HIDDEN)
+                # contact_btn.add_style(style_press_btn, lv.PART.MAIN | lv.STATE.PRESSED)
                 
                 contact_btn_label_1 = lv.label(contact_btn)
+                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)
+                # contact_btn_label_2.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                 contact_btn_label_3 = lv.label(contact_btn)
+                contact_btn_label_3.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                 self.contact_detail_listt_dict.append({"contact_btn":contact_btn,"contact_btn_label_1":contact_btn_label_1,"contact_btn_label_2":contact_btn_label_2,"contact_btn_label_3":contact_btn_label_3})
             self.meta = contacts_screen
         self.count = 0
@@ -4006,29 +4026,32 @@ class ContactsScreen(Screen):
                 #contact_btn = lv.btn(self.contact_detail_list)
                 self.contact_detail_listt_dict[i]["contact_btn"].set_size(LCD_X,45)
                 self.contact_detail_listt_dict[i]["contact_btn"].set_pos(0,47*i )
-                self.contact_detail_listt_dict[i]["contact_btn"].add_style(style_contact_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
+                self.contact_detail_listt_dict[i]["contact_btn"].set_style_bg_color(lv.color_make(0xff, 0xff, 0xff), lv.PART.MAIN | lv.STATE.DEFAULT)
+                # 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(5, 4)
+                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(LCD_X-15, 16)
                 self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_text(key_tmp[4:])
-                self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_long_mode(lv.label.LONG.DOT)
-                self.contact_detail_listt_dict[i]["contact_btn_label_1"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
+                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"].set_long_mode(lv.label.LONG.DOT)
+                # self.contact_detail_listt_dict[i]["contact_btn_label_1"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
 
                 #contact_btn_label_2 = lv.label(contact_btn)
-                self.contact_detail_listt_dict[i]["contact_btn_label_2"].set_pos(0, 5)
+                self.contact_detail_listt_dict[i]["contact_btn_label_2"].set_pos(0, 0)
                 self.contact_detail_listt_dict[i]["contact_btn_label_2"].set_size(0, 0)
                 self.contact_detail_listt_dict[i]["contact_btn_label_2"].set_text(key_tmp)
                 
 
                 #contact_btn_label_3 = lv.label(contact_btn)
-                self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_pos(5, 24)
+                self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_pos(0, 20)
                 self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_size(LCD_X-15, 16)
                 self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_text(name)
-                self.contact_detail_listt_dict[i]["contact_btn_label_3"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
+                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)
                 
                 
                 self.contact_detail_listt_dict[i]["contact_btn"].clear_flag(lv.obj.FLAG.HIDDEN)
index c8b5981..a948654 100644 (file)
@@ -2957,15 +2957,14 @@ class testSmsSetIPManager(Abstract):#
         # return [self.newip,self.newcom,self.newmd5]
         if(tmp_data != None):
             return [self.newip,self.newcom]
-
 class setclassTimeManager(Abstract):#设置上课禁用时间
     def __init__(self):
         self.class_buf = {}
         self.class_state = 0
-        check_json = ql_fs.path_exists("/ext/static/storage_file/class_msg.json")
+        check_json = ql_fs.path_exists("/usr/static/storage_file/class_msg.json")
 
         if check_json == True:
-            with open("/ext/static/storage_file/class_msg.json","r",encoding="utf-8") as fd:
+            with open("/usr/static/storage_file/class_msg.json","r",encoding="utf-8") as fd:
                 self.class_buf = ujson.load(fd)
                 print("读取上课禁用时间段")
                 # print("self.class_buf:",self.class_buf)
@@ -3060,6 +3059,7 @@ class setclassTimeManager(Abstract):#设置上课禁用时间
             week2_state = 0
             week3_state = 0
             week4_state = 0
+            print("week4 ",cur_week,week1,week2,week3,week4,enable1,enable2,enable3,enable4)
             # print("end_time1 ",start_time1,end_time1,start_time2,end_time2,start_time3,end_time3,start_time4,end_time4)
             for i in range(0,7):
                 if ((cur_week in week1) and enable1 == 1):
@@ -3072,30 +3072,18 @@ class setclassTimeManager(Abstract):#设置上课禁用时间
                 
                 if ((cur_week in week4) and enable4 == 1):
                     week4_state = 1
-
-                if ((cur_week in week1) and enable1 == 1) or ((cur_week in week2) and enable2 == 1) or\
-                    ((cur_week in week3) and enable3 == 1) or ((cur_week in week4) and enable4 == 1):
-                    if  enable1 == 1 or enable2 == 1 or enable3 == 1 or enable4 == 1:
-                        if week1 != [] or week2 != [] or week3 != [] or week4 != []:
+                # print("week4_state ",cur_week,week1_state,week2_state,week3_state,week4_state,cur_week)
+                if week1 != [] or week2 != [] or week3 != [] or week4 != []:
+                    if ((cur_week in week1) and enable1 == 1 and week1 != []) or ((cur_week in week2) and enable2 == 1 and week2 != []) or\
+                        ((cur_week in week3) and enable3 == 1 and week3 != []) or ((cur_week in week4) and enable4 == 1 and week4 != []):
+                        if  enable1 == 1 or enable2 == 1 or enable3 == 1 or enable4 == 1:
                             if (end_time1 > start_time1  and  enable1 == 1 and week1_state == 1) or (end_time2 > start_time2 and  enable2 == 1 and week2_state == 1) or\
                             (end_time3 > start_time3 and  enable3 == 1 and week3_state == 1) or (end_time4 > start_time4 and  enable4 == 1 and week4_state == 1):
                                 if (cur_total_min <= end_time1 and cur_total_min >= start_time1 and enable1 == 1) or (cur_total_min <= end_time2 and cur_total_min >= start_time2 and enable2 == 1) or\
-                                    (cur_total_min <= end_time3 and cur_total_min >= start_time3 and enable3 == 1) or (cur_total_min <= end_time4 and cur_total_min >= start_time4 and enable3 == 1):
+                                    (cur_total_min <= end_time3 and cur_total_min >= start_time3 and enable3 == 1) or (cur_total_min <= end_time4 and cur_total_min >= start_time4 and enable4 == 1):
                                     self.class_state = 1
                                     print("class_in1")
                                     break
-                            else:#开始时间小于结束时间属于垮天 9:00 -7:00 7*60 6:00
-
-                                # print("end_time1!!!!!!!!!",start_time1,end_time1,start_time2,end_time2,start_time3,end_time3,start_time4,end_time4)
-                                if (((end_time1 >= cur_total_min or cur_total_min >= start_time1) and enable1 == 1 and week1_state == 1)or \
-                                    ((end_time2 >= cur_total_min or cur_total_min >= start_time2) and enable2 == 1 and week2_state == 1) or\
-                                    ((end_time3 >= cur_total_min or cur_total_min >= start_time3) and enable3 == 1 and week3_state == 1) or \
-                                    ((end_time4 >= cur_total_min or cur_total_min >= start_time4) and enable4 == 1 and week4_state == 1)):
-                                        self.class_state = 1
-                                        print("class_in2")
-                                        break
-
-
         return self.class_state
     
     def get_class_in_time_page(self, event, msg):
@@ -3114,4 +3102,7 @@ class setclassTimeManager(Abstract):#设置上课禁用时间
                    EventMesh.publish("load_screen", {"screen": "main_menu"})
             
         pass
+
+
+
     
\ No newline at end of file