From: dxy15521469561 <1731678236@qq.com> Date: Sat, 2 Sep 2023 09:08:27 +0000 (+0800) Subject: k01: X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=40624d465f25a4149d70f16b7a2b249b46230817;p=mirrors%2FASR1603_G5.git k01: 拍照保存和删除逻辑 k5: 通话记录重启不保存数据问题 --- 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 ac6b33a4..9f5f7a95 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 @@ -150,6 +150,7 @@ def main_init(): ui.add_screen(_ui.cameraalbumScreen()) ui.add_screen(_ui.cameraVdieoScreen()) ui.add_screen(_ui.albumPreviewScreen()) + ui.add_screen(_ui.cameraFullScreen()) ui.add_screen(NewWechatPopupScreen()) ui.add_screen(HealthScreen()) # ui.add_screen(_ui.Setting3Screen()) 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 ee140466..cd27a0a6 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 @@ -2166,7 +2166,8 @@ class CallLogManager(Abstract): def set(self, event, msg): self.check_json = msg[0] self.read_call_log = msg[1] - + with open("/usr/static/storage_file/Call_log.json","w+",encoding="utf-8") as fd: + ujson.dump(self.read_call_log,fd) # def call_usr(self,event,msg): # content = self.log[msg] # # 参数1 姓名 参数2 电话 参数3 1/主动呼叫 0别人呼叫 @@ -2929,7 +2930,8 @@ class cameraAlbumManager(Abstract):#保存相册数目 def set_camera_num(self, event, msg): self.album_list = msg - + with open("/usr/static/storage_file/album_config.json","w+",encoding="utf-8") as fd: + ujson.dump(self.album_list,fd) # sorted_keys = sorted(self.album_list.keys()) # print("self.album_list",self.album_list,sorted_keys) 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 2af68e43..399e0f04 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 @@ -6992,6 +6992,55 @@ def camCapturecallback(result_list): pass dec = camera.camCapture(0,240,320,1,128,128) dec.callback(camCapturecallback) + +camera_full_popup_screen = None +camera_full_label_popup_screen = None +class cameraFullScreen(Screen):#相册已满 + # + NAME = "camera_full" + + def __init__(self): + super().__init__() + self.meta = None + self.meta_type = "popup" + + + def initialization(self): + global camera_full_popup_screen ,camera_full_label_popup_screen + + + if camera_full_popup_screen == None: + camera_full_popup_screen = lv.obj() + print("camera_full") + camera_full_popup_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + + camera_full_label_popup_screen = lv.label(camera_full_popup_screen) + camera_full_label_popup_screen.set_pos(0, 50) + camera_full_label_popup_screen.set_size(128, 40) + camera_full_label_popup_screen.set_text("相册已满,删除即可拍照") + camera_full_label_popup_screen.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + camera_full_label_popup_screen.set_long_mode(lv.label.LONG.WRAP) + camera_full_label_popup_screen.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + self.meta = camera_full_popup_screen + + + def done_click(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + 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 + class cameraScreen(Screen):#相机拍照二级界面 # NAME = "camera" @@ -7021,7 +7070,10 @@ class cameraScreen(Screen):#相机拍照二级界面 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 - + album_data = EventMesh.publish("get_camera_num") + if len(album_data) >= 2:#相册已满 + EventMesh.publish("load_screen", {"screen": "camera_full"}) + pass state = dec.open() self.timer.start(1*1000,1,self.fun) @@ -7038,7 +7090,7 @@ class cameraScreen(Screen):#相机拍照二级界面 state = dec.close() def done_click(self): - self.timer2.start(1*1000,0,self.save_album) + self.timer2.start(1*1000,0,self.save_album)#延迟1s保存图片 pass def save_album(self,*argc): album_data = EventMesh.publish("get_camera_num") @@ -7046,6 +7098,8 @@ class cameraScreen(Screen):#相机拍照二级界面 date_tmp = utime.localtime() time_tmp = utime.mktime(date_tmp) dec.start(50,50, "U:/static/album/%d_camera"%(time_tmp)) + else: + EventMesh.publish("load_screen", {"screen": "camera_full"}) def done_return(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) @@ -7095,31 +7149,41 @@ class cameraalbumScreen(Screen):#相册 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.set_pos(5, 30) + camera_album_popup_img1.set_size(50, 50) + camera_album_popup_img1.add_flag(lv.obj.FLAG.HIDDEN) 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.set_pos(65, 30) + camera_album_popup_img2.set_size(50, 50) + camera_album_popup_img2.add_flag(lv.obj.FLAG.HIDDEN) 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.set_pos(5, 90) + camera_album_popup_img3.set_size(50, 50) + camera_album_popup_img3.add_flag(lv.obj.FLAG.HIDDEN) 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.set_size(65, 50) + camera_album_popup_img4.add_flag(lv.obj.FLAG.HIDDEN) 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.set_pos(5, 140) + camera_album_popup_img5.set_size(50, 50) + camera_album_popup_img5.add_flag(lv.obj.FLAG.HIDDEN) 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) @@ -7130,7 +7194,13 @@ class cameraalbumScreen(Screen):#相册 sort_new = {} sort_new = sorted(read_album.keys())#按照key的升序排序 count = 0 - print("sort_new read_album ",sort_new,read_album) + camera_album_popup_img1.add_flag(lv.obj.FLAG.HIDDEN) + camera_album_popup_img2.add_flag(lv.obj.FLAG.HIDDEN) + camera_album_popup_img3.add_flag(lv.obj.FLAG.HIDDEN) + camera_album_popup_img4.add_flag(lv.obj.FLAG.HIDDEN) + camera_album_popup_img5.add_flag(lv.obj.FLAG.HIDDEN) + + # 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"]) @@ -7144,26 +7214,31 @@ class cameraalbumScreen(Screen):#相册 continue if count == 0: - camera_album_popup_img1.set_src("/usr/static/album/%d_camera.jpg"%(value)) #'U:/6_camera.jpeg' + camera_album_popup_img1.clear_flag(lv.obj.FLAG.HIDDEN) + camera_album_popup_img1.set_src("U:/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' + camera_album_popup_img2.clear_flag(lv.obj.FLAG.HIDDEN) + camera_album_popup_img2.set_src("U:/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' + camera_album_popup_img3.clear_flag(lv.obj.FLAG.HIDDEN) + camera_album_popup_img3.set_src("U:/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' + camera_album_popup_img4.clear_flag(lv.obj.FLAG.HIDDEN) + camera_album_popup_img4.set_src("U:/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' + camera_album_popup_img5.clear_flag(lv.obj.FLAG.HIDDEN) + camera_album_popup_img5.set_src("U:/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: + if len(read_album) != 0 and i < len(read_album): sort_new = {} sort_new = sorted(read_album.keys()) key = sort_new[i] @@ -7195,6 +7270,9 @@ class cameraalbumScreen(Screen):#相册 album_preview_popup_screen = None album_preview_popup_img = None +album_preview_popup_delet_con_label = None +album_preview_popup_delet_con_label = None +album_preview_popup_delet_label = None class albumPreviewScreen(Screen):#点击预览 # NAME = "album_preview" @@ -7204,7 +7282,7 @@ class albumPreviewScreen(Screen):#点击预览 self.meta = None def initialization(self): - global album_preview_popup_screen ,album_preview_popup_img + global album_preview_popup_screen ,album_preview_popup_delet_label,album_preview_popup_img,album_preview_popup_delet_can_label,album_preview_popup_delet_con_label if album_preview_popup_screen == None: album_preview_popup_screen = lv.obj() @@ -7213,12 +7291,12 @@ class albumPreviewScreen(Screen):#点击预览 album_preview_popup_img = lv.img(album_preview_popup_screen) - album_preview_popup_img.set_pos(0, 5) - + album_preview_popup_img.set_pos(39, 5) + album_preview_popup_img.set_size(50,50) # 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_pos(0, 65) 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) @@ -7226,8 +7304,8 @@ class albumPreviewScreen(Screen):#点击预览 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_pos(0, 95) + album_preview_popup_delet_con_label.set_size(64, 33) 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) @@ -7236,8 +7314,8 @@ class albumPreviewScreen(Screen):#点击预览 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_pos(64, 95) + album_preview_popup_delet_can_label.set_size(64, 33) 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) @@ -7250,7 +7328,8 @@ class albumPreviewScreen(Screen):#点击预览 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' + + album_preview_popup_img.set_src("U:/static/album/%d_camera.jpg"%(album_num_tmp))#'U:/6_camera.jpeg' def cancel_pop(self,e):#取消删除 EventMesh.publish("load_screen", {"screen": "main_menu"})#点击回到相册界面 @@ -7271,7 +7350,7 @@ class albumPreviewScreen(Screen):#点击预览 if read_album != {}: key_tmp = album_num_tmp del read_album[key_tmp]#删除内容 - + EventMesh.publish("set_camera_num",read_album) print("img is exit2",read_album) pass else:#图片不存在 diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py index 0b00f135..ea014ff4 100644 --- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py +++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py @@ -2229,7 +2229,8 @@ class CallLogManager(Abstract): def set(self, event, msg): self.check_json = msg[0] self.read_call_log = msg[1] - + with open("/usr/static/storage_file/Call_log.json","w+",encoding="utf-8") as fd: + ujson.dump(self.read_call_log,fd) # def call_usr(self,event,msg): # content = self.log[msg] # # 参数1 姓名 参数2 电话 参数3 1/主动呼叫 0别人呼叫