From: Caisking Date: Tue, 10 Mar 2026 06:58:38 +0000 (+0800) Subject: 优化倒计时校准 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=5dfe9c815dfc89696be01e23d18f41321a585fcd;p=mirrors%2FFD230.git 优化倒计时校准 --- diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/include/CountDownModel.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/include/CountDownModel.h index 41c1aa3d6..070b94240 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/include/CountDownModel.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/include/CountDownModel.h @@ -115,13 +115,13 @@ namespace OHOS bool GetisPaused(void) const { return isPaused; } - uint32_t get_current_time();//获取当前系统时间戳 + uint32_t get_current_time(); // 获取当前系统时间戳(ms) public: static int g_CountDownTimes; static int totalSeconds; //要到计时总秒数 - static uint32_t startTime; //开始时间戳 - static uint32_t pauseTime; //暂停时间戳 - static uint32_t endTime; //结束时间戳 + static uint32_t startTime; // 开始时间戳(ms) + static uint32_t pauseTime; // 暂停时间戳(ms) + static uint32_t endTime; // 结束时间戳(ms) private: CountDownModel() {} diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/include/MainCountDownPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/include/MainCountDownPresenter.h index 226a9c03d..fcae7c27a 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/include/MainCountDownPresenter.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/include/MainCountDownPresenter.h @@ -26,7 +26,7 @@ namespace OHOS COUNTDOWN_MAX, } CountDownViewId; - static constexpr const int COUNTDOWN_TIMER_DURATION = 1000; // 计时器的定时器周期 + static constexpr const int COUNTDOWN_TIMER_DURATION = 500; // 计时器的定时器周期(ms) class MainCountDownView; class MainCountDownPresenter : public Presenter, public UIView::OnClickListener, diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/CountDownModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/CountDownModel.cpp index f339f1537..69d9c59d5 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/CountDownModel.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/CountDownModel.cpp @@ -459,22 +459,25 @@ namespace OHOS bool isRunning = CountDownModel::GetInstance()->GetisRunning(); bool isPaused = CountDownModel::GetInstance()->GetisPaused(); - if (isRunning &&!isPaused) + if (isRunning && !isPaused) { - uint32_t currentTime = CountDownModel::GetInstance()->get_current_time(); - CountDownModel::g_CountDownTimes = CountDownModel::totalSeconds - (currentTime - CountDownModel::startTime); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "当前时间戳:%u,倒计时剩余时间:%d", currentTime ,CountDownModel::g_CountDownTimes); - if (CountDownModel::g_CountDownTimes <= 0 && currentTime == CountDownModel::endTime) { + uint32_t currentTime = CountDownModel::GetInstance()->get_current_time(); + if (currentTime >= CountDownModel::endTime) { + CountDownModel::g_CountDownTimes = 0; // 这里可以添加倒计时结束后的操作,比如发出提示音等 GraphicService::GetInstance()->PostGraphicEvent(std::bind(CountDown_TimerCallbackProc, data)); + return; } + uint32_t remainingMs = CountDownModel::endTime - currentTime; + CountDownModel::g_CountDownTimes = static_cast((remainingMs + 999) / 1000); // ceil to seconds + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "当前时间戳(ms):%u,倒计时剩余时间(s):%d", currentTime, CountDownModel::g_CountDownTimes); } } uint32_t CountDownModel::get_current_time() { uint32_t time; - if (uapi_get_timestampe_ss(&time) != ERRCODE_SUCC) { + if (uapi_get_timestampe_ms(&time) != ERRCODE_SUCC) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to get timestamp"); return 0; } @@ -487,8 +490,8 @@ namespace OHOS isPaused = false; CountDownModel::totalSeconds = CountDownModel::g_CountDownTimes; CountDownModel::startTime = get_current_time(); //获取开始时间戳 - CountDownModel::endTime = CountDownModel::startTime + g_CountDownTimes; //获取结束时间戳 - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "startTime:%u,endTime:%u",CountDownModel::startTime,CountDownModel::endTime); + CountDownModel::endTime = CountDownModel::startTime + static_cast(g_CountDownTimes) * 1000; //获取结束时间戳(ms) + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "startTime(ms):%u,endTime(ms):%u",CountDownModel::startTime,CountDownModel::endTime); } @@ -506,8 +509,14 @@ namespace OHOS uint32_t currentTime = get_current_time(); uint32_t pauseDuration = currentTime - CountDownModel::pauseTime; CountDownModel::endTime = CountDownModel::endTime + pauseDuration; - CountDownModel::totalSeconds = CountDownModel::totalSeconds + pauseDuration + 1; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "startTime:%u,pauseDuration:%u,endTime:%u",CountDownModel::startTime,pauseDuration,CountDownModel::endTime); + if (currentTime >= CountDownModel::endTime) { + CountDownModel::g_CountDownTimes = 0; + } else { + uint32_t remainingMs = CountDownModel::endTime - currentTime; + CountDownModel::g_CountDownTimes = static_cast((remainingMs + 999) / 1000); // ceil to seconds + } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "startTime(ms):%u,pauseDuration(ms):%u,endTime(ms):%u", + CountDownModel::startTime, pauseDuration, CountDownModel::endTime); } } diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp index ba3ceb2f9..639caadf3 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp @@ -269,6 +269,10 @@ namespace OHOS p_CountDownModel->SetCountDownTimerIsPause(false); p_CountDownModel->CountDown_StartTimer(COUNTDOWN_TIMER_DURATION); p_CountDownModel->CountDown_ResumeTimer(COUNTDOWN_TIMER_DURATION); + if (p_StartCountDownView->GetShowCountDownTimelabel()) { + p_StartCountDownView->GetShowCountDownTimelabel()->SetText( + CountDownModel::GetInstance()->DisplayCountDownDuration()); + } /*视图恢复*/ p_StartCountDownView->SetImageAndLabel(true); p_StartCountDownView->ShowEndView(false);