openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-12-30 08:04:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!2704 Fix setInterval bug while interval is zero

Browse Source 
Merge pull request !2704 from shiyu_huang/dev_20220815
This commit is contained in:
openharmony_ci 2022-08-16 08:14:32 +00:00 committed by Gitee
commit b91498dad0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frameworks/native/runtime/js_timer.cpp
View File

@ -67,15 +67,15 @@ private:
class JsTimer final {
public:
JsTimer(JsRuntime& jsRuntime, const std::shared_ptr<NativeReference>& jsFunction, const std::string &name,
int64_t interval)
: jsRuntime_(jsRuntime), jsFunction_(jsFunction), name_(name), interval_(interval)
int64_t interval, bool isInterval)
: jsRuntime_(jsRuntime), jsFunction_(jsFunction), name_(name), interval_(interval), isInterval_(isInterval)
{}
~JsTimer() = default;
void operator()() const
{
if (interval_ > 0) {
if (isInterval_) {
jsRuntime_.PostTask(*this, name_, interval_);
}
#ifdef SUPPORT_GRAPHICS
@ -108,6 +108,7 @@ private:
std::vector<std::shared_ptr<NativeReference>> jsArgs_;
std::string name_;
int64_t interval_ = 0;
bool isInterval_ = false;
#ifdef SUPPORT_GRAPHICS
int32_t containerScopeId_ = ContainerScope::CurrentId();
#endif
@ -138,7 +139,7 @@ NativeValue* StartTimeoutOrInterval(NativeEngine* engine, NativeCallbackInfo* in
// create timer task
JsRuntime& jsRuntime = *reinterpret_cast<JsRuntime*>(engine->GetJsEngine());
JsTimer task(jsRuntime, jsFunction, name, isInterval ? delayTime : 0);
JsTimer task(jsRuntime, jsFunction, name, delayTime, isInterval);
for (size_t index = 2; index < info->argc; ++index) {
task.PushArgs(std::shared_ptr<NativeReference>(engine->CreateReference(info->argv[index], 1)));
}

7
frameworks/simulator/ability_simulator/src/js_timer.cpp
View File

@ -125,7 +125,12 @@ NativeValue* StartTimeoutOrInterval(NativeEngine* engine, NativeCallbackInfo* in
task->PushArgs(std::shared_ptr<NativeReference>(engine->CreateReference(info->argv[index], 1)));
}
task->Start(delayTime, isInterval ? delayTime : 0);
// if setInterval is called, interval must not be zero for repeat, so set to 1ms
int64_t interval = 0;
if (isInterval) {
interval = delayTime > 0 ? delayTime : 1;
}
task->Start(delayTime, interval);
{
std::lock_guard<std::mutex> lock(g_mutex);