board: Add access code for fire board.

Signed-off-by: luoweiyuan <luoweiyuan@m5stack.com>

Author: luoweiyuan

m5stack/boards/M5STACK_Fire/files/system/fire/SettingWifi.jpg

@@ -12,13 +12,6 @@
 import time
 from .. import res
 
-try:
-    import M5Things
-
-    _HAS_SERVER = True
-except ImportError:
-    _HAS_SERVER = False
-
 
 class RunApp(app_base.AppBase):
     def __init__(self, icos: dict, data=None) -> None:
@@ -28,7 +21,7 @@ def on_install(self):
         M5.Lcd.drawImage(res.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")
+        self._mtime_text, self._ver_text = self._get_file_info("main.py")
 
     def on_view(self):
         M5.Lcd.drawImage(res.APPRUN_SELECTED_IMG, 5 + 62 * 2, 0)
@@ -58,21 +51,10 @@ def on_view(self):
         )
         self._mtime_label.set_text(self._mtime_text)
 
-        self._account_label = widgets.Label(
-            "Account: XXABC",
-            4 + 10 + 8,
-            (56 + 4) + 4 + 20 + 6 + 18,
-            w=312,
-            fg_color=0x000000,
-            bg_color=0xDCDDDD,
-            font="/system/common/font/Montserrat-Medium-16.vlw",
-        )
-        self._account_label.set_text(self._account_text)
-
         self._ver_label = widgets.Label(
             "Ver: UIFLOW2.0 a18",
             4 + 10 + 8,
-            (56 + 4) + 4 + 20 + 6 + 18 + 18,
+            (56 + 4) + 4 + 20 + 6 + 18,
             w=312,
             fg_color=0x000000,
             bg_color=0xDCDDDD,
@@ -88,7 +70,7 @@ def on_hide(self):
 
     def on_exit(self):
         M5.Lcd.drawImage(res.APPRUN_UNSELECTED_IMG, 5 + 62 * 2, 0)
-        del self._name_label, self._mtime_label, self._account_label, self._ver_label
+        del self._name_label, self._mtime_label, self._ver_label
 
     async def _btna_event_handler(self, fw):
         pass
@@ -106,7 +88,6 @@ async def _btnc_event_handler(self, fw):
     @staticmethod
     def _get_file_info(path):
         mtime = None
-        account = None
         ver = f"Ver: UIFLOW2 {esp32.firmware_info()[3]}"
 
         try:
@@ -124,17 +105,8 @@ def _get_file_info(path):
 
         with open(path, "r") as f:
             for line in f:
-                if line.find("Account") != -1:
-                    account = line.split(":")[1].strip()
                 if line.find("Ver") != -1:
                     ver = line.split(":")[1].strip()
-                if account is not None and ver is not None:
                     break
 
-        if account is None and _HAS_SERVER and M5Things.status() == 2:
-            infos = M5Things.info()
-            account = "Account: None" if len(infos[1]) == 0 else "Account: {:s}".format(infos[1])
-        else:
-            account = "Account: None"
-
-        return (mtime, account, ver)
+        return (mtime, ver)

m5stack/boards/M5STACK_Fire/files/system/fire/SettingWifi.png

@@ -6,9 +6,7 @@
 import M5
 import widgets
 import asyncio
-import requests
 from .. import res
-import os
 import binascii
 import machine
 import network
@@ -49,6 +47,13 @@ class CloudStatus:
     CloudStatus.DISCONNECTED: res.SERVER_ERROR_IMG,
 }
 
+_BG_COLOR = 0xEEEEEF
+_LABEL_COLOR = 0x008FD7
+_VALUE_COLOR = 0x000000
+_LABEL_FONT = "/system/common/font/Montserrat-Medium-14.vlw"
+_VALUE_FONT = "/system/common/font/Montserrat-Medium-18.vlw"
+_TEXT_PANEL_W = 181
+
 
 class DevApp(app_base.AppBase):
     def __init__(self, icos: dict, data=None) -> None:
@@ -60,9 +65,7 @@ def on_install(self):
         M5.Lcd.drawImage(res.DEVELOP_UNSELECTED_IMG, 5 + 62 * 1, 0)
 
     def on_launch(self):
-        self._mac_text = self._get_mac()
-        self._account_text = self._get_account()
-        self._bg_src = self._get_bg_src()
+        self._state = self._collect_state()
         self._status_bar_src = self._get_bar_src()
         self._network_status = self._get_network_status()
         self._cloud_status = self._get_cloud_status()
@@ -72,7 +75,6 @@ def on_launch(self):
             M5.Power.getBatteryLevel(), M5.Power.isCharging()
         )
         self._battery_text = self._get_battery_text(M5.Power.getBatteryLevel())
-        self._avatar_src = self._get_avatar()
 
     def on_view(self):
         M5.Lcd.drawImage(res.DEVELOP_SELECTED_IMG, 5 + 62 * 1, 0)
@@ -83,38 +85,16 @@ def on_view(self):
         self._bg_img = widgets.Image(use_sprite=False, parent=self._lcd)
         self._bg_img.set_pos(4, 4)
         self._bg_img.set_size(312, 156)
-        self._bg_img.set_src(self._bg_src)
-
-        self._mac_label = widgets.Label(
-            "aabbcc112233",
-            4 + 6,
-            4 + 57,
-            w=177,
-            fg_color=0x000000,
-            bg_color=0xEEEEEF,
-            font="/system/common/font/Montserrat-Medium-18.vlw",
-            parent=self._lcd,
-        )
-        self._mac_label.set_text(self._mac_text)
-
-        self._account_label = widgets.Label(
-            "XXABC",
-            4 + 6,
-            4 + 57 + 40,
-            w=110,
-            h=60,
-            fg_color=0x000000,
-            bg_color=0xEEEEEF,
-            font="/system/common/font/Montserrat-Medium-18.vlw",
-            parent=self._lcd,
-        )
-        self._account_label.set_text(self._account_text)
+        self._bg_img.set_src(res.DEVELOP_BG_IMG)
+        self._lcd.fillRect(4, 4, _TEXT_PANEL_W, 156, _BG_COLOR)
 
-        self._avatar_img = widgets.Image(use_sprite=False, parent=self._lcd)
-        self._avatar_img.set_pos(130, 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)
+        self._mac_label, self._mac_value = self._create_row("Device MAC:", 8)
+        self._code_label, self._code_value = self._create_row("Access Code:", 59)
+        self._nick_label, self._nick_value = self._create_row("Nickname:", 110)
+
+        self._set_value(self._mac_value, self._state.get("mac", "-"))
+        self._set_value(self._code_value, self._state.get("pair_code", ""), fallback="")
+        self._set_value(self._nick_value, self._state.get("nick_name", ""), fallback="")
 
         self._bar_img = widgets.Image(use_sprite=False, parent=self._lcd)
         self._bar_img.set_pos(0, 164)
@@ -154,30 +134,17 @@ async def on_run(self):
         refresh_bg = False
         refresh_bar = False
         while True:
-            t = self._get_bg_src()
-            if t != self._bg_src:
-                self._bg_src = t
-                self._bg_img.set_src(self._bg_src)
-                refresh_bg = True
+            new_state = self._collect_state()
 
-            refresh_bg and self._mac_label.set_text(self._mac_text)
-
-            t = self._get_account()
-            if t != self._account_text or refresh_bg:
-                self._account_text = t
-                self._account_label.set_text(self._account_text)
-                self._lcd.push(self._origin_x, self._origin_y)
+            if new_state["pair_code"] != self._state.get("pair_code"):
+                self._state["pair_code"] = new_state["pair_code"]
+                self._set_value(self._code_value, new_state["pair_code"], fallback="")
+                refresh_bg = True
 
-            t = self._get_avatar()
-            if t != self._avatar_src:
-                self._avatar_src = t
-                try:
-                    os.stat(self._avatar_src)
-                    self._avatar_img.set_src(self._avatar_src)
-                except OSError:
-                    self._dl_task = asyncio.create_task(self._dl_avatar(self._avatar_src))
-            elif refresh_bg:
-                self._avatar_img._draw(False)
+            if new_state["nick_name"] != self._state.get("nick_name"):
+                self._state["nick_name"] = new_state["nick_name"]
+                self._set_value(self._nick_value, new_state["nick_name"], fallback="")
+                refresh_bg = True
 
             t = self._get_bar_src()
             if t != self._status_bar_src:
@@ -219,13 +186,12 @@ async def on_run(self):
             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(res.DEVELOP_UNSELECTED_IMG, 5 + 62 * 1, 0)
-        del self._bg_img, self._mac_label, self._account_label, self._avatar_img
+        del self._bg_img, self._mac_label, self._mac_value
+        del self._code_label, self._code_value, self._nick_label, self._nick_value
         del self._bar_img, self._network_img, self._cloud_img, self._battery_img
         del self._battery_label
 
@@ -238,58 +204,69 @@ async def _btnb_event_handler(self, fw):
     async def _btnc_event_handler(self, fw):
         pass
 
