From 21b3353e18deaacbe346fc3454eaa82077f850fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= <jingpeng.wang@outlook.com>
Date: Thu, 28 Jan 2021 19:44:06 +0800
Subject: [PATCH] change runnable to lambda

---
 doric-Qt/doric/async/async_call.h |  5 +++--
 doric-Qt/doric/engine/js_engine.h |  6 +++---
 doric-Qt/doric/native_driver.cpp  | 16 +++++-----------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/doric-Qt/doric/async/async_call.h b/doric-Qt/doric/async/async_call.h
index c945c06a..117ee5cc 100644
--- a/doric-Qt/doric/async/async_call.h
+++ b/doric-Qt/doric/async/async_call.h
@@ -2,13 +2,14 @@
 #define ASYNC_CALL_H
 
 #include <QThreadPool>
+#include <QtConcurrent/QtConcurrent>
 
 class AsyncCall {
 
 public:
-    static void ensureRunInThreadPool(QThreadPool &threadPool, QRunnable *runnable)
+    static void ensureRunInThreadPool(QThreadPool *threadPool, std::function<void()> lambda)
     {
-        threadPool.start(runnable);
+        QtConcurrent::run(threadPool, lambda);
     }
 };
 
diff --git a/doric-Qt/doric/engine/js_engine.h b/doric-Qt/doric/engine/js_engine.h
index 4a6dabd6..7eefa1d7 100644
--- a/doric-Qt/doric/engine/js_engine.h
+++ b/doric-Qt/doric/engine/js_engine.h
@@ -13,7 +13,6 @@ private:
     InterfaceJSE *mJSE;
 
     void loadBuiltinJS(QString assetName);
-    void prepareContext(QString contextId, QString script, QString source);
     QString packageContextScript(QString contextId, QString content);
     QString packageModuleScript(QString moduleName, QString content);
 public:
@@ -21,9 +20,10 @@ public:
 
     explicit JSEngine(QObject *parent = nullptr);
 
-    QJSValue invokeDoricMethod(QString method, QJSValueList arguments);
-
     ~JSEngine();
+
+    QJSValue invokeDoricMethod(QString method, QJSValueList arguments);
+    void prepareContext(QString contextId, QString script, QString source);
 };
 
 #endif // JSENGINE_H
diff --git a/doric-Qt/doric/native_driver.cpp b/doric-Qt/doric/native_driver.cpp
index 5404b425..497d12ce 100644
--- a/doric-Qt/doric/native_driver.cpp
+++ b/doric-Qt/doric/native_driver.cpp
@@ -1,6 +1,8 @@
 #include "native_driver.h"
 #include "async/async_call.h"
 
+#include <functional>
+
 void NativeDriver::invokeContextEntityMethod(QString contextId, QString method, QList<QObject> args)
 {
 
@@ -13,17 +15,9 @@ void NativeDriver::invokeDoricMethod(QString method, QList<QObject> args)
 
 void NativeDriver::createContext(QString contextId, QString script, QString source)
 {
-    class Runnable: public QRunnable
-    {
-        void run() override
-        {
-            qDebug() << "123";
-        }
-    };
-    Runnable *runnable = new Runnable();
-    runnable->setAutoDelete(true);
-
-    AsyncCall::ensureRunInThreadPool(jsEngine.mJSThreadPool, runnable);
+    AsyncCall::ensureRunInThreadPool(&jsEngine.mJSThreadPool, [this, contextId, script, source]{
+        this->jsEngine.prepareContext(contextId, script, source);
+    });
 }
 
 void NativeDriver::destroyContext(QString contextId)