单次闹钟
authord15521469561 <d155214695615@qq.com>
Mon, 17 Apr 2023 12:24:32 +0000 (20:24 +0800)
committerd15521469561 <d155214695615@qq.com>
Mon, 17 Apr 2023 12:24:32 +0000 (20:24 +0800)
倒计时 秒表

3.code/1.watch/2.code/alarm.py
3.code/1.watch/2.code/appWechat.py
3.code/1.watch/2.code/main.py
3.code/1.watch/2.code/main_1.py
3.code/1.watch/2.code/mgr.py
3.code/1.watch/2.code/ui.py
3.code/1.watch/2.code/ui_WatchFaceScreen.py
3.code/1.watch/2.code/ui_main_menu.py
3.code/1.watch/2.code/ui_setting.py

index 28c3967..40e672c 100644 (file)
@@ -9,7 +9,10 @@ from ext.common import Abstract, LogAdapter
 from machine import RTC
 import ujson
 import ql_fs
+import audio
 from ext.ui import style_img,style_screen,style_font_youyuan_20
+import ntptime
+ntptime.settime(timezone=8)
 """
 可以添加/编辑闹钟时间、周期;
 最多添加三个闹钟;
@@ -402,6 +405,8 @@ class ClockManager(Abstract):
     def __init__(self):
         super().__init__()
         self.rtc = RTC()
+        self.days = 0
+        self.idx = 0
 
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("push_clock_info", self.set)
@@ -465,7 +470,20 @@ class ClockManager(Abstract):
             ujson.dump(alarm_list,fd)
 
     def _rtc_callback(self,args):
-        print("---!!!!!!alarm_ring!!!!!!!---")
+        print("---!!!!!!alarm_ring!!!!!!!---,idx:",args)
+        global alarm_list
+        EventMesh.publish("read_alarminjson")
+        idx = self.idx
+        print("单次闹钟关闭:",idx)
+        #判断是否是单次闹钟,如果是,则将开关状态设置为关闭
+        print("关闭1:",alarm_list [idx]["days"])
+        if not alarm_list [idx]["days"] :
+                print("关闭2:",alarm_list [idx]["days"])
+                alarm_list[idx]["enabled"] = False
+                with open("/ext/static/storage_file/alarm_msg.json", 'w+',encoding='utf-8') as fd:
+                    ujson.dump(alarm_list,fd)
+
+        #设置下一个闹钟
         EventMesh.publish("set_rtc_alarm")
         get_hr_state = EventMesh.publish("get_hr_state")
         get_spo2_state = EventMesh.publish("get_spo2_state")
@@ -479,9 +497,10 @@ class ClockManager(Abstract):
     def set_rtc_alarm(self,event,msg):
         global alarm_list
         EventMesh.publish("read_alarminjson")
+        rtc_now_time = self.rtc.datetime()
 
-        print("00获取所有闹钟信息:{}".format(alarm_list))
-        new_alarm_list = [(alarm['hour'], alarm['minute'], alarm['days']) for alarm in alarm_list if alarm['enabled']]
+        print("00获取所有闹钟信息:{}".format(alarm_list))
+        new_alarm_list = [(alarm['hour'], alarm['minute'], alarm['days'],alarm["idx"]) for alarm in alarm_list if alarm['enabled']]
 
         print("01获取开启的闹钟:{}".format(new_alarm_list))
         start_day = 0 # 周日
@@ -495,16 +514,27 @@ class ClockManager(Abstract):
             return
         
         for alarm in new_alarm_list:
-            hour, minute, days = alarm
-            for day in days:
-                minute_list.append(hour*60 + minute + (day-start_day)*24*60)
+            hour, minute, days,idx = alarm
+            #如果没有选择day,则表示是单次闹钟
+            if days:
+                for day in days:
+                    minute_list.append(hour*60 + minute + (day-start_day)*24*60)
+                   
+            else:
+                #如果当前时间没超过闹钟设置时间,则设置为今天,否则设置为明天
+                if (hour*60 + minute) > (rtc_now_time[4]*60 + rtc_now_time[5]):
+                    minute_list.append(hour*60 + minute + (rtc_now_time[3]-start_day)*24*60)
+                    print("设置单次闹钟:{}".format(new_alarm_list))
 
+                else:
+                    minute_list.append(hour*60 + minute + (rtc_now_time[3]-start_day+1)*24*60)
+        
         total_minutes = sorted(minute_list)
         print("02以周日00:00为起点,计算所有开启闹钟的total_min并排序:{}".format(total_minutes))
 
         #获取当前时间  (2020, 9, 11, 5, 15, 43, 23, 0)
         # rtc_now_time = (2020, 9, 11, 6, 11, 43, 23, 0)
-        rtc_now_time = self.rtc.datetime()
+        # rtc_now_time = self.rtc.datetime()
 
         print("03当前的rtc时间:{}".format(rtc_now_time))  
 
@@ -564,6 +594,11 @@ class ClockManager(Abstract):
         data_e=tuple(data_l)
         print("13将该时间转换为RTC元组:", data_e)
        
+        for alarm in alarm_list:
+            if not alarm["days"] and alarm["enabled"]:
+                print("关闭666:",alarm["idx"])
+                if alarm["hour"] == data_l[4] and alarm["minute"]==data_l[5]:
+                    self.idx = alarm["idx"]
         #设置rtc闹钟时间
         self.rtc.register_callback(self._rtc_callback)
 
@@ -603,14 +638,15 @@ class PopupAlarmScreen(Screen):
         super().__init__()
         self.meta = popup_alarm_screen
         self.timer = osTimer()
+        self.aud = audio.Audio(0)
 
     def initialization(self):
         self.timer.start(10*1000,0,self.exit_alarm_page)
         time = EventMesh.publish("screen_get_time")#获取系统时间
-        print("time:{}".format(time))
         popup_alarm_time.set_text("{}:{}".format(time[0][0],time[0][1]))
-    
-    def exit_alarm_page(self):
+        self.aud.play(1, 0, 'E:/static/audio_audio_haixiu.mp3')  #播放声音
+
+    def exit_alarm_page(self,*arges):
         EventMesh.publish("load_screen", {"screen": "watchface"})
 
     def done_left_to_right(self):
index e3f0c94..74d77cb 100644 (file)
@@ -85,6 +85,8 @@ class WechatScreen(Screen):
         self.MXA_MSG = 10
         self.wechat_recode_list = {}
         self.wechat_num = 0
+        self.read_data = {}
+        self.volum_size = 8 
         check_txt = ql_fs.path_exists("/ext/static/storage_file/wechat_num.txt")
         if check_txt == True :
             with open("/ext/static/storage_file/wechat_num.txt","r") as fd:#音频文件编号
@@ -95,12 +97,26 @@ class WechatScreen(Screen):
                     self.wechat_num = int(num_tmp)#
         if self.wechat_num != 0:
             with open("/ext/static/storage_file/wechat_record.json","r",encoding="utf-8") as fd:#音频文件记录
-                self.wechat_recode_list = ujson.load(fd)#读取每一个amr音频文件的时长
+                self.wechat_recode_list = ujson.load(fd)#读取每一个amr音频文件的时长ui_setting.py
 
         self.record_test = audio.Record()
         self.aud = audio.Audio(0)
         self.aud.set_pa(Pin.GPIO29)
-        self.aud.setVolume(11)
+        check_volum = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        if check_volum == True :
+            with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
+                self.read_data = ujson.load(fd)
+                if self.read_data != {}:
+                    b = str("volum") in self.read_data.keys()
+                    if b == True:
+                        self.volum_size = self.read_data["volum"]  
+                    else:
+                        self.volum_size = 8
+                else:
+                    self.volum_size = 8
+        else:
+            self.volum_size = 8
+        self.aud.setVolume(self.volum_size)
         self.meta = wechat_screen
         wechat_press_btn.add_event_cb(lambda e: self.talking(e),
                                      lv.EVENT.LONG_PRESSED, None)
index a3738f6..565f87a 100644 (file)
@@ -85,7 +85,7 @@ if __name__ == '__main__':
     ui.add_screen(_ui.ContactsScreen()) 
     ui.add_screen(WechatScreen()) 
     ui.add_screen(ClkListScreen()) 
-
+    ui.add_screen(_ui.CountdownEndScreen()) 
     ui.add_screen(NewEditClk()) 
     ui.add_screen(CLKTimeScreen()) 
     ui.add_screen(ClkPeriod()) 
@@ -104,6 +104,7 @@ if __name__ == '__main__':
     ui.add_screen(_ui_setting.AlarmvolumeScreen()) 
     ui.add_screen(_ui_setting.MsgvolumeScreen()) 
     ui.add_screen(_ui_setting.PhoneringScreen()) 
+    ui.add_screen(_ui_setting.totalvolumeScreen()) 
     ui.add_screen(_ui.DialingScreen()) 
     ui.add_screen(_ui.CallLogScreen()) 
     ui.add_screen(AlipayOpenScreen()) 
index a3738f6..565f87a 100644 (file)
@@ -85,7 +85,7 @@ if __name__ == '__main__':
     ui.add_screen(_ui.ContactsScreen()) 
     ui.add_screen(WechatScreen()) 
     ui.add_screen(ClkListScreen()) 
-
+    ui.add_screen(_ui.CountdownEndScreen()) 
     ui.add_screen(NewEditClk()) 
     ui.add_screen(CLKTimeScreen()) 
     ui.add_screen(ClkPeriod()) 
@@ -104,6 +104,7 @@ if __name__ == '__main__':
     ui.add_screen(_ui_setting.AlarmvolumeScreen()) 
     ui.add_screen(_ui_setting.MsgvolumeScreen()) 
     ui.add_screen(_ui_setting.PhoneringScreen()) 
+    ui.add_screen(_ui_setting.totalvolumeScreen()) 
     ui.add_screen(_ui.DialingScreen()) 
     ui.add_screen(_ui.CallLogScreen()) 
     ui.add_screen(AlipayOpenScreen()) 
index 91794cd..219e092 100644 (file)
@@ -972,7 +972,6 @@ class DeviceInfoManager(Abstract):
         vbat = 0
         temp = Power.getVbatt()
         if temp <= 3500:
-
             vbat = 20 #"E:/vbat_20.jpg"
         elif temp <= 3600:
             vbat = 40 #"E:/vbat_40.jpg"
@@ -1699,5 +1698,30 @@ class getStorageDataManager(Abstract):#获取内存数据
     def get_storage_data(self, event, msg): 
         return self.read_data 
     
+class getVolumSizeManager(Abstract):#设置或获取音量大小数据
+    def __init__(self):
+        self.volume_size = 8
+        self.read_data = {}
+        check = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        print("check:{}".format(check))
+        if check == True:
+            with open("/ext/static/storage_file/config.json","r") as fd:
+                self.read_data = ujson.load(fd)
+                if self.read_data != {}:
+                    b = str("volum") in self.read_data.keys()
+                    if b == True:
+                        self.volume_size = self.read_data["volum"]   
+                    else:
+                        self.volume_size = 8
+        else:
+            self.volume_size = 8
+    def post_processor_after_instantiation(self):
+        EventMesh.subscribe("set_volum_size", self.set_volum_size)
+        EventMesh.subscribe("get_volum_size", self.get_volum_size)
+
+    def set_volum_size(self, event, msg): 
+        self.volume_size = msg
 
+    def get_volum_size(self, event, msg): 
+        return self.volume_size
 
index a2afc20..25b9586 100644 (file)
@@ -309,251 +309,11 @@ alarm_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 # alarm_list.set_size(240, 250)
 # alarm_list.add_style(style_list, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-# -------------------------------------------countdown screen----------------------------------------------------------
-countdown_screen = lv.obj()
-countdown = lv.obj(countdown_screen)
-countdown.center()
-countdown.set_size(240, 320)
-countdown.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-countdown_title = lv.label(countdown)
-countdown_title.set_pos(0, 20)
-countdown_title.set_size(240, 20)
-countdown_title.set_text("倒计时")
-countdown_title.set_long_mode(lv.label.LONG.WRAP)
-countdown_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-countdown_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-countdown_hour = lv.label(countdown)
-countdown_hour.set_pos(30, 140)
-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)
-countdown_hour.set_long_mode(lv.label.LONG.WRAP)
-countdown_hour.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
-
-countdown_mao = lv.label(countdown)
-countdown_mao.set_pos(82, 138)
-countdown_mao.set_size(30, 30)
-countdown_mao.set_text(":")
-countdown_mao.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT)
-countdown_mao.set_long_mode(lv.label.LONG.WRAP)
-countdown_mao.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
 
 
-countdown_min = lv.label(countdown)
-countdown_min.set_pos(95, 140)
-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)
-countdown_min.set_long_mode(lv.label.LONG.WRAP)
-countdown_min.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
-
-countdown_mao1 = lv.label(countdown)
-countdown_mao1.set_pos(146, 138)
-countdown_mao1.set_size(30, 30)
-countdown_mao1.set_text(":")
-countdown_mao1.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT)
-countdown_mao1.set_long_mode(lv.label.LONG.WRAP)
-countdown_mao1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
-
-
-countdown_sec = lv.label(countdown)
-countdown_sec.set_pos(160, 140)
-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)
-countdown_sec.set_long_mode(lv.label.LONG.WRAP)
-countdown_sec.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
-
-countdown_hour_up = lv.img(countdown)
-countdown_hour_up.set_size(34, 30)
-countdown_hour_up.set_pos(36, 100)
-countdown_hour_up.set_src("E:/static/time_up.png")
 
 
 
-countdown_hour_up.add_flag(lv.obj.FLAG.CLICKABLE)
-countdown_hour_up.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-countdown_hour_down = lv.img(countdown)
-countdown_hour_down.set_size(34, 30)
-countdown_hour_down.set_pos(36, 180)
-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_min_up = lv.img(countdown)
-countdown_min_up.set_size(34, 30)
-countdown_min_up.set_pos(99, 100)
-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_down = lv.img(countdown)
-countdown_min_down.set_size(34, 30)
-countdown_min_down.set_pos(99, 180)
-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_sec_up = lv.img(countdown)
-countdown_sec_up.set_size(34, 30)
-countdown_sec_up.set_pos(165, 100)
-countdown_sec_up.set_src("E:/static/time_up.png")
-
-
-
-countdown_sec_up.add_flag(lv.obj.FLAG.CLICKABLE)
-countdown_sec_up.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-countdown_sec_down = lv.img(countdown)
-countdown_sec_down.set_size(34, 30)
-countdown_sec_down.set_pos(165, 180)
-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_reset_imgbtn = lv.img(countdown)
-countdown_reset_imgbtn.set_size(99, 36)
-countdown_reset_imgbtn.set_src("E:/static/stopwatch_reset.png")
-
-
-
-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, 260)
-
-countdown_start_imgbtn = lv.img(countdown)
-countdown_start_imgbtn.set_size(99, 36)
-countdown_start_imgbtn.set_src("E:/static/stopwatch_play.png")
-
-
-
-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, 260)
-
-countdown_stop_imgbtn = lv.img(countdown)
-countdown_stop_imgbtn.set_size(99, 36)
-countdown_stop_imgbtn.set_src("E:/static/stopwatch_stop.png")
-
-
-
-countdown_stop_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE)
-countdown_stop_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-countdown_stop_imgbtn.set_pos(120, 260)
-countdown_stop_imgbtn.add_flag(lv.obj.FLAG.HIDDEN)
-
-#结束倒计时显示图标
-countdown_end_img = lv.img(countdown)
-countdown_end_img.set_size(140, 140)
-countdown_end_img.set_pos(50, 20)
-countdown_end_img.set_src("E:/static/time_finish.png")
-countdown_end_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-countdown_end_label = lv.label(countdown)
-countdown_end_label.set_pos(0, 190)
-countdown_end_label.set_size(240, 40)
-countdown_end_label.set_text("时间到")
-countdown_end_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-countdown_end_label.set_long_mode(lv.label.LONG.WRAP)
-countdown_end_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-#............................................................................................
-
-
-
-# -------------------------------------------stopwatch screen----------------------------------------------------------
-stopwatch_screen = lv.obj()
-stopwatch = lv.obj(stopwatch_screen)
-stopwatch.center()
-stopwatch.set_size(240, 320)
-stopwatch.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-stopwatch_title = lv.label(stopwatch)
-stopwatch_title.set_pos(0, 20)
-stopwatch_title.set_size(240, 20)
-stopwatch_title.set_text("秒表")
-stopwatch_title.set_long_mode(lv.label.LONG.WRAP)
-stopwatch_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-stopwatch_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-stopwatch_label_min = lv.label(stopwatch)
-stopwatch_label_min.set_pos(30, 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)
-stopwatch_label_min.set_long_mode(lv.label.LONG.WRAP)
-stopwatch_label_min.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
-
-stopwatch_mao = lv.label(stopwatch)
-stopwatch_mao.set_pos(82, 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)
-stopwatch_mao.set_long_mode(lv.label.LONG.WRAP)
-stopwatch_mao.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
-
-
-stopwatch_label_sec = lv.label(stopwatch)
-stopwatch_label_sec.set_pos(95, 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)
-stopwatch_label_sec.set_long_mode(lv.label.LONG.WRAP)
-stopwatch_label_sec.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
-
-stopwatch_mao1 = lv.label(stopwatch)
-stopwatch_mao1.set_pos(146, 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)
-stopwatch_mao1.set_long_mode(lv.label.LONG.WRAP)
-stopwatch_mao1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
-
-
-stopwatch_label_ms = lv.label(stopwatch)
-stopwatch_label_ms.set_pos(160, 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)
-stopwatch_label_ms.set_long_mode(lv.label.LONG.WRAP)
-stopwatch_label_ms.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
-
-
-
-
-stopwatch_reset_imgbtn = lv.img(stopwatch)
-stopwatch_reset_imgbtn.set_size(99, 36)
-stopwatch_reset_imgbtn.set_src("E:/static/stopwatch_reset.png")
-stopwatch_reset_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE)
-stopwatch_reset_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-stopwatch_reset_imgbtn.set_pos(10, 210)
-
-stopwatch_start_imgbtn = lv.img(stopwatch)
-stopwatch_start_imgbtn.set_size(99, 36)
-
-stopwatch_start_imgbtn.set_src("E:/static/stopwatch_play.png")
-stopwatch_start_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE)
-stopwatch_start_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-stopwatch_start_imgbtn.set_pos(115, 210)
-
-stopwatch_stop_imgbtn = lv.img(stopwatch)
-stopwatch_stop_imgbtn.set_size(99, 36)
-stopwatch_stop_imgbtn.set_src("E:/static/stopwatch_stop.png")
-stopwatch_stop_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE)
-stopwatch_stop_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-stopwatch_stop_imgbtn.set_pos(115, 210)
-stopwatch_stop_imgbtn.add_flag(lv.obj.FLAG.HIDDEN)
 
 # -------------------------------------------temperature screen----------------------------------------------------------
 temperature_screen = lv.obj()
@@ -1636,7 +1396,7 @@ class PopupScreen(Screen):
             
             self.sms_detail_list = lv.obj(msg_list_screen)
             self.sms_detail_list.set_pos(0, 50)
-            self.sms_detail_list.set_size(240, 270)
+            self.sms_detail_list.set_size(180, 270)
             self.sms_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
             self.sms_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
             if self.msg_nums > 10:
@@ -1901,9 +1661,25 @@ class IncomingCallScreen(Screen):
 
     def __init__(self):
         super().__init__()
+        self.read_data = {}
+        self.volum_size = 8
+        check_volum = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        if check_volum == True :
+            with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
+                self.read_data = ujson.load(fd)
+                if self.read_data != {}:
+                    b = str("volum") in self.read_data.keys()
+                    if b == True:
+                        self.volum_size = self.read_data["volum"]  
+                    else:
+                        self.volum_size = 8
+                else:
+                    self.volum_size = 8
+        else:
+            self.volum_size = 8
         self.aud = audio.Audio(0)
         self.aud.set_pa(Pin.GPIO29)
-        self.aud.setVolume(10)
+        self.aud.setVolume(self.volum_size)
         self.call_timer = osTimer()
         self.name = None
         self.phonebook = {}
@@ -2152,13 +1928,20 @@ class StepScreen(Screen):
         super().__init__()
         self.meta = step_screen
         self.step = 0
-        EventMesh.subscribe(constants.EVENT.PUSH_STEP,self.revcing)
+        self.timer = osTimer()
+        
+    def post_processor_after_initialization(self):
+        step = EventMesh.publish(constants.EVENT.GET_STEP)
+        step_label_01.set_text("{}步".format(step[0]))
+        self.timer.start(5000, 1, self.revcing)
+
+    def revcing(self, *args, **kwargs):
+        step = EventMesh.publish(constants.EVENT.GET_STEP)
+        step_label_01.set_text("{}步".format(step[0]))
+
+    def Close(self):
+        self.timer.stop()
 
-    def revcing(self,event,msg):
-        # print("msg:{}".format(msg))
-        self.step = msg[0]
-        step_label_01.set_text("{}步".format(self.step))
-    
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "toolbox"})
 
@@ -2188,7 +1971,7 @@ no_weather_img.set_src("E:/static/update.png")
 no_weather_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 weather_tem_label = lv.label(weather)
-weather_tem_label.set_pos(155, 40)
+weather_tem_label.set_pos(155, 44)
 weather_tem_label.set_size(60, 50)
 weather_tem_label.set_text("_ _")
 weather_tem_label.set_long_mode(lv.label.LONG.WRAP)
@@ -2461,15 +2244,12 @@ class ContactsScreen(Screen):
         voiceCall.callStart(phone_num)
 
     def done_return(self):
-        # print("done_return....\r\n")
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        # print("btn1_release....\r\n")
         EventMesh.publish("load_screen", {"screen": "watchface"})
 
     def btn8_press(self):
-        # print("btn8_press....\r\n")
         EventMesh.publish("load_screen", {"screen": "watchface"})
 
 
@@ -2702,7 +2482,174 @@ class Spo2Screen(Screen):
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "watchface"})
+# -------------------------------------------countdown screen----------------------------------------------------------
+countdown_screen = lv.obj()
+countdown = lv.obj(countdown_screen)
+countdown.center()
+countdown.set_size(240, 320)
+countdown.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+countdown_title = lv.label(countdown)
+countdown_title.set_pos(0, 20)
+countdown_title.set_size(240, 20)
+countdown_title.set_text("倒计时")
+countdown_title.set_long_mode(lv.label.LONG.WRAP)
+countdown_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+countdown_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
+countdown_hour = lv.label(countdown)
+countdown_hour.set_pos(30, 140)
+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)
+countdown_hour.set_long_mode(lv.label.LONG.WRAP)
+countdown_hour.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+
+countdown_mao = lv.label(countdown)
+countdown_mao.set_pos(82, 138)
+countdown_mao.set_size(30, 30)
+countdown_mao.set_text(":")
+countdown_mao.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT)
+countdown_mao.set_long_mode(lv.label.LONG.WRAP)
+countdown_mao.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+
+
+countdown_min = lv.label(countdown)
+countdown_min.set_pos(95, 140)
+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)
+countdown_min.set_long_mode(lv.label.LONG.WRAP)
+countdown_min.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+
+countdown_mao1 = lv.label(countdown)
+countdown_mao1.set_pos(146, 138)
+countdown_mao1.set_size(30, 30)
+countdown_mao1.set_text(":")
+countdown_mao1.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT)
+countdown_mao1.set_long_mode(lv.label.LONG.WRAP)
+countdown_mao1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+
+
+countdown_sec = lv.label(countdown)
+countdown_sec.set_pos(160, 140)
+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)
+countdown_sec.set_long_mode(lv.label.LONG.WRAP)
+countdown_sec.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+
+countdown_hour_up = lv.img(countdown)
+countdown_hour_up.set_size(34, 30)
+countdown_hour_up.set_pos(36, 100)
+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)
+countdown_hour_up_btn.set_size(62, 70)
+countdown_hour_up_btn.set_pos(20, 80)
+countdown_hour_up_btn.add_flag(lv.obj.FLAG.CLICKABLE)
+
+
+countdown_hour_down = lv.img(countdown)
+countdown_hour_down.set_size(34, 30)
+countdown_hour_down.set_pos(36, 180)
+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)
+countdown_hour_down_btn.set_size(62, 80)
+countdown_hour_down_btn.set_pos(20, 150)
+countdown_hour_down_btn.add_flag(lv.obj.FLAG.CLICKABLE)
+
+
+countdown_min_up = lv.img(countdown)
+countdown_min_up.set_size(34, 30)
+countdown_min_up.set_pos(99, 100)
+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)
+countdown_min_up_btn.set_size(64, 70)
+countdown_min_up_btn.set_pos(82, 80)
+countdown_min_up_btn.add_flag(lv.obj.FLAG.CLICKABLE)
+
+
+
+countdown_min_down = lv.img(countdown)
+countdown_min_down.set_size(34, 30)
+countdown_min_down.set_pos(99, 180)
+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)
+countdown_min_down_btn.set_size(64, 80)
+countdown_min_down_btn.set_pos(82, 150)
+countdown_min_down_btn.add_flag(lv.obj.FLAG.CLICKABLE)
+
+
+countdown_sec_up = lv.img(countdown)
+countdown_sec_up.set_size(34, 30)
+countdown_sec_up.set_pos(165, 100)
+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)
+countdown_sec_up_btn.set_size(64, 70)
+countdown_sec_up_btn.set_pos(146, 80)
+countdown_sec_up_btn.add_flag(lv.obj.FLAG.CLICKABLE)
+
+countdown_sec_down = lv.img(countdown)
+countdown_sec_down.set_size(34, 30)
+countdown_sec_down.set_pos(165, 180)
+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)
+countdown_sec_down_btn.set_size(64, 80)
+countdown_sec_down_btn.set_pos(146, 150)
+countdown_sec_down_btn.add_flag(lv.obj.FLAG.CLICKABLE)
+
+countdown_reset_img = lv.img(countdown)
+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_imgbtn = lv.img(countdown)
+countdown_reset_imgbtn.set_size(99, 70)
+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_start_img = lv.img(countdown)
+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_imgbtn = lv.img(countdown)
+countdown_start_imgbtn.set_size(99, 70)
+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_stop_img = lv.img(countdown)
+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.add_flag(lv.obj.FLAG.HIDDEN)
+
+#............................................................................................
 class CountdownScreen(Screen):
     NAME = "countdown"
     
@@ -2718,38 +2665,34 @@ class CountdownScreen(Screen):
         self.g_state = 0
         self.g_end = 0
         self.total = 0
-        countdown_end_label.add_flag(lv.obj.FLAG.HIDDEN)
-        countdown_end_img.add_flag(lv.obj.FLAG.HIDDEN)
-        countdown_start_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
-        countdown_stop_imgbtn.add_flag(lv.obj.FLAG.HIDDEN)
-        countdown_reset_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
+        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_sec_up.add_event_cb(lambda e: self.sec_up(e),
+        countdown_sec_up_btn.add_event_cb(lambda e: self.sec_up(e),
                                      lv.EVENT.CLICKED, None)
-        countdown_sec_down.add_event_cb(lambda e: self.sec_down(e),
+        countdown_sec_down_btn.add_event_cb(lambda e: self.sec_down(e),
                                      lv.EVENT.CLICKED, None)
-        countdown_min_up.add_event_cb(lambda e: self.min_up(e),
+        countdown_min_up_btn.add_event_cb(lambda e: self.min_up(e),
                                      lv.EVENT.CLICKED, None)
-        countdown_min_down.add_event_cb(lambda e: self.min_down(e),
+        countdown_min_down_btn.add_event_cb(lambda e: self.min_down(e),
                                      lv.EVENT.CLICKED, None)
-        countdown_hour_up.add_event_cb(lambda e: self.hour_up(e),
+        countdown_hour_up_btn.add_event_cb(lambda e: self.hour_up(e),
                                      lv.EVENT.CLICKED, None)
-        countdown_hour_down.add_event_cb(lambda e: self.hour_down(e),
+        countdown_hour_down_btn.add_event_cb(lambda e: self.hour_down(e),
                                      lv.EVENT.CLICKED, None)
         countdown_start_imgbtn.add_event_cb(lambda e: self.start(e),
                                      lv.EVENT.CLICKED, None)
         countdown_reset_imgbtn.add_event_cb(lambda e: self.reset(e),
                                      lv.EVENT.CLICKED, None)
-        countdown_stop_imgbtn.add_event_cb(lambda e: self.stop(e),
-                                     lv.EVENT.CLICKED, None)       
+        # countdown_stop_imgbtn.add_event_cb(lambda e: self.stop(e),
+        #                              lv.EVENT.CLICKED, None)       
                            
     def post_processor_before_initialization(self):
         if self.g_state == 0:
-            countdown_end_label.add_flag(lv.obj.FLAG.HIDDEN)
-            countdown_end_img.add_flag(lv.obj.FLAG.HIDDEN)
-            countdown_start_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
-            countdown_stop_imgbtn.add_flag(lv.obj.FLAG.HIDDEN)
-            countdown_reset_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
+            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)
@@ -2765,6 +2708,7 @@ class CountdownScreen(Screen):
             self.hour = 0
             self.min = 0
             self.sec = 0
+        
 
     def sec_up(self,e):
         if self.sec < 59:
@@ -2804,34 +2748,49 @@ class CountdownScreen(Screen):
     
     def start(self,e):
         self.total = self.hour*60*60 + self.min*60 + self.sec
-        print("--00:",self.total,self.hour,self.min,self.sec)
-        if self.total > 0:
+        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
-            self.g_end = 0
-            self.show_value()
-            self.timer.start(period=1000, mode=self.timer.PERIODIC, callback=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_imgbtn.add_flag(lv.obj.FLAG.HIDDEN)
-            countdown_stop_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
-            countdown_reset_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
-
-    def stop(self,e):
+        if self.total > 0:
+            if self.g_state != 2:
+                self.g_state = 1
+                self.g_end = 0
+                self.show_value()
+                self.timer.start(period=1000, mode=self.timer.PERIODIC, callback=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)
+        
+
+    def stop(self):
         print("in stop")
-        if self.g_state == 1:
-            countdown_start_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
-            countdown_stop_imgbtn.add_flag(lv.obj.FLAG.HIDDEN)
-            countdown_reset_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
-            self.g_state = 0
-            self.g_end = 0
-            self.timer.stop()
-            self.show_value()
+        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.clear_flag(lv.obj.FLAG.HIDDEN)
+        countdown_stop_img.add_flag(lv.obj.FLAG.HIDDEN)
+        countdown_reset_img.clear_flag(lv.obj.FLAG.HIDDEN)
+        
+        self.g_end = 0
+        self.timer.stop()
+        # self.show_value()
+        # EventMesh.publish("load_screen", {"screen": "countdown"})
 
     def fun(self,e):
 
@@ -2842,26 +2801,10 @@ class CountdownScreen(Screen):
         self.show_value()  
         
         if self.total <= 0:
-            countdown_sec.add_flag(lv.obj.FLAG.HIDDEN)
-            countdown_min.add_flag(lv.obj.FLAG.HIDDEN)
-            countdown_hour.add_flag(lv.obj.FLAG.HIDDEN)
-            countdown_title.add_flag(lv.obj.FLAG.HIDDEN)
-            countdown_end_label.clear_flag(lv.obj.FLAG.HIDDEN)
-            countdown_end_img.clear_flag(lv.obj.FLAG.HIDDEN)
-            countdown_start_imgbtn.add_flag(lv.obj.FLAG.HIDDEN)
-            countdown_stop_imgbtn.add_flag(lv.obj.FLAG.HIDDEN)
-            countdown_reset_imgbtn.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_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)
             self.g_state = 0
             self.g_end = 1
             self.timer.stop()
+            EventMesh.publish("load_screen", {"screen": "countdown_end"})
         
         self.total = self.total - 1
         
@@ -2878,12 +2821,9 @@ class CountdownScreen(Screen):
         self.sec = 0
         self.g_state = 0
         self.g_end = 0
-        countdown_start_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
-        countdown_stop_imgbtn.add_flag(lv.obj.FLAG.HIDDEN)
-        countdown_reset_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
-        
-        countdown_end_label.add_flag(lv.obj.FLAG.HIDDEN)
-        countdown_end_img.add_flag(lv.obj.FLAG.HIDDEN)
+        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)
@@ -2894,8 +2834,6 @@ class CountdownScreen(Screen):
         self.show_value()
 
     def show_value(self):
-
-        # print(" in show value :",str(self.sec),str(self.min),str(self.hour))
         countdown_sec.set_text(str("%02d"%(self.sec)))
         countdown_min.set_text(str("%02d"%(self.min)))
         countdown_hour.set_text(str("%02d"%(self.hour)))
@@ -2918,6 +2856,132 @@ class CountdownScreen(Screen):
         if self.g_state == 0:
             self.timer.stop()
         EventMesh.publish("load_screen", {"screen": "toolbox"})
+#结束倒计时显示图标
+countdown_end_screen = lv.obj()
+countdown = lv.obj(countdown_end_screen)
+countdown.center()
+countdown.set_size(240, 320)
+countdown.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+countdown_end_img = lv.img(countdown)
+countdown_end_img.set_size(140, 140)
+countdown_end_img.set_pos(50, 20)
+countdown_end_img.set_src("E:/static/time_finish.png")
+countdown_end_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+countdown_end_label = lv.label(countdown_end_screen)
+countdown_end_label.set_pos(0, 200)
+countdown_end_label.set_size(240, 40)
+countdown_end_label.set_text("时间到")
+countdown_end_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+countdown_end_label.set_long_mode(lv.label.LONG.WRAP)
+countdown_end_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+class CountdownEndScreen(Screen):
+    NAME = "countdown_end"
+    
+    def __init__(self):
+        super().__init__()
+        self.meta = countdown_end_screen
+
+    def done_return(self):
+        EventMesh.publish("load_screen", {"screen": "countdown"})
+
+    def btn1_release(self):
+        EventMesh.publish("load_screen", {"screen": "countdown"})
+        
+    def btn8_press(self):
+        EventMesh.publish("load_screen", {"screen": "watchface"})
+
+# -------------------------------------------stopwatch screen----------------------------------------------------------
+stopwatch_screen = lv.obj()
+stopwatch = lv.obj(stopwatch_screen)
+stopwatch.center()
+stopwatch.set_size(240, 320)
+stopwatch.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+stopwatch_title = lv.label(stopwatch)
+stopwatch_title.set_pos(0, 20)
+stopwatch_title.set_size(240, 20)
+stopwatch_title.set_text("秒表")
+stopwatch_title.set_long_mode(lv.label.LONG.WRAP)
+stopwatch_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+stopwatch_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+stopwatch_label_min = lv.label(stopwatch)
+stopwatch_label_min.set_pos(30, 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)
+stopwatch_label_min.set_long_mode(lv.label.LONG.WRAP)
+stopwatch_label_min.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+
+stopwatch_mao = lv.label(stopwatch)
+stopwatch_mao.set_pos(82, 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)
+stopwatch_mao.set_long_mode(lv.label.LONG.WRAP)
+stopwatch_mao.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+
+
+stopwatch_label_sec = lv.label(stopwatch)
+stopwatch_label_sec.set_pos(95, 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)
+stopwatch_label_sec.set_long_mode(lv.label.LONG.WRAP)
+stopwatch_label_sec.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+
+stopwatch_mao1 = lv.label(stopwatch)
+stopwatch_mao1.set_pos(146, 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)
+stopwatch_mao1.set_long_mode(lv.label.LONG.WRAP)
+stopwatch_mao1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+
+
+stopwatch_label_ms = lv.label(stopwatch)
+stopwatch_label_ms.set_pos(160, 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)
+stopwatch_label_ms.set_long_mode(lv.label.LONG.WRAP)
+stopwatch_label_ms.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+
+
+
+
+stopwatch_reset_img = lv.img(stopwatch)
+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_imgbtn = lv.img(stopwatch)
+stopwatch_reset_imgbtn.set_size(99, 76)
+stopwatch_reset_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE)
+stopwatch_reset_imgbtn.set_pos(10, 190)
+
+
+stopwatch_start_img = lv.img(stopwatch)
+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_imgbtn = lv.img(stopwatch)
+stopwatch_start_imgbtn.set_size(99, 76)
+stopwatch_start_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE)
+stopwatch_start_imgbtn.set_pos(115, 190)
+
+
+stopwatch_stop_img = lv.img(stopwatch)
+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.add_flag(lv.obj.FLAG.HIDDEN)
 
 
 class StopwatchScreen(Screen):
@@ -2936,34 +3000,42 @@ class StopwatchScreen(Screen):
         
         stopwatch_reset_imgbtn.add_event_cb(lambda e: self.reset(e),
                                      lv.EVENT.CLICKED, None)
-        stopwatch_stop_imgbtn.add_event_cb(lambda e: self.paused(e),
-                                     lv.EVENT.CLICKED, None)
+       
+    def post_processor_before_initialization(self):
+        if self.s_state == 0:
+            self.reset(0)
 
     def start(self, e):      
+        print("stopwatch start:{}".format(self.s_state))
         #self.timer.start(100, 1, self._fun)  
-        self.timer.start(period=100, mode=self.timer.PERIODIC, callback=self._fun)
-        self.s_state = 1
-        stopwatch_stop_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
-        stopwatch_start_imgbtn.add_flag(lv.obj.FLAG.HIDDEN)
-
-
-    def paused(self, e):        
+        if self.s_state == 1:
+            self.s_state = 2
+            self.paused()
+        elif self.s_state == 2:
+            self.s_state = 1
+        if self.s_state != 2:
+            self.s_state = 1
+            self.timer.start(period=100, mode=self.timer.PERIODIC, callback=self._fun)
+            stopwatch_stop_img.clear_flag(lv.obj.FLAG.HIDDEN)
+            stopwatch_start_img.add_flag(lv.obj.FLAG.HIDDEN)
+
+
+    def paused(self):        
         print("stopwatch pause")
-        stopwatch_start_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
-        stopwatch_stop_imgbtn.add_flag(lv.obj.FLAG.HIDDEN)
-        self.s_state = 0
+        stopwatch_start_img.clear_flag(lv.obj.FLAG.HIDDEN)
+        stopwatch_stop_img.add_flag(lv.obj.FLAG.HIDDEN)
         self.timer.stop()
         self.show_value()
 
-    def reset(self, e):
+    def reset(self,e):
         print("stopwatch reset")        
 
         self.sec_value = 0
         self.min_value = 0
         self.ms_value = 0
         self.s_state = 0
-        stopwatch_start_imgbtn.clear_flag(lv.obj.FLAG.HIDDEN)
-        stopwatch_stop_imgbtn.add_flag(lv.obj.FLAG.HIDDEN)
+        stopwatch_start_img.clear_flag(lv.obj.FLAG.HIDDEN)
+        stopwatch_stop_img.add_flag(lv.obj.FLAG.HIDDEN)
         self.timer.stop()
         self.show_value()
 
@@ -3009,9 +3081,25 @@ class UIFINDScreen(Screen):
     NAME = "FIND"
     def __init__(self):
         super().__init__()
+        self.read_data = {}
+        self.volum_size = 8
+        check_volum = ql_fs.path_exists("/ext/static/storage_file/config.json")
+        if check_volum == True :
+            with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
+                self.read_data = ujson.load(fd)
+                if self.read_data != {}:
+                    b = str("volum") in self.read_data.keys()
+                    if b == True:
+                        self.volum_size = self.read_data["volum"]  
+                    else:
+                        self.volum_size = 8
+                else:
+                    self.volum_size = 8
+        else:
+            self.volum_size = 8
         self.aud = audio.Audio(0)
         self.aud.set_pa(Pin.GPIO29)
-        self.aud.setVolume(10)
+        self.aud.setVolume(self.volum_size)
         self.FIND_timer = osTimer()
         self.FIND_timer_count = 0
 
index 0ce62bd..c6089b8 100644 (file)
@@ -26,7 +26,8 @@ class Watchface2():
         self.watchface_default.set_bg_opa(255)
         # add style for watchface
         self.meta.add_style(self.watchface_default, lv.PART.MAIN|lv.STATE.DEFAULT)
-
+        
+        # create style style_watchface_img_default
         self.style_watchface_img_default = lv.style_t()
         self.style_watchface_img_default.init()
         self.style_watchface_img_default.set_img_recolor(lv.color_make(0xff,0xff,0xff))
@@ -36,7 +37,7 @@ class Watchface2():
         #状态栏
         
         self.watchface_mpsignal_img = lv.img(self.meta)
-        self.watchface_mpsignal_img.set_pos(int(0),int(0))
+        self.watchface_mpsignal_img.set_pos(int(40),int(0))
         self.watchface_mpsignal_img.set_size(24,17)
         self.watchface_mpsignal_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
         self.watchface_mpsignal_img.add_flag(lv.obj.FLAG.CLICKABLE)
@@ -52,83 +53,219 @@ class Watchface2():
         self.watchface_res_stat_battery_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
         self.watchface_res_stat_charge_in_img = lv.img(self.meta)
-        self.watchface_res_stat_charge_in_img.set_pos(int(190),int(0))
-        self.watchface_res_stat_charge_in_img.set_size(10,18)
+        self.watchface_res_stat_charge_in_img.set_pos(int(180),int(0))
+        self.watchface_res_stat_charge_in_img.set_size(6,16)
         self.watchface_res_stat_charge_in_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
         self.watchface_res_stat_charge_in_img.add_flag(lv.obj.FLAG.CLICKABLE)
         self.watchface_res_stat_charge_in_img.set_src("E:/static/charge_in.png")
         # add style for watchface_res_stat_charge_in_img
         self.watchface_res_stat_charge_in_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
-
+        
         #时间
-        x = 10
-        y = 60
-        self.watchface1_time1_img = lv.img(self.meta)
-        self.watchface1_time1_img.set_pos(int(x),int(y))
-        self.watchface1_time1_img.set_size(56,56)
-        self.watchface1_time1_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_time1_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_time1_img.set_src("E:/static/watch_plate/style_2/time/1.png")
-        self.watchface1_time1_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        x = 20
+        y = 80
+        self.watchface2_time1_img = lv.img(self.meta)
+        self.watchface2_time1_img.set_pos(int(x),int(y))
+        self.watchface2_time1_img.set_size(56,56)
+        self.watchface2_time1_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        self.watchface2_time1_img.set_src("E:/static/watch_plate/style_2/time/1.png")
+        self.watchface2_time1_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
         
-        self.watchface1_time2_img = lv.img(self.meta)
-        self.watchface1_time2_img.set_pos(int(x+60),int(y))
-        self.watchface1_time2_img.set_size(56,56)
-        self.watchface1_time2_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_time2_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_time2_img.set_src("E:/static/watch_plate/style_2/time/3.png")
-        self.watchface1_time2_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        self.watchface2_time2_img = lv.img(self.meta)
+        self.watchface2_time2_img.set_pos(int(x+5+56),int(y))
+        self.watchface2_time2_img.set_size(56,56)
+        self.watchface2_time2_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        self.watchface2_time2_img.set_src("E:/static/watch_plate/style_2/time/3.png")
+        self.watchface2_time2_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+        self.watchface2_time4_img = lv.img(self.meta)
+        self.watchface2_time4_img.set_pos(int(x),int(y+20+56))
+        self.watchface2_time4_img.set_size(56,56)
+        self.watchface2_time4_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        self.watchface2_time4_img.set_src("E:/static/watch_plate/style_2/time/2.png")
+        self.watchface2_time4_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+        self.watchface2_time5_img = lv.img(self.meta)
+        self.watchface2_time5_img.set_pos(int(x+5+56),int(y+20+56))
+        self.watchface2_time5_img.set_size(56,56)
+        self.watchface2_time5_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        self.watchface2_time5_img.set_src("E:/static/watch_plate/style_2/time/3.png")
+        self.watchface2_time5_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        # create style self.watchface1_style_default
+        self.watchface2_style_default = lv.style_t()
+        self.watchface2_style_default.init()
+        self.watchface2_style_default.set_radius(0)
+        self.watchface2_style_default.set_bg_color(lv.color_make(0x21,0x95,0xf6))
+        self.watchface2_style_default.set_bg_grad_color(lv.color_make(0x21,0x95,0xf6))
+        self.watchface2_style_default.set_bg_grad_dir(lv.GRAD_DIR.NONE)
+        self.watchface2_style_default.set_bg_opa(0)
+        self.watchface2_style_default.set_border_color(lv.color_make(0x00,0x00,0x00))
+        self.watchface2_style_default.set_border_width(0)
+        self.watchface2_style_default.set_border_opa(255)
+        self.watchface2_style_default.set_pad_left(0)
+        self.watchface2_style_default.set_pad_right(0)
+        self.watchface2_style_default.set_pad_top(0)
+        self.watchface2_style_default.set_pad_bottom(0)
+        self.watchface2_style_default.set_text_font_v2("font_20.bin",20,0) #将外部字体库与该style对象绑定
+        #日期
+        self.watchface2_date = lv.spangroup(self.meta)
+        self.watchface2_date.set_pos(int(x+5+56+10+56),int(y+28))
+        self.watchface2_date.set_size(84,25)
+        self.watchface2_date.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        self.watchface2_date.set_align(lv.TEXT_ALIGN.LEFT)
+        self.watchface2_date.set_overflow(lv.SPAN_OVERFLOW.CLIP)
+        self.watchface2_date.set_mode(lv.SPAN_MODE.BREAK)
+        self.watchface2_date_span = self.watchface1_date.new_span()
+        self.watchface2_date_span.set_text("12-09")
+        self.watchface2_date_span.style.set_text_color(lv.color_make(0xe0,0xd7,0xd7))
+        self.watchface2_date_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
+        self.watchface2_date_span.style.set_size(100)
+        self.watchface2_date.refr_mode()
+        
+        # add style for main_style_1_spangroup_date
+        self.watchface2_date.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        #星期
 
-        self.watchface1_time4_img = lv.img(self.meta)
-        self.watchface1_time4_img.set_pos(int(x),int(y + 5 + 56))
-        self.watchface1_time4_img.set_size(56,56)
-        self.watchface1_time4_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_time4_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_time4_img.set_src("E:/static/watch_plate/style_2/time/2.png")
-        self.watchface1_time4_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        self.watchface2_week = lv.img(self.meta)
+        self.watchface2_week.set_pos(int(x+10),int(y+20+56+40))
+        self.watchface2_week.set_size(90,30)
+        self.watchface2_week.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        self.watchface2_week.set_src("E:/static/watch_plate/style_2/0_week.png")
+        self.watchface2_week.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+     
+        #天气
+        self.watchface2_weather_img = lv.img(self.meta)
+        self.watchface2_weather_img.set_pos(int(140),int(176))
+        self.watchface2_weather_img.set_size(65,45)
+        self.watchface2_weather_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        self.watchface2_weather_img.set_src("E:/static/watch_plate/style_2/0_main2_weather.png")
+        self.watchface2_weather_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        
+        self.watchface2_weather_txt = lv.spangroup(self.meta)
+        self.watchface2_weather_txt.set_pos(int(140),int(231))
+        self.watchface2_weather_txt.set_size(40,30)
+        self.watchface2_weather_txt.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        self.watchface2_weather_txt.set_align(lv.TEXT_ALIGN.LEFT)
+        self.watchface2_weather_txt.set_overflow(lv.SPAN_OVERFLOW.CLIP)
+        self.watchface2_weather_txt.set_mode(lv.SPAN_MODE.BREAK)
+        self.watchface2_weather_txt_span = self.watchface1_weather_txt.new_span()
+        self.watchface2_weather_txt_span.set_text("00")
+        self.watchface2_weather_txt_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7))
+        self.watchface2_weather_txt_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
+        #self.watchface1_week_step_span.style.set_text_font(lv.font_harmony_19)
+        self.watchface2_weather_txt.refr_mode()
+        # add style for main_style_1_spangroup_week
+        self.watchface2_weather_txt.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
-        self.watchface1_time5_img = lv.img(self.meta)
-        self.watchface1_time5_img.set_pos(int(x+60),int(y+5+56))
-        self.watchface1_time5_img.set_size(56,56)
-        self.watchface1_time5_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_time5_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_time5_img.set_src("E:/static/watch_plate/style_2/time/3.png")
-        self.watchface1_time5_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        #摄氏度
+        self.watchface2_degree_img = lv.img(self.meta)
+        self.watchface2_degree_img.set_pos(int(140),int(271))
+        self.watchface2_degree_img.set_size(26,24)
+        self.watchface2_degree_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        self.watchface2_degree_img.set_src("E:/static/watch_plate/style_2/degree.png")
+        self.watchface2_degree_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
-        #星期
 
-        self.weekday = lv.img(self.meta)
-        self.weekday.set_pos(15,190)
-        self.weekday.set_size(56,56)
-        self.weekday.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.weekday.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.weekday.set_src("E:/static/watch_plate/style_2/week/fri.png")
-        self.weekday.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
-        #日期
-        
-        self.date = lv.label(self.meta)
-        self.date.set_pos()
-        self.date.set_size()
-        self.date.set_long_mode(lv.label.LONG.WRAP)
-        self.date.set_text()
-        self.date.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
-        self.date.add_style(style_font_youyuan_20,lv.PART.MAIN|lv.STATE.DEFAULT)
-
-        #阴历
-        self.date = lv.label(self.meta)
-        self.date.set_pos()
-        self.date.set_size()
-        self.date.set_long_mode(lv.label.LONG.WRAP)
-        self.date.set_text()
-        self.date.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
-        self.date.add_style(style_font_youyuan_20,lv.PART.MAIN|lv.STATE.DEFAULT)
-
-        #天气logo
-        self.weather = lv.img(self.meta)
-        self.weather.set_pos(0, 50)
-        self.weather.set_size(240, 96)
-        self.weather.set_src("E:/static/IMAGE_HEART_ONLY_TEST_DONE.png")
-        #温度
+
+    def initialization(self):    
+        #获取信号
+        signal = EventMesh.publish("screen_get_sig")
+        if signal:
+            self.__signal(None, signal)
+        # 获取电池电量
+        battery = EventMesh.publish("screen_get_battery")
+        if battery:
+            self.__battery(None, battery)
+        time = EventMesh.publish("screen_get_time")
+        #print("publish_time:"+time)
+        if time:
+            self.__time(None, time)
+       
+
+
+    def timerout_update(self):
+        #获取信号
+        signal = EventMesh.publish("screen_get_sig")
+        if signal:
+            self.__signal(None, signal)
+        # 获取电池电量
+        battery = EventMesh.publish("screen_get_battery")
+        if battery:
+            self.__battery(None, battery)
+         
+        time = EventMesh.publish("screen_get_time")
+        #print("publish_time:"+time)
+        if time:
+            self.__time(None, time)
+
+        weather_data = EventMesh.publish("get_weather_data")
+        connect = EventMesh.publish(constants.EVENT.GET_CONNECT) #获取网络状态
+        if connect == 0:
+            self.__temp_value(None,None)
+            self.__temp_type(None,None)
+        else:
+            temp = weather_data[4]
+            temp_value = 0
+            if temp == None:
+                temp_value = None
+            else:
+                temp_value = temp
+                
+            self.__temp_value(None,temp_value)
+
+            type = weather_data[3]
+            type_value = 0
+            if type_value == None:
+                type_value = None
+            else:
+                type_value = temp
+            self.__temp_type(None,type_value)
+
+    def __time(self, event, msg):
+        #时间
+        hour1_chose = (msg[0][0])//10%10
+        hour2_chose = (msg[0][0])%10
+        min1_chose = (msg[0][1])//10%10
+        min2_chose = (msg[0][1])%10
+        self.watchface1_time1_img.set_src("E:/static/watch_plate/style_2/time/%d.png"%(hour1_chose))
+        self.watchface1_time2_img.set_src("E:/static/watch_plate/style_2/time/%d.png"%(hour2_chose))
+        self.watchface1_time4_img.set_src("E:/static/watch_plate/style_2/time/%d.png"%(min1_chose))
+        self.watchface1_time5_img.set_src("E:/static/watch_plate/style_2/time/%d.png"%(min2_chose))
+        self.watchface1_date_span.set_text(msg[2])#日期
+        self.watchface1_week.set_src("E:/static/watch_plate/style_2/{}_week.png".format(msg[3]))   #星期
+
+    def __signal(self, event, msg):
+        #print("__signal_cb:",str(msg))
+        # 信号强度值范围0 ~ 31,值越大表示信号强度越好
+        #print("__signal_cb:{}".format(msg//8))
+        if msg:
+            if msg >= 0 and msg<=31 :
+                self.watchface_mpsignal_img.set_src("E:/static/mpsignal{}.png".format(msg//8))
+            else :
+                self.watchface_mpsignal_img.set_src("E:/static/mpsignal5.png") 
+
+    def __battery(self, event, msg):
+        #print("__battery_cb:",str(msg))
+        #print(msg)
+        if msg[0] == '1':
+            self.watchface_res_stat_charge_in_img.set_src("E:/static/charge_in.png")
+        else:
+            self.watchface_res_stat_charge_in_img.set_src("E:/static/charge_in1.png")
+
+        self.watchface_res_stat_battery_img.set_src("E:/static/vbat_%d.png"%(msg[1]))#"E:/vbat_60.png"
+
+    def __temp_value(self, event, msg):
+        if msg != None:
+            self.watchface1_weather_txt_span.set_text(str(msg))
+        else:
+            self.watchface1_weather_txt_span.set_text("未连接网络")
+
+    def __temp_type(self, event, msg):
+        if msg != None:
+            self.watchface1_weather_img.clear_flag(lv.obj.FLAG.HIDDEN)
+            self.watchface1_weather_img.set_src("E:/static/{}_main2_weather.png".format(msg))#"E:/vbat_60.png"
+        else:
+            self.watchface1_weather_img.add_flag(lv.obj.FLAG.HIDDEN)
 
 
 class Watchface1():
@@ -394,8 +531,8 @@ class Watchface1():
         
 
     def get_step(self,event,msg):
-        # print("main get_step msg:{}".format(msg))
-        self.step = msg[0]
+        step = EventMesh.publish(constants.EVENT.GET_STEP)
+        self.step = step[0]
         self.watchface1_step_span.set_text(str(self.step))
 
 
@@ -484,7 +621,6 @@ class WatchFaceScreen(Screen):
                 self.watchface_style = wat
         self.meta = self.watchface_style.meta
         self.watchface_style.initialization()
-        EventMesh.subscribe(constants.EVENT.PUSH_STEP,self.watchface_style.get_step)
         self.timer_update.start(10000, 1, self.timerout_update)
         
     def post_processor_after_initialization(self):
index c10f2d1..0944399 100644 (file)
@@ -287,6 +287,9 @@ class MainMenu2():
         self.MainMenu2 = lv.tileview(self.meta)
         self.MainMenu2.set_scrollbar_mode(0)
         self.MainMenu2.add_style(style_MainMenu_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+        #表盘
+
         #支付宝
         self.MainMenu2_alipay = self.MainMenu2.add_tile(0, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
         self.MainMenu2_img_alipay = lv.img(self.MainMenu2_alipay)
@@ -299,7 +302,8 @@ class MainMenu2():
         # self.label_alipay.set_pos(0, 240)
         # self.label_alipay.set_size(240, 80)
         # self.label_alipay.set_text("支付宝")
-        # self.label_alipay.set_long_mode(lv.label.LONG.WRAP)
+        # self.label_ali
+        # pay.set_long_mode(lv.label.LONG.WRAP)
         # self.label_alipay.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
         # self.label_alipay.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
         #拨号盘
index c8e1c4e..3bbe5e3 100644 (file)
@@ -6,6 +6,9 @@ from misc import Power
 from ext.ui import style_screen,style_font_youyuan_20,ContStyle,style_btn,style_img,Screen,style_contact_btn
 from ext import constants
 import osTimer
+import audio
+from machine import Pin
+import ujson
 from ext.lcd import style_font_youyuan_40
 # -------------------------------------------setting screen----------------------------------------------------------
 
@@ -268,7 +271,7 @@ class SettingScreen(Screen):
         setting_imei.add_event_cb(lambda e: self.load_screen(e, {"screen": "imei"}), lv.EVENT.CLICKED, None)
         setting_app.add_event_cb(lambda e: self.load_screen(e, {"screen": "app"}), lv.EVENT.CLICKED, None)
         setting_bright.add_event_cb(lambda e: self.load_screen(e, {"screen": "brightness"}), lv.EVENT.CLICKED, None)
-        setting_volume.add_event_cb(lambda e: self.load_screen(e, {"screen": "volume"}), lv.EVENT.CLICKED, None)
+        setting_volume.add_event_cb(lambda e: self.load_screen(e, {"screen": "totalvolume"}), lv.EVENT.CLICKED, None)
         setting_restore.add_event_cb(lambda e: self.load_screen(e, {"screen": "restore"}), lv.EVENT.CLICKED, None)
         setting_poweroff.add_event_cb(lambda e: self.load_screen(e, {"screen": "poweroff"}), lv.EVENT.CLICKED, None)
         setting_update.add_event_cb(lambda e: self.load_screen(e, {"screen": "update"}), lv.EVENT.CLICKED, None)
@@ -281,7 +284,7 @@ class SettingScreen(Screen):
         setting_imei_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "imei"}), lv.EVENT.CLICKED, None)
         setting_app_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "app"}), lv.EVENT.CLICKED, None)
         setting_bright_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "brightness"}), lv.EVENT.CLICKED, None)
-        setting_volume_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "volume"}), lv.EVENT.CLICKED, None)
+        setting_volume_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "totalvolume"}), lv.EVENT.CLICKED, None)
         setting_restore_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "restore"}), lv.EVENT.CLICKED, None)
         setting_poweroff_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "poweroff"}), lv.EVENT.CLICKED, None)
         setting_update_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "update"}), lv.EVENT.CLICKED, None)
@@ -1356,4 +1359,113 @@ class MsgvolumeScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "watchface"})
         
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "volume"})
\ No newline at end of file
+        EventMesh.publish("load_screen", {"screen": "volume"})
+
+
+
+#-----------------------------------------Total--volum-------------------------------
+
+volume_adjust_screen = lv.obj()
+volume_adjust_volume = lv.obj(volume_adjust_screen)
+volume_adjust_volume.center()
+volume_adjust_volume.set_size(240, 320)
+volume_adjust_volume.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+totalvolume_title = lv.label(volume_adjust_volume)
+totalvolume_title.set_pos(0, 10)
+totalvolume_title.set_size(240, 40)
+totalvolume_title.set_text("铃声调节")
+totalvolume_title.set_long_mode(lv.label.LONG.WRAP)
+totalvolume_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+totalvolume_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+totalvolume_label1 = lv.label(volume_adjust_volume)
+totalvolume_label1.set_pos(10, 70)
+totalvolume_label1.set_size(230, 40)
+totalvolume_label1.set_text("铃声:")
+totalvolume_label1.set_long_mode(lv.label.LONG.WRAP)
+totalvolume_label1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+totalvolume_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+totalvolume_bar = lv.bar(volume_adjust_volume)
+totalvolume_bar.set_pos(20, 120)
+totalvolume_bar.set_size(200, 15)
+totalvolume_bar.set_style_anim_time(1000, lv.PART.INDICATOR | lv.STATE.DEFAULT)
+totalvolume_bar.set_mode(lv.bar.MODE.NORMAL)
+totalvolume_bar.set_value(50, lv.ANIM.OFF)
+totalvolume_bar.add_style(style_bar, lv.PART.MAIN | lv.STATE.DEFAULT)
+totalvolume_bar.add_style(style_bar_indic, lv.PART.INDICATOR | lv.STATE.DEFAULT)
+
+totalvolume_reduce_imgbtn = lv.img(volume_adjust_volume)
+totalvolume_reduce_imgbtn.set_pos(5, 150)
+totalvolume_reduce_imgbtn.set_size(110, 46)
+totalvolume_reduce_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE)
+totalvolume_reduce_imgbtn.set_src("E:/static/reduce_btn.png")
+totalvolume_reduce_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+
+totalvolume_add_imgbtn = lv.img(volume_adjust_volume)
+totalvolume_add_imgbtn.set_pos(125, 150)
+totalvolume_add_imgbtn.set_size(110, 46)
+totalvolume_add_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE)
+totalvolume_add_imgbtn.set_src("E:/static/add_btn.png")
+totalvolume_add_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+class totalvolumeScreen(Screen):
+    NAME = "totalvolume"
+
+    def __init__(self):
+        super().__init__()
+        self.meta = volume_adjust_screen
+        totalvolume_add_imgbtn.add_event_cb(lambda e: self.add_volum_size(e),
+                                     lv.EVENT.CLICKED, None)
+        totalvolume_reduce_imgbtn.add_event_cb(lambda e: self.reduce_volum_size(e),
+                                     lv.EVENT.CLICKED, None)
+        self.read_data = {}
+        self.volum_size = 8
+        self.aud = audio.Audio(0)
+        self.aud.set_pa(Pin.GPIO29)
+        
+    def initialization(self):
+        self.read_data = EventMesh.publish("get_storage_data")
+        print("self.read_data:{}".format(self.read_data))
+        num = EventMesh.publish("get_volum_size")
+        if num == None:
+            self.volum_size = 8
+        else:
+            self.volum_size = num
+        self.aud.setVolume(self.volum_size)
+        self.show_bar(0)
+
+    def add_volum_size(self, e):
+        self.volum_size+=1
+        if self.volum_size >= 11:
+            self.volum_size = 11
+        self.show_bar(1)
+
+    def reduce_volum_size(self, e):
+        if self.volum_size > 0:
+            self.volum_size -= 1
+        self.show_bar(1)
+
+    def show_bar(self,msg):
+        totalvolume_bar.set_value((100 // 11) * self.volum_size, lv.ANIM.OFF)
+        if msg == 1:
+            self.read_data["volum"] = self.volum_size
+            self.aud.setVolume(self.volum_size)
+            EventMesh.publish("set_storage_data", self.read_data)
+            with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
+                ujson.dump(self.read_data,fd)
+            self.aud.play(1, 0, 'E:/static/audio_audio_haixiu.mp3')  #播放声音
+ 
+    def Close(self):
+        self.aud.stop()
+
+    def done_return(self):
+        EventMesh.publish("load_screen", {"screen": "setting"})
+
+    def btn1_release(self):
+        EventMesh.publish("load_screen", {"screen": "watchface"})
+        
+    def btn8_press(self):
+        EventMesh.publish("load_screen", {"screen": "setting"})