同步

Conch/source/conch/JSWrapper/JSInterface/JSVM/JSVMBinder.h

@@ -37,7 +37,9 @@ namespace laya {
         IsolateData::getInstance()->_setNeedCallConstructor(true);
 		cobj->initialize(obj);
 		cobj->makeWeak();
-        return obj;
+        JSVM_Value newIns;
+        JSVM_API_CALL(status, env, OH_JSVM_EscapeHandle(env, esc.getScope(), obj, &newIns));
+        return newIns;
     }
 
     typedef JSVM_Value JsValue;
@@ -341,7 +343,9 @@ namespace laya {
             JSVM_Value result;
             JSVM_API_CALL(status, _env, 
                 OH_JSVM_CallFunction(_env, jthis, func, argc, argv, &result));
-            return result;
+            JSVM_Value newIns;
+            JSVM_API_CALL(status, _env, OH_JSVM_EscapeHandle(_env, esc.getScope(), result, &newIns));
+            return newIns;
         }
 
         JsValue callJsFunc(JsFunction& func);

Conch/source/conch/JSWrapper/JSInterface/JSVM/JSVMEnv.h

@@ -23,6 +23,9 @@ namespace laya
         public:
             AutoEscHandleScope();
             ~AutoEscHandleScope();
+            EscapableHandleScope getScope() {
+                return _escapableHandleScope;
+            }
     
         private:
         EscapableHandleScope _escapableHandleScope;

Conch/source/conch/JSWrapper/LayaWrap/JSConchConfig.cpp

@@ -374,13 +374,13 @@ namespace laya
     const char* JSConchConfig::getRuntimeVersion()
     {
 #ifdef __APPLE__
-        return "ios-conch6-release-2.13.9.1";
+        return "ios-conch6-release-2.13.9.2";
 #elif ANDROID
-        return "android-conch6-release-2.13.9.1";
+        return "android-conch6-release-2.13.9.2";
 #elif OHOS
-        return "ohos-conch6-release-2.13.9.1";
+        return "ohos-conch6-release-2.13.9.2";
 #elif WIN32
-        return "window-conch6-release-2.13.9.1";
+        return "window-conch6-release-2.13.9.2";
 #endif
     }
     const char* JSConchConfig::getAppVersion()