fix: 节点列表长按切换模式,短按不处理
- 添加 onUpPressed/onDownPressed 记录按键时间 - 在 drawDynamicNodeListScreen 中调用 checkLongPress() 检测长按 - 长按(>500ms)切换模式,短按不处理
This commit is contained in:
@@ -1597,18 +1597,16 @@ int Screen::handleInputEvent(const InputEvent *event)
|
|||||||
} else if (event->inputEvent == INPUT_BROKER_RIGHT || event->inputEvent == INPUT_BROKER_USER_PRESS) {
|
} else if (event->inputEvent == INPUT_BROKER_RIGHT || event->inputEvent == INPUT_BROKER_USER_PRESS) {
|
||||||
showNextFrame();
|
showNextFrame();
|
||||||
} else if (event->inputEvent == INPUT_BROKER_UP) {
|
} else if (event->inputEvent == INPUT_BROKER_UP) {
|
||||||
// 在节点列表界面,UP 切换到上一个模式
|
// 在节点列表界面,记录按键按下时间,由渲染函数检测长按
|
||||||
if (this->ui->getUiState()->currentFrame == framesetInfo.positions.nodelist) {
|
if (this->ui->getUiState()->currentFrame == framesetInfo.positions.nodelist) {
|
||||||
graphics::NodeListRenderer::switchToPrevMode();
|
graphics::NodeListRenderer::onUpPressed();
|
||||||
setFastFramerate();
|
setFastFramerate();
|
||||||
ui->update();
|
|
||||||
}
|
}
|
||||||
} else if (event->inputEvent == INPUT_BROKER_DOWN) {
|
} else if (event->inputEvent == INPUT_BROKER_DOWN) {
|
||||||
// 在节点列表界面,DOWN 切换到下一个模式
|
// 在节点列表界面,记录按键按下时间,由渲染函数检测长按
|
||||||
if (this->ui->getUiState()->currentFrame == framesetInfo.positions.nodelist) {
|
if (this->ui->getUiState()->currentFrame == framesetInfo.positions.nodelist) {
|
||||||
graphics::NodeListRenderer::switchToNextMode();
|
graphics::NodeListRenderer::onDownPressed();
|
||||||
setFastFramerate();
|
setFastFramerate();
|
||||||
ui->update();
|
|
||||||
}
|
}
|
||||||
} else if (event->inputEvent == INPUT_BROKER_SELECT) {
|
} else if (event->inputEvent == INPUT_BROKER_SELECT) {
|
||||||
if (this->ui->getUiState()->currentFrame == framesetInfo.positions.home) {
|
if (this->ui->getUiState()->currentFrame == framesetInfo.positions.home) {
|
||||||
|
|||||||
@@ -50,6 +50,13 @@ static NodeListMode currentMode = MODE_LAST_HEARD;
|
|||||||
static int scrollIndex = 0;
|
static int scrollIndex = 0;
|
||||||
static bool autoCycleEnabled = false; // 禁用自动切换,改为手动按键控制
|
static bool autoCycleEnabled = false; // 禁用自动切换,改为手动按键控制
|
||||||
|
|
||||||
|
// 长按检测变量
|
||||||
|
static unsigned long lastUpPressTime = 0;
|
||||||
|
static unsigned long lastDownPressTime = 0;
|
||||||
|
static bool upLongPressHandled = false;
|
||||||
|
static bool downLongPressHandled = false;
|
||||||
|
#define LONG_PRESS_THRESHOLD_MS 500
|
||||||
|
|
||||||
// =============================
|
// =============================
|
||||||
// Mode Control Functions (manual UP/DOWN control)
|
// Mode Control Functions (manual UP/DOWN control)
|
||||||
// =============================
|
// =============================
|
||||||
@@ -69,6 +76,72 @@ void switchToPrevMode()
|
|||||||
currentMode = static_cast<NodeListMode>((currentMode + MODE_COUNT - 1) % MODE_COUNT);
|
currentMode = static_cast<NodeListMode>((currentMode + MODE_COUNT - 1) % MODE_COUNT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 处理 UP 按键(短按滚动,长按切换模式)
|
||||||
|
void handleUpKey(bool isLongPress)
|
||||||
|
{
|
||||||
|
if (isLongPress) {
|
||||||
|
switchToPrevMode();
|
||||||
|
}
|
||||||
|
// 短按不做任何事(让 Screen.cpp 处理滚动)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理 DOWN 按键(短按滚动,长按切换模式)
|
||||||
|
void handleDownKey(bool isLongPress)
|
||||||
|
{
|
||||||
|
if (isLongPress) {
|
||||||
|
switchToNextMode();
|
||||||
|
}
|
||||||
|
// 短按不做任何事(让 Screen.cpp 处理滚动)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 定时器函数,检查长按状态(在 runOnce 中调用)
|
||||||
|
void checkLongPress()
|
||||||
|
{
|
||||||
|
unsigned long now = millis();
|
||||||
|
|
||||||
|
// 检查 UP 长按
|
||||||
|
if (lastUpPressTime > 0 && !upLongPressHandled) {
|
||||||
|
if (now - lastUpPressTime > LONG_PRESS_THRESHOLD_MS) {
|
||||||
|
switchToPrevMode();
|
||||||
|
upLongPressHandled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查 DOWN 长按
|
||||||
|
if (lastDownPressTime > 0 && !downLongPressHandled) {
|
||||||
|
if (now - lastDownPressTime > LONG_PRESS_THRESHOLD_MS) {
|
||||||
|
switchToNextMode();
|
||||||
|
downLongPressHandled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 标记按键按下(从 Screen.cpp 调用)
|
||||||
|
void onUpPressed()
|
||||||
|
{
|
||||||
|
lastUpPressTime = millis();
|
||||||
|
upLongPressHandled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void onDownPressed()
|
||||||
|
{
|
||||||
|
lastDownPressTime = millis();
|
||||||
|
downLongPressHandled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 标记按键释放(从 Screen.cpp 调用)
|
||||||
|
void onUpReleased()
|
||||||
|
{
|
||||||
|
lastUpPressTime = 0;
|
||||||
|
upLongPressHandled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void onDownReleased()
|
||||||
|
{
|
||||||
|
lastDownPressTime = 0;
|
||||||
|
downLongPressHandled = false;
|
||||||
|
}
|
||||||
|
|
||||||
// =============================
|
// =============================
|
||||||
// Utility Functions
|
// Utility Functions
|
||||||
// =============================
|
// =============================
|
||||||
@@ -538,9 +611,19 @@ void drawDynamicNodeListScreen(OLEDDisplay *display, OLEDDisplayUiState *state,
|
|||||||
// Static variables to track mode and duration
|
// Static variables to track mode and duration
|
||||||
static NodeListMode lastRenderedMode = MODE_COUNT;
|
static NodeListMode lastRenderedMode = MODE_COUNT;
|
||||||
static unsigned long modeStartTime = 0;
|
static unsigned long modeStartTime = 0;
|
||||||
|
static NodeListMode previousMode = MODE_COUNT;
|
||||||
|
|
||||||
unsigned long now = millis();
|
unsigned long now = millis();
|
||||||
|
|
||||||
|
// 检查长按并切换模式
|
||||||
|
checkLongPress();
|
||||||
|
|
||||||
|
// 如果模式改变了,强制刷新显示
|
||||||
|
if (previousMode != currentMode) {
|
||||||
|
previousMode = currentMode;
|
||||||
|
// 模式已切换,UI 会自动刷新
|
||||||
|
}
|
||||||
|
|
||||||
#if defined(M5STACK_UNITC6L)
|
#if defined(M5STACK_UNITC6L)
|
||||||
display->clear();
|
display->clear();
|
||||||
if (now - lastSwitchTime >= 3000) {
|
if (now - lastSwitchTime >= 3000) {
|
||||||
|
|||||||
@@ -59,6 +59,13 @@ void switchToNextMode();
|
|||||||
void switchToPrevMode();
|
void switchToPrevMode();
|
||||||
NodeListMode getCurrentMode();
|
NodeListMode getCurrentMode();
|
||||||
|
|
||||||
|
// Long press detection for UP/DOWN keys
|
||||||
|
void onUpPressed();
|
||||||
|
void onDownPressed();
|
||||||
|
void onUpReleased();
|
||||||
|
void onDownReleased();
|
||||||
|
void checkLongPress();
|
||||||
|
|
||||||
// Bitmap drawing function
|
// Bitmap drawing function
|
||||||
void drawScaledXBitmap16x16(int x, int y, int width, int height, const uint8_t *bitmapXBM, OLEDDisplay *display);
|
void drawScaledXBitmap16x16(int x, int y, int width, int height, const uint8_t *bitmapXBM, OLEDDisplay *display);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user