Cocos2d x 3.0 oh

cocos/2d/platform/ohos/napi/helper/NapiHelper.h

@@ -114,7 +114,11 @@ class JSFunction {
         napi_value jsArgs[sizeof...(Args)] = {NapiValueConverter::ToNapiValue(env, args)...};
         napi_value return_val;
         status = napi_call_function(env, global, func, sizeof...(Args), jsArgs, &return_val);
-
+        if (status == napi_pending_exception) {
+            LOGI("Caught invoke exception: napi_pending_exception");
+            napi_value exception;
+            napi_get_and_clear_last_exception(env, &exception);
+        }
         ReturnType value;
         if (!NapiValueConverter::ToCppValue(env, return_val, value)) {
             // Handle error here
@@ -136,6 +140,11 @@ class JSFunction {
         napi_value jsArgs[sizeof...(Args)] = {NapiValueConverter::ToNapiValue(env, args)...};
         napi_value return_val;
         status = napi_call_function(env, global, func, sizeof...(Args), jsArgs, &return_val);
+        if (status == napi_pending_exception) {
+            LOGI("Caught invoke exception: napi_pending_exception");
+            napi_value exception;
+            napi_get_and_clear_last_exception(env, &exception);
+        }
     }
 
     static void callFunctionWithParams(WorkParam *param) {
@@ -167,6 +176,11 @@ class JSFunction {
         }
         if (status != napi_ok) {
             LOGI("XXXXXX:napi_call_function getClassObject != napi_ok %{public}d", status);
+            if (status == napi_pending_exception) {
+                LOGI("Caught invoke exception: napi_pending_exception");
+                napi_value exception;
+                napi_get_and_clear_last_exception(env, &exception);
+            }
         }
 
         napi_value thenFunc = nullptr;
@@ -187,6 +201,11 @@ class JSFunction {
         status = napi_call_function(env, promise, thenFunc, 1, &successFunc, &ret);
         if (status != napi_ok) {
             LOGI("XXXXXX:napi_call_function thenFunc failed, ret: %{public}d", status);
+            if (status == napi_pending_exception) {
+                LOGI("Caught invoke exception: napi_pending_exception");
+                napi_value exception;
+                napi_get_and_clear_last_exception(env, &exception);
+            }
         }
     }
     // Callback Function Type

cocos/2d/platform/ohos/napi/plugin_manager.cpp

@@ -58,7 +58,11 @@ napi_value NapiManager::GetContext(napi_env env, napi_callback_info info) {
 
     int64_t value;
     NAPI_CALL(env, napi_get_value_int64(env, args[0], &value));
-
+    napi_handle_scope scope = nullptr;
+    NAPI_CALL(env, napi_open_handle_scope(env, &scope));
+    if(scope == nullptr){
+        return nullptr;
+    }
     NAPI_CALL(env, napi_create_object(env, &exports));
 
     switch (value) {
@@ -165,6 +169,7 @@ napi_value NapiManager::GetContext(napi_env env, napi_callback_info info) {
         default:
             OHOS_LOGE("unknown type");
     }
+    NAPI_CALL(env, napi_close_handle_scope(env, scope));
     return exports;
 }
 

cocos/2d/platform/ohos/napi/render/plugin_render.cpp

@@ -1,3 +1,4 @@
+#include <ace/xcomponent/native_xcomponent_key_event.h>
 #include <stdint.h>
 #include <unistd.h>
 
@@ -31,7 +32,7 @@ float mousePositionY = -1;
 bool isMouseLeftActive = false;
 double scrollDistance = 0;
 
-std::unordered_map<int, cocos2d::EventKeyboard::KeyCode> ohKeyMap = {
+const std::unordered_map<OH_NativeXComponent_KeyCode, cocos2d::EventKeyboard::KeyCode> ohKeyMap = {
     {KEY_ESCAPE, cocos2d::EventKeyboard::KeyCode::KEY_ESCAPE},
     {KEY_GRAVE, cocos2d::EventKeyboard::KeyCode::KEY_GRAVE},
     {KEY_MINUS, cocos2d::EventKeyboard::KeyCode::KEY_MINUS},
@@ -61,7 +62,22 @@ std::unordered_map<int, cocos2d::EventKeyboard::KeyCode> ohKeyMap = {
     {KEY_DPAD_UP, cocos2d::EventKeyboard::KeyCode::KEY_UP_ARROW},
     {KEY_SYSRQ, cocos2d::EventKeyboard::KeyCode::KEY_PRINT},
     {KEY_INSERT, cocos2d::EventKeyboard::KeyCode::KEY_INSERT},
-    {KEY_FORWARD_DEL, cocos2d::EventKeyboard::KeyCode::KEY_DELETE}
+    {KEY_FORWARD_DEL, cocos2d::EventKeyboard::KeyCode::KEY_DELETE},
+    {KEY_SCROLL_LOCK, cocos2d::EventKeyboard::KeyCode::KEY_SCROLL_LOCK},
+    {KEY_MINUS, cocos2d::EventKeyboard::KeyCode::KEY_MINUS},
+    {KEY_AT, cocos2d::EventKeyboard::KeyCode::KEY_AT},
+    {KEY_PLUS, cocos2d::EventKeyboard::KeyCode::KEY_PLUS},
+    {KEY_MENU, cocos2d::EventKeyboard::KeyCode::KEY_MENU},
+    {KEY_BREAK, cocos2d::EventKeyboard::KeyCode::KEY_PAUSE},
+    {KEY_MOVE_HOME, cocos2d::EventKeyboard::KeyCode::KEY_HOME},
+    {KEY_MOVE_END, cocos2d::EventKeyboard::KeyCode::KEY_END},
+    {KEY_PAGE_UP, cocos2d::EventKeyboard::KeyCode::KEY_PG_UP},
+    {KEY_PAGE_DOWN, cocos2d::EventKeyboard::KeyCode::KEY_PG_DOWN},
+    {KEY_NUMPAD_ADD, cocos2d::EventKeyboard::KeyCode::KEY_KP_PLUS},
+    {KEY_NUMPAD_SUBTRACT, cocos2d::EventKeyboard::KeyCode::KEY_KP_MINUS},
+    {KEY_NUMPAD_MULTIPLY, cocos2d::EventKeyboard::KeyCode::KEY_KP_MULTIPLY},
+    {KEY_NUMPAD_DIVIDE, cocos2d::EventKeyboard::KeyCode::KEY_KP_DIVIDE},
+    {KEY_NUMPAD_ENTER, cocos2d::EventKeyboard::KeyCode::KEY_KP_ENTER}
 };
 
 cocos2d::EventKeyboard::KeyCode ohKeyCodeToCocosKeyCode(OH_NativeXComponent_KeyCode ohKeyCode)
@@ -82,7 +98,8 @@ cocos2d::EventKeyboard::KeyCode ohKeyCodeToCocosKeyCode(OH_NativeXComponent_KeyC
         // A - Z
         return cocos2d::EventKeyboard::KeyCode(int(cocos2d::EventKeyboard::KeyCode::KEY_A) + (ohKeyCode - KEY_A));
     }
-    return cocos2d::EventKeyboard::KeyCode(ohKeyCode);
+    OHOS_LOGW("Unmapped OH key code: %d", ohKeyCode);
+    return cocos2d::EventKeyboard::KeyCode::KEY_NONE;
 }
 
 void OnSurfaceCreatedCB(OH_NativeXComponent* component, void* window)

tests/cpp-tests/proj.ohos/build-profile.json5

@@ -4,8 +4,7 @@
       {
         "name": "default",
         "signingConfig": "default",
-        "compatibleSdkVersion": "5.0.0(12)",
-        "targetSdkVersion": "5.0.0(12)",
+        "compatibleSdkVersion": "5.0.3(15)",
         "runtimeOS": "HarmonyOS"
       }
     ],

tests/cpp-tests/proj.ohos/entry/build-profile.json5

@@ -12,7 +12,7 @@
     },
     "sourceOption": {
       "workers": [
-        './src/main/ets/workers/CocosWorker.ts'
+        './src/main/ets/workers/CocosWorker.ets'
       ]
     },
   },

tests/cpp-tests/proj.ohos/entry/src/main/ets/MainAbility/MainAbility.ets

@@ -0,0 +1,118 @@
+import window from '@ohos.window';
+import UIAbility from '@ohos.app.ability.UIAbility';
+import nativeRender from "libnativerender.so";
+import { ContextType, DeviceUtils  } from "@ohos/libSysCapabilities"
+import { GlobalContext,GlobalContextConstants} from "@ohos/libSysCapabilities"
+import { BusinessError } from '@kit.BasicServicesKit';
+import { WorkerManager } from '../workers/WorkerManager';
+import Want from '@ohos.app.ability.Want';
+import AbilityConstant from '@ohos.app.ability.AbilityConstant';
+
+const nativeAppLifecycle: nativeRender.CPPFunctions = nativeRender.getContext(ContextType.APP_LIFECYCLE);
+const rawFileUtils: nativeRender.CPPFunctions = nativeRender.getContext(ContextType.RAW_FILE_UTILS);
+let cocosWorker = WorkerManager.getInstance().getWorker();
+GlobalContext.storeGlobalThis(GlobalContextConstants.COCOS2DX_SHOW_FLAG, true);
+GlobalContext.storeGlobalThis(GlobalContextConstants.COCOS2DX_HIDE_FLAG, true);
+export default class MainAbility extends UIAbility {
+    onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void {
+        nativeAppLifecycle.onCreate();
+        GlobalContext.storeGlobalThis(GlobalContextConstants.COCOS2DX_ABILITY_CONTEXT, this.context);
+        console.info('[LIFECYCLE-App] onCreate')
+    }
+
+    onDestroy() {
+        nativeAppLifecycle.onDestroy();
+        console.info('[LIFECYCLE-App] onDestroy')
+    }
+
+    onWindowStageCreate(windowStage: window.WindowStage): void {
+        // Main window is created, set main page for this ability
+        windowStage.loadContent('pages/Index', (err:BusinessError, data) => {
+            if (err.code) {
+                return;
+            }
+            rawFileUtils.nativeResourceManagerInit(this.context.resourceManager);
+            rawFileUtils.writablePathInit(this.context.filesDir);
+        });
+
+        windowStage.getMainWindow().then((windowIns: window.Window) => {
+            GlobalContext.storeGlobalThis(GlobalContextConstants.COCOS2DX_MAIN_WINDOW, windowIns);
+            // Set whether to display the status bar and navigation bar. If they are not displayed, [] is displayed.
+            let systemBarPromise = windowIns.setWindowSystemBarEnable([]);
+            // Whether the window layout is displayed in full screen mode
+            let fullScreenPromise = windowIns.setWindowLayoutFullScreen(true);
+            // Sets whether the screen is always on.
+            let keepScreenOnPromise = windowIns.setWindowKeepScreenOn(true);
+            Promise.all([systemBarPromise, fullScreenPromise, keepScreenOnPromise]).then(() => {
+                console.info('Succeeded in setting the window');
+            }).catch((err: BusinessError) => {
+                console.error('Failed to set the window, cause ', err.code, err.message);
+            });
+
+            try {
+                DeviceUtils.calculateSafeArea(cocosWorker, windowIns.getWindowAvoidArea(window.AvoidAreaType.TYPE_CUTOUT), windowIns.getWindowProperties().windowRect);
+                windowIns.on('avoidAreaChange', (data) => {
+                    console.info('getSafeAreaRect Succeeded in enabling the listener for system avoid area changes. type:' +
+                    JSON.stringify(data.type) + ', area: ' + JSON.stringify(data.area));
+
+                    if(data.type == window.AvoidAreaType.TYPE_SYSTEM_GESTURE || data.type == window.AvoidAreaType.TYPE_KEYBOARD) {
+                        return;
+                    }
+
+                    let mainWindow: window.Window = GlobalContext.loadGlobalThis(GlobalContextConstants.COCOS2DX_MAIN_WINDOW);
+                    DeviceUtils.calculateSafeArea(cocosWorker, data.area, mainWindow.getWindowProperties().windowRect);
+                });
+            } catch (exception) {
+                console.error(`Failed to enable the listener for system avoid area changes. Cause code: ${exception.code}, message: ${exception.message}`);
+            }
+        })
+
+        windowStage.on("windowStageEvent", (data:window.WindowStageEventType) => {
+            let stageEventType: window.WindowStageEventType = data;
+            switch (stageEventType) {
+                case window.WindowStageEventType.RESUMED:
+                    console.info('[LIFECYCLE-App] onShow_RESUMED')
+                    if(GlobalContext.loadGlobalThis(GlobalContextConstants.COCOS2DX_SHOW_FLAG)){
+                        nativeAppLifecycle.onShow();
+                        GlobalContext.storeGlobalThis(GlobalContextConstants.COCOS2DX_SHOW_FLAG, false);
+                        GlobalContext.storeGlobalThis(GlobalContextConstants.COCOS2DX_HIDE_FLAG, true);
+                    }
+                    break;
+                case window.WindowStageEventType.PAUSED:
+                    if(GlobalContext.loadGlobalThis(GlobalContextConstants.COCOS2DX_HIDE_FLAG)){
+                        console.info('[LIFECYCLE-App] onHide_PAUSED')
+                        nativeAppLifecycle.onHide();
+                        GlobalContext.storeGlobalThis(GlobalContextConstants.COCOS2DX_HIDE_FLAG, false);
+                        GlobalContext.storeGlobalThis(GlobalContextConstants.COCOS2DX_SHOW_FLAG, true);
+                    }
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+
+    onWindowStageDestroy() {
+        // Main window is destroyed, release UI related resources
+    }
+
+    onForeground() {
+        if(GlobalContext.loadGlobalThis(GlobalContextConstants.COCOS2DX_SHOW_FLAG)){
+            // Ability has brought to foreground
+            console.info('[LIFECYCLE-App] onShow')
+            nativeAppLifecycle.onShow();
+            GlobalContext.storeGlobalThis(GlobalContextConstants.COCOS2DX_SHOW_FLAG, false);
+            GlobalContext.storeGlobalThis(GlobalContextConstants.COCOS2DX_HIDE_FLAG, true);
+        }
+    }
+
+    onBackground() {
+        if(GlobalContext.loadGlobalThis(GlobalContextConstants.COCOS2DX_HIDE_FLAG)){
+            // Ability has back to background
+            console.info('[LIFECYCLE-App] onHide')
+            nativeAppLifecycle.onHide();
+            GlobalContext.storeGlobalThis(GlobalContextConstants.COCOS2DX_HIDE_FLAG, false);
+            GlobalContext.storeGlobalThis(GlobalContextConstants.COCOS2DX_SHOW_FLAG, true);
+        }
+    }
+};

tests/cpp-tests/proj.ohos/entry/src/main/ets/components/CocosVideoPlayer.ets

@@ -12,7 +12,7 @@ export struct  CocosVideoPlayer {
       Video({
         src: this.videoPlayerInfo.isUrl ? this.videoPlayerInfo.url : this.videoPlayerInfo.rawfile,
         controller: this.videoPlayerInfo.controller
-      }).position({ x: this.videoPlayerInfo.x, y: this.videoPlayerInfo.y })
+      })
         .width(this.videoPlayerInfo.w)
         .height(this.videoPlayerInfo.h)
         .visibility(this.videoPlayerInfo.visible ? Visibility.Visible : Visibility.None)