Fix the incorrect orientation of the gravity sensor and JSVM crash is…

…sue in HarmonyOS Next (#18041) * 1.Fix the problem of incorrect rotation direction of openharmony screen 2.Remove redundant files # Conflicts: # templates/harmonyos-next/entry/src/main/ets/cocos/jsb-adapter/sys-ability-polyfill.js * Fix the issue of JSVM running crash --------- Co-authored-by: qiuguohua <[email protected]>
cocos · Dec 17, 2024 · 2e4a9d5 · 2e4a9d5
1 parent 86aed39
commit 2e4a9d5
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 275 deletions.
diff --git a/native/cocos/audio/openharmony/PcmAudioService.cpp b/native/cocos/audio/openharmony/PcmAudioService.cpp
@@ -149,4 +149,4 @@ void PcmAudioService::resume() {
         OH_AudioRenderer_Start(_audioRenderer);
     }
 }
-} // namespace cocos2d
+} // namespace cc
diff --git a/native/cocos/bindings/jswrapper/jsvm/Object.cpp b/native/cocos/bindings/jswrapper/jsvm/Object.cpp
@@ -104,7 +104,7 @@ void Object::setPrivateObject(PrivateObjectBase* data) {
     auto tmpThis = _objRef.getValue(_env);
     JSVM_Ref result = nullptr;
     NODE_API_CALL(status, _env,
-                  OH_JSVM_Wrap(_env, tmpThis, this, sendWeakCallback,
+                  OH_JSVM_Wrap(_env, tmpThis, this, weakCallback,
                             (void*)this /* finalize_hint */, &result));
     //_objRef.setWeakref(_env, result);
     setProperty("__native_ptr__", se::Value(static_cast<uint64_t>(reinterpret_cast<uintptr_t>(data))));
@@ -423,19 +423,8 @@ Object* Object::createTypedArrayWithBuffer(TypedArrayType type, const Object *ob
 Object* Object::createExternalArrayBufferObject(void* contents, size_t byteLength, BufferContentsFreeFunc freeFunc, void* freeUserData) {
     JSVM_Status status;
     JSVM_Value result;
-    if (freeFunc) {
-        struct ExternalArrayBufferCallbackParams* param = new (struct ExternalArrayBufferCallbackParams);
-        param->func = freeFunc;
-        param->contents = contents;
-        param->byteLength = byteLength;
-        param->userData = freeUserData;
-        NODE_API_CALL(status, ScriptEngine::getEnv(), OH_JSVM_CreateArraybuffer(ScriptEngine::getEnv(), byteLength, &contents,  &result));
-        param->func(param->contents, param->byteLength, param->userData);
-        delete param;
-    } else {
-        NODE_API_CALL(status, ScriptEngine::getEnv(), OH_JSVM_CreateArraybuffer(ScriptEngine::getEnv(), byteLength, &contents,  &result));
-    }
-
+    // JSVM does not support the napi_create_external_arraybuffer interface like in NAPI.
+    NODE_API_CALL(status, ScriptEngine::getEnv(), OH_JSVM_CreateArrayBufferFromBackingStoreData(ScriptEngine::getEnv(), contents, byteLength, 0, byteLength, &result));
     Object* obj = Object::_createJSObject(ScriptEngine::getEnv(), result, nullptr);
     return obj;
 }
@@ -703,16 +692,14 @@ void Object::sendWeakCallback(JSVM_Env env, void* nativeObject, void* finalizeHi
 }
 
 void Object::weakCallback(JSVM_Env env, void* nativeObject, void* finalizeHint /*finalize_hint*/) {
+
     if (finalizeHint) {
         if (nativeObject == nullptr) {
             return;
         }
         void *rawPtr = reinterpret_cast<Object*>(finalizeHint)->_privateData;
         Object* seObj = reinterpret_cast<Object*>(finalizeHint);
         Object* rawPtrObj = reinterpret_cast<Object*>(rawPtr);
-        if(rawPtrObj->getRefCount() == 0) {
-            return;
-        }
         if (seObj->_onCleaingPrivateData) { //called by cleanPrivateData, not release seObj;
             return;
         }
@@ -726,11 +713,11 @@ void Object::weakCallback(JSVM_Env env, void* nativeObject, void* finalizeHint /
         }
 
         if (seObj->_finalizeCb != nullptr) {
-            seObj->_finalizeCb(env, rawPtr, rawPtr);
+            seObj->_finalizeCb(env, finalizeHint, finalizeHint);
         } else {
             assert(seObj->_getClass() != nullptr);
             if (seObj->_getClass()->_getFinalizeFunction() != nullptr) {
-                seObj->_getClass()->_getFinalizeFunction()(env, rawPtr, rawPtr);
+                seObj->_getClass()->_getFinalizeFunction()(env, finalizeHint, finalizeHint);
             }
         }
         seObj->decRef();

diff --git a/native/cocos/bindings/jswrapper/jsvm/Object.h b/native/cocos/bindings/jswrapper/jsvm/Object.h
@@ -189,10 +189,10 @@ class Object : public RefCounter {
 
 
     /**
-         *  @brief Delete a property of an object.
-         *  @param[in] name A utf-8 string containing the property's name.
-         *  @return true if the property is deleted successfully, otherwise false.
-         */
+     *  @brief Delete a property of an object.
+     *  @param[in] name A utf-8 string containing the property's name.
+     *  @return true if the property is deleted successfully, otherwise false.
+     */
     bool deleteProperty(const char *name);
 
     /**

diff --git a/native/cocos/bindings/jswrapper/napi/Object.cpp b/native/cocos/bindings/jswrapper/napi/Object.cpp
@@ -662,11 +662,11 @@ void Object::weakCallback(napi_env env, void* nativeObject, void* finalizeHint /
         }
 
         if (seObj->_finalizeCb != nullptr) {
-            seObj->_finalizeCb(env, rawPtr, rawPtr);
+            seObj->_finalizeCb(env, finalizeHint, finalizeHint);
         } else {
             assert(seObj->_getClass() != nullptr);
             if (seObj->_getClass()->_getFinalizeFunction() != nullptr) {
-                seObj->_getClass()->_getFinalizeFunction()(env, rawPtr, rawPtr);
+                seObj->_getClass()->_getFinalizeFunction()(env, finalizeHint, finalizeHint);
             }
         }
         seObj->decRef();

diff --git a/native/cocos/bindings/manual/jsb_global.cpp b/native/cocos/bindings/manual/jsb_global.cpp
@@ -979,7 +979,7 @@ static bool jsb_createExternalArrayBuffer(se::State &s) { // NOLINT
         SE_PRECONDITION2(ok, false, "Error processing arguments");
         if (byteLength > 0) {
 // NOTE: Currently V8 use shared_ptr which has different abi on win64-debug and win64-release
-#if CC_PLATFORM == CC_PLATFORM_WINDOWS && SCRIPT_ENGINE_TYPE == SCRIPT_ENGINE_V8
+#if (CC_PLATFORM == CC_PLATFORM_WINDOWS && SCRIPT_ENGINE_TYPE == SCRIPT_ENGINE_V8) || (SCRIPT_ENGINE_TYPE == SCRIPT_ENGINE_JSVM)
             se::HandleObject arrayBuffer{se::Object::createArrayBufferObject(nullptr, byteLength)};
 #else
             void *buffer = malloc(byteLength);

diff --git a/native/cocos/platform/openharmony/modules/Screen.cpp b/native/cocos/platform/openharmony/modules/Screen.cpp
@@ -56,11 +56,11 @@ Screen::Orientation Screen::getDeviceOrientation() const {
     if(value == 0) {
         return Orientation::PORTRAIT;
     } else if(value == 1) {
-        return Orientation::LANDSCAPE_RIGHT;
+        return Orientation::LANDSCAPE_LEFT;
     } else if(value == 2) {
         return Orientation::PORTRAIT_UPSIDE_DOWN;
     } else if(value == 3) {
-        return Orientation::LANDSCAPE_LEFT;
+        return Orientation::LANDSCAPE_RIGHT;
     }
     CC_ASSERT(false);
     return Orientation::PORTRAIT;

diff --git a/native/cocos/platform/openharmony/napi/NapiHelper.cpp b/native/cocos/platform/openharmony/napi/NapiHelper.cpp
@@ -52,7 +52,6 @@ enum ContextType {
     ENGINE_UTILS,
     EDITBOX_UTILS,
     WEBVIEW_UTILS,
-    SYSTEM_UTILS,
     DISPLAY_UTILS,
     UV_ASYNC_SEND,
     VIDEO_UTILS
@@ -226,13 +225,13 @@ static void napiOnDisplayChange(const Napi::CallbackInfo &info) {
             orientation = static_cast<int>(cc::IScreen::Orientation::PORTRAIT);
         break;
         case 1: // ROTATION_90
-            orientation = static_cast<int>(cc::IScreen::Orientation::LANDSCAPE_RIGHT);
+            orientation = static_cast<int>(cc::IScreen::Orientation::LANDSCAPE_LEFT);
         break;
         case 2: // ROTATION_180
             orientation = static_cast<int>(cc::IScreen::Orientation::PORTRAIT_UPSIDE_DOWN);
         break;
         case 3: // ROTATION_270
-            orientation = static_cast<int>(cc::IScreen::Orientation::LANDSCAPE_LEFT);
+            orientation = static_cast<int>(cc::IScreen::Orientation::LANDSCAPE_RIGHT);
         break;
     }
     cc::events::Orientation::broadcast(orientation);

diff --git a/platforms/native/builtin/index.js b/platforms/native/builtin/index.js
@@ -217,12 +217,6 @@ for (const key in jsbWindow) {
     }
 }
 
-// In the openharmony platform, XMLHttpRequest is not undefined, but there are problems to using it.
-// So the native implementation is forced to be used.
-if (window.oh && typeof globalThis.XMLHttpRequest !== 'undefined') {
-    globalThis.XMLHttpRequest = jsbWindow.XMLHttpRequest;
-}
-
 if (typeof globalThis.window === 'undefined') {
     globalThis.window = globalThis;
 }

diff --git a/scripts/native-pack-tool/source/platforms/harmonyos-next.ts b/scripts/native-pack-tool/source/platforms/harmonyos-next.ts
@@ -71,10 +71,10 @@ export class HarmonyOSNextPackTool extends NativePackTool {
             moduleJSON.module.abilities[0].orientation = 'auto_rotation';
         }
         else if (cfg.landscapeRight && !cfg.landscapeLeft) {
-            moduleJSON.module.abilities[0].orientation = 'landscape';
+            moduleJSON.module.abilities[0].orientation = 'landscape_inverted';
         }
         else if (!cfg.landscapeRight && cfg.landscapeLeft) {
-            moduleJSON.module.abilities[0].orientation = 'landscape_inverted';
+            moduleJSON.module.abilities[0].orientation = 'landscape';
         }
         else if (cfg.landscapeRight && cfg.landscapeLeft) {
             moduleJSON.module.abilities[0].orientation = 'auto_rotation_landscape';

diff --git a/templates/harmonyos-next/entry/src/main/cpp/types/libcocos/oh-package.json5 b/templates/harmonyos-next/entry/src/main/cpp/types/libcocos/oh-package.json5
@@ -1,6 +1,6 @@
 {
   "name": "libcocos.so",
   "types": "./index.d.ts",
-  "version": "",
+  "version": "1.0.0",
   "description": "Please describe the basic information."
 }