W9:添加缺失的图片文件
authordxy15521469561 <1731678236@qq.com>
Wed, 24 Jul 2024 09:30:50 +0000 (17:30 +0800)
committerdxy15521469561 <1731678236@qq.com>
Wed, 24 Jul 2024 09:30:50 +0000 (17:30 +0800)
2.sdk-ZY/project/W9/sdk/services/microPython/ports/quectel/core/main_init.py
2.sdk-ZY/project/W9/sdk/services/microPython/ports/quectel/core/ui_setting.py
2.sdk-ZY/project/W9/usr/static/find_phone.png [new file with mode: 0644]
2.sdk/project/W8/sdk/services/microPython/ports/quectel/core/ui_setting.py

index fd07bd0..308ceac 100644 (file)
@@ -138,14 +138,10 @@ def main_init():
         ui.add_screen(_ui_setting.ImeiScreen()) 
         ui.add_screen(_ui_setting.AppScreen()) 
         ui.add_screen(_ui_setting.BrightnessScreen()) 
-        ui.add_screen(_ui_setting.VolumeScreen()) 
         ui.add_screen(_ui_setting.RestoreScreen()) 
         ui.add_screen(_ui_setting.PoweroffScreen()) 
         ui.add_screen(_ui_setting.VersionScreen()) 
         ui.add_screen(_ui_setting.UpdateScreen()) 
-        ui.add_screen(_ui_setting.AlarmvolumeScreen()) 
-        ui.add_screen(_ui_setting.MsgvolumeScreen()) 
-        ui.add_screen(_ui_setting.PhoneringScreen()) 
         ui.add_screen(_ui_setting.totalvolumeScreen()) 
         ui.add_screen(_ui_setting.PoweroffConfirmScreen()) 
         ui.add_screen(_ui_setting.PowerOnScreen())
index 7d3a573..427b684 100644 (file)
@@ -1067,10 +1067,10 @@ class UpdateScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "setting"})
        
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "setting"})
+        EventMesh.publish("return_prev_screen")
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "setting"})
+       EventMesh.publish("return_prev_screen")
         
     def btn8_press(self):
         EventMesh.publish("watch_top_show")
@@ -1118,7 +1118,7 @@ class VersionScreen(Screen):
    
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "setting"})
+        EventMesh.publish("return_prev_screen")
 
     def btn8_press(self):
         EventMesh.publish("watch_top_show")
@@ -1500,7 +1500,7 @@ class DialswitchScreen(Screen):
 
 
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "setting"})
+        EventMesh.publish("return_prev_screen")
 
     def button_cb(self,e,msg):
         code = e.get_code()
@@ -1634,7 +1634,7 @@ class ThemeswitchScreen(Screen):#主题风格选择
                 EventMesh.publish("set_mainmenu",msg = ["2",0])   
                 EventMesh.publish("load_screen", {"screen": "main_menu"})
     def done_return(self): 
-        EventMesh.publish("load_screen", {"screen": "setting"})
+        EventMesh.publish("return_prev_screen")
 
     def btn8_press(self):
         EventMesh.publish("watch_top_show")
@@ -1698,7 +1698,7 @@ class ImeiScreen(Screen):
         EventMesh.publish("return_prev_screen")
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "setting"})
+        EventMesh.publish("return_prev_screen")
         
     
 
@@ -1730,10 +1730,10 @@ class AppScreen(Screen):
                 EventMesh.publish("return_prev_screen")
 
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "setting"})
+        EventMesh.publish("return_prev_screen")
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "setting"})
+        EventMesh.publish("return_prev_screen")
 
     def btn8_press(self):
         EventMesh.publish("watch_top_show")
@@ -1890,7 +1890,7 @@ class BrightnessScreen(Screen):
         if self.time == None:
             self.time = 5
         brightness_label_time_text.set_text("{}秒".format(self.time))
-        EventMesh.publish("get_storage_config","flip_sw")
+        self.flip_sw = EventMesh.publish("get_storage_config","flip_sw")
         if self.flip_sw == None:
             self.flip_sw = 0
         if self.flip_sw == 0: 
@@ -1954,164 +1954,16 @@ class BrightnessScreen(Screen):
    
 
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "setting"})
+        EventMesh.publish("return_prev_screen")
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "setting"})
+       EventMesh.publish("return_prev_screen")
 
     def btn8_press(self):
         EventMesh.publish("watch_top_show")
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
-class VolumeScreen(Screen):
-    NAME = "volume"
-
-    def __init__(self):
-        super().__init__()
-        self.meta = volume_screen
-        volume_phone_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "phonering"})), lv.EVENT.SHORT_CLICKED, None)
-        volume_message_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "msgvolume"})), lv.EVENT.SHORT_CLICKED, None)
-        volume_alarm_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "alarmvolume"})), lv.EVENT.SHORT_CLICKED, None)
-
-    def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "setting"})
-
-    def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
-        
-    def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "setting"})
-
-
-
-class PhoneringScreen(Screen):
-    NAME = "phonering"
-
-    def __init__(self):
-        super().__init__()
-        self.level = 0
-        self.meta = phonering_screen
-        phonering_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_level(e)),
-                                     lv.EVENT.SHORT_CLICKED, None)
-        phonering_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_level(e)),
-                                     lv.EVENT.SHORT_CLICKED, None)
-        phonering_add_imgbtn.set_ext_click_area(20)
-        phonering_reduce_imgbtn.set_ext_click_area(20)
-
-    def add_level(self, e):
-        EventMesh.publish("push_add_phonering_level")
-        self.level = EventMesh.publish("get_phonering_level")
-        self.show_bar()
-
-    def reduce_level(self, e):
-        EventMesh.publish("push_reduce_phonering_level")
-        self.level = EventMesh.publish("get_phonering_level")
-        self.show_bar()
-
-    def show_bar(self):
-        phonering_bar.set_value((100 // 7) * self.level, lv.ANIM.OFF)
-
-    def initialization(self):
-        self.level = EventMesh.publish("get_phonering_level")
-        self.show_bar()
-
-    def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "volume"})
-
-    def done_left_to_right(self):
-        pass
-
-    def done_right_to_left(self):
-        pass
-    def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
-        
-    def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "volume"})
-
-
-
-class AlarmvolumeScreen(Screen):
-    NAME = "alarmvolume"
-
-    def __init__(self):
-        super().__init__()
-        self.level = 0
-        self.meta = alarmvolume_screen
-        alarmvolume_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_level(e)),
-                                     lv.EVENT.SHORT_CLICKED, None)
-        alarmvolume_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_level(e)),
-                                     lv.EVENT.SHORT_CLICKED, None)
-
-    def add_level(self, e):
-        EventMesh.publish("push_add_alarmvolume_level")
-        self.level = EventMesh.publish("get_alarmvolume_level")
-        self.show_bar()
-
-    def reduce_level(self, e):
-        EventMesh.publish("push_reduce_alarmvolume_level")
-        self.level = EventMesh.publish("get_alarmvolume_level")
-        self.show_bar()
-
-    def show_bar(self):
-        alarmvolume_bar.set_value((100 // 7) * self.level, lv.ANIM.OFF)
-
-    def initialization(self):
-        self.level = EventMesh.publish("get_alarmvolume_level")
-        self.show_bar()
-    
-    def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "volume"})
-
-    def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
-        
-    def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "volume"})
-
-
-
-class MsgvolumeScreen(Screen):
-    NAME = "msgvolume"
-
-    def __init__(self):
-        super().__init__()
-        self.level = 0
-        self.meta = msgvolume_screen
-        msgvolume_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_level(e)),
-                                     lv.EVENT.SHORT_CLICKED, None)
-        msgvolume_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_level(e)),
-                                     lv.EVENT.SHORT_CLICKED, None)
-
-    def add_level(self, e):
-        EventMesh.publish("push_add_msgvolume_level")
-        self.level = EventMesh.publish("get_msgvolume_level")
-        self.show_bar()
-
-    def reduce_level(self, e):
-        EventMesh.publish("push_reduce_msgvolume_level")
-        self.level = EventMesh.publish("get_msgvolume_level")
-        self.show_bar()
-
-    def show_bar(self):
-        msgvolume_bar.set_value((100 // 7) * self.level, lv.ANIM.OFF)
-
-    def initialization(self):
-        self.level = EventMesh.publish("get_msgvolume_level")
-        self.show_bar()
-    
-    def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "volume"})
-
-    def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
-        
-    def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "volume"})
-
-
-
 #-----------------------------------------Total--volum-------------------------------
 
 volume_adjust_screen = lv.obj()
@@ -2216,12 +2068,12 @@ class totalvolumeScreen(Screen):#总的铃声调节
 
     def done_return(self):
         self.aud.stop()
-        EventMesh.publish("load_screen", {"screen": "setting"})
+        EventMesh.publish("return_prev_screen")
 
     
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "setting"})
+        EventMesh.publish("return_prev_screen")
 
     def btn8_press(self):
         EventMesh.publish("watch_top_show")
diff --git a/2.sdk-ZY/project/W9/usr/static/find_phone.png b/2.sdk-ZY/project/W9/usr/static/find_phone.png
new file mode 100644 (file)
index 0000000..1909951
Binary files /dev/null and b/2.sdk-ZY/project/W9/usr/static/find_phone.png differ
index bf70b5e..c9d6d37 100644 (file)
@@ -1742,7 +1742,7 @@ class BrightnessScreen(Screen):
         if self.time == None:
             self.time = 5
         brightness_label_time_text.set_text("{}秒".format(self.time))
-        EventMesh.publish("get_storage_config","flip_sw")
+        self.flip_sw = EventMesh.publish("get_storage_config","flip_sw")
         if self.flip_sw == None:
             self.flip_sw = 0
         if self.flip_sw == 0: