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
cocos · Dec 13, 2024 · e4ac5b3 · e4ac5b3
1 parent c2882db
commit e4ac5b3
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 249 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/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."
 }
diff --git a/templates/harmonyos-next/entry/src/main/ets/cocos/jsb-adapter/sys-ability-polyfill.js b/templates/harmonyos-next/entry/src/main/ets/cocos/jsb-adapter/sys-ability-polyfill.js
diff --git a/templates/harmonyos-next/entry/src/main/ets/cocos/oh-adapter/sys-ability-polyfill.js b/templates/harmonyos-next/entry/src/main/ets/cocos/oh-adapter/sys-ability-polyfill.js
@@ -182,11 +182,11 @@ globalThis.initScreenInfo = function () {
         if (data.boundingRects.length == 0) {
             return;
         }
-        const rc = data.boundingRects[0];
-        cutout.left = rc.left;
-        cutout.top = rc.top;
-        cutout.width = rc.width;
-        cutout.height = rc.height;
+
+        cutout.left = data.boundingRects[0].left;
+        cutout.top = data.boundingRects[0].top;
+        cutout.width = data.boundingRects[0].width;
+        cutout.height = data.boundingRects[0].height;
     }).catch((err) => {
         console.log("get cutout info error!");
     });

diff --git a/templates/harmonyos-next/entry/src/main/ets/common/Constants.ts b/templates/harmonyos-next/entry/src/main/ets/common/Constants.ts
@@ -32,7 +32,6 @@ export enum ContextType {
     ENGINE_UTILS,
     EDITBOX_UTILS,
     WEBVIEW_UTILS,
-    SYSTEM_UTILS,
     DISPLAY_UTILS,
     UV_ASYNC_SEND,
     VIDEO_UTILS