From 0071adcdde6c6b8387cbd987d9c2f9ec6e1c2ddc Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 31 Aug 2024 15:41:23 +0800 Subject: [PATCH] update --- ui/ui.h | 13 ++++++------ usrc/project_configs.h | 1 - usrc/service/app_core.cpp | 4 ++-- usrc/service/page/Page_main.cpp | 2 +- usrc/service/page/page.hpp | 3 ++- usrc/service/page/submenu/Page_muDeviceInfo.cpp | 15 ++++++++++++++ usrc/service/page/submenu/Page_muDeviceInfo.hpp | 27 +++++++++++++++++++++++++ 7 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 usrc/service/page/submenu/Page_muDeviceInfo.cpp create mode 100644 usrc/service/page/submenu/Page_muDeviceInfo.hpp diff --git a/ui/ui.h b/ui/ui.h index 227c1e3..eaef2cc 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -147,6 +147,7 @@ #define ob_muTmrMgr_select4 6 #define ob_muTmrMgr_select5 7 #define ob_muTmrMgr_b0 8 +#define ob_muTmrMgr_t0 9 //muAcidType.objs #define ob_muAcidType_muAcidType 0 #define ob_muAcidType_bak 1 @@ -202,12 +203,12 @@ //muDeviceInfo.objs #define ob_muDeviceInfo_muDeviceInfo 0 #define ob_muDeviceInfo_bak 1 -#define ob_muDeviceInfo_t2 2 -#define ob_muDeviceInfo_t3 3 -#define ob_muDeviceInfo_t6 4 -#define ob_muDeviceInfo_t7 5 -#define ob_muDeviceInfo_t10 6 -#define ob_muDeviceInfo_t11 7 +#define ob_muDeviceInfo_softVersTil 2 +#define ob_muDeviceInfo_softVers 3 +#define ob_muDeviceInfo_deviceIdTil 4 +#define ob_muDeviceInfo_deviceId 5 +#define ob_muDeviceInfo_manufaTil 6 +#define ob_muDeviceInfo_manufa 7 #define ob_muDeviceInfo_t0 8 //muAudit.objs #define ob_muAudit_muAudit 0 diff --git a/usrc/project_configs.h b/usrc/project_configs.h index 93ef7c3..b0604b4 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -17,7 +17,6 @@ // #define BOARD_TYPE_ID_FLASH_ADD 0x080E0000 // 板子类型 // #define SN_FLASH_ADD 0x080E0004 // 使用扇区11存储SN编码 -#define SOFTWARE_VERSION 100 // 软件版本 #define HARDWARE_VERSION 1 // 硬件版本 #define PROJECT "hand_acid_main_board" // 工程名称 #define APP_VERSION "101" diff --git a/usrc/service/app_core.cpp b/usrc/service/app_core.cpp index 73ee141..b8b7221 100644 --- a/usrc/service/app_core.cpp +++ b/usrc/service/app_core.cpp @@ -89,10 +89,10 @@ void AppCore::appsetup() { Page_changePasswd::ins()->initialize(); Page_muSettings::ins()->initialize(); Page_muUsrMgr::ins()->initialize(); + Page_muDeviceInfo::ins()->initialize(); // EventProcesser RemoteControlerEventProcesser::ins()->initialize(); - /*********************************************************************************************************************** * REG_EVENT_HANDLER * ***********************************************************************************************************************/ @@ -129,7 +129,7 @@ void AppCore::initialize() { ZLOGI(TAG, "======================= boardinfo ==================== "); ZLOGI(TAG, "project : %s ", PROJECT); - ZLOGI(TAG, "version : %d ", SOFTWARE_VERSION); + ZLOGI(TAG, "version : %s ", APP_VERSION); ZLOGI(TAG, "sn : %s", sn_get_str()); ZLOGI(TAG, "="); diff --git a/usrc/service/page/Page_main.cpp b/usrc/service/page/Page_main.cpp index bc30b67..d258981 100644 --- a/usrc/service/page/Page_main.cpp +++ b/usrc/service/page/Page_main.cpp @@ -76,7 +76,7 @@ void Page_main::OnPageLoad() { UIS->setVal(PAGE, ob_main_acidch3, GSM->getPumpSelectState(3)); // 时间位置暂时显示版本号 - UIS->setVal(PAGE, ob_main_clock, "", APP_VERSION); + // UIS->setVal(PAGE, ob_main_clock, "", APP_VERSION); // UIS->setVal(PAGE, ob_main_clock, "版本:%s", APP_VERSION); // 根据当前登录用户设置菜单页面 diff --git a/usrc/service/page/page.hpp b/usrc/service/page/page.hpp index 12955ba..d5cdd65 100644 --- a/usrc/service/page/page.hpp +++ b/usrc/service/page/page.hpp @@ -8,4 +8,5 @@ #include "submenu/Page_muAcidType.hpp" #include "submenu/Page_muInterval.hpp" #include "submenu/Page_muSettings.hpp" -#include "submenu/Page_muUsrMgr.hpp" \ No newline at end of file +#include "submenu/Page_muUsrMgr.hpp" +#include "submenu/Page_muDeviceInfo.hpp" \ No newline at end of file diff --git a/usrc/service/page/submenu/Page_muDeviceInfo.cpp b/usrc/service/page/submenu/Page_muDeviceInfo.cpp new file mode 100644 index 0000000..6fda356 --- /dev/null +++ b/usrc/service/page/submenu/Page_muDeviceInfo.cpp @@ -0,0 +1,15 @@ +#include "Page_muDeviceInfo.hpp" + +using namespace iflytop; + +#define PAGE pg_muDeviceInfo +#define TAG "Page_muDeviceInfo" +bool Page_muDeviceInfo::isBelongThisPage(int page) { return page == PAGE; } + +void Page_muDeviceInfo::OnPageLoad() { + UIS->setVal(PAGE, ob_muDeviceInfo_deviceId, "SN000000"); + UIS->setVal(PAGE, ob_muDeviceInfo_manufa, "中国黄金"); + UIS->setVal(PAGE, ob_muDeviceInfo_softVers, APP_VERSION); +} +void Page_muDeviceInfo::OnInputFieldContentChange(uint8_t bid, const char* text) {} +void Page_muDeviceInfo::OnButton(uint8_t bid, uint8_t val) {} \ No newline at end of file diff --git a/usrc/service/page/submenu/Page_muDeviceInfo.hpp b/usrc/service/page/submenu/Page_muDeviceInfo.hpp new file mode 100644 index 0000000..f746e52 --- /dev/null +++ b/usrc/service/page/submenu/Page_muDeviceInfo.hpp @@ -0,0 +1,27 @@ +#pragma once +// +#include "../page_processer.hpp" +namespace iflytop { +using namespace std; +// page: keybAcidCh +class Page_muDeviceInfo : public IPageProcesser { + private: + /* data */ + + public: + static Page_muDeviceInfo* ins() { + static Page_muDeviceInfo instance; + return &instance; + } + + private: + virtual bool isBelongThisPage(int page) override; + + virtual void OnPageLoad() override; + virtual void OnInputFieldContentChange(uint8_t bid, const char* text) override; + virtual void OnButton(uint8_t bid, uint8_t val) override; + + private: +}; + +} // namespace iflytop