-    async def _dl_avatar(self, dst):
-        if _HAS_SERVER is True and M5Things.status() == 2:
-            infos = M5Things.info()
-            if len(infos[4]) == 0:
-                self._avatar_img.set_src("/system/common/img/avatar.jpg")
-            else:
-                try:
-                    rsp = requests.get("https://community.m5stack.com" + str(infos[4]))
-                    f = open(dst, "wb")
-                    f.write(rsp.content)
-                    f.close()
-                    rsp.close()
-                    self._avatar_img.set_src(dst)
-                except:
-                    self._avatar_img.set_src("/system/common/img/avatar.jpg")
-                finally:
-                    self._lcd.push(self._origin_x, self._origin_y)
-        else:
-            self._avatar_img.set_src("/system/common/img/avatar.jpg")
+    def _create_row(self, label_text, y):
+        label = widgets.Label(
+            label_text,
+            12,
+            y,
+            w=_TEXT_PANEL_W - 18,
+            h=20,
+            fg_color=_LABEL_COLOR,
+            bg_color=_BG_COLOR,
+            font=_LABEL_FONT,
+            parent=self._lcd,
+        )
+        label.set_text(label_text)
+
+        value = widgets.Label(
+            "",
+            12,
+            y + 22,
+            w=_TEXT_PANEL_W - 18,
+            h=26,
+            fg_color=_VALUE_COLOR,
+            bg_color=_BG_COLOR,
+            font=_VALUE_FONT,
+            parent=self._lcd,
+        )
+        value.set_long_mode(widgets.Label.LONG_DOT)
+        return label, value
 
     @staticmethod
-    def _get_mac():
-        return binascii.hexlify(machine.unique_id()).upper()
+    def _set_value(label, text, fallback="-"):
+        text = fallback if text is None or text == "" else str(text)
+        label.set_text(text)
 
     @staticmethod
-    def _get_account():
-        if _HAS_SERVER is True and M5Things.status() == 2:
-            infos = M5Things.info()
-            return "None" if len(infos[1]) == 0 else infos[1]
-        else:
-            return "None"
+    def _get_mac():
+        return binascii.hexlify(machine.unique_id()).decode("utf-8").upper()
 
     @staticmethod
-    def _get_avatar():
-        if _HAS_SERVER is True and M5Things.status() == 2:
-            infos = M5Things.info()
-            if len(infos[4]) == 0:
-                return "/system/common/img/avatar.jpg"
-            else:
-                return "/system/common/img/" + str(infos[4]).split("/")[-1]
-        else:
-            return "/system/common/img/avatar.jpg"
+    def _get_pair_code():
+        if _HAS_SERVER is True:
+            try:
+                if M5Things.status() == 2:
+                    return M5Things.paircode() or ""
+            except Exception:
+                pass
+        return ""
 
-    def _get_bg_src(self):
-        if _HAS_SERVER is True and M5Things.status() == 2:
-            infos = M5Things.info()
-            if infos[0] == 0:
-                return "/system/fire/developPrivate.png"
-            elif infos[0] in (1, 2):
-                return "/system/fire/developPublic.png"
-        else:
-            return "/system/fire/developPrivate.png"
+    @staticmethod
+    def _get_nick_name():
+        if _HAS_SERVER is True:
+            try:
+                if M5Things.status() == 2:
+                    return M5Things.nick_name() or ""
+            except Exception:
+                pass
+        return ""
+
+    def _collect_state(self):
+        return {
+            "mac": self._get_mac(),
+            "pair_code": self._get_pair_code(),
+            "nick_name": self._get_nick_name(),
+        }
 
     def _get_bar_src(self):
         if _HAS_SERVER is True and M5Things.status() == 2:

m5stack/boards/M5STACK_Fire/files/system/fire/develop_bg.jpg

@@ -36,9 +36,9 @@ def on_view(self):
 
         self._ssid_label = widgets.Label(
             "ssid",
-            self._origin_x + 98,
+            self._origin_x + 56 + 2,
             self._origin_y + 12,
-            w=144,
+            w=180,
             font_align=widgets.Label.LEFT_ALIGNED,
             fg_color=0x000000,
             bg_color=0xFEFEFE,
@@ -50,9 +50,9 @@ def on_view(self):
 
         self._psk_label = widgets.Label(
             "pwd",
-            self._origin_x + 98,
+            self._origin_x + 56 + 2,
             self._origin_y + 12 + 35,
-            w=144,
+            w=180,
             font_align=widgets.Label.LEFT_ALIGNED,
             fg_color=0x000000,
             bg_color=0xFEFEFE,
@@ -67,9 +67,9 @@ def on_view(self):
 
         self._server_label = widgets.Label(
             "server",
-            self._origin_x + 98,
+            self._origin_x + 56 + 2,
             self._origin_y + 12 + 35 + 34,
-            w=144,
+            w=190,
             font_align=widgets.Label.LEFT_ALIGNED,
             fg_color=0x000000,
             bg_color=0xFEFEFE,

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

@@ -37,6 +37,7 @@
     "BOOT_YES_IMG": "/system/fire/boot_Yes.png",
     "DEVELOP_SELECTED_IMG": "/system/fire/develop_selected.png",
     "DEVELOP_UNSELECTED_IMG": "/system/fire/develop_unselected.png",
+    "DEVELOP_BG_IMG": "/system/fire/develop_bg.jpg",
     "DEVELOP_PRIVATE_IMG": "/system/fire/developPrivate.png",
     "DEVELOP_PUBLIC_IMG": "/system/fire/developPublic.png",
     "EZDATA_SELECTED_IMG": "/system/fire/ezdata_selected.png",