modules/startup/tab5: Adapte new ws api.

Signed-off-by: Forairaaaaa <applesyqd@outlook.com>

Author: Forairaaaaa

m5stack/modules/startup/tab5/launcher/apps/app_ezdata.py

@@ -4,7 +4,6 @@
 
 from .app import AppBase
 from ..common import Ezdata, debug_print
-from ..hal import get_hal
 import lvgl as lv
 import asyncio
 import time
@@ -114,6 +113,40 @@ def __init__(self, parent: lv.obj, data: list):
  self._Item(panel, str(item), i * 84)
 
 
+class ViewDict(ViewBase):
+ class _Item:
+ def __init__(self, parent: lv.obj, data: str, pos_y: int):
+ panel = lv.obj(parent)
+ panel.set_size(1044, 55)
+ panel.align(lv.ALIGN.TOP_LEFT, 0, pos_y)
+ panel.set_style_radius(16, lv.PART.MAIN)
+ panel.set_style_bg_color(lv.color_hex(0xE0EDFF), lv.PART.MAIN)
+ panel.set_style_border_width(0, lv.PART.MAIN)
+ panel.set_style_pad_all(0, lv.PART.MAIN)
+
+ label = lv.label(panel)
+ label.set_text(data)
+ label.align(lv.ALIGN.LEFT_MID, 34, 0)
+ label.set_style_text_color(lv.color_hex(0x272F43), lv.PART.MAIN)
+ label.set_style_text_font(lv.font_montserrat_30, lv.PART.MAIN)
+
+ def __init__(self, parent: lv.obj, data: dict):
+ super().__init__(parent, data)
+
+ panel = lv.obj(parent)
+ panel.set_size(1092, 429)
+ panel.align(lv.ALIGN.CENTER, 0, -20)
+ panel.set_style_bg_opa(lv.OPA.TRANSP, lv.PART.MAIN)
+ panel.set_style_border_width(0, lv.PART.MAIN)
+ panel.set_style_pad_all(0, lv.PART.MAIN)
+ panel.set_style_pad_left(24, lv.PART.MAIN)
+ panel.set_style_pad_top(28, lv.PART.MAIN)
+
+ data_dict = data.get("value")
+ for i, (key, value) in enumerate(data_dict.items()):
+ self._Item(panel, f"{str(key)}: {str(value)}", i * 84)
+
+
 class AppEzdata(AppBase):
  async def main(self):
  self._view = None
@@ -148,8 +181,11 @@ def _create_view(self):
  self._view = ViewNumber(self.get_app_panel(), data)
  elif isinstance(value, list):
  self._view = ViewArray(self.get_app_panel(), data)
+ elif isinstance(value, dict):
+ self._view = ViewDict(self.get_app_panel(), data)
  else:
  print("unsupported data type:", type(value))
 
  def _handle_data_changed(self):
+ debug_print("data changed")
  self._create_view()

m5stack/modules/startup/tab5/launcher/common/ezdata.py

@@ -26,10 +26,25 @@ class _EzdataClientWebsocket:
  DEVICE_DATA = 104
  DEVICE_DATA_FILE = 105
  DEVICE_REQUEST_ERROR = 500
-
- def __init__(self, device_token: str, on_data_changed: Signal):
+ DEVICE_USER_SCAN = 106
+ DEVICE_USER_UPDATE_DATA = 107
+ DEVICE_USER_DELETE_DATA = 108
+ DEVICE_USER_ADD_DATA = 109
+
+ DATA_CHANGE_TYPE_LIST = [
+ DEVICE_ADD_DATA,
+ DEVICE_UPDATE_DATA,
+ DEVICE_DELETE_DATA,
+ DEVICE_DATA_LIST,
+ DEVICE_USER_UPDATE_DATA,
+ DEVICE_USER_DELETE_DATA,
+ DEVICE_USER_ADD_DATA,
+ ]
+
+ def __init__(self, device_token: str, on_data_changed: Signal, on_data_list_changed: Signal):
  self._device_token = device_token
  self._on_data_changed = on_data_changed
+ self._on_data_list_changed = on_data_list_changed
  self._ws: WebsocketClient | None = None
  self._ws_last_heartbeat_time = 0
  self._data = {}
@@ -83,6 +98,8 @@ async def fetch_all_data(self):
  if self._ws is None:
  return
 
+ debug_print("fetch all data")
+
  self._data.clear()
 
  for i in range(10):
@@ -102,22 +119,24 @@ async def fetch_all_data(self):
  response = json.loads(resp)
  if response.get("code") == 200:
  self._data = response.get("body")
- # debug_print("fetch first data success:", self._data)
+ # debug_print("fetch all data success:", self._data)
+ # pretty print
+
  return
 
  except Exception as e:
- debug_print("fetch first data failed:", e)
+ debug_print("fetch all data failed:", e)
  await asyncio.sleep(1)
  continue
 
  self._data.clear()
- raise Exception("max fetch data retry")
+ raise Exception("max fetch all data retry")
 
- def update(self):
- self._receive()
+ async def update(self):
+ await self._receive()
  self._heartbeat()
 
- def _receive(self):
+ async def _receive(self):
  if self._ws is None:
  return
 
@@ -126,7 +145,7 @@ def _receive(self):
  if not msg:
  return
 
- # debug_print("ws recv:", msg)
+ debug_print("ws recv:", msg)
 
  # Skip heartbeat
  if msg == "pong":
@@ -136,14 +155,13 @@ def _receive(self):
  response = json.loads(msg)
  if response.get("code") == 200:
  cmd = response.get("cmd")
- if cmd in [
- self.DEVICE_ADD_DATA,
- self.DEVICE_UPDATE_DATA,
- self.DEVICE_DELETE_DATA,
- self.DEVICE_DATA_LIST,
- ]:
- self.fetch_all_data()
+ if cmd in self.DATA_CHANGE_TYPE_LIST:
+ await self.fetch_all_data()
  self._on_data_changed.emit()
+ self._on_data_list_changed.emit()
+ else:
+ debug_print("unhandled cmd:", cmd)
+
  else:
  print("ws recv error msg:", msg)
 
@@ -219,14 +237,16 @@ async def _ezdata_task():
 
  # Create ezdata websocket client and init
  Ezdata._client = _EzdataClientWebsocket(
- Ezdata._device_token, Ezdata.on_selected_data_changed
+ Ezdata._device_token,
+ Ezdata.on_selected_data_changed,
+ Ezdata.on_data_list_changed,
  )
  await Ezdata._client.init()
  Ezdata._set_state(Ezdata.State.NORMAL)
 
  # Keep ezdata websocket client running
  while True:
- Ezdata._client.update()
+ await Ezdata._client.update()
  await asyncio.sleep(0.2)
 
  except Exception as e: