From: dxy15521469561 <1731678236@qq.com>
Date: Mon, 21 Aug 2023 02:51:22 +0000 (+0800)
Subject: k01:
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=17dcd45758007664be048f3b48264232deb6e730;p=mirrors%2FASR1603_G5.git

k01:
加入拍照ui
---

diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
index 867ae05a..f4fe1e86 100644
--- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
+++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
@@ -111,24 +111,26 @@ class BtnDevice(Abstract):
             return
         if status == 1:#拔出
             print("USB OUT")
-            # if(self.GPIO41_status == 1):
-            #     EventMesh.publish("btn8_press")
-            #self.__pwk_timer.start(self.__PowerDownTimeOut, 0, self.pwk_press_cb)
-            EventMesh.publish("load_screen", {"screen": "charge_in"})
-
+            screen_NAME = EventMesh.publish("get_screen_NAME")
+            if screen_NAME != None:
+                if screen_NAME == "poweron":
+                    return
+            
+            bat_tmp = EventMesh.publish("screen_get_battery")
+            if bat_tmp !=  None:
+                if bat_tmp[0] == "1":
+                    EventMesh.publish("load_screen", {"screen": "charge_in"})
             pass
         elif status == 0:#插入usb
             print("USB IN")
-            EventMesh.publish("load_screen", {"screen": "charge_out"})
-            # self.__pwk_timer.stop()
-            # # print("btn_back:{}".format(mdls.screen_size_style[mdls.models][1]))
-            # if self.pwk_press != 0:
-            #     self.pwk_press = 0
-            #     return
-            # if(self.GPIO41_status == 1):
-            #     EventMesh.publish("btn8_press")
-            #pass
-
+            screen_NAME = EventMesh.publish("get_screen_NAME")
+            if screen_NAME != None:
+                if screen_NAME == "poweron":
+                    return
+            bat_tmp = EventMesh.publish("screen_get_battery")
+            if bat_tmp !=  None:
+                if bat_tmp[0] == "0":
+                    EventMesh.publish("load_screen", {"screen": "charge_out"})
     
 
     def start(self):
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 37d072e7..94f93600 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,28 @@ MainMenu2x+=1
 # 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)
+label_text.set_size(0, 0)
+label_text.set_text("{}".format(MainMenu2_num))
+MainMenu2_img_toolbox = lv.img(MainMenu2_camera)
+MainMenu2_img_toolbox.set_size(80,80)
+MainMenu2_img_toolbox.set_pos(24,10)
+MainMenu2_img_toolbox.set_src("U:/static/IMAGE_ONE_PAGE_CAMERA.png")
+MainMenu2_img_toolbox.add_flag(lv.obj.FLAG.CLICKABLE)
+MainMenu2_img_toolbox.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
+MainMenu2_img_toolbox_txt = lv.label(MainMenu2_camera)
+MainMenu2_img_toolbox_txt.set_pos(int(0),int(100))
+MainMenu2_img_toolbox_txt.set_size(128,20)
+MainMenu2_img_toolbox_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+MainMenu2_img_toolbox_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+MainMenu2_img_toolbox_txt.set_text("拍照")
+MainMenu2_img_toolbox_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)
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 def5c4f5..2ddef655 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-16 20:27:35" 
+Build_Time="2023-08-19  9:45:12" 
diff --git a/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_CAMERA.png b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_CAMERA.png
new file mode 100644
index 00000000..1931413c
Binary files /dev/null and b/2.sdk/project/K01/usr/static/IMAGE_ONE_PAGE_CAMERA.png differ
diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
index 4b0b2d74..29178ce3 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
@@ -125,9 +125,6 @@ class BtnDevice(Abstract):
             if screen_NAME != None:
                 if screen_NAME == "poweron":
                     return
-            # if(self.GPIO26_status == 1):
-            #     EventMesh.publish("btn8_press")
-            #self.__pwk_timer.start(self.__PowerDownTimeOut, 0, self.pwk_press_cb)
             bat_tmp = EventMesh.publish("screen_get_battery")
             if bat_tmp !=  None:
                 if bat_tmp[0] == "1":
@@ -142,14 +139,6 @@ class BtnDevice(Abstract):
             if bat_tmp !=  None:
                 if bat_tmp[0] == "0":
                     EventMesh.publish("load_screen", {"screen": "charge_out"})
-            # self.__pwk_timer.stop()
-            # # print("btn_back:{}".format(mdls.screen_size_style[mdls.models][1]))
-            # if self.pwk_press != 0:
-            #     self.pwk_press = 0
-            #     return
-            # if(self.GPIO26_status == 1):
-            #     EventMesh.publish("btn8_press")
-            #pass