Skip to content

3.3 version OHOS adaptation #20819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
minggo merged 5 commits into from
Dec 24, 2024
Merged

3.3 version OHOS adaptation #20819

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b1fd48
3.3 version OHOS adaptation
IceBBBBB Dec 16, 2024
c234bfa
3.3 version OHOS adaptation
IceBBBBB Dec 16, 2024
f1f38c4
3.3 version OHOS adaptation
IceBBBBB Dec 16, 2024
5f3e752
Review and revise based on feedback
IceBBBBB Dec 24, 2024
2710f40
Review and revise based on feedback
IceBBBBB Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Review and revise based on feedback 
Signed-off-by: 冰冰冰 <[email protected]>
  • Loading branch information
@IceBBBBB
IceBBBBB committed Dec 24, 2024
commit 5f3e7522794efeff85607e4661fbd0e7a93f9113
4 changes: 2 additions & 2 deletions cmake/Modules/CocosBuildHelpers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ endfunction()
#IOS = iOS
#MACOSX = MacOS X
#LINUX = Linux
#OHOS = OpenHarmonyOS
#OHOS = HarmonyOS Next OS
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
if(WINRT)
set(SYSTEM_STRING "Windows RT")
Expand All @@ -140,7 +140,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(SYSTEM_STRING "Mac OSX")
endif()
elseif(OHOS)
set(SYSTEM_STRING "OpenHarmony")
set(SYSTEM_STRING "HarmonyOS Next")
endif()

if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
Expand Down
2 changes: 1 addition & 1 deletion cocos/audio/ohos/AudioEngine-inl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ namespace {
int outputSampleRate = 48000;

// TODO(hack) : There is currently a bug in the opensles module,
// so openharmony must configure a fixed size, otherwise the callback will be suspended
// so HarmonyOS Next must configure a fixed size, otherwise the callback will be suspended
int bufferSizeInFrames = 2048;


Expand Down
2 changes: 1 addition & 1 deletion cocos/audio/ohos/AudioPlayerProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ THE SOFTWARE.
namespace cocos2d { namespace experimental {

static int getSystemAPILevel() {
// TODO(qgh): On the openharmony platform, pcm streaming must be used
// TODO(qgh): On the HarmonyOS Next platform, pcm streaming must be used
return std::numeric_limits<int>::max();
}

Expand Down
6 changes: 3 additions & 3 deletions cocos/platform/ohos/napi/render/plugin_render.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ void DispatchKeyEventCB(OH_NativeXComponent* component, void* window)
PluginRender::keyEventQueue_.push(keyEvent);
PluginRender::GetInstance()->sendMsgToWorker(MessageType::WM_XCOMPONENT_KEY_EVENT, component, window);
} else {
OHOS_LOGE("OpenHarmonyPlatform::getKeyEventError");
OHOS_LOGE("HarmonyOS Next Platform::getKeyEventError");
}
}

Expand All @@ -142,13 +142,13 @@ void DispatchMouseEventCB(OH_NativeXComponent* component, void* window)
PluginRender::mouseEventQueue_.push(mouseEvent);
PluginRender::GetInstance()->sendMsgToWorker(MessageType::WM_XCOMPONENT_MOUSE_EVENT, component, window);
} else {
OHOS_LOGE("OpenHarmonyPlatform::getMouseEventError");
OHOS_LOGE("HarmonyOS Next Platform::getMouseEventError");
}
}

void DispatchHoverEventCB(OH_NativeXComponent* component, bool isHover)
{
OHOS_LOGD("OpenHarmonyPlatform::DispatchHoverEventCB");
OHOS_LOGD("HarmonyOS Next Platform::DispatchHoverEventCB");
}

void DispatchTouchEventCB(OH_NativeXComponent* component, void* window) {
Expand Down