fix/startup: Avatar cannot be updated

Signed-off-by: lbuque <[email protected]>

Author: lbuque

m5stack/include/files.mk

@@ -4,4 +4,5 @@
 define base-files/install
 	@cp ./fs/user/* $(2)/ -rf
 	@cp ./fs/system/$(1) $(2)/res/ -rf
+	@cp ./fs/system/common/img/avatar.jpg $(2)/res/img/ -rf
 endef

m5stack/modules/startup/basic/app.py

@@ -1,7 +1,4 @@
-try:
-    import uasyncio as asyncio
-except ImportError:
-    import asyncio
+import uasyncio as asyncio
 
 
 def generator(d):

m5stack/modules/startup/basic/apps/app_list.py

@@ -1,8 +1,7 @@
 from ..app import AppBase
 from widgets.image import Image
 from widgets.label import Label
-import M5
-from M5 import Widgets
+from M5 import Lcd, Widgets
 import os
 import sys
 from ..res import (
@@ -16,7 +15,7 @@
 
 
 class Rectangle:
-    def __init__(self, x, y, w, h, color, fill_c, parent=M5.Lcd) -> None:
+    def __init__(self, x, y, w, h, color, fill_c, parent=Lcd) -> None:
         self._x = x
         self._y = y
         self._w = w
@@ -87,7 +86,7 @@ def __init__(self, icos: dict, data=None) -> None:
         pass
 
     def on_install(self):
-        M5.Lcd.drawImage(APPLIST_UNSELECTED_IMG, 5 + 62 * 3, 0)
+        Lcd.drawImage(APPLIST_UNSELECTED_IMG, 5 + 62 * 3, 0)
 
     def on_launch(self):
         self._files = FileList("apps")
@@ -96,17 +95,12 @@ def on_launch(self):
         self._file_pos = 0
 
     def on_view(self):
-        M5.Lcd.drawImage(APPLIST_SELECTED_IMG, 5 + 62 * 3, 0)
-
         self._origin_x = 0
         self._origin_y = 56
 
-        self._bg_img = Image(use_sprite=False)
-        self._bg_img.set_pos(self._origin_x + 4, self._origin_y + 4)
-        self._bg_img.set_size(312, 156)
-        self._bg_img.set_src(APPLIST_IMG)
-
-        M5.Lcd.drawImage(BAR5_IMG, 0, 220)
+        Lcd.drawImage(APPLIST_SELECTED_IMG, 5 + 62 * 3, 0)
+        Lcd.drawImage(APPLIST_IMG, self._origin_x + 4, self._origin_y + 4)
+        Lcd.drawImage(BAR5_IMG, 0, 220)
 
         self._line_spacing = 36 + 2 + 2
         self._left_cursor_x = self._origin_x + 4
@@ -125,7 +119,7 @@ def on_view(self):
         self._right_cursor_y = self._origin_y + 4 + 2
 
         self._rect1 = Rectangle(
-            self._right_cursor_x, self._right_cursor_y, 10, 36, 0xFEFEFE, 0xFEFEFE, parent=M5.Lcd
+            self._right_cursor_x, self._right_cursor_y, 10, 36, 0xFEFEFE, 0xFEFEFE, parent=Lcd
         )
 
         self._right_img = Image(use_sprite=False)
@@ -186,8 +180,8 @@ def on_view(self):
             file and label and label.setText(file)
 
     def on_exit(self):
-        M5.Lcd.drawImage(APPLIST_UNSELECTED_IMG, 5 + 62 * 3, 0)
-        del self._bg_img, self._left_img, self._right_img
+        Lcd.drawImage(APPLIST_UNSELECTED_IMG, 5 + 62 * 3, 0)
+        del self._left_img, self._right_img
         del self._label0, self._label1, self._label2, self._label3, self._labels
         del self._rect0
         del self._files, self._max_file_num, self._cursor_pos, self._file_pos
@@ -202,14 +196,11 @@ async def _btnb_event_handler(self, fw):
         self._rect1.set_pos(
             self._right_cursor_x, self._right_cursor_y + self._cursor_pos * self._line_spacing
         )
-        # M5.Lcd.fillRect(self._left_cursor_x, self._left_cursor_y + self._cursor_pos * self._line_spacing, 10, 36, 0xfefefe)
-        # M5.Lcd.fillRect(self._right_cursor_x, self._right_cursor_y + self._cursor_pos * self._line_spacing, 10, 36, 0xfefefe)
         if self._file_pos + 1 == len(self._files):
             self._cursor_pos = 0
         else:
             self._cursor_pos = (self._cursor_pos + 1) % self._max_file_num
         self._file_pos = (self._file_pos + 1) % len(self._files)
-        # self._bg_img._draw(False)
         self._left_img.set_pos(
             self._left_cursor_x, self._left_cursor_y + self._cursor_pos * self._line_spacing
         )

m5stack/modules/startup/basic/apps/app_run.py

@@ -1,7 +1,5 @@
 from ..app import AppBase
-import M5
-from M5 import Widgets
-from widgets.label import Label
+from M5 import Lcd, Widgets
 import esp32
 import sys
 import machine
@@ -28,65 +26,35 @@ def __init__(self, icos: dict, data=None) -> None:
         super().__init__()
 
     def on_install(self):
-        M5.Lcd.drawImage(APPRUN_UNSELECTED_IMG, 5 + 62 * 2, 0)
+        Lcd.drawImage(APPRUN_UNSELECTED_IMG, 5 + 62 * 2, 0)
 
     def on_launch(self):
         self._mtime_text, self._account_text, self._ver_text = self._get_file_info("main.py")
 
     def on_view(self):
-        M5.Lcd.drawImage(APPRUN_SELECTED_IMG, 5 + 62 * 2, 0)
-
         self._origin_x = 0
         self._origin_y = 56
+        Lcd.drawImage(APPRUN_SELECTED_IMG, 5 + 62 * 2, 0)
+        Lcd.fillRect(self._origin_x, self._origin_y, 320, 184, 0x000000)
+        Lcd.drawImage(RUN_IMG, self._origin_x + 4, self._origin_y + 4)
+        Lcd.drawImage(BAR4_IMG, self._origin_x, 220)
+
+        # file name
+        Lcd.setFont(Widgets.FONTS.DejaVu18)
+        Lcd.setTextColor(0x000000, 0xEEEEEF)
+        Lcd.drawString("main.py", 4 + 10, self._origin_y + 4 + 4)
+
+        Lcd.setFont(Widgets.FONTS.DejaVu12)
+        Lcd.setTextColor(0x000000, 0xDCDDDD)
+        Lcd.drawString(self._mtime_text, 4 + 10 + 8, self._origin_y + 4 + 4 + 20 + 6)
 
-        M5.Lcd.fillRect(self._origin_x, self._origin_y, 320, 184, 0x000000)
-
-        M5.Lcd.drawImage(RUN_IMG, self._origin_x + 4, self._origin_y + 4)
-        M5.Lcd.drawImage(BAR4_IMG, self._origin_x, 220)
-
-        self._name_label = Label(
-            "name",
-            4 + 10,
-            self._origin_y + 4 + 4,
-            w=312,
-            fg_color=0x000000,
-            bg_color=0xEEEEEF,
-            font=Widgets.FONTS.DejaVu18,
-        )
-        self._name_label.setText("main.py")
-
-        self._mtime_label = Label(
-            "Time: 2023/5/14 12:23:43",
-            4 + 10 + 8,
-            self._origin_y + 4 + 4 + 20 + 6,
-            w=312,
-            fg_color=0x000000,
-            bg_color=0xDCDDDD,
-            font=Widgets.FONTS.DejaVu12,
-        )
-        self._mtime_label.setText(self._mtime_text)
-
-        self._account_label = Label(
-            "Account: XXABC",
-            4 + 10 + 8,
-            self._origin_y + 4 + 4 + 20 + 6 + 18,
-            w=312,
-            fg_color=0x000000,
-            bg_color=0xDCDDDD,
-            font=Widgets.FONTS.DejaVu12,
-        )
-        self._account_label.setText(self._account_text)
-
-        self._ver_label = Label(
-            "Ver: UIFLOW2.0 a18",
-            4 + 10 + 8,
-            self._origin_y + 4 + 4 + 20 + 6 + 18 + 18,
-            w=312,
-            fg_color=0x000000,
-            bg_color=0xDCDDDD,
-            font=Widgets.FONTS.DejaVu12,
-        )
-        self._ver_label.setText(self._ver_text)
+        Lcd.setFont(Widgets.FONTS.DejaVu12)
+        Lcd.setTextColor(0x000000, 0xDCDDDD)
+        Lcd.drawString(self._account_text, 4 + 10 + 8, self._origin_y + 4 + 4 + 20 + 6 + 18)
+
+        Lcd.setFont(Widgets.FONTS.DejaVu12)
+        Lcd.setTextColor(0x000000, 0xDCDDDD)
+        Lcd.drawString(self._ver_text, 4 + 10 + 8, self._origin_y + 4 + 4 + 20 + 6 + 18 + 18)
 
     def on_ready(self):
         pass
@@ -95,14 +63,13 @@ def on_hide(self):
         pass
 
     def on_exit(self):
-        M5.Lcd.drawImage(APPRUN_UNSELECTED_IMG, 5 + 62 * 2, 0)
-        del self._name_label, self._mtime_label, self._account_label, self._ver_label
+        Lcd.drawImage(APPRUN_UNSELECTED_IMG, 5 + 62 * 2, 0)
         del self._origin_x, self._origin_y
         del self._mtime_text, self._account_text, self._ver_text
 
-    async def _btna_event_handler(self, fw):
-        # print("_btna_event_handler")
-        pass
+    # async def _btna_event_handler(self, fw):
+    #     # print("_btna_event_handler")
+    #     pass
 
     async def _btnb_event_handler(self, fw):
         # print("_btnb_event_handler")

m5stack/modules/startup/basic/apps/dev.py

@@ -31,6 +31,8 @@
     BATTERY_GREEN_IMG,
     BATTERY_BLACK_CHARGE_IMG,
     BATTERY_BLACK_IMG,
+    AVATAR_IMG,
+    USER_AVATAR_PATH,
 )
 
 try:
@@ -85,8 +87,6 @@ def on_launch(self):
         self._status_bar_src = self._get_bar_src()
         self._network_status = self._get_network_status()
         self._cloud_status = self._get_cloud_status()
-        self._network_status_src = _NETWORK_STATUS_ICOS[self._network_status]
-        self._cloud_status_src = _CLOUD_STATUS_ICOS[self._cloud_status]
         self._battery_src = self._get_battery_src(
             M5.Power.getBatteryLevel(), M5.Power.isCharging()
         )
@@ -132,7 +132,11 @@ def on_view(self):
         self._avatar_img.set_pos(130, self._origin_y + 100)
         self._avatar_img.set_size(56, 56)
         self._avatar_img.set_scale(0.28, 0.28)
-        self._avatar_img.set_src(self._avatar_src)
+        try:
+            os.stat(self._avatar_src)
+            self._avatar_img.set_src(self._avatar_src)
+        except OSError:
+            self._avatar_img.set_src(AVATAR_IMG)
 
         self._bar_img = Image(use_sprite=False)
         self._bar_img.set_pos(0, self._origin_y + 164)
@@ -142,12 +146,12 @@ def on_view(self):
         self._network_img = Image(use_sprite=False)
         self._network_img.set_pos(320 - 56 - 20 - 5 - 20 - 5, self._origin_y + 164)
         self._network_img.set_size(20, 20)
-        self._network_img.set_src(self._network_status_src)
+        self._network_img.set_src(_NETWORK_STATUS_ICOS[self._network_status])
 
         self._cloud_img = Image(use_sprite=False)
         self._cloud_img.set_pos(320 - 56 - 20 - 5, self._origin_y + 164)
         self._cloud_img.set_size(20, 20)
-        self._cloud_img.set_src(self._cloud_status_src)
+        self._cloud_img.set_src(_CLOUD_STATUS_ICOS[self._cloud_status])
 
         self._battery_img = Image(use_sprite=False)
         self._battery_img.set_pos(320 - 56, self._origin_y + 164)
@@ -181,9 +185,6 @@ async def on_run(self):
 
             t = self._get_account()
             if t != self._account_text or refresh_bg:
-                print(refresh_bg)
-                print(self._account_text)
-                print(t)
                 self._account_text = t
                 self._account_label.setText(self._account_text)
 
@@ -194,7 +195,7 @@ async def on_run(self):
                     os.stat(self._avatar_src)
                     self._avatar_img.set_src(self._avatar_src)
                 except OSError:
-                    asyncio.create_task(self._dl_avatar(self._avatar_src))
+                    self._dl_task = asyncio.create_task(self._dl_avatar(self._avatar_src))
             elif refresh_bg:
                 self._avatar_img._draw(False)
 
@@ -234,6 +235,11 @@ async def on_run(self):
             refresh_bar = False
             await asyncio.sleep_ms(1500)
 
+    def on_hide(self):
+        if hasattr(self, "_dl_task"):
+            self._dl_task.cancel()
+        self._task.cancel()
+
     def on_exit(self):
         M5.Lcd.drawImage(DEVELOP_UNSELECTED_IMG, 5 + 62 * 1, 0)
         del self._bg_img, self._mac_label, self._account_label, self._avatar_img
@@ -246,8 +252,6 @@ def on_exit(self):
         del self._status_bar_src
         del self._network_status
         del self._cloud_status
-        del self._network_status_src
-        del self._cloud_status_src
         del self._battery_src
         del self._battery_text
         del self._avatar_src
@@ -268,18 +272,22 @@ async def _dl_avatar(self, dst):
         if _HAS_SERVER is True and M5Things.status() is 2:
             infos = M5Things.info()
             if len(infos[4]) is 0:
-                self._avatar_img.set_src("/system/common/img/avatar.jpg")
+                self._avatar_img.set_src(AVATAR_IMG)
             else:
                 try:
-                    rsp = requests.get("https://community.m5stack.com" + str(infos[4]))
+                    rsp = requests.get("http://community.m5stack.com" + str(infos[4]))
                     f = open(dst, "wb")
                     f.write(rsp.content)
                     f.close()
+                    self._avatar_img.set_src(dst)
+                except Exception as e:
+                    print(e)
+                    os.remove(dst)
+                    self._avatar_img.set_src(AVATAR_IMG)
+                finally:
                     rsp.close()
-                except:
-                    self._avatar_img.set_src("/system/common/img/avatar.jpg")
         else:
-            self._avatar_img.set_src("/system/common/img/avatar.jpg")
+            self._avatar_img.set_src(AVATAR_IMG)
 
     @staticmethod
     def _get_mac():
@@ -298,11 +306,11 @@ def _get_avatar():
         if _HAS_SERVER is True and M5Things.status() is 2:
             infos = M5Things.info()
             if len(infos[4]) is 0:
-                return "/system/common/img/avatar.jpg"
+                return AVATAR_IMG
             else:
-                return "/system/common/" + str(infos[4]).split("/")[-1]
+                return USER_AVATAR_PATH + str(infos[4]).split("/")[-1]
         else:
-            return "/system/common/img/avatar.jpg"
+            return AVATAR_IMG
 
     def _get_bg_src(self):
         if _HAS_SERVER is True and M5Things.status() is 2:

m5stack/modules/startup/basic/apps/ezdata.py

@@ -28,11 +28,11 @@ def on_exit(self):
         M5.Lcd.drawImage(EZDATA_UNSELECTED_IMG, 5 + 62 * 4, 0)
         del self._origin_x, self._origin_y
 
-    async def _btna_event_handler(self, fw):
-        pass
+    # async def _btna_event_handler(self, fw):
+    #     pass
 
-    async def _btnb_event_handler(self, fw):
-        pass
+    # async def _btnb_event_handler(self, fw):
+    #     pass
 
-    async def _btnc_event_handler(self, fw):
-        pass
+    # async def _btnc_event_handler(self, fw):
+    #     pass