fix onDataInit

alibaba · Sep 23, 2024 · d7f9d5a · d7f9d5a
1 parent d6adf29
commit d7f9d5a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/GaiaXAndroidJS/src/main/assets/bootstrap.js b/GaiaXAndroidJS/src/main/assets/bootstrap.js
diff --git a/GaiaXAndroidJS/src/main/kotlin/com/alibaba/gaiax/js/impl/qjs/QuickJSContext.kt b/GaiaXAndroidJS/src/main/kotlin/com/alibaba/gaiax/js/impl/qjs/QuickJSContext.kt
@@ -130,14 +130,15 @@ internal class QuickJSContext(
         if (Log.isScriptLog()) {
             Log.e("jsContext = $jsContext, evaluateJS() called with: script = $script")
         }
-        this.jsContext?.evaluate(script, "index.js", GXHostContext.EVAL_TYPE_MODULE, JSContext.EVAL_FLAG_STRIP)
+        this.jsContext?.evaluate(script, "index.js", JSContext.EVAL_TYPE_MODULE, 0)
     }
 
     override fun <T> evaluateJS(script: String, clazz: Class<T>?): T? {
         if (Log.isScriptLog()) {
             Log.e("jsContext = $jsContext, evaluateJS() called with: script = $script")
         }
-        val ret = this.jsContext?.evaluate(script, "index.js", JSContext.EVAL_TYPE_MODULE, JSContext.EVAL_FLAG_STRIP, clazz)
+        // 执行带返回值的JS脚本，需要使用EVAL_TYPE_GLOBAL
+        val ret = this.jsContext?.evaluate(script, "index.js", JSContext.EVAL_TYPE_GLOBAL, 0, clazz)
         if (Log.isScriptLog()) {
             Log.e("jsContext = $jsContext, evaluateJS() called with: ret=$ret")
         }

diff --git a/GaiaXAndroidQuickJS/src/main/c/quickjs-jni.c b/GaiaXAndroidQuickJS/src/main/c/quickjs-jni.c
@@ -1094,8 +1094,6 @@ JNIEXPORT jlong JNICALL Java_com_alibaba_gaiax_quickjs_QuickJS_evaluate(
     if (source_code_utf != NULL && file_name_utf != NULL) {
         JSValue val = JS_Eval(ctx, source_code_utf, (size_t) source_code_length, file_name_utf, flags);
 
-        _LOGD("evaluate val.tag: %ld", val.tag);
-
         COPY_JS_VALUE(ctx, val, result);
     }
 
@@ -1108,8 +1106,6 @@ JNIEXPORT jlong JNICALL Java_com_alibaba_gaiax_quickjs_QuickJS_evaluate(
 
     CHECK_NULL_RET(env, result, MSG_OOM);
 
-    _LOGD("evaluate result: %p", result);
-
     return (jlong) result;
 }