From: dxy15521469561 <1731678236@qq.com> Date: Fri, 1 Sep 2023 06:58:18 +0000 (+0800) Subject: k01:拍照 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=582c41c64cd33307842b9fa7510780105adfe1e4;p=mirrors%2FASR1603_G5.git k01:拍照 --- diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/camera_capture.c b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/camera_capture.c index 93d34920..05237171 100644 --- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/camera_capture.c +++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/camera_capture.c @@ -104,8 +104,8 @@ void Helios_SaveImage(unsigned char* pYUVBuffer, int width, int height) { int result = -1; char name[256] = {0}; - - sprintf(name, "U:/%s.jpeg",image_info.image_name); + sprintf(name, "%s.jpg",image_info.image_name); + // sprintf(name, "U:/%s.jpeg",image_info.image_name); CAPTURE_LOG("SaveImage %d %d %d %d\n", width, height, image_info.img_width, image_info.img_height); if(image_info.img_width <= width && image_info.img_height <= height && pYUVBuffer != NULL) { diff --git a/2.sdk/project/K01/new.bat b/2.sdk/project/K01/new.bat index 07fd56dd..424606e4 100644 --- a/2.sdk/project/K01/new.bat +++ b/2.sdk/project/K01/new.bat @@ -13,7 +13,7 @@ if errorlevel 0 ( ) :STEP1 -..\..\Helios_SDK\tools\ASR_1606\win32\mklfs.exe -c usr -b 4096 -r 4096 -p 4096 -s 851968 -i .\images\customer_fs.bin +..\..\Helios_SDK\tools\ASR_1606\win32\mklfs.exe -c usr -b 4096 -r 4096 -p 4096 -s 819200 -i .\images\customer_fs.bin if errorlevel 1 ( echo "customer_fs.binÉú³Éʧ°Ü Çë¼ì²éusrĿ¼ÊÇ·ñ´óÓÚ316K!!!!!!!!!!!!!!!" goto exit diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/lcd.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/lcd.py index 9dc9b35d..29c2e716 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/lcd.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/lcd.py @@ -5,7 +5,6 @@ import _thread import utime import EventMesh from misc import PWM - init_data = ( 0, 0, 0xfe, @@ -275,4 +274,6 @@ lv.scr_load(power_on_screen) utime.sleep_ms(200) print("power_on_screen end...") PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_10US, 200, 1000) -PWM_backlight.open() \ No newline at end of file +PWM_backlight.open() + +#class camera.camPreview(model,cam_w,cam_h,lcd_w,lcd_h,perview_level) \ No newline at end of file diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py index 45facf59..ac6b33a4 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py @@ -58,7 +58,7 @@ def main_init(): from appFactoryMode import FactoryModeLocationScreen,FactoryModeScreen ,FactoryModeBatTestScreen import ui as _ui - from mgr import setclassTimeManager,setkeyboardManager,testSmsSetIPManager,ConfigStoreManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\ + from mgr import cameraAlbumManager,setclassTimeManager,setkeyboardManager,testSmsSetIPManager,ConfigStoreManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\ AddrBookManager,MsgdetailManager,PhoneCallingManager,getOldTimeManager,getStorageDataManager,getBrightnessManager,getHrTimeManager,getTempTimeManager,getLowBatManager # import ui as _ui @@ -146,6 +146,10 @@ def main_init(): ui.add_screen(_ui.keyboardScreen()) ui.add_screen(_ui.classMgrPopupScreen()) ui.add_screen(_ui.calculatorScreen()) + ui.add_screen(_ui.cameraScreen()) + ui.add_screen(_ui.cameraalbumScreen()) + ui.add_screen(_ui.cameraVdieoScreen()) + ui.add_screen(_ui.albumPreviewScreen()) ui.add_screen(NewWechatPopupScreen()) ui.add_screen(HealthScreen()) # ui.add_screen(_ui.Setting3Screen()) @@ -172,7 +176,7 @@ def main_init(): print("init10:{}".format(utime.localtime())) - EventMesh.publish("load_screen", {"screen": "poweron"}) + app.append_manager(mgr.AlarmVolumeLevelManager()) \ .append_manager(mgr.MsgVolumeLevelManager()) \ .append_manager(mgr.PhoneVolumeLevelManager()) \ @@ -208,6 +212,7 @@ def main_init(): app.append_manager(sosInfoCallManager()) app.append_manager(testSmsSetIPManager()) app.append_manager(setclassTimeManager()) + app.append_manager(cameraAlbumManager()) print("init21:{}".format(utime.localtime())) @@ -243,7 +248,7 @@ def main_init(): pcr.add_support(KEYBRD_ProtoCol()) pcr.add_support(SILENCETIME2_ProtoCol()) pcr.add_support(WLKEY_ProtoCol()) - + EventMesh.publish("load_screen", {"screen": "poweron"}) sm = SockManager() sm.add_support_resolver(pcr) app.append_manager(sm) diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py index b936dffa..ee140466 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py @@ -2900,6 +2900,44 @@ class setkeyboardManager(Abstract):#设置键盘开关状态 return self.key_state +class cameraAlbumManager(Abstract):#保存相册数目 + def __init__(self): + self.album_list = {} + + check_txt = ql_fs.path_exists("/usr/static/storage_file/album_config.json") + if check_txt == True : + with open("/usr/static/storage_file/album_config.json","r") as fd:#音频文件编号 + self.album_list = ujson.load(fd) + if not self.album_list: + self.album_list = {} + self.album_num = 0 + else: + b = str("num") in self.album_list.keys() + if b == True: + self.album_num = self.album_list["num"] + else : + self.album_list = {} + with open("/usr/static/storage_file/album_config.json","w",encoding="utf-8") as fd: + ujson.dump(self.album_list,fd) + + + + def post_processor_after_instantiation(self): + EventMesh.subscribe("set_camera_num", self.set_camera_num)#设置关机时间 + EventMesh.subscribe("get_camera_num", self.get_camera_num) + + def set_camera_num(self, event, msg): + + self.album_list = msg + + # sorted_keys = sorted(self.album_list.keys()) + # print("self.album_list",self.album_list,sorted_keys) + + + def get_camera_num(self, event, msg): + + return self.album_list + class setclassTimeManager(Abstract):#设置上课禁用时间 def __init__(self): self.class_buf = {} diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py index deabefe4..2af68e43 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py @@ -20,6 +20,7 @@ import uos import gc import _thread from queue import Queue +import camera from machine import RTC LCD_X = 128 LCD_Y = 128 @@ -123,6 +124,7 @@ style_btn.set_bg_opa(0) style_btn.set_shadow_opa(0) style_btn.set_border_width(0) + style_wechat_btn = lv.style_t() style_wechat_btn.init() style_wechat_btn.set_bg_color(lv.color_make(0x1E, 0x26, 0xff)) @@ -6970,6 +6972,636 @@ class classMgrPopupScreen(Screen):#上课禁用时间界面 EventMesh.publish(constants.EVENT.SYSTEM_SLEEP) else: EventMesh.publish(constants.EVENT.SYSTEM_UP) + + +camera_popup_screen = None +camera_popup_label = None +def camCapturecallback(result_list): + print("camCapturecallback",result_list) + if result_list[0] == 0:#保存成功 + file = str(result_list[1]) + tmp = file.split('/')[3] + tmp = tmp.split("_camera")[0] + time = int(tmp) + album_data = EventMesh.publish("get_camera_num") + album_data_tmp = {} + album_data_tmp["timeSec"] = time + album_data[time] = album_data_tmp + EventMesh.publish("set_camera_num",album_data) + pass + pass +dec = camera.camCapture(0,240,320,1,128,128) +dec.callback(camCapturecallback) +class cameraScreen(Screen):#相机拍照二级界面 + # + NAME = "camera" + + def __init__(self): + super().__init__() + self.meta = None + self.preview1 = None + self.timer = osTimer() + self.timer2 =osTimer() + self.camera_num = 0 + + def initialization(self): + global camera_popup_screen ,camera_popup_label + + + if camera_popup_screen == None: + camera_popup_screen = lv.obj() + print("Lowpower_screen") + camera_popup_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + + camera_popup_label = lv.label(camera_popup_screen) + camera_popup_label.set_pos(0, 20) + camera_popup_label.set_size(128, 20) + camera_popup_label.set_text("点击屏幕保存") + camera_popup_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + camera_popup_label.set_long_mode(lv.label.LONG.WRAP) + camera_popup_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + self.meta = camera_popup_screen + + + state = dec.open() + self.timer.start(1*1000,1,self.fun) + print("state",state) + + def fun(self,*argc): + EventMesh.publish("system_sleep_rest")#防止黑屏 + + + + + def Close(self): + self.timer.stop() + state = dec.close() + + def done_click(self): + self.timer2.start(1*1000,0,self.save_album) + pass + def save_album(self,*argc): + album_data = EventMesh.publish("get_camera_num") + if len(album_data) < 2: + date_tmp = utime.localtime() + time_tmp = utime.mktime(date_tmp) + dec.start(50,50, "U:/static/album/%d_camera"%(time_tmp)) + + def done_return(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + + def btn1_release(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + + def btn8_press(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + + + +camera_album_popup_screen = None +camera_album_popup_label = None +camera_album_popup_img = None +imgbt_contanier = None +camera_album_popup_img1 = None +camera_album_popup_img2 = None +camera_album_popup_img3 = None +camera_album_popup_img4 = None +camera_album_popup_img5 = None +class cameraalbumScreen(Screen):#相册 + # + NAME = "camera_album" + + def __init__(self): + super().__init__() + self.meta = None + + def initialization(self): + global camera_album_popup_screen ,camera_album_popup_label,camera_album_popup_img1,camera_album_popup_img2,camera_album_popup_img3,camera_album_popup_img4,camera_album_popup_img5 + + if camera_album_popup_screen == None: + camera_album_popup_screen = lv.obj() + print("camera_album_popup_screen") + camera_album_popup_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + + camera_album_popup_label = lv.label(camera_album_popup_screen) + camera_album_popup_label.set_pos(0, 5) + camera_album_popup_label.set_size(128, 20) + camera_album_popup_label.set_text("相册预览") + camera_album_popup_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + camera_album_popup_label.set_long_mode(lv.label.LONG.WRAP) + camera_album_popup_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + + camera_album_popup_img1 = lv.img(camera_album_popup_screen) + camera_album_popup_img1.set_pos(0, 30) + camera_album_popup_img1.add_flag(lv.obj.FLAG.CLICKABLE) + # camera_album_popup_img1.set_zoom(160) + camera_album_popup_img1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.click_album(e,0)), lv.EVENT.CLICKED, None) + + camera_album_popup_img2 = lv.img(camera_album_popup_screen) + camera_album_popup_img2.set_pos(50, 30) + camera_album_popup_img2.add_flag(lv.obj.FLAG.CLICKABLE) + # camera_album_popup_img2.set_zoom(160) + camera_album_popup_img2.add_event_cb(lambda e: EventMesh.callback_wrapper(self.click_album(e,1)), lv.EVENT.CLICKED, None) + + camera_album_popup_img3 = lv.img(camera_album_popup_screen) + camera_album_popup_img3.set_pos(0, 90) + camera_album_popup_img3.add_flag(lv.obj.FLAG.CLICKABLE) + # camera_album_popup_img3.set_zoom(160) + camera_album_popup_img3.add_event_cb(lambda e: EventMesh.callback_wrapper(self.click_album(e,2)), lv.EVENT.CLICKED, None) + + camera_album_popup_img4 = lv.img(camera_album_popup_screen) + camera_album_popup_img4.set_pos(50, 90) + camera_album_popup_img4.add_flag(lv.obj.FLAG.CLICKABLE) + # camera_album_popup_img4.set_zoom(160) + camera_album_popup_img4.add_event_cb(lambda e: EventMesh.callback_wrapper(self.click_album(e,3)), lv.EVENT.CLICKED, None) + + camera_album_popup_img5 = lv.img(camera_album_popup_screen) + camera_album_popup_img5.set_pos(0, 140) + camera_album_popup_img5.add_flag(lv.obj.FLAG.CLICKABLE) + # camera_album_popup_img5.set_zoom(160) + camera_album_popup_img5.add_event_cb(lambda e: EventMesh.callback_wrapper(self.click_album(e,4)), lv.EVENT.CLICKED, None) + + self.meta = camera_album_popup_screen + read_album = {} + read_album = EventMesh.publish("get_camera_num") + sort_new = {} + sort_new = sorted(read_album.keys())#按照key的升序排序 + count = 0 + print("sort_new read_album ",sort_new,read_album) + for i in range(0,len(sort_new)): + key = sort_new[i] + value = int(read_album[key]["timeSec"]) + print(value) + check_img = ql_fs.path_exists("/usr/static/album/%d_camera.jpg"%(value)) + if check_img == True :#图片存着 + print("图片存在显示") + pass + else: + print("图片不存在不显示循环下一个显示") + continue + + if count == 0: + camera_album_popup_img1.set_src("/usr/static/album/%d_camera.jpg"%(value)) #'U:/6_camera.jpeg' + pass + elif count == 1: + camera_album_popup_img2.set_src("/usr/static/album/%d_camera.jpg"%(value))#'U:/6_camera.jpeg' + pass + elif count == 2: + camera_album_popup_img3.set_src("/usr/static/album/%d_camera.jpg"%(value))#'U:/6_camera.jpeg' + pass + elif count == 3: + camera_album_popup_img4.set_src("/usr/static/album/%d_camera.jpg"%(value))#'U:/6_camera.jpeg' + pass + elif count == 4: + camera_album_popup_img5.set_src("/usr/static/album/%d_camera.jpg"%(value))#'U:/6_camera.jpeg' + pass + count+=1 + + def click_album(self,e,i): + read_album = {} + read_album = EventMesh.publish("get_camera_num") + if len(read_album) != 0: + sort_new = {} + sort_new = sorted(read_album.keys()) + key = sort_new[i] + value = int(read_album[key]["timeSec"]) + self.meta_info = value + print(self.meta_info,i) + EventMesh.publish("load_screen", {"screen": "album_preview","meta": self.meta_info})#点击进入相册预览大图显示 + print(i) + pass + + def Close(self): + pass + + def done_click(self): + + pass + + def done_return(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + + def btn1_release(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + + def btn8_press(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + +album_preview_popup_screen = None +album_preview_popup_img = None +class albumPreviewScreen(Screen):#点击预览 + # + NAME = "album_preview" + + def __init__(self): + super().__init__() + self.meta = None + + def initialization(self): + global album_preview_popup_screen ,album_preview_popup_img + + if album_preview_popup_screen == None: + album_preview_popup_screen = lv.obj() + print("album_preview_popup_screen") + album_preview_popup_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + + + album_preview_popup_img = lv.img(album_preview_popup_screen) + album_preview_popup_img.set_pos(0, 5) + + # album_preview_popup_img.set_zoom(400) + + album_preview_popup_delet_label = lv.label(album_preview_popup_screen) + album_preview_popup_delet_label.set_pos(0, 60) + album_preview_popup_delet_label.set_size(128, 20) + album_preview_popup_delet_label.set_text("是否删除") + album_preview_popup_delet_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + album_preview_popup_delet_label.set_long_mode(lv.label.LONG.WRAP) + album_preview_popup_delet_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + + album_preview_popup_delet_con_label = lv.label(album_preview_popup_screen) + album_preview_popup_delet_con_label.set_pos(0, 90) + album_preview_popup_delet_con_label.set_size(64, 38) + album_preview_popup_delet_con_label.set_text("确定") + album_preview_popup_delet_con_label.add_flag(lv.obj.FLAG.CLICKABLE) + album_preview_popup_delet_con_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + album_preview_popup_delet_con_label.set_long_mode(lv.label.LONG.WRAP) + album_preview_popup_delet_con_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + + + album_preview_popup_delet_can_label = lv.label(album_preview_popup_screen) + album_preview_popup_delet_can_label.set_pos(64, 90) + album_preview_popup_delet_can_label.set_size(64, 38) + album_preview_popup_delet_can_label.set_text("取消") + album_preview_popup_delet_can_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + album_preview_popup_delet_can_label.set_long_mode(lv.label.LONG.WRAP) + album_preview_popup_delet_can_label.add_flag(lv.obj.FLAG.CLICKABLE) + album_preview_popup_delet_can_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + + self.meta = album_preview_popup_screen + album_num_tmp = None + album_num_tmp = int(self.meta_info) + print(album_num_tmp) + album_preview_popup_delet_can_label.add_event_cb(lambda e:EventMesh.callback_wrapper(self.cancel_pop(e)),lv.EVENT.CLICKED,None) + album_preview_popup_delet_con_label.add_event_cb(lambda e:EventMesh.callback_wrapper(self.confirm_pop(e)),lv.EVENT.CLICKED,None) + album_preview_popup_img.set_src("/usr/static/album/%d_camera.jpg"%(album_num_tmp))#'U:/6_camera.jpeg' + + def cancel_pop(self,e):#取消删除 + EventMesh.publish("load_screen", {"screen": "main_menu"})#点击回到相册界面 + pass + + def confirm_pop(self,e):#确认删除 + # album_num = int(self.meta_info.split(':')[1]) + album_num_tmp = None + album_num_tmp = int(self.meta_info) + print(album_num_tmp) + + check_img = ql_fs.path_exists("/usr/static/album/%d_camera.jpg"%(album_num_tmp)) + if check_img == True :#图片存在 + uos.remove("/usr/static/album/%d_camera.jpg"%(album_num_tmp))#删除单张图片 + read_album = {} + read_album = EventMesh.publish("get_camera_num")#删除的同时把数据部分也清掉 + print("img is exit1",read_album) + if read_album != {}: + key_tmp = album_num_tmp + del read_album[key_tmp]#删除内容 + + print("img is exit2",read_album) + pass + else:#图片不存在 + print("img is not exit") + pass + EventMesh.publish("load_screen", {"screen": "camera_album"})#点击回到相册界面 + pass + + def Close(self): + pass + + def done_click(self): + pass + + def done_return(self): + + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + + + def btn1_release(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + + def btn8_press(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + + +camera_video_screen = None +camera_video_label_screen = None +class cameraVdieoScreen(Screen):#视频通话 + #上课禁用 + NAME = "camera_video" + + def __init__(self): + super().__init__() + self.meta = None + self.preview1 = None + self.timer = osTimer() + self.open_preview1 = 0 + + def initialization(self): + global camera_video_screen,camera_video_label_screen + + if camera_video_screen == None: + camera_video_screen = lv.obj() + print("Lowpower_screen") + camera_video_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + + camera_video_label_screen = lv.label(camera_video_screen) + camera_video_label_screen.set_pos(0, 40) + camera_video_label_screen.set_size(128, 40) + camera_video_label_screen.set_text(" ") + camera_video_label_screen.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + camera_video_label_screen.set_long_mode(lv.label.LONG.WRAP) + camera_video_label_screen.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + + self.meta = camera_video_screen + + if EventMesh.publish(constants.EVENT.GET_CONNECT) != 0:#未联网提示关机 + self.preview1 = camera.camPreview(0,240,320,128,128,1) + state = self.preview1.open() + self.timer.start(1*1000,1,self.fun) + camera_video_label_screen.set_text(" ") + self.open_preview1 = 1 + else: + self.open_preview1 = 0 + camera_video_label_screen.set_text("无SIM卡或无网络") + + def fun(self,*argc): + EventMesh.publish("system_sleep_rest")#防止黑屏 + + + def Close(self): + if self.open_preview1 == 1: + self.timer.stop() + self.preview1.close() + + def done_click(self): + pass + + + + + def done_return(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + + def btn1_release(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + + def btn8_press(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + +style_screen_calendar_1_extra_header_main_default = lv.style_t() +style_screen_calendar_1_extra_header_main_default.init() +style_screen_calendar_1_extra_header_main_default.set_bg_color(lv.color_make(0x21,0x95,0xf6)) +style_screen_calendar_1_extra_header_main_default.set_bg_grad_color(lv.color_make(0x21,0x95,0xf6)) +style_screen_calendar_1_extra_header_main_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) +style_screen_calendar_1_extra_header_main_default.set_bg_opa(255) +style_screen_calendar_1_extra_header_main_default.set_text_color(lv.color_make(0xff,0xff,0xff)) +style_screen_calendar_1_extra_header_main_default.set_text_font(lv.K01_font_16_ALL) + +style_screen_calendar_1_main_main_default = lv.style_t() +style_screen_calendar_1_main_main_default.init() +style_screen_calendar_1_main_main_default.set_radius(0) +style_screen_calendar_1_main_main_default.set_bg_color(lv.color_make(0xff,0xff,0xff)) +style_screen_calendar_1_main_main_default.set_bg_grad_color(lv.color_make(0xff,0xff,0xff)) +style_screen_calendar_1_main_main_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) +style_screen_calendar_1_main_main_default.set_bg_opa(255) +style_screen_calendar_1_main_main_default.set_border_color(lv.color_make(0xc0,0xc0,0xc0)) +style_screen_calendar_1_main_main_default.set_border_width(1) +style_screen_calendar_1_main_main_default.set_border_opa(255) + +# add style for screen_calendar_1 + + + + +calendar_screen = None +calendar_label_screen = None +screen_calendar_1 = None +class calendar_Screen(Screen):#日历 + #上课禁用 + NAME = "calendar_screen" + + def __init__(self): + super().__init__() + self.meta = None + self.preview1 = None + self.timer = osTimer() + self.open_preview1 = 0 + + def initialization(self): + global calendar_screen,calendar_label_screen,screen_calendar_1 + data = RTC().datetime() + hour = data[4] + min = data[5] + + week = data[3] + + date1 = data[0] + date2 = data[1] + date3 = data[2] + highlighted_days=[lv.calendar_date_t({'year':date1, 'month':date2, 'day':date3})] + if calendar_screen == None: + calendar_screen = lv.obj() + print("calendar_screen") + calendar_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + + screen_calendar_1 = lv.calendar(calendar_screen) + screen_calendar_1.set_pos(int(0),int(30)) + screen_calendar_1.set_size(240,260) + screen_calendar_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + screen_calendar_1.set_today_date(date1,date2,date3) + screen_calendar_1.set_showed_date(date1,date2) + screen_calendar_1.set_highlighted_dates(highlighted_days, len(highlighted_days)) + screen_calendar_1.add_style(style_screen_calendar_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) + + screen_calendar_1_header = lv.calendar_header_arrow(screen_calendar_1) + screen_calendar_1_header.add_style(style_screen_calendar_1_extra_header_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) + screen_calendar_1.get_btnmatrix().add_event_cb(lambda e: EventMesh.callback_wrapper(self.style_screen_calendar_1_extra_ctrl_day_names_items_default_event_cb(e)), lv.EVENT.DRAW_PART_BEGIN, None) + # screen_calendar_1.get_btnmatrix().add_event_cb(style_screen_calendar_1_extra_ctrl_day_names_items_default_event_cb, lv.EVENT.DRAW_PART_BEGIN, None) + screen_calendar_1.get_btnmatrix().add_event_cb(lambda e: EventMesh.callback_wrapper(self.style_screen_calendar_1_extra_ctrl_days_of_current_month_items_default_event_cb(e)),lv.EVENT.DRAW_PART_BEGIN,None) + + screen_calendar_1.get_btnmatrix().add_event_cb(lambda e: EventMesh.callback_wrapper(self.style_screen_calendar_1_extra_ctrl_highlight_items_default_event_cb(e)),lv.EVENT.DRAW_PART_BEGIN,None) + + screen_calendar_1.get_btnmatrix().add_event_cb(lambda e: EventMesh.callback_wrapper(self.style_screen_calendar_1_extra_ctrl_today_items_default_event_cb(e)),lv.EVENT.DRAW_PART_BEGIN,None) + + screen_calendar_1.get_btnmatrix().add_event_cb(lambda e: EventMesh.callback_wrapper(self.style_screen_calendar_1_extra_ctrl_other_month_items_default_event_cb(e)),lv.EVENT.DRAW_PART_BEGIN,None) + + self.meta = calendar_screen + + + screen_calendar_1.set_today_date(date1,date2,date3) + screen_calendar_1.set_showed_date(date1,date2) + screen_calendar_1.set_highlighted_dates(highlighted_days, len(highlighted_days)) + + if EventMesh.publish(constants.EVENT.GET_CONNECT) != 0:#未联网提示关机 + self.preview1 = camera.camPreview(0,240,320,128,128,1) + state = self.preview1.open() + self.timer.start(1*1000,1,self.fun) + camera_video_label_screen.set_text(" ") + self.open_preview1 = 1 + else: + self.open_preview1 = 0 + + camera_video_label_screen.set_text("无SIM卡或无网络") + + + + def style_screen_calendar_1_extra_ctrl_days_of_current_month_items_default_event_cb(self,e): + obj = lv.btnmatrix.__cast__(e.get_target()) + dsc = lv.obj_draw_part_dsc_t.__cast__(e.get_param()) + if (dsc.id >= 7 + and not obj.has_btn_ctrl(dsc.id, lv.btnmatrix.CTRL.CUSTOM_1) + and not obj.has_btn_ctrl(dsc.id, lv.btnmatrix.CTRL.CUSTOM_2) + and not obj.has_btn_ctrl(dsc.id, lv.btnmatrix.CTRL.DISABLED)): + dsc.rect_dsc.bg_color = lv.color_make(0x01,0xa2,0xb1) + + dsc.rect_dsc.bg_opa = 0 + dsc.rect_dsc.border_color = lv.color_make(0xc0,0xc0,0xc0) + dsc.rect_dsc.border_width = 1 + dsc.rect_dsc.border_opa = 255 + if dsc.label_dsc: + dsc.label_dsc.color = lv.color_make(0x0D,0x30,0x55) + try: + lv.K01_font_16_ALL + dsc.label_dsc.font = lv.K01_font_16_ALL + except AttributeError: + try: + lv.K01_font_16_ALL + dsc.label_dsc.font = lv.K01_font_16_ALL + except AttributeError: + dsc.label_dsc.font = lv.K01_font_16_ALL + + + + def style_screen_calendar_1_extra_ctrl_day_names_items_default_event_cb(self,e): + obj = lv.btnmatrix.__cast__(e.get_target()) + dsc = lv.obj_draw_part_dsc_t.__cast__(e.get_param()) + if dsc.id < 7: + + if dsc.label_dsc: + dsc.label_dsc.color = lv.color_make(0x0D,0x30,0x55) + try: + lv.K01_font_16_ALL + dsc.label_dsc.font = lv.K01_font_16_ALL + except AttributeError: + try: + lv.K01_font_16_ALL + dsc.label_dsc.font = lv.K01_font_16_ALL + except AttributeError: + dsc.label_dsc.font = lv.K01_font_16_ALL + + + def style_screen_calendar_1_extra_ctrl_highlight_items_default_event_cb(self,e): + obj = lv.btnmatrix.__cast__(e.get_target()) + dsc = lv.obj_draw_part_dsc_t.__cast__(e.get_param()) + if dsc.id >= 7 and obj.has_btn_ctrl(dsc.id, lv.btnmatrix.CTRL.CUSTOM_2): + dsc.rect_dsc.bg_color = lv.color_make(0x21,0x95,0xf6) + + dsc.rect_dsc.bg_opa = 255 + if dsc.label_dsc: + dsc.label_dsc.color = lv.color_make(0x0D,0x30,0x55) + try: + lv.K01_font_16_ALL + dsc.label_dsc.font = lv.K01_font_16_ALL + except AttributeError: + try: + lv.K01_font_16_ALL + dsc.label_dsc.font = lv.K01_font_16_ALL + except AttributeError: + dsc.label_dsc.font = lv.K01_font_16_ALL + + + def style_screen_calendar_1_extra_ctrl_today_items_default_event_cb(self,e): + obj = lv.btnmatrix.__cast__(e.get_target()) + dsc = lv.obj_draw_part_dsc_t.__cast__(e.get_param()) + if dsc.id >= 7 and obj.has_btn_ctrl(dsc.id, lv.btnmatrix.CTRL.CUSTOM_1): + dsc.rect_dsc.bg_color = lv.color_make(0x01,0xa2,0xb1) + + dsc.rect_dsc.bg_opa = 255 + dsc.rect_dsc.border_color = lv.color_make(0xc0,0xc0,0xc0) + dsc.rect_dsc.border_width = 1 + dsc.rect_dsc.border_opa = 255 + if dsc.label_dsc: + dsc.label_dsc.color = lv.color_make(0x0D,0x30,0x55) + try: + lv.K01_font_16_ALL + dsc.label_dsc.font = lv.K01_font_16_ALL + except AttributeError: + try: + lv.K01_font_16_ALL + dsc.label_dsc.font = lv.K01_font_16_ALL + except AttributeError: + dsc.label_dsc.font = lv.K01_font_16_ALL + + + def style_screen_calendar_1_extra_ctrl_other_month_items_default_event_cb(self,e): + obj = lv.btnmatrix.__cast__(e.get_target()) + dsc = lv.obj_draw_part_dsc_t.__cast__(e.get_param()) + if dsc.id >= 7 and obj.has_btn_ctrl(dsc.id, lv.btnmatrix.CTRL.DISABLED): + dsc.rect_dsc.bg_color = lv.color_make(0x01,0xa2,0xb1) + + dsc.rect_dsc.bg_opa = 0 + if dsc.label_dsc: + dsc.label_dsc.color = lv.color_make(0xA9,0xA2,0xA2) + try: + lv.K01_font_16_ALL + dsc.label_dsc.font = lv.K01_font_16_ALL + except AttributeError: + try: + lv.font_montserrat_13 + dsc.label_dsc.font = lv.K01_font_16_ALL + except AttributeError: + dsc.label_dsc.font = lv.K01_font_16_ALL + + def fun(self,*argc): + EventMesh.publish("system_sleep_rest")#防止黑屏 + + + def Close(self): + if self.open_preview1 == 1: + self.timer.stop() + self.preview1.close() + + def done_click(self): + pass + + + + + def done_return(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + + def btn1_release(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + + def btn8_press(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + + + calculator_CALL_MAX_DATA = 16 @@ -7035,13 +7667,20 @@ class calculatorScreen(Screen): # phone_line.set_size(2,18) # phone_line.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) # phone_line.add_style(style_line,0) + calculator_label_screen = lv.obj(calculator_screen) + calculator_label_screen.set_pos(0,0) + calculator_label_screen.set_size(128,16) + calculator_label_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + print("phone_screen") + calculator_label_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) - calculator_label = lv.label(calculator_screen) - calculator_label.set_pos(0, 5) - calculator_label.set_size(128, 20) + + calculator_label = lv.label(calculator_label_screen) + calculator_label.set_pos(0, 0) + calculator_label.set_size(0, 20) calculator_label.set_text(" ") calculator_label.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT) - calculator_label.set_long_mode(lv.label.LONG.CLIP) + calculator_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) calculator_one = lv.img(calculator_screen) @@ -7328,7 +7967,7 @@ class calculatorScreen(Screen): return all(element == 0 for element in lst) def input_num(self,msg):#输入数字 - if msg == '9': + if msg == 'delete': if len(self.result_buf) == 0: if self.one_buf != '': if self.operator != '': @@ -7362,7 +8001,7 @@ class calculatorScreen(Screen): else: self.one_buf = self.one_buf+msg else: - if self.operator == '':#没有特殊字符 + - / * + if self.operator == '':#没有特殊字符 + - / * 一直会将数字添加到数字1中 否则添加到数字2中 if self.one_buf.find('.') == -1: if len(self.one_buf) <= 10 and len(self.one_buf) > 0:#第二个数据超过10个数据不让输入 0 if len(self.one_buf) == 1 and self.one_buf == '0' and msg != '.': @@ -7449,28 +8088,31 @@ class calculatorScreen(Screen): if self.operator != '':#90 print("operator") if self.two_buf != '':#90+90 计算结果 -0.9 + if self.one_buf.find('.') != -1: - if int(self.one_buf.split(".")[1]) == 0: - self.one_buf = self.one_buf.split('.')[0] + if self.one_buf.find('e') == -1:#1.2e + if int(self.one_buf.split(".")[1]) == 0: + self.one_buf = self.one_buf.split('.')[0] if self.two_buf.find('.') != -1: - if int(self.two_buf.split('.')[1]) == 0: - self.two_buf = self.two_buf.split('.')[0] + if self.two_buf.find('e') == -1:#1.2e + if int(self.two_buf.split('.')[1]) == 0: + self.two_buf = self.two_buf.split('.')[0] str_sum = '' - if self.one_buf.find('e') != -1:#1.2e - tmp1 = (self.one_buf.split('e')[0])#2.1717041952680391897126070275863e-15 - tmp2 = (self.one_buf.split('e')[1]) - if len(tmp2) > 0: - self.result_buf = str(eval(tmp1 + "*"+"10**"+tmp2)) - else: - self.result_buf = str(eval(tmp1 + "*"+"10**"+"0")) - pass - pass - else: - str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) - self.result_buf = str(eval(str_sum)) - pass + # if self.one_buf.find('e') != -1:#1.2e + # tmp1 = (self.one_buf.split('e')[0])#2.1717041952680391897126070275863e-15 + # tmp2 = (self.one_buf.split('e')[1]) + # if len(tmp2) > 0: + # self.result_buf = str(eval(tmp1 + "*"+"10**"+tmp2)) + # else: + # self.result_buf = str(eval(tmp1 + "*"+"10**"+"0")) + # pass + # pass + # else: + str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) + self.result_buf = str(eval(str_sum)) + # pass print("str_sum",str_sum,self.result_buf) if self.result_buf.find('e') == -1: @@ -7480,7 +8122,8 @@ class calculatorScreen(Screen): self.result_buf = (self.result_buf.split(".")[0]) if len(self.result_buf) > 14:#99978654.087766666 - self.result_buf = str(self.result_buf[:14]) + tmp = str(self.result_buf[:14]) + self.result_buf = tmp self.one_buf = str(self.result_buf) self.two_buf = '' @@ -7503,26 +8146,27 @@ class calculatorScreen(Screen): print("operator!!!!!!!!!!!!") if self.two_buf != '':#90+90 计算结果 -0.9 if self.one_buf.find('.') != -1: - if int(self.one_buf.split(".")[1]) == 0: - self.one_buf = self.one_buf.split('.')[0] + if self.one_buf.find('e') == -1:#1.2e + if int(self.one_buf.split(".")[1]) == 0: + self.one_buf = self.one_buf.split('.')[0] if self.two_buf.find('.') != -1: - if int(self.two_buf.split('.')[1]) == 0: - self.two_buf = self.two_buf.split('.')[0] + if self.two_buf.find('e') == -1:#1.2e + if int(self.two_buf.split('.')[1]) == 0: + self.two_buf = self.two_buf.split('.')[0] str_sum = '' - if self.one_buf.find('e') != -1:#1.2e - tmp1 = (self.one_buf.split('e')[0])#2.1717041952680391897126070275863e-15 - tmp2 = (self.one_buf.split('e')[1]) - if len(tmp2) > 0: - self.result_buf = str(eval(tmp1 + "*"+"10**"+tmp2)) - else: - self.result_buf = str(eval(tmp1 + "*"+"10**"+"0")) - pass - pass - else: - str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) - self.result_buf = str(eval(str_sum)) - pass + # if self.one_buf.find('e') != -1:#1.2e + # tmp1 = (self.one_buf.split('e')[0])#2.1717041952680391897126070275863e-15 + # tmp2 = (self.one_buf.split('e')[1]) + # if len(tmp2) > 0: + # self.result_buf = str(eval(tmp1 + "*"+"10**"+tmp2)) + # else: + # self.result_buf = str(eval(tmp1 + "*"+"10**"+"0")) + # pass + # pass + # else: + str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) + self.result_buf = str(eval(str_sum)) print("str_sum",str_sum,self.result_buf) if self.result_buf.find('e') == -1: @@ -7532,7 +8176,8 @@ class calculatorScreen(Screen): self.result_buf = (self.result_buf.split(".")[0]) if len(self.result_buf) > 14:#99978654.087766666 - self.result_buf = str(self.result_buf[:14]) + tmp = str(self.result_buf[:14]) + self.result_buf = tmp self.one_buf = str(self.result_buf) self.two_buf = '' @@ -7555,27 +8200,29 @@ class calculatorScreen(Screen): print("operator====***********") if self.two_buf != '':#90+90 计算结果 -0.9 if self.one_buf.find('.') != -1: - if int(self.one_buf.split(".")[1]) == 0: - self.one_buf = self.one_buf.split('.')[0] + if self.one_buf.find('e') == -1:#1.2e + if int(self.one_buf.split(".")[1]) == 0: + self.one_buf = self.one_buf.split('.')[0] if self.two_buf.find('.') != -1: - if int(self.two_buf.split('.')[1]) == 0: - self.two_buf = self.two_buf.split('.')[0] + if self.two_buf.find('e') == -1:#1.2e + if int(self.two_buf.split('.')[1]) == 0: + self.two_buf = self.two_buf.split('.')[0] str_sum = '' - if self.one_buf.find('e') != -1:#1.2e - tmp1 = (self.one_buf.split('e')[0])#2.1717041952680391897126070275863e-15 - tmp2 = (self.one_buf.split('e')[1]) - if len(tmp2) > 0: - self.result_buf = str(eval(tmp1 + "*"+"10**"+tmp2)) - else: - self.result_buf = str(eval(tmp1 + "*"+"10**"+"0")) - pass - pass - else: - str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) - self.result_buf = str(eval(str_sum)) - pass + # if self.one_buf.find('e') != -1:#1.2e + # tmp1 = (self.one_buf.split('e')[0])#2.1717041952680391897126070275863e-15 + # tmp2 = (self.one_buf.split('e')[1]) + # if len(tmp2) > 0: + # self.result_buf = str(eval(tmp1 + "*"+"10**"+tmp2)) + # else: + # self.result_buf = str(eval(tmp1 + "*"+"10**"+"0")) + # pass + # pass + # else: + str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) + self.result_buf = str(eval(str_sum)) + # pass print("str_sum",str_sum,self.result_buf) if self.result_buf.find('e') == -1:#有e @@ -7585,7 +8232,8 @@ class calculatorScreen(Screen): self.result_buf = (self.result_buf.split(".")[0]) if len(self.result_buf) > 14:#99978654.087766666 - self.result_buf = str(self.result_buf[:14]) + tmp = str(self.result_buf[:14]) + self.result_buf = tmp self.one_buf = str(self.result_buf) self.two_buf = '' @@ -7610,25 +8258,27 @@ class calculatorScreen(Screen): if self.two_buf != '':#90+90 计算结果 -0.9 if float(self.two_buf) != 0: if self.one_buf.find('.') != -1: - if int(self.one_buf.split(".")[1]) == 0: - self.one_buf = self.one_buf.split('.')[0] + if self.one_buf.find('e') == -1:#1.2e + if int(self.one_buf.split(".")[1]) == 0: + self.one_buf = self.one_buf.split('.')[0] if self.two_buf.find('.') != -1: - if int(self.two_buf.split('.')[1]) == 0: - self.two_buf = self.two_buf.split('.')[0] + if self.two_buf.find('e') == -1:#1.2e + if int(self.two_buf.split('.')[1]) == 0: + self.two_buf = self.two_buf.split('.')[0] str_sum = '' - if self.one_buf.find('e') != -1:#1.2e + # if self.one_buf.find('e') != -1:#1.2e - tmp = (self.one_buf.split('e')[0]) + # tmp = (self.one_buf.split('e')[0]) - str_sum = tmp + self.operator + self.two_buf - self.result_buf = str(eval(str_sum))+'e' - pass - else: - str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) - self.result_buf = str(eval(str_sum)) - pass + # str_sum = tmp + self.operator + self.two_buf + # self.result_buf = str(eval(str_sum))+'e' + # pass + # else: + str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) + self.result_buf = str(eval(str_sum)) + # pass print("str_sum",str_sum,self.result_buf) if self.result_buf.find('e') == -1:#有小数点 @@ -7637,8 +8287,9 @@ class calculatorScreen(Screen): if int(self.result_buf.split(".")[1]) == 0:#小数点后面全是0 就取整数 self.result_buf = (self.result_buf.split(".")[0]) - if len(self.result_buf) > 14:#99978654.087766666 - self.result_buf = str(self.result_buf[:14]) + # if len(self.result_buf) > 14:#99978654.087766666 + # tmp = str(self.result_buf[:14]) + # self.result_buf = tmp self.one_buf = str(self.result_buf) self.two_buf = '' @@ -7667,23 +8318,25 @@ class calculatorScreen(Screen): if self.two_buf != '':#90+90 计算结果 -0.9 if float(self.two_buf) != 0: if self.one_buf.find('.') != -1: - if int(self.one_buf.split(".")[1]) == 0: - self.one_buf = self.one_buf.split('.')[0] + if self.one_buf.find('e') == -1:#1.2e + if int(self.one_buf.split(".")[1]) == 0: + self.one_buf = self.one_buf.split('.')[0] if self.two_buf.find('.') != -1: - if int(self.two_buf.split('.')[1]) == 0: - self.two_buf = self.two_buf.split('.')[0] + if self.two_buf.find('e') == -1:#1.2e + if int(self.two_buf.split('.')[1]) == 0: + self.two_buf = self.two_buf.split('.')[0] str_sum = '' - if self.one_buf.find('e') != -1:#1.2e - tmp = (self.one_buf.split('e')[0]) - str_sum = tmp + self.operator + self.two_buf - self.result_buf = str(eval(str_sum))+'e' - pass - else: - str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) - self.result_buf = str(eval(str_sum)) - pass + # if self.one_buf.find('e') != -1:#1.2e + # tmp = (self.one_buf.split('e')[0]) + # str_sum = tmp + self.operator + self.two_buf + # self.result_buf = str(eval(str_sum))+'e' + # pass + # else: + str_sum = (self.one_buf.split()[0])+self.operator+(self.two_buf.split()[0]) + self.result_buf = str(eval(str_sum)) + # pass print("str_sum",str_sum,self.result_buf) if self.result_buf.find('e') == -1:#有小数点 @@ -7693,7 +8346,8 @@ class calculatorScreen(Screen): self.result_buf = (self.result_buf.split(".")[0]) if len(self.result_buf) > 14:#99978654.087766666 - self.result_buf = str(self.result_buf[:14]) + tmp = str(self.result_buf[:14]) + self.result_buf = tmp self.one_buf = str(self.result_buf) self.two_buf = '' @@ -7722,8 +8376,9 @@ class calculatorScreen(Screen): print("self.one_buf ",self.one_buf,self.two_buf,self.operator) global calculator_label tmp = str(self.one_buf)+str(self.operator)+str(self.two_buf) - calculator_label.set_pos(0, 5) - calculator_label.set_size(128, 20) + label_size = len(tmp)*16 + calculator_label.set_pos(0, 0) + calculator_label.set_size(128, 16) calculator_label.set_text(tmp) def calculator_fun(self,msg): @@ -8050,18 +8705,16 @@ class calculatorScreen(Screen): def show_num(self): print("self.phone_num ",self.phone_num,self.phone_list) - global calculator_label - calculator_label.set_pos(0, 5) - calculator_label.set_size(128, 20) - calculator_label.set_text(self.phone_num) + pass + # global calculator_label + # calculator_label.set_pos(0, 5) + # calculator_label.set_size(128, 20) + # calculator_label.set_text(self.phone_num) def calaulator_results(self):#计算结果显示 - print("self.calcul_num ",self.calcul_num,self.phone_list) - global calculator_label - calculator_label.set_pos(0, 5) - calculator_label.set_size(128, 20) - calculator_label.set_text(self.calcul_num) - + pass + + def lcd_on(self): if self.timer_cb != 0: self.timer_cb = 0 diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py index 61284745..a5fb8273 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py @@ -214,7 +214,30 @@ MainMenu2x+=1 # MainMenu2_num+=1 # MainMenu2x+=1 -#工具箱 +#视频通话 +MainMenu2_camera_video = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) +label_text = lv.label(MainMenu2_camera_video) +label_text.set_pos(0, 0) +label_text.set_size(0, 0) +label_text.set_text("{}".format(MainMenu2_num)) +MainMenu2_img_camera_video = lv.img(MainMenu2_camera_video) +MainMenu2_img_camera_video.set_size(80,80) +MainMenu2_img_camera_video.set_pos(24,10) +MainMenu2_img_camera_video.set_src("U:/static/IMAGE_ONE_PAGE_VIDEOCALL.png") +MainMenu2_img_camera_video.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_camera_video.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + +MainMenu2_img_camera_video_txt = lv.label(MainMenu2_camera_video) +MainMenu2_img_camera_video_txt.set_pos(int(0),int(100)) +MainMenu2_img_camera_video_txt.set_size(128,20) +MainMenu2_img_camera_video_txt.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_camera_video_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +MainMenu2_img_camera_video_txt.set_text("视频通话") +MainMenu2_img_camera_video_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) +MainMenu2_num+=1 +MainMenu2x+=1 + +#相机 MainMenu2_camera = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) label_text = lv.label(MainMenu2_camera) label_text.set_pos(0, 0) @@ -237,6 +260,30 @@ MainMenu2_img_camera_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.S MainMenu2_num+=1 MainMenu2x+=1 + +#相册 +MainMenu2_camera_album = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) +label_text = lv.label(MainMenu2_camera_album) +label_text.set_pos(0, 0) +label_text.set_size(0, 0) +label_text.set_text("{}".format(MainMenu2_num)) +MainMenu2_img_camera_album = lv.img(MainMenu2_camera_album) +MainMenu2_img_camera_album.set_size(80,80) +MainMenu2_img_camera_album.set_pos(24,10) +MainMenu2_img_camera_album.set_src("U:/static/IMAGE_ONE_PAGE_ALBUM.png") +MainMenu2_img_camera_album.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_camera_album.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + +MainMenu2_img_camera_album_txt = lv.label(MainMenu2_camera_album) +MainMenu2_img_camera_album_txt.set_pos(int(0),int(100)) +MainMenu2_img_camera_album_txt.set_size(128,20) +MainMenu2_img_camera_album_txt.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_camera_album_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +MainMenu2_img_camera_album_txt.set_text("相册") +MainMenu2_img_camera_album_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) +MainMenu2_num+=1 +MainMenu2x+=1 + #工具箱 MainMenu2_toolbox = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) label_text = lv.label(MainMenu2_toolbox) @@ -302,12 +349,15 @@ class MainMenuScreen(Screen): MainMenu2_img_phone.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "Phone")), lv.EVENT.CLICKED, None) MainMenu2_img_toolbox.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "toolbox")), lv.EVENT.CLICKED, None) MainMenu2_img_setting.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "setting")), lv.EVENT.CLICKED, None) - #MainMenu2_img_health.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "health")), lv.EVENT.CLICKED, None) + MainMenu2_img_camera_video.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "camera_video")), lv.EVENT.CLICKED, None) + MainMenu2_img_camera.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "camera")), lv.EVENT.CLICKED, None) + MainMenu2_img_camera_album.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "camera_album")), lv.EVENT.CLICKED, None) MainMenu2_img_contacts.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "contacts")), lv.EVENT.CLICKED, None) MainMenu2_img_wechat.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "wechat")), lv.EVENT.CLICKED, None) # MainMenu2_img_spo2.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "spo2")), lv.EVENT.CLICKED, None) MainMenu2_img_sms.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "popup")), lv.EVENT.CLICKED, None) + EventMesh.subscribe("watch_top_show", self.watch_top_show) EventMesh.subscribe("return_setiing", self.return_setiing) @@ -331,11 +381,11 @@ class MainMenuScreen(Screen): def img_cb(self, e, msg): state = EventMesh.publish("get_key_board", "key_board") - print("state",state) + # print("state",state) if state == 1: - print("state11",state) + # print("state11",state) if msg == 'Phone': - print("Phone",state) + # print("Phone",state) EventMesh.publish("load_screen", {"screen": "keyboard_popup"}) pass else: diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/versions.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/versions.py index f14b0cf7..756f660c 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/versions.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/versions.py @@ -1,2 +1,2 @@ Version="810M_K01_V1.0" -Build_Time="2023-08-28 11:42:25" +Build_Time="2023-09-01 14:53:51" diff --git a/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/autoconf.h b/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/autoconf.h index bc104c6c..26766385 100644 --- a/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/autoconf.h +++ b/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/autoconf.h @@ -37,3 +37,6 @@ #define CONFIG_LVGL_QRCODE 1 #define CONFIG_LVGL_TILEVIEW 1 #define CONFIG_LVGL_HANDLER_TASK_PRIORITY 80 +#define CONFIG_CAMERA 1 +#define CONFIG_JPEG 1 +#define CONFIG_CAMERA_SAVEPHOTOS 1 diff --git a/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/config.mk b/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/config.mk index de80d967..bf69c97c 100644 --- a/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/config.mk +++ b/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/config/config.mk @@ -9,7 +9,7 @@ PROJECT_NAME_G3_K01=y CONFIG_MBEDTLS=y # -# EG810MCN_GA_ALIPAY +# EG810MCN_GA_VOLTE # CONFIG_LVGL=y @@ -46,11 +46,13 @@ CONFIG_LVGL_KEYBOARD=y CONFIG_LVGL_SPAN=y CONFIG_LVGL_HANDLER_TASK_PRIORITY=80 # CONFIG_QRCODE is not set -# CONFIG_CAMERA is not set +CONFIG_CAMERA=y +# CONFIG_CAMERA_DECODE is not set +CONFIG_CAMERA_SAVEPHOTOS=y # CONFIG_QUECTHING is not set # CONFIG_SPINAND is not set # CONFIG_RTMP is not set -# CONFIG_JPEG is not set +CONFIG_JPEG=y # CONFIG_SPI_SDCARD is not set CONFIG_VIOCE_CALL=y # CONFIG_TTS is not set diff --git a/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip b/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip index 98638084..c5f0f16e 100644 Binary files a/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip and b/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip differ diff --git a/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/include/app_link_start_addr.h b/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/include/app_link_start_addr.h index 8dd3c23d..bfd51397 100644 --- a/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/include/app_link_start_addr.h +++ b/2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/include/app_link_start_addr.h @@ -3,7 +3,7 @@ #define __APP_LINK_START_ADDR_H__ #define APP_LINK_START_ADDR 0x80521000 -#define APP_FLASH_MAX_SIZE 0x1A0000 +#define APP_FLASH_MAX_SIZE 0x1A8000 #define APP_RAM_START 0x7E3E0000 #define APP_RAM_MAX_SIZE 0x180000 diff --git a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_ALBUM.png b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_ALBUM.png new file mode 100644 index 00000000..34df5ca6 Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_ALBUM.png differ diff --git a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_VIDEOCALL.png b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_VIDEOCALL.png new file mode 100644 index 00000000..2b0610bb Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_VIDEOCALL.png differ diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py index 53af1bd6..4516b5af 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py @@ -188,6 +188,7 @@ def main_init(): ui.add_screen(_ui.chargeInScreen()) ui.add_screen(_ui.chargeOutScreen()) ui.add_screen(_ui.restore_confirmScreen()) + ui.add_screen(_ui.calendar_Screen()) ui.add_screen(NewWechatPopupScreen()) ui.add_screen(HealthScreen()) # ui.add_screen(_ui.Setting3Screen()) diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py index f1a97ac8..26a01259 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py @@ -4290,7 +4290,7 @@ class TemperatureScreen(Screen): temperature_keep_label.set_text("体温偏高") temperature_keep_label.set_style_text_color(lv.color_make(0xff, 0x00, 0x00), lv.STATE.DEFAULT) elif temp == 0: - temperature_keep_label.set_text("体温异常") + temperature_keep_label.set_text(" ") temperature_keep_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) else: temperature_keep_label.set_text("体温正常") @@ -4302,7 +4302,7 @@ class TemperatureScreen(Screen): temp = 0 temperature_start_label.set_text("佩戴异常,点击重测") temperature_bpm_label.set_text("- -") - temperature_keep_label.set_text("体温异常") + temperature_keep_label.set_text(" ") temperature_keep_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) else : temperature_start_label.set_text("测量结束,点击重测") diff --git a/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip b/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip index b573d711..e4cd5de2 100644 Binary files a/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip and b/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip differ