From: d15521469561 Date: Mon, 8 May 2023 07:55:54 +0000 (+0800) Subject: 修改冲突 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=0ad8e2b21483c2a713ec74cbf268fc082d52524b;p=mirrors%2FASR1603_G5.git 修改冲突 --- diff --git a/3.code/1.watch/2.code/appWechat.py b/3.code/1.watch/2.code/appWechat.py index 2ec4df03..62f0d51a 100644 --- a/3.code/1.watch/2.code/appWechat.py +++ b/3.code/1.watch/2.code/appWechat.py @@ -261,7 +261,7 @@ class WechatScreen(Screen): _btn_label1.set_pos(self.startWidth-72, 8) _btn_label1.set_text(str(msg_tmp)+'\"') elif value.find("T:") != -1: - _btn_label1.set_size(230, 40) + _btn_label1.set_size(230, 60) _btn_label1.set_pos(0, 0) _btn_label1.set_text(str(msg_tmp)) _btn_label1.set_long_mode(lv.label.LONG.DOT) diff --git a/3.code/1.watch/2.code/main.py b/3.code/1.watch/2.code/main.py index e3501ad2..26d28818 100644 --- a/3.code/1.watch/2.code/main.py +++ b/3.code/1.watch/2.code/main.py @@ -49,12 +49,13 @@ if __name__ == '__main__': print("init2:{}".format(utime.localtime())) from ext.lcd import tp_cst816 print("init3:{}".format(utime.localtime())) - from ext.btn_device_ec800m import BtnDevice + from ui_main_menu import MainMenuScreen # from ui_WatchFaceScreen import WatchFaceScreen from ext.appFactoryMode import FactoryModeLocationScreen,FactoryModeScreen import ui as _ui + # import ui as _ui print("init4:{}".format(utime.localtime())) ui = _ui.UI() ui.post_processor_after_instantiation() @@ -129,12 +130,12 @@ if __name__ == '__main__': print("init6:{}".format(utime.localtime())) - from ext.protocol import LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,UPLOAD_ProtoCol,TEMP_ProtoCol,DLT_ProtoCol,\ + from ext.protocol import LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,CENTER_ProtoCol,UPLOAD_ProtoCol,TEMP_ProtoCol,DLT_ProtoCol,\ WT_ProtoCol,UD_ProtoCol,REMIND_ProtoCol, CR_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,ProtoColResolver,PHL_ProtoCol,MONITOR_ProtoCol import mgr as mgr print("init7:{}".format(utime.localtime())) - from mgr import ConfigStoreManager, LocationManager, SockManager,getVolumSizeManager,gethistoryDataManager, \ + from ext.mgr import ConfigStoreManager, LocationManager, SockManager,getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, \ NetManager,AddrBookManager,MsgdetailManager,PhoneCallingManager,getStorageDataManager,getBrightnessManager,getHrTimeManager print("init8:{}".format(utime.localtime())) @@ -146,8 +147,7 @@ if __name__ == '__main__': # getStorageDataManager print("init9:{}".format(utime.localtime())) #from usr.ui_wechat import WechatScreen,TK_ProtoCol - btn_device = BtnDevice(tp_cst816) - btn_device.start() + print("init10:{}".format(utime.localtime())) @@ -177,6 +177,7 @@ if __name__ == '__main__': app.append_manager(getHrTimeManager()) app.append_manager(getBrightnessManager()) app.append_manager(getStorageDataManager()) + app.append_manager(mgr.getUpLoadDataManager()) print("init11:{}".format(utime.localtime())) pcr = ProtoColResolver() @@ -200,6 +201,7 @@ if __name__ == '__main__': pcr.add_support(DLT_ProtoCol()) pcr.add_support(UPLOAD_ProtoCol()) pcr.add_support(MONITOR_ProtoCol()) + pcr.add_support(CENTER_ProtoCol()) sm = SockManager() sm.add_support_resolver(pcr) app.append_manager(sm) diff --git a/3.code/1.watch/2.code/main_1.py b/3.code/1.watch/2.code/main_1.py index 4098d639..b55069b2 100644 --- a/3.code/1.watch/2.code/main_1.py +++ b/3.code/1.watch/2.code/main_1.py @@ -54,7 +54,7 @@ if __name__ == '__main__': # from ui_WatchFaceScreen import WatchFaceScreen from ext.appFactoryMode import FactoryModeLocationScreen,FactoryModeScreen - from ext import ui as _ui + import ui as _ui # import ui as _ui print("init4:{}".format(utime.localtime())) ui = _ui.UI() @@ -177,7 +177,7 @@ if __name__ == '__main__': app.append_manager(getHrTimeManager()) app.append_manager(getBrightnessManager()) app.append_manager(getStorageDataManager()) - app.append_manager(mgr.getUpLoadDataManager()) + app.append_manager(getUpLoadDataManager()) print("init11:{}".format(utime.localtime())) pcr = ProtoColResolver() diff --git a/3.code/1.watch/2.code/mgr.py b/3.code/1.watch/2.code/mgr.py index 2f56b9b6..f569a264 100644 --- a/3.code/1.watch/2.code/mgr.py +++ b/3.code/1.watch/2.code/mgr.py @@ -1775,6 +1775,7 @@ class getBrightnessManager(Abstract):#获取亮度级别 def __init__(self): self.level = 6#默认值6 self.read_data = {} + self.time = 5 self.PWM_backlight = None check = ql_fs.path_exists("/ext/static/storage_file/config.json") if check == True: @@ -1787,6 +1788,9 @@ class getBrightnessManager(Abstract):#获取亮度级别 EventMesh.subscribe("push_reduce_brightness_level", self.reduce) EventMesh.subscribe("set_brightness_level", self.set_brightness_level) + EventMesh.subscribe("set_brightness_time", self.set_brightness_time) + EventMesh.subscribe("get_brightness_time", self.get_brightness_time) + def set_brightness_level(self, event, msg): self.level = msg @@ -1796,6 +1800,19 @@ class getBrightnessManager(Abstract):#获取亮度级别 if b == True: self.level = self.read_data["brightness_level"] return self.level + + def set_brightness_time(self, event, msg): + self.time = msg + + def get_brightness_time(self, event, msg): + # print("get_brightness_time self.read_data:{} self.time:{}".format(self.read_data,self.time)) + if self.read_data != {}: + b = str("brightness_time") in self.read_data.keys() + if b == True: + self.time = self.read_data["brightness_time"] + return self.time + + def add(self, event, msg): if self.level < 10: diff --git a/3.code/1.watch/2.code/protocol.py b/3.code/1.watch/2.code/protocol.py index 6e4673f7..0856256a 100644 --- a/3.code/1.watch/2.code/protocol.py +++ b/3.code/1.watch/2.code/protocol.py @@ -444,7 +444,7 @@ class POWEROFF_ProtoCol(ProtoCol): """ EventMesh.publish(constants.PROTOCOL.POWEROFF_SEND) #print("POWEROFF_ProtoCol:recv:%s"%(msg)) - Power.powerDown() + EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) class PHL_ProtoCol(ProtoCol): """电话本同步""" diff --git a/3.code/1.watch/2.code/ui.py b/3.code/1.watch/2.code/ui.py index 6fbae57d..698312d1 100644 --- a/3.code/1.watch/2.code/ui.py +++ b/3.code/1.watch/2.code/ui.py @@ -921,13 +921,16 @@ class DialingScreen(Screen): voiceCall.callEnd() def done_return(self): - EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + #EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn1_release(self): - EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + #EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn8_press(self): - EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + #EventMesh.publish("load_screen", {"screen": "main_menu"}) message_popup_screen = None @@ -1764,9 +1767,9 @@ class IncomingCallScreen(Screen): pass def btn8_press(self): - self.aud.stop() - self.call_timer.stop() - + # self.aud.stop() + # self.call_timer.stop() + pass def done_left_to_right(self): pass @@ -1852,10 +1855,12 @@ class OnCallScreen(Screen): def btn1_release(self): - EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + #EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn8_press(self): - EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + #EventMesh.publish("load_screen", {"screen": "main_menu"}) # -------------------------------------------step screen----------------------------------------------------------# step_screen = None @@ -2509,7 +2514,7 @@ class CountdownScreen(Screen): def __init__(self): super().__init__() self.meta = None - self.timer = Timer(Timer.Timer1) + self.timer = osTimer() self.sec = 0 self.min = 0 self.hour = 0 @@ -2790,7 +2795,7 @@ class CountdownScreen(Screen): self.g_state = 1 self.g_end = 0 self.show_value() - self.timer.start(period=1000, mode=self.timer.PERIODIC, callback=self.fun) + self.timer.start(1000,1,self.fun) countdown_hour_up.add_flag(lv.obj.FLAG.HIDDEN) countdown_hour_down.add_flag(lv.obj.FLAG.HIDDEN) countdown_hour_up.add_flag(lv.obj.FLAG.HIDDEN) @@ -2953,12 +2958,26 @@ class CountdownEndScreen(Screen): def Close(self): self.stop_FIND() + def done_left_to_right(self): + EventMesh.publish("load_screen", {"screen": "countdown"}) + + def done_right_to_left(self): + EventMesh.publish("load_screen", {"screen": "countdown"}) + + def done_bottom_to_top(self): + EventMesh.publish("load_screen", {"screen": "countdown"}) + + def done_top_to_bottom(self): + EventMesh.publish("load_screen", {"screen": "countdown"}) + def done_return(self): EventMesh.publish("load_screen", {"screen": "countdown"}) + def done_click(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": "main_menu"}) @@ -2987,7 +3006,7 @@ class StopwatchScreen(Screen): self.sec_value = 0 self.min_value = 0 self.s_state = 0 - self.timer = Timer(Timer.Timer1) + self.timer = osTimer() def initialization(self): global stopwatch_screen,stopwatch_title,stopwatch_label_min,stopwatch_mao,stopwatch_label_sec ,\ @@ -3104,7 +3123,7 @@ class StopwatchScreen(Screen): 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) + self.timer.start(100,1,self._fun) stopwatch_stop_img.clear_flag(lv.obj.FLAG.HIDDEN) stopwatch_start_img.add_flag(lv.obj.FLAG.HIDDEN) @@ -3311,36 +3330,29 @@ class UI(object): self.system_sleep_timer = osTimer() self.system_sleep_timer_count = 0 self.sleep_flag = 1 - self.level = 0 + self.level = 6 self.read_data = {} self.level = EventMesh.publish("get_brightness_level") self.read_data = EventMesh.publish("get_storage_data") self.main_flag = 0 self.main_id = 0 # print("self.read_data:{} self.level:{}".format(self.read_data,self.level)) - if self.level == None: - - check = ql_fs.path_exists("/ext/static/storage_file/config.json") - 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("brightness_level") in self.read_data.keys() - if b == True: - self.level = self.read_data["brightness_level"] - else: - self.level = 6 - self.read_data["brightness_level"] = self.level - 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) - else: - self.level = 6 #默认是5级别 - EventMesh.publish("set_brightness_level", self.level) - elif self.level > 10: - self.level = 10 - elif self.level <= 0: - self.level = 1 + check = ql_fs.path_exists("/ext/static/storage_file/config.json") + 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("brightness_level") in self.read_data.keys() + if b == True: + self.level = self.read_data["brightness_level"] + else: + self.level = 6 + self.read_data["brightness_level"] = self.level + 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) + else: + self.level = 6 #默认是6级别 self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_MS, self.level, 10) self.PWM_backlight.open() @@ -3494,8 +3506,11 @@ class UI(object): self.__lcd_on() def system_sleep_timer_cb(self, *args): + time = EventMesh.publish("get_brightness_time") + if time == None: + time = 10 self.system_sleep_timer_count += 1 - if self.system_sleep_timer_count > 15 : + if self.system_sleep_timer_count >= time : self.system_sleep_timer_count = 0 self.__lcd_off() diff --git a/3.code/1.watch/2.code/ui_WatchFaceScreen.py b/3.code/1.watch/2.code/ui_WatchFaceScreen.py index d003e9b0..e7e9131d 100644 --- a/3.code/1.watch/2.code/ui_WatchFaceScreen.py +++ b/3.code/1.watch/2.code/ui_WatchFaceScreen.py @@ -7,14 +7,14 @@ from ext import constants from ui import Screen,style_screen import ql_fs import ujson - +from machine import RTC from ui_main_menu import MainMenu2_Watchface # style_font_youyuan_20 = lv.style_t() # style_font_youyuan_20.init() # style_font_youyuan_20.set_text_color(lv.color_make(0xff, 0xff, 0xff)) -# style_font_youyuan_20.set_text_font_v2("font_24.bin",24,0) +# style_font_youyuan_20.set_text_font_v2("font_22.bin",22,0) watchface_style_default = lv.style_t() watchface_style_default.init() @@ -88,12 +88,40 @@ style_font_youyuan_70_black = lv.style_t() style_font_youyuan_70_black.init() style_font_youyuan_70_black.set_text_color(lv.color_make(0x32, 0xc8, 0xdb)) style_font_youyuan_70_black.set_text_font(lv.font_70_bold) +#init3:(2106, 2, 7, 6, 29, 38, 6, 38) +data = RTC().datetime() +hour = data[4] +min = data[5] + +week = data[3] + +date1 = data[1] +date2 = data[2] +print("hour:{} min:{} week:{} date1:{} date2:{} data:{}".format(hour,min,week,date1,date2,data)) + +def get_week(msg): + if msg == 1: + return '一' + elif msg == 2: + return '二' + elif msg == 3: + return '三' + elif msg == 4: + return '四' + elif msg == 5: + return '五' + elif msg == 6: + return '六' + elif msg == 7 or msg == 0: + return '日' + watchface1_time1_text = lv.label(Watchface1) watchface1_time1_text.set_pos(20, 50) watchface1_time1_text.set_size(190, 71) watchface1_time1_text.set_align(lv.TEXT_ALIGN.LEFT) -watchface1_time1_text.set_text("12:00") +watchface1_time1_text.set_text("{}:{}".format("%02d"%(hour),"%02d"%(min))) +# watchface1_time1_text.set_text("%02d:%02d"%(hour,min)) watchface1_time1_text.add_style(style_font_youyuan_70_black, lv.PART.MAIN|lv.STATE.DEFAULT) #日期 @@ -101,14 +129,14 @@ watchface1_date_span = lv.label(Watchface1) watchface1_date_span.set_pos(24, 118) watchface1_date_span.set_size(140, 30) watchface1_date_span.set_align(lv.TEXT_ALIGN.LEFT) -watchface1_date_span.set_text("12月9日") +watchface1_date_span.set_text("%d月%d日"%(date1,date2)) watchface1_date_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT) #星期 watchface1_week_span = lv.label(Watchface1) watchface1_week_span.set_pos(24, 153) watchface1_week_span.set_size(100, 30) watchface1_week_span.set_align(lv.TEXT_ALIGN.LEFT) -watchface1_week_span.set_text("星期四") +watchface1_week_span.set_text("星期%s"%(get_week(week))) watchface1_week_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT) @@ -311,7 +339,7 @@ watchface2_time1_hour_text = lv.label(Watchface2) watchface2_time1_hour_text.set_pos(20, 80) watchface2_time1_hour_text.set_size(88, 70) watchface2_time1_hour_text.set_align(lv.TEXT_ALIGN.LEFT) -watchface2_time1_hour_text.set_text("10") +watchface2_time1_hour_text.set_text("{}".format("%02d"%(hour))) watchface2_time1_hour_text.add_style(style_font_youyuan_70_red, lv.PART.MAIN|lv.STATE.DEFAULT) watchface2_time1_mao_text = lv.label(Watchface2) @@ -325,7 +353,7 @@ watchface2_time1_hour1_text = lv.label(Watchface2) watchface2_time1_hour1_text.set_pos(152, 80) watchface2_time1_hour1_text.set_size(88, 70) watchface2_time1_hour1_text.set_align(lv.TEXT_ALIGN.LEFT) -watchface2_time1_hour1_text.set_text("40") +watchface2_time1_hour1_text.set_text("{}".format("%02d"%(min))) watchface2_time1_hour1_text.add_style(style_font_youyuan_70_red, lv.PART.MAIN|lv.STATE.DEFAULT) @@ -336,7 +364,7 @@ watchface2_date_span = lv.label(Watchface2) watchface2_date_span.set_pos(18, 170) watchface2_date_span.set_size(120, 35) watchface2_date_span.set_align(lv.TEXT_ALIGN.LEFT) -watchface2_date_span.set_text("12月9日") +watchface2_date_span.set_text("%d月%d日"%(date1,date2)) watchface2_date_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT) #日期 @@ -344,7 +372,7 @@ watchface2_week = lv.label(Watchface2) watchface2_week.set_pos(146, 170) watchface2_week.set_size(110, 35) watchface2_week.set_align(lv.TEXT_ALIGN.LEFT) -watchface2_week.set_text("星期四") +watchface2_week.set_text("星期%s"%(get_week(week))) watchface2_week.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT) #星期 diff --git a/3.code/1.watch/2.code/ui_setting.py b/3.code/1.watch/2.code/ui_setting.py index fa4c719b..b3668632 100644 --- a/3.code/1.watch/2.code/ui_setting.py +++ b/3.code/1.watch/2.code/ui_setting.py @@ -767,7 +767,7 @@ version_label8.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) version_label9 = lv.label(version_screen) version_label9.set_pos(20, 230) -version_label9.set_size(220, 100) +version_label9.set_size(220, 30) version_label9.set_long_mode(lv.label.LONG.WRAP) version_label9.set_text(" ") version_label9.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) @@ -1202,8 +1202,8 @@ brightness_label1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) brightness_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_bar = lv.bar(brightness_screen) -brightness_bar.set_pos(20, 120) -brightness_bar.set_size(200, 15) +brightness_bar.set_pos(20, 100) +brightness_bar.set_size(200, 25) brightness_bar.set_style_anim_time(1000, lv.PART.INDICATOR | lv.STATE.DEFAULT) brightness_bar.set_mode(lv.bar.MODE.NORMAL) brightness_bar.set_value(50, lv.ANIM.OFF) @@ -1211,39 +1211,90 @@ brightness_bar.add_style(style_bar, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_bar.add_style(style_bar_indic, lv.PART.INDICATOR | lv.STATE.DEFAULT) brightness_reduce_imgbtn = lv.img(brightness_screen) -brightness_reduce_imgbtn.set_pos(5, 150) +brightness_reduce_imgbtn.set_pos(5, 195) brightness_reduce_imgbtn.set_size(110, 46) brightness_reduce_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) - brightness_reduce_imgbtn.set_src("E:/static/reduce_btn.png") - brightness_reduce_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) brightness_add_imgbtn = lv.img(brightness_screen) -brightness_add_imgbtn.set_pos(125, 150) +brightness_add_imgbtn.set_pos(125, 195) brightness_add_imgbtn.set_size(110, 46) brightness_add_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) brightness_add_imgbtn.set_src("E:/static/add_btn.png") brightness_add_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) +brightness_label_time = lv.label(brightness_screen) +brightness_label_time.set_pos(10, 150) +brightness_label_time.set_size(80, 30) +brightness_label_time.set_text("时间:") +brightness_label_time.set_long_mode(lv.label.LONG.WRAP) +brightness_label_time.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) +brightness_label_time.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +brightness_time_reduce_img = lv.img(brightness_screen) +brightness_time_reduce_img.set_pos(90, 145) +brightness_time_reduce_img.set_size(30, 34) +brightness_time_reduce_img.set_src("E:/static/time_up2.png") +brightness_time_reduce_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +brightness_time_reduce_imgbtn= lv.img(brightness_screen) +brightness_time_reduce_imgbtn.set_size(80, 45) +brightness_time_reduce_imgbtn.set_pos(90, 140) +brightness_time_reduce_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) + + +brightness_label_time_text = lv.label(brightness_screen) +brightness_label_time_text.set_pos(130, 152) +brightness_label_time_text.set_size(60, 30) +brightness_label_time_text.set_text("5秒") +brightness_label_time_text.set_long_mode(lv.label.LONG.WRAP) +brightness_label_time_text.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) +brightness_label_time_text.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +brightness_time_add_img = lv.img(brightness_screen) +brightness_time_add_img.set_pos(190, 145) +brightness_time_add_img.set_size(30, 34) +brightness_time_add_img.set_src("E:/static/time_up1.png") +brightness_time_add_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +brightness_time_add_imgbtn= lv.img(brightness_screen) +brightness_time_add_imgbtn.set_size(70, 45) +brightness_time_add_imgbtn.set_pos(170, 140) +brightness_time_add_imgbtn.add_flag(lv.obj.FLAG.CLICKABLE) + + + class BrightnessScreen(Screen): NAME = "brightness" def __init__(self): super().__init__() - self.level = 0 + self.level = 6 + self.time = 10 + self.read_data = {} self.meta = brightness_screen brightness_add_imgbtn.add_event_cb(lambda e: self.add_level(e), lv.EVENT.CLICKED, None) brightness_reduce_imgbtn.add_event_cb(lambda e: self.reduce_level(e), lv.EVENT.CLICKED, None) + + brightness_time_reduce_imgbtn.add_event_cb(lambda e: self.reduce_time_level(e), + lv.EVENT.CLICKED, None) + + brightness_time_add_imgbtn.add_event_cb(lambda e: self.add_time_level(e), + lv.EVENT.CLICKED, None) def initialization(self): self.level = EventMesh.publish("get_brightness_level") + self.time = EventMesh.publish("get_brightness_time") + print("self.time:{}".format(self.time)) + brightness_label_time_text.set_text("{}秒".format(self.time)) self.show_bar() def add_level(self, e): EventMesh.publish("push_add_brightness_level") self.level = EventMesh.publish("get_brightness_level") + print("self.level:{}".format(self.level)) self.show_bar() def reduce_level(self, e): @@ -1251,10 +1302,40 @@ class BrightnessScreen(Screen): self.level = EventMesh.publish("get_brightness_level") self.show_bar() + def reduce_time_level(self, e): + if self.time > 5: + self.time-=5 + EventMesh.publish("set_brightness_time",self.time) + self.read_data = EventMesh.publish("get_storage_data") + self.read_data["brightness_time"] = self.time + + 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) + brightness_label_time_text.set_text("{}秒".format(self.time)) + print("reduce_time_level:{}".format(self.read_data)) + + def add_time_level(self, e): + self.time+=5 + if self.time >= 30: + self.time = 30 + EventMesh.publish("set_brightness_time",self.time) + self.read_data = EventMesh.publish("get_storage_data") + self.read_data["brightness_time"] = self.time + + 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) + brightness_label_time_text.set_text("{}秒".format(self.time)) + print("add_time_level:{}".format(self.read_data)) + + + def show_bar(self): if self.level == None: self.level = 6 brightness_bar.set_value((100 // 10) * self.level, lv.ANIM.OFF) + def done_return(self): @@ -1438,8 +1519,8 @@ 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_screen) -totalvolume_bar.set_pos(20, 120) -totalvolume_bar.set_size(200, 15) +totalvolume_bar.set_pos(20, 100) +totalvolume_bar.set_size(200, 25) 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) @@ -1447,7 +1528,7 @@ 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_screen) -totalvolume_reduce_imgbtn.set_pos(5, 150) +totalvolume_reduce_imgbtn.set_pos(5, 145) 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") @@ -1455,7 +1536,7 @@ totalvolume_reduce_imgbtn.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) totalvolume_add_imgbtn = lv.img(volume_adjust_screen) -totalvolume_add_imgbtn.set_pos(125, 150) +totalvolume_add_imgbtn.set_pos(125, 145) 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")