From b47dd5022212d6d4408fd1a1c7c8e6dbacf68700 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 29 Aug 2023 21:34:31 +0800
Subject: [PATCH] update

---
 components/dwin/dwin_screen.cpp    | 4 ++--
 components/dwin/dwin_screen.hpp    | 6 +++---
 components/dwin/text_displayer.cpp | 1 +
 components/dwin/var_icon.cpp       | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/components/dwin/dwin_screen.cpp b/components/dwin/dwin_screen.cpp
index 1f3ccb3..00a7712 100644
--- a/components/dwin/dwin_screen.cpp
+++ b/components/dwin/dwin_screen.cpp
@@ -58,12 +58,12 @@ uint16_t DwinScreen::alloc_free_ram(uint16_t size) {
   return item->second->alloc(size);
 }
 uint16_t DwinScreen::alloc_one_text_displayer() {
-  auto item = m_rammanager_map.find(TEXT_DISPLAYER_RAM_MAP);
+  auto item = m_rammanager_map.find(LEVEL1_TEXT);
   ZASSERT(item != m_rammanager_map.end());
   return item->second->alloc();
 }
 uint16_t DwinScreen::alloc_one_var_icon() {
-  auto item = m_rammanager_map.find(VAR_ICON_RAM_MAP);
+  auto item = m_rammanager_map.find(LEVEL1_ICON);
   ZASSERT(item != m_rammanager_map.end());
   return item->second->alloc();
 }
diff --git a/components/dwin/dwin_screen.hpp b/components/dwin/dwin_screen.hpp
index add0c76..1e9dcc0 100644
--- a/components/dwin/dwin_screen.hpp
+++ b/components/dwin/dwin_screen.hpp
@@ -62,9 +62,9 @@ class Pos {
 //   uint16_t varIconSize      = 0;
 // };
 
-#define FREE_RAM_MAP           "FreeRamRamMap"
-#define TEXT_DISPLAYER_RAM_MAP "TextDisplayerRamMap"
-#define VAR_ICON_RAM_MAP       "VarIconRamMap"
+#define FREE_RAM_MAP "FreeRamRamMap"
+#define LEVEL1_TEXT  "level1_text"
+#define LEVEL1_ICON  "level1_icon"
 
 // typedef enum {
 //   kdw_freeram       = 1,
diff --git a/components/dwin/text_displayer.cpp b/components/dwin/text_displayer.cpp
index c511aeb..ee06e69 100644
--- a/components/dwin/text_displayer.cpp
+++ b/components/dwin/text_displayer.cpp
@@ -19,6 +19,7 @@ bool TextDisplayer::init(DwinScreen *dwin_screen, uint16_t valsize) {
 
 bool TextDisplayer::init(DwinScreen *dwin_screen, uint16_t descript_add, uint16_t val_add) {
   //
+  printf("TextDisplayer init %04x %04x\n", descript_add, val_add);
   m_dwin_screen  = dwin_screen;
   m_descript_add = descript_add;
   // printf("TextDisplayer init %04x\n", m_descript_add);
diff --git a/components/dwin/var_icon.cpp b/components/dwin/var_icon.cpp
index a4ea72e..774efc2 100644
--- a/components/dwin/var_icon.cpp
+++ b/components/dwin/var_icon.cpp
@@ -32,9 +32,10 @@ bool VarIcon::init(DwinScreen *dwin_screen, uint16_t descript_add) {
 //   sscanf(pos, "(%d,%d)", &posx, &posy);
 //   initcfg(m_dwin_screen->alloc_one_var_icon(), posx, posy, iconpath, initval);
 // }
-void VarIcon::initcfg(int x, int y, const char *iconpath, uint16_t initval) { initcfg(m_dwin_screen->alloc_one_var_icon(), x, y, iconpath, initval); }
+void VarIcon::initcfg(int x, int y, const char *iconpath, uint16_t initval) { initcfg(m_dwin_screen->alloc_free_ram(1), x, y, iconpath, initval); }
 
 void VarIcon::initcfg(uint16_t valpointerAdd, uint16_t posx, uint16_t posy, const char *iconpath, uint16_t initval) {
+  printf("initcfg %04x %d %d %s %d\n", valpointerAdd, posx, posy, iconpath, initval);
   int iconlib = 0;
   int iconmin = 0;
   int iconmax = 0;