From 24da610e0d9a690704bd7ba2de03030b5f58055c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= Date: Mon, 30 Mar 2026 21:19:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20FREETEXT=20=E6=A8=A1=E5=BC=8F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=BB=9A=E5=8A=A8=E6=9D=A1=E5=92=8C=E5=85=89=E6=A0=87?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8\n\n-=20=E6=B7=BB=E5=8A=A0=20textScrollOffset?= =?UTF-8?q?=20=E5=8F=98=E9=87=8F=E8=B7=9F=E8=B8=AA=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE\n-=20UP/DOWN=20=E6=8C=89=E9=92=AE=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=85=89=E6=A0=87\n-=20=E6=96=87=E6=9C=AC=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=97=B6=E8=87=AA=E5=8A=A8=E6=BB=9A=E5=8A=A8=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E5=85=89=E6=A0=87=E5=8F=AF=E8=A7=81\n-=20=E7=BB=98?= =?UTF-8?q?=E5=88=B6=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=98=BE=E7=A4=BA=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E4=BD=8D=E7=BD=AE\n-=20=E8=BF=9B=E5=85=A5=20FREETEXT?= =?UTF-8?q?=20=E6=97=B6=E9=87=8D=E7=BD=AE=E6=BB=9A=E5=8A=A8=E5=81=8F?= =?UTF-8?q?=E7=A7=BB"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/CannedMessageModule.cpp | 72 ++++++++++++++++++- .../src/modules/CannedMessageModule.h | 1 + 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/code/firmware-2.7.15.567b8ea/src/modules/CannedMessageModule.cpp b/code/firmware-2.7.15.567b8ea/src/modules/CannedMessageModule.cpp index abe85f8..6e5b8ee 100644 --- a/code/firmware-2.7.15.567b8ea/src/modules/CannedMessageModule.cpp +++ b/code/firmware-2.7.15.567b8ea/src/modules/CannedMessageModule.cpp @@ -394,6 +394,8 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event) case CANNED_MESSAGE_RUN_STATE_ACTIVE: if (event->inputEvent == INPUT_BROKER_LEFT || event->inputEvent == INPUT_BROKER_RIGHT) { runState = CANNED_MESSAGE_RUN_STATE_FREETEXT; + textScrollOffset = 0; // 重置滚动偏移 + cursor = 0; requestFocus(); UIFrameEvent e; e.action = UIFrameEvent::Action::REGENERATE_FRAMESET; @@ -420,6 +422,8 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event) if (event->kbchar >= 32 && event->kbchar <= 126) { LOG_DEBUG("CannedMessage: Entering FREETEXT, kbchar=%d", event->kbchar); runState = CANNED_MESSAGE_RUN_STATE_FREETEXT; + textScrollOffset = 0; // 重置滚动偏移 + cursor = 0; requestFocus(); UIFrameEvent e; e.action = UIFrameEvent::Action::REGENERATE_FRAMESET; @@ -935,6 +939,28 @@ bool CannedMessageModule::handleFreeTextInput(const InputEvent *event) return true; } + // UP/DOWN keys: move cursor in FREETEXT mode + if (event->inputEvent == INPUT_BROKER_UP) { + if (cursor > 0) { + cursor--; + // 确保光标在可见区域内，自动滚动 + if (cursor < textScrollOffset) { + textScrollOffset = cursor; + } + } + lastTouchMillis = millis(); + screen->forceDisplay(); + return true; + } + if (event->inputEvent == INPUT_BROKER_DOWN) { + if (cursor < freetext.length()) { + cursor++; + } + lastTouchMillis = millis(); + screen->forceDisplay(); + return true; + } + // '#' key: cycle input mode DIGIT -> LOWER -> UPPER -> DIGIT ... if (event->kbchar == '#') { // First, commit any pending multi-tap character @@ -1334,6 +1360,14 @@ int32_t CannedMessageModule::runOnce() this->freetext.substring(this->cursor); } this->cursor++; + + // 自动滚动：确保光标在可见区域内 + // 假设屏幕宽度约 21 个字符 (128px / 6px) + const int visibleChars = 20; + if (this->cursor > this->textScrollOffset + visibleChars) { + this->textScrollOffset = this->cursor - visibleChars; + } + uint16_t maxChars = meshtastic_Constants_DATA_PAYLOAD_LEN - (moduleConfig.canned_message.send_bell ? 1 : 0); if (this->freetext.length() > maxChars) { this->cursor = maxChars; @@ -1465,8 +1499,42 @@ void CannedMessageModule::drawKeyboard(OLEDDisplay *display, OLEDDisplayUiState display->setColor(OLEDDISPLAY_COLOR::WHITE); - display->drawStringMaxWidth(0, 0, display->getWidth(), - cannedMessageModule->drawWithCursor(cannedMessageModule->freetext, cannedMessageModule->cursor)); + // 绘制带滚动的文本输入区域 + { + String text = cannedMessageModule->freetext; + unsigned int cursorPos = cannedMessageModule->cursor; + unsigned int scrollOffset = cannedMessageModule->textScrollOffset; + + // 计算可见区域宽度（减去滚动条宽度） + int maxWidth = display->getWidth() - 4; // 留出滚动条空间 + + // 获取显示文本（从 scrollOffset 开始） + String displayText = text.substring(scrollOffset); + + // 添加光标 + String textWithCursor = displayText.substring(0, cursorPos - scrollOffset) + "_" + displayText.substring(cursorPos - scrollOffset); + + // 绘制文本 + display->drawStringMaxWidth(0, 0, maxWidth, textWithCursor); + + // 如果文本超出可见区域，绘制滚动条 + int totalWidth = display->getStringWidth(text); + if (totalWidth > maxWidth) { + // 计算滚动条位置 + int scrollbarHeight = 8; + int scrollbarWidth = 3; + int scrollbarX = display->getWidth() - scrollbarWidth - 1; + + // 滚动条位置与光标位置关联 + float scrollRatio = (float)cursorPos / std::max(1u, (unsigned int)text.length()); + int scrollbarY = (display->getHeight() - 20) * scrollRatio; + scrollbarY = std::max(0, std::min(scrollbarY, display->getHeight() - 20 - scrollbarHeight)); + + // 绘制滚动条 + display->setColor(OLEDDISPLAY_COLOR::WHITE); + display->fillRect(scrollbarX, 10, scrollbarWidth, scrollbarHeight); + } + } display->setFont(FONT_MEDIUM); diff --git a/code/firmware-2.7.15.567b8ea/src/modules/CannedMessageModule.h b/code/firmware-2.7.15.567b8ea/src/modules/CannedMessageModule.h index 5edbf5f..2b2f0cb 100644 --- a/code/firmware-2.7.15.567b8ea/src/modules/CannedMessageModule.h +++ b/code/firmware-2.7.15.567b8ea/src/modules/CannedMessageModule.h @@ -181,6 +181,7 @@ class CannedMessageModule : public SinglePortModule, public Observable