diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..aec1961e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "editor.formatOnSave": false, + "editor.codeActionsOnSave": {}, + "[javascript][typescript][javascriptreact][typescriptreact]": { + "editor.formatOnSave": false, + "editor.codeActionsOnSave": {}, + }, +} diff --git a/cocos2d-x/CMakeLists.txt b/cocos2d-x/CMakeLists.txt index 2147548a..f2b42e95 100644 --- a/cocos2d-x/CMakeLists.txt +++ b/cocos2d-x/CMakeLists.txt @@ -869,7 +869,7 @@ function(cc_apply_definations target) target_compile_definitions(${target} PUBLIC $,USE_GFX_RENDERER=1,USE_GFX_RENDERER=0> $,USE_VIDEO=1,USE_VIDEO=0> - $,USE_WEBVIEW=1,USE_WEBVIEW=0> + $,USE_WEB_VIEW=1,USE_WEB_VIEW=0> $,USE_AUDIO=1,USE_AUDIO=0> $,USE_SOCKET=1,USE_SOCKET=0> $,USE_WEBSOCKET_SERVER=1,USE_WEBSOCKET_SERVER=0> diff --git a/cocos2d-x/cocos/cocos2d.cpp b/cocos2d-x/cocos/cocos2d.cpp index eee4ade3..a1c7b926 100644 --- a/cocos2d-x/cocos/cocos2d.cpp +++ b/cocos2d-x/cocos/cocos2d.cpp @@ -32,7 +32,7 @@ NS_CC_BEGIN CC_DLL const char* cocos2dVersion() { - return "2.4.12"; + return "2.4.13"; } NS_CC_END diff --git a/cocos2d-x/cocos/editor-support/dragonbones-creator-support/CCArmatureCacheDisplay.h b/cocos2d-x/cocos/editor-support/dragonbones-creator-support/CCArmatureCacheDisplay.h index 2a82544a..6f56010a 100644 --- a/cocos2d-x/cocos/editor-support/dragonbones-creator-support/CCArmatureCacheDisplay.h +++ b/cocos2d-x/cocos/editor-support/dragonbones-creator-support/CCArmatureCacheDisplay.h @@ -34,7 +34,7 @@ DRAGONBONES_NAMESPACE_BEGIN class CacheModeAttachUtil; -class CCArmatureCacheDisplay : public cocos2d::middleware::IMiddleware, public cocos2d::Ref +class CCArmatureCacheDisplay : public cocos2d::Ref, public cocos2d::middleware::IMiddleware { public: CCArmatureCacheDisplay(const std::string& armatureName, const std::string& armatureKey, const std::string& atlasUUID, bool isShare); diff --git a/cocos2d-x/cocos/editor-support/particle/ParticleSimulator.h b/cocos2d-x/cocos/editor-support/particle/ParticleSimulator.h index 8c6e1c0e..96379f43 100644 --- a/cocos2d-x/cocos/editor-support/particle/ParticleSimulator.h +++ b/cocos2d-x/cocos/editor-support/particle/ParticleSimulator.h @@ -106,7 +106,7 @@ enum EmitterMode RADIUS = 1 }; -class ParticleSimulator : public cocos2d::middleware::IMiddleware, public cocos2d::Ref { +class ParticleSimulator : public cocos2d::Ref, public cocos2d::middleware::IMiddleware { //* @enum enum { diff --git a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonAnimation.cpp b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonAnimation.cpp index 41bd83af..f24a445f 100644 --- a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonAnimation.cpp +++ b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonAnimation.cpp @@ -130,6 +130,10 @@ SkeletonAnimation::SkeletonAnimation () } SkeletonAnimation::~SkeletonAnimation () { + SkeletonAnimation::destroy(); +} + +void SkeletonAnimation::destroy() { _startListener = nullptr; _interruptListener = nullptr; _endListener = nullptr; @@ -139,9 +143,12 @@ SkeletonAnimation::~SkeletonAnimation () { if (_state) { clearTracks(); - if (_ownsAnimationStateData) delete _state->getData(); - delete _state; + if (_ownsAnimationStateData) { + delete _state->getData(); + } + CC_SAFE_DELETE(_state); } + SkeletonRenderer::destroy(); } void SkeletonAnimation::update (float deltaTime) { diff --git a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonAnimation.h b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonAnimation.h index c4f17c21..0ef80606 100644 --- a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonAnimation.h +++ b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonAnimation.h @@ -92,6 +92,7 @@ public: virtual void onAnimationStateEvent (TrackEntry* entry, EventType type, Event* event); virtual void onTrackEntryEvent (TrackEntry* entry, EventType type, Event* event); + virtual void destroy(); AnimationState* getState() const; diff --git a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonCache.h b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonCache.h index 12a5efa5..e3ceee84 100644 --- a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonCache.h +++ b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonCache.h @@ -76,7 +76,7 @@ namespace spine { bool inEffect = false; std::vector textureDatas; }; - + struct BoneData { cocos2d::Mat4 globalTransformMatrix; }; diff --git a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonCacheAnimation.cpp b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonCacheAnimation.cpp index 43f22367..4a8dacf6 100644 --- a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonCacheAnimation.cpp +++ b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonCacheAnimation.cpp @@ -63,6 +63,11 @@ namespace spine { } SkeletonCacheAnimation::~SkeletonCacheAnimation () { + destroy(); + } + + void SkeletonCacheAnimation::destroy() { + stopSchedule(); if (_skeletonCache) { _skeletonCache->release(); _skeletonCache = nullptr; @@ -73,9 +78,8 @@ namespace spine { delete ani; } CC_SAFE_RELEASE_NULL(_attachUtil); - CC_SAFE_RELEASE(_nodeProxy); - CC_SAFE_RELEASE(_effect); - stopSchedule(); + CC_SAFE_RELEASE_NULL(_nodeProxy); + CC_SAFE_RELEASE_NULL(_effect); } void SkeletonCacheAnimation::update(float dt) { @@ -207,13 +211,13 @@ namespace spine { return multiSegments; } - + void SkeletonCacheAnimation::render(float dt) { if (_useMulti) { renderMulti(dt); return; } - + if (!_nodeProxy || !_effect) { return; } @@ -826,7 +830,7 @@ namespace spine { void SkeletonCacheAnimation::setUseMulti(bool enabled) { _useMulti = enabled; } - + void SkeletonCacheAnimation::setAnimation (const std::string& name, bool loop) { _playTimes = loop ? 0 : 1; _animationName = name; diff --git a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonCacheAnimation.h b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonCacheAnimation.h index 49193e0e..f6b076f2 100644 --- a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonCacheAnimation.h +++ b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonCacheAnimation.h @@ -39,7 +39,7 @@ namespace spine { class CacheModeAttachUtil; - class SkeletonCacheAnimation : public cocos2d::middleware::IMiddleware, public cocos2d::Ref { + class SkeletonCacheAnimation : public cocos2d::Ref, public cocos2d::middleware::IMiddleware { public: SkeletonCacheAnimation (const std::string& uuid, bool isShare); virtual ~SkeletonCacheAnimation (); @@ -47,7 +47,7 @@ namespace spine { virtual void update(float dt) override; virtual void render(float dt) override; virtual uint32_t getRenderOrder() const override; - + void renderMulti(float dt); std::vector toMultiSegments( const std::vector& segments); @@ -83,7 +83,7 @@ namespace spine { void onDisable(); void setUseTint(bool enabled); void setUseMulti(bool enabled); - + void setAnimation (const std::string& name, bool loop); void addAnimation (const std::string& name, bool loop, float delay = 0); Animation* findAnimation(const std::string& name) const; @@ -98,6 +98,7 @@ namespace spine { void setToSetupPose (); void setBonesToSetupPose (); void setSlotsToSetupPose (); + void destroy(); private: float _timeScale = 1; bool _paused = false; @@ -124,7 +125,7 @@ namespace spine { std::string _animationName = ""; bool _useTint = false; bool _useMulti = false; - + struct AniQueueData { std::string animationName = ""; bool loop = false; diff --git a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp index 8d705efd..f01d41ee 100644 --- a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp +++ b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp @@ -151,23 +151,37 @@ SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, const s } SkeletonRenderer::~SkeletonRenderer () { - CC_SAFE_RELEASE(_effectDelegate); - if (_ownsSkeletonData) delete _skeleton->getData(); - if (_ownsSkeleton) delete _skeleton; - if (_ownsAtlas && _atlas) delete _atlas; - if (_attachmentLoader) delete _attachmentLoader; - if (_uuid != "") SkeletonDataMgr::getInstance()->releaseByUUID(_uuid); - if (_clipper) delete _clipper; - - if (_debugBuffer) { - delete _debugBuffer; - _debugBuffer = nullptr; - } - - CC_SAFE_RELEASE(_attachUtil); - CC_SAFE_RELEASE(_nodeProxy); - CC_SAFE_RELEASE(_effect); + SkeletonRenderer::destroy(); +} + +void SkeletonRenderer::destroy() { stopSchedule(); + CC_SAFE_RELEASE_NULL(_effectDelegate); + if (_ownsSkeletonData) { + if (_skeleton) { + delete _skeleton->getData(); + } + _ownsSkeletonData = false; + } + if (_ownsSkeleton) { + CC_SAFE_DELETE(_skeleton); + } + if (_ownsAtlas && _atlas) { + CC_SAFE_DELETE(_atlas); + } + _skeleton = nullptr; + _atlas = nullptr; + CC_SAFE_DELETE(_attachmentLoader); + if (_uuid != "") { + SkeletonDataMgr::getInstance()->releaseByUUID(_uuid); + _uuid = ""; + } + CC_SAFE_DELETE(_clipper); + CC_SAFE_DELETE(_debugBuffer); + + CC_SAFE_RELEASE_NULL(_attachUtil); + CC_SAFE_RELEASE_NULL(_nodeProxy); + CC_SAFE_RELEASE_NULL(_effect); } void SkeletonRenderer::initWithUUID(const std::string& uuid) { @@ -298,7 +312,7 @@ void SkeletonRenderer::render (float deltaTime) { // vertex size int bytes with one color int vbs1 = _useMulti ? sizeof(V2F_T2F_C4B_T1F) : sizeof(V2F_T2F_C4B); - // vertex size in floats with one color + // vertex size in floats with one color int vs1 = vbs1 / sizeof(float); // vertex size int bytes with two color int vbs2 = _useMulti ? sizeof(V2F_T2F_C4B_C4B_T1F) :sizeof(V2F_T2F_C4B_C4B); @@ -315,11 +329,11 @@ void SkeletonRenderer::render (float deltaTime) { int preBlendMode = -1; GLuint preTextureIndex = -1; GLuint curTextureIndex = -1; - + float curTextureId = -1; bool texInEffect = false; - int preISegWritePos = -1; + int preISegWritePos = -1; int curISegLen = 0; int materialLen = 0; @@ -361,7 +375,7 @@ void SkeletonRenderer::render (float deltaTime) { curBlendSrc = _premultipliedAlpha ? BlendFactor::ONE : BlendFactor::SRC_ALPHA; curBlendDst = BlendFactor::ONE_MINUS_SRC_ALPHA; } - + double curHash = (_useMulti && texInEffect) ? ((curBlendMode << 16) + ((int)_useTint << 24) + @@ -470,34 +484,34 @@ void SkeletonRenderer::render (float deltaTime) { } if (!_useMulti) { - if (!_useTint) { - triangles.vertCount = attachmentVertices->_triangles->vertCount; - vbSize = triangles.vertCount * sizeof(V2F_T2F_C4B); - isFull |= vb.checkSpace(vbSize, true); - triangles.verts = (V2F_T2F_C4B*)vb.getCurBuffer(); - memcpy(triangles.verts, attachmentVertices->_triangles->verts, vbSize); - attachment->computeWorldVertices(slot->getBone(), (float*)triangles.verts, 0, vs1); + if (!_useTint) { + triangles.vertCount = attachmentVertices->_triangles->vertCount; + vbSize = triangles.vertCount * sizeof(V2F_T2F_C4B); + isFull |= vb.checkSpace(vbSize, true); + triangles.verts = (V2F_T2F_C4B*)vb.getCurBuffer(); + memcpy(triangles.verts, attachmentVertices->_triangles->verts, vbSize); + attachment->computeWorldVertices(slot->getBone(), (float*)triangles.verts, 0, vs1); - triangles.indexCount = attachmentVertices->_triangles->indexCount; - ibSize = triangles.indexCount * sizeof(unsigned short); - ib.checkSpace(ibSize, true); - triangles.indices = (unsigned short*)ib.getCurBuffer(); - memcpy(triangles.indices, attachmentVertices->_triangles->indices, ibSize); - } else { - trianglesTwoColor.vertCount = attachmentVertices->_triangles->vertCount; - vbSize = trianglesTwoColor.vertCount * sizeof(V2F_T2F_C4B_C4B); - isFull |= vb.checkSpace(vbSize, true); - trianglesTwoColor.verts = (V2F_T2F_C4B_C4B*)vb.getCurBuffer(); - for (int ii = 0; ii < trianglesTwoColor.vertCount; ii++) { - trianglesTwoColor.verts[ii].texCoord = attachmentVertices->_triangles->verts[ii].texCoord; - } - attachment->computeWorldVertices(slot->getBone(), (float*)trianglesTwoColor.verts, 0, vs2); - - trianglesTwoColor.indexCount = attachmentVertices->_triangles->indexCount; - ibSize = trianglesTwoColor.indexCount * sizeof(unsigned short); - ib.checkSpace(ibSize, true); - trianglesTwoColor.indices = (unsigned short*)ib.getCurBuffer(); - memcpy(trianglesTwoColor.indices, attachmentVertices->_triangles->indices, ibSize); + triangles.indexCount = attachmentVertices->_triangles->indexCount; + ibSize = triangles.indexCount * sizeof(unsigned short); + ib.checkSpace(ibSize, true); + triangles.indices = (unsigned short*)ib.getCurBuffer(); + memcpy(triangles.indices, attachmentVertices->_triangles->indices, ibSize); + } else { + trianglesTwoColor.vertCount = attachmentVertices->_triangles->vertCount; + vbSize = trianglesTwoColor.vertCount * sizeof(V2F_T2F_C4B_C4B); + isFull |= vb.checkSpace(vbSize, true); + trianglesTwoColor.verts = (V2F_T2F_C4B_C4B*)vb.getCurBuffer(); + for (int ii = 0; ii < trianglesTwoColor.vertCount; ii++) { + trianglesTwoColor.verts[ii].texCoord = attachmentVertices->_triangles->verts[ii].texCoord; + } + attachment->computeWorldVertices(slot->getBone(), (float*)trianglesTwoColor.verts, 0, vs2); + + trianglesTwoColor.indexCount = attachmentVertices->_triangles->indexCount; + ibSize = trianglesTwoColor.indexCount * sizeof(unsigned short); + ib.checkSpace(ibSize, true); + trianglesTwoColor.indices = (unsigned short*)ib.getCurBuffer(); + memcpy(trianglesTwoColor.indices, attachmentVertices->_triangles->indices, ibSize); } } else { if (!_useTint) { @@ -565,34 +579,34 @@ void SkeletonRenderer::render (float deltaTime) { } if (!_useMulti) { - if (!_useTint) { - triangles.vertCount = attachmentVertices->_triangles->vertCount; - vbSize = triangles.vertCount * sizeof(V2F_T2F_C4B); - isFull |= vb.checkSpace(vbSize, true); - triangles.verts = (V2F_T2F_C4B*)vb.getCurBuffer(); - memcpy(triangles.verts, attachmentVertices->_triangles->verts, vbSize); - attachment->computeWorldVertices(*slot, 0, attachment->getWorldVerticesLength(), (float*)triangles.verts, 0, vs1); + if (!_useTint) { + triangles.vertCount = attachmentVertices->_triangles->vertCount; + vbSize = triangles.vertCount * sizeof(V2F_T2F_C4B); + isFull |= vb.checkSpace(vbSize, true); + triangles.verts = (V2F_T2F_C4B*)vb.getCurBuffer(); + memcpy(triangles.verts, attachmentVertices->_triangles->verts, vbSize); + attachment->computeWorldVertices(*slot, 0, attachment->getWorldVerticesLength(), (float*)triangles.verts, 0, vs1); - triangles.indexCount = attachmentVertices->_triangles->indexCount; - ibSize = triangles.indexCount * sizeof(unsigned short); - ib.checkSpace(ibSize, true); - triangles.indices = (unsigned short*)ib.getCurBuffer(); - memcpy(triangles.indices, attachmentVertices->_triangles->indices, ibSize); - } else { - trianglesTwoColor.vertCount = attachmentVertices->_triangles->vertCount; - vbSize = trianglesTwoColor.vertCount * sizeof(V2F_T2F_C4B_C4B); - isFull |= vb.checkSpace(vbSize, true); - trianglesTwoColor.verts = (V2F_T2F_C4B_C4B*)vb.getCurBuffer(); - for (int ii = 0; ii < trianglesTwoColor.vertCount; ii++) { - trianglesTwoColor.verts[ii].texCoord = attachmentVertices->_triangles->verts[ii].texCoord; - } - attachment->computeWorldVertices(*slot, 0, attachment->getWorldVerticesLength(), (float*)trianglesTwoColor.verts, 0, vs2); - - trianglesTwoColor.indexCount = attachmentVertices->_triangles->indexCount; - ibSize = trianglesTwoColor.indexCount * sizeof(unsigned short); - ib.checkSpace(ibSize, true); - trianglesTwoColor.indices = (unsigned short*)ib.getCurBuffer(); - memcpy(trianglesTwoColor.indices, attachmentVertices->_triangles->indices, ibSize); + triangles.indexCount = attachmentVertices->_triangles->indexCount; + ibSize = triangles.indexCount * sizeof(unsigned short); + ib.checkSpace(ibSize, true); + triangles.indices = (unsigned short*)ib.getCurBuffer(); + memcpy(triangles.indices, attachmentVertices->_triangles->indices, ibSize); + } else { + trianglesTwoColor.vertCount = attachmentVertices->_triangles->vertCount; + vbSize = trianglesTwoColor.vertCount * sizeof(V2F_T2F_C4B_C4B); + isFull |= vb.checkSpace(vbSize, true); + trianglesTwoColor.verts = (V2F_T2F_C4B_C4B*)vb.getCurBuffer(); + for (int ii = 0; ii < trianglesTwoColor.vertCount; ii++) { + trianglesTwoColor.verts[ii].texCoord = attachmentVertices->_triangles->verts[ii].texCoord; + } + attachment->computeWorldVertices(*slot, 0, attachment->getWorldVerticesLength(), (float*)trianglesTwoColor.verts, 0, vs2); + + trianglesTwoColor.indexCount = attachmentVertices->_triangles->indexCount; + ibSize = trianglesTwoColor.indexCount * sizeof(unsigned short); + ib.checkSpace(ibSize, true); + trianglesTwoColor.indices = (unsigned short*)ib.getCurBuffer(); + memcpy(trianglesTwoColor.indices, attachmentVertices->_triangles->indices, ibSize); } } else { if (!_useTint) { @@ -650,7 +664,7 @@ void SkeletonRenderer::render (float deltaTime) { : (float*)trianglesTexId.verts) : (_useTint ? (float*)trianglesTwoColor.verts : (float*)triangles.verts); - + int stride = _useTint ? vs2 : vs1; _debugBuffer->writeFloat32(DebugType::Mesh); _debugBuffer->writeFloat32(indexCount * 2); @@ -702,217 +716,217 @@ void SkeletonRenderer::render (float deltaTime) { darkColor.b = 0; } darkColor.a = _premultipliedAlpha ? 255 : 0; - + if (!_useMulti) { - // One color tint logic - if (!_useTint) { - // Cliping logic - if (_clipper->isClipping()) { - _clipper->clipTriangles((float*)&triangles.verts[0].vertex, triangles.indices, triangles.indexCount, (float*)&triangles.verts[0].texCoord, vs1); - - if (_clipper->getClippedTriangles().size() == 0) { - _clipper->clipEnd(*slot); - continue; + // One color tint logic + if (!_useTint) { + // Cliping logic + if (_clipper->isClipping()) { + _clipper->clipTriangles((float*)&triangles.verts[0].vertex, triangles.indices, triangles.indexCount, (float*)&triangles.verts[0].texCoord, vs1); + + if (_clipper->getClippedTriangles().size() == 0) { + _clipper->clipEnd(*slot); + continue; + } + + triangles.vertCount = (int)_clipper->getClippedVertices().size() >> 1; + vbSize = triangles.vertCount * sizeof(V2F_T2F_C4B); + isFull |= vb.checkSpace(vbSize, true); + triangles.verts = (V2F_T2F_C4B*)vb.getCurBuffer(); + + triangles.indexCount = (int)_clipper->getClippedTriangles().size(); + ibSize = triangles.indexCount * sizeof(unsigned short); + ib.checkSpace(ibSize, true); + triangles.indices = (unsigned short*)ib.getCurBuffer(); + memcpy(triangles.indices, _clipper->getClippedTriangles().buffer(), sizeof(unsigned short) * _clipper->getClippedTriangles().size()); + + float* verts = _clipper->getClippedVertices().buffer(); + float* uvs = _clipper->getClippedUVs().buffer(); + if (effect) { + Color light; + Color dark; + light.r = color.r / 255.0f; + light.g = color.g / 255.0f; + light.b = color.b / 255.0f; + light.a = color.a / 255.0f; + dark.r = dark.g = dark.b = dark.a = 0; + for (int v = 0, vn = triangles.vertCount, vv = 0; v < vn; ++v, vv+=2) { + V2F_T2F_C4B* vertex = triangles.verts + v; + Color lightCopy = light; + Color darkCopy = dark; + vertex->vertex.x = verts[vv]; + vertex->vertex.y = verts[vv + 1]; + vertex->texCoord.u = uvs[vv]; + vertex->texCoord.v = uvs[vv + 1]; + effect->transform(vertex->vertex.x, vertex->vertex.y, vertex->texCoord.u, vertex->texCoord.v, lightCopy, darkCopy); + vertex->color.r = (GLubyte)(lightCopy.r * 255); + vertex->color.g = (GLubyte)(lightCopy.g * 255); + vertex->color.b = (GLubyte)(lightCopy.b * 255); + vertex->color.a = (GLubyte)(lightCopy.a * 255); } - - triangles.vertCount = (int)_clipper->getClippedVertices().size() >> 1; - vbSize = triangles.vertCount * sizeof(V2F_T2F_C4B); - isFull |= vb.checkSpace(vbSize, true); - triangles.verts = (V2F_T2F_C4B*)vb.getCurBuffer(); - - triangles.indexCount = (int)_clipper->getClippedTriangles().size(); - ibSize = triangles.indexCount * sizeof(unsigned short); - ib.checkSpace(ibSize, true); - triangles.indices = (unsigned short*)ib.getCurBuffer(); - memcpy(triangles.indices, _clipper->getClippedTriangles().buffer(), sizeof(unsigned short) * _clipper->getClippedTriangles().size()); - - float* verts = _clipper->getClippedVertices().buffer(); - float* uvs = _clipper->getClippedUVs().buffer(); - if (effect) { - Color light; - Color dark; - light.r = color.r / 255.0f; - light.g = color.g / 255.0f; - light.b = color.b / 255.0f; - light.a = color.a / 255.0f; - dark.r = dark.g = dark.b = dark.a = 0; - for (int v = 0, vn = triangles.vertCount, vv = 0; v < vn; ++v, vv+=2) { - V2F_T2F_C4B* vertex = triangles.verts + v; - Color lightCopy = light; - Color darkCopy = dark; - vertex->vertex.x = verts[vv]; - vertex->vertex.y = verts[vv + 1]; - vertex->texCoord.u = uvs[vv]; - vertex->texCoord.v = uvs[vv + 1]; - effect->transform(vertex->vertex.x, vertex->vertex.y, vertex->texCoord.u, vertex->texCoord.v, lightCopy, darkCopy); - vertex->color.r = (GLubyte)(lightCopy.r * 255); - vertex->color.g = (GLubyte)(lightCopy.g * 255); - vertex->color.b = (GLubyte)(lightCopy.b * 255); - vertex->color.a = (GLubyte)(lightCopy.a * 255); - } - } else { - for (int v = 0, vn = triangles.vertCount, vv = 0; v < vn; ++v, vv+=2) { - V2F_T2F_C4B* vertex = triangles.verts + v; - vertex->vertex.x = verts[vv]; - vertex->vertex.y = verts[vv + 1]; - vertex->texCoord.u = uvs[vv]; - vertex->texCoord.v = uvs[vv + 1]; - vertex->color.r = (GLubyte)color.r; - vertex->color.g = (GLubyte)color.g; - vertex->color.b = (GLubyte)color.b; - vertex->color.a = (GLubyte)color.a; - } - } - // No cliping logic } else { - if (effect) { - Color light; - Color dark; - light.r = color.r / 255.0f; - light.g = color.g / 255.0f; - light.b = color.b / 255.0f; - light.a = color.a / 255.0f; - dark.r = dark.g = dark.b = dark.a = 0; - for (int v = 0, vn = triangles.vertCount; v < vn; ++v) { - V2F_T2F_C4B* vertex = triangles.verts + v; - Color lightCopy = light; - Color darkCopy = dark; - effect->transform(vertex->vertex.x, vertex->vertex.y, vertex->texCoord.u, vertex->texCoord.v, lightCopy, darkCopy); - vertex->color.r = (GLubyte)(lightCopy.r * 255); - vertex->color.g = (GLubyte)(lightCopy.g * 255); - vertex->color.b = (GLubyte)(lightCopy.b * 255); - vertex->color.a = (GLubyte)(lightCopy.a * 255); - } - } else { - for (int v = 0, vn = triangles.vertCount; v < vn; ++v) { - V2F_T2F_C4B* vertex = triangles.verts + v; - vertex->color.r = (GLubyte)color.r; - vertex->color.g = (GLubyte)color.g; - vertex->color.b = (GLubyte)color.b; - vertex->color.a = (GLubyte)color.a; - } + for (int v = 0, vn = triangles.vertCount, vv = 0; v < vn; ++v, vv+=2) { + V2F_T2F_C4B* vertex = triangles.verts + v; + vertex->vertex.x = verts[vv]; + vertex->vertex.y = verts[vv + 1]; + vertex->texCoord.u = uvs[vv]; + vertex->texCoord.v = uvs[vv + 1]; + vertex->color.r = (GLubyte)color.r; + vertex->color.g = (GLubyte)color.g; + vertex->color.b = (GLubyte)color.b; + vertex->color.a = (GLubyte)color.a; + } + } + // No cliping logic + } else { + if (effect) { + Color light; + Color dark; + light.r = color.r / 255.0f; + light.g = color.g / 255.0f; + light.b = color.b / 255.0f; + light.a = color.a / 255.0f; + dark.r = dark.g = dark.b = dark.a = 0; + for (int v = 0, vn = triangles.vertCount; v < vn; ++v) { + V2F_T2F_C4B* vertex = triangles.verts + v; + Color lightCopy = light; + Color darkCopy = dark; + effect->transform(vertex->vertex.x, vertex->vertex.y, vertex->texCoord.u, vertex->texCoord.v, lightCopy, darkCopy); + vertex->color.r = (GLubyte)(lightCopy.r * 255); + vertex->color.g = (GLubyte)(lightCopy.g * 255); + vertex->color.b = (GLubyte)(lightCopy.b * 255); + vertex->color.a = (GLubyte)(lightCopy.a * 255); + } + } else { + for (int v = 0, vn = triangles.vertCount; v < vn; ++v) { + V2F_T2F_C4B* vertex = triangles.verts + v; + vertex->color.r = (GLubyte)color.r; + vertex->color.g = (GLubyte)color.g; + vertex->color.b = (GLubyte)color.b; + vertex->color.a = (GLubyte)color.a; } } } - // Two color tint logic - else { - if (_clipper->isClipping()) { - _clipper->clipTriangles((float*)&trianglesTwoColor.verts[0].vertex, trianglesTwoColor.indices, trianglesTwoColor.indexCount, (float*)&trianglesTwoColor.verts[0].texCoord, vs2); - - if (_clipper->getClippedTriangles().size() == 0) { - _clipper->clipEnd(*slot); - continue; - } - - trianglesTwoColor.vertCount = (int)_clipper->getClippedVertices().size() >> 1; - vbSize = trianglesTwoColor.vertCount * sizeof(V2F_T2F_C4B_C4B); - isFull |= vb.checkSpace(vbSize, true); - trianglesTwoColor.verts = (V2F_T2F_C4B_C4B*)vb.getCurBuffer(); - - trianglesTwoColor.indexCount = (int)_clipper->getClippedTriangles().size(); - ibSize = trianglesTwoColor.indexCount * sizeof(unsigned short); - trianglesTwoColor.indices = (unsigned short*)ib.getCurBuffer(); - memcpy(trianglesTwoColor.indices, _clipper->getClippedTriangles().buffer(), sizeof(unsigned short) * _clipper->getClippedTriangles().size()); - - float* verts = _clipper->getClippedVertices().buffer(); - float* uvs = _clipper->getClippedUVs().buffer(); - - if (effect) { - Color light; - Color dark; - light.r = color.r / 255.0f; - light.g = color.g / 255.0f; - light.b = color.b / 255.0f; - light.a = color.a / 255.0f; - dark.r = darkColor.r / 255.0f; - dark.g = darkColor.g / 255.0f; - dark.b = darkColor.b / 255.0f; - dark.a = darkColor.a / 255.0f; - for (int v = 0, vn = trianglesTwoColor.vertCount, vv = 0; v < vn; ++v, vv += 2) { - V2F_T2F_C4B_C4B* vertex = trianglesTwoColor.verts + v; - Color lightCopy = light; - Color darkCopy = dark; - vertex->vertex.x = verts[vv]; - vertex->vertex.y = verts[vv + 1]; - vertex->texCoord.u = uvs[vv]; - vertex->texCoord.v = uvs[vv + 1]; - effect->transform(vertex->vertex.x, vertex->vertex.y, vertex->texCoord.u, vertex->texCoord.v, lightCopy, darkCopy); - vertex->color.r = (GLubyte)(lightCopy.r * 255); - vertex->color.g = (GLubyte)(lightCopy.g * 255); - vertex->color.b = (GLubyte)(lightCopy.b * 255); - vertex->color.a = (GLubyte)(lightCopy.a * 255); - vertex->color2.r = (GLubyte)(darkCopy.r * 255); - vertex->color2.g = (GLubyte)(darkCopy.g * 255); - vertex->color2.b = (GLubyte)(darkCopy.b * 255); - vertex->color2.a = (GLubyte)darkColor.a; - } - } else { - for (int v = 0, vn = trianglesTwoColor.vertCount, vv = 0; v < vn; ++v, vv += 2) { - V2F_T2F_C4B_C4B* vertex = trianglesTwoColor.verts + v; - vertex->vertex.x = verts[vv]; - vertex->vertex.y = verts[vv + 1]; - vertex->texCoord.u = uvs[vv]; - vertex->texCoord.v = uvs[vv + 1]; - vertex->color.r = (GLubyte)color.r; - vertex->color.g = (GLubyte)color.g; - vertex->color.b = (GLubyte)color.b; - vertex->color.a = (GLubyte)color.a; - vertex->color2.r = (GLubyte)darkColor.r; - vertex->color2.g = (GLubyte)darkColor.g; - vertex->color2.b = (GLubyte)darkColor.b; - vertex->color2.a = (GLubyte)darkColor.a; - } + } + // Two color tint logic + else { + if (_clipper->isClipping()) { + _clipper->clipTriangles((float*)&trianglesTwoColor.verts[0].vertex, trianglesTwoColor.indices, trianglesTwoColor.indexCount, (float*)&trianglesTwoColor.verts[0].texCoord, vs2); + + if (_clipper->getClippedTriangles().size() == 0) { + _clipper->clipEnd(*slot); + continue; + } + + trianglesTwoColor.vertCount = (int)_clipper->getClippedVertices().size() >> 1; + vbSize = trianglesTwoColor.vertCount * sizeof(V2F_T2F_C4B_C4B); + isFull |= vb.checkSpace(vbSize, true); + trianglesTwoColor.verts = (V2F_T2F_C4B_C4B*)vb.getCurBuffer(); + + trianglesTwoColor.indexCount = (int)_clipper->getClippedTriangles().size(); + ibSize = trianglesTwoColor.indexCount * sizeof(unsigned short); + trianglesTwoColor.indices = (unsigned short*)ib.getCurBuffer(); + memcpy(trianglesTwoColor.indices, _clipper->getClippedTriangles().buffer(), sizeof(unsigned short) * _clipper->getClippedTriangles().size()); + + float* verts = _clipper->getClippedVertices().buffer(); + float* uvs = _clipper->getClippedUVs().buffer(); + + if (effect) { + Color light; + Color dark; + light.r = color.r / 255.0f; + light.g = color.g / 255.0f; + light.b = color.b / 255.0f; + light.a = color.a / 255.0f; + dark.r = darkColor.r / 255.0f; + dark.g = darkColor.g / 255.0f; + dark.b = darkColor.b / 255.0f; + dark.a = darkColor.a / 255.0f; + for (int v = 0, vn = trianglesTwoColor.vertCount, vv = 0; v < vn; ++v, vv += 2) { + V2F_T2F_C4B_C4B* vertex = trianglesTwoColor.verts + v; + Color lightCopy = light; + Color darkCopy = dark; + vertex->vertex.x = verts[vv]; + vertex->vertex.y = verts[vv + 1]; + vertex->texCoord.u = uvs[vv]; + vertex->texCoord.v = uvs[vv + 1]; + effect->transform(vertex->vertex.x, vertex->vertex.y, vertex->texCoord.u, vertex->texCoord.v, lightCopy, darkCopy); + vertex->color.r = (GLubyte)(lightCopy.r * 255); + vertex->color.g = (GLubyte)(lightCopy.g * 255); + vertex->color.b = (GLubyte)(lightCopy.b * 255); + vertex->color.a = (GLubyte)(lightCopy.a * 255); + vertex->color2.r = (GLubyte)(darkCopy.r * 255); + vertex->color2.g = (GLubyte)(darkCopy.g * 255); + vertex->color2.b = (GLubyte)(darkCopy.b * 255); + vertex->color2.a = (GLubyte)darkColor.a; } } else { - if (effect) { - Color light; - Color dark; - light.r = color.r / 255.0f; - light.g = color.g / 255.0f; - light.b = color.b / 255.0f; - light.a = color.a / 255.0f; - dark.r = darkColor.r / 255.0f; - dark.g = darkColor.g / 255.0f; - dark.b = darkColor.b / 255.0f; - dark.a = darkColor.a / 255.0f; - - for (int v = 0, vn = trianglesTwoColor.vertCount; v < vn; ++v) { - V2F_T2F_C4B_C4B* vertex = trianglesTwoColor.verts + v; - Color lightCopy = light; - Color darkCopy = dark; - effect->transform(vertex->vertex.x, vertex->vertex.y, vertex->texCoord.u, vertex->texCoord.v, lightCopy, darkCopy); - vertex->color.r = (GLubyte)(lightCopy.r * 255); - vertex->color.g = (GLubyte)(lightCopy.g * 255); - vertex->color.b = (GLubyte)(lightCopy.b * 255); - vertex->color.a = (GLubyte)(lightCopy.a * 255); - vertex->color2.r = (GLubyte)(darkCopy.r * 255); - vertex->color2.g = (GLubyte)(darkCopy.g * 255); - vertex->color2.b = (GLubyte)(darkCopy.b * 255); - vertex->color2.a = (GLubyte)darkColor.a; - } - } else { - for (int v = 0, vn = trianglesTwoColor.vertCount; v < vn; ++v) { - V2F_T2F_C4B_C4B* vertex = trianglesTwoColor.verts + v; - vertex->color.r = (GLubyte)color.r; - vertex->color.g = (GLubyte)color.g; - vertex->color.b = (GLubyte)color.b; - vertex->color.a = (GLubyte)color.a; - vertex->color2.r = (GLubyte)darkColor.r; - vertex->color2.g = (GLubyte)darkColor.g; - vertex->color2.b = (GLubyte)darkColor.b; - vertex->color2.a = (GLubyte)darkColor.a; - } + for (int v = 0, vn = trianglesTwoColor.vertCount, vv = 0; v < vn; ++v, vv += 2) { + V2F_T2F_C4B_C4B* vertex = trianglesTwoColor.verts + v; + vertex->vertex.x = verts[vv]; + vertex->vertex.y = verts[vv + 1]; + vertex->texCoord.u = uvs[vv]; + vertex->texCoord.v = uvs[vv + 1]; + vertex->color.r = (GLubyte)color.r; + vertex->color.g = (GLubyte)color.g; + vertex->color.b = (GLubyte)color.b; + vertex->color.a = (GLubyte)color.a; + vertex->color2.r = (GLubyte)darkColor.r; + vertex->color2.g = (GLubyte)darkColor.g; + vertex->color2.b = (GLubyte)darkColor.b; + vertex->color2.a = (GLubyte)darkColor.a; + } + } + } else { + if (effect) { + Color light; + Color dark; + light.r = color.r / 255.0f; + light.g = color.g / 255.0f; + light.b = color.b / 255.0f; + light.a = color.a / 255.0f; + dark.r = darkColor.r / 255.0f; + dark.g = darkColor.g / 255.0f; + dark.b = darkColor.b / 255.0f; + dark.a = darkColor.a / 255.0f; + + for (int v = 0, vn = trianglesTwoColor.vertCount; v < vn; ++v) { + V2F_T2F_C4B_C4B* vertex = trianglesTwoColor.verts + v; + Color lightCopy = light; + Color darkCopy = dark; + effect->transform(vertex->vertex.x, vertex->vertex.y, vertex->texCoord.u, vertex->texCoord.v, lightCopy, darkCopy); + vertex->color.r = (GLubyte)(lightCopy.r * 255); + vertex->color.g = (GLubyte)(lightCopy.g * 255); + vertex->color.b = (GLubyte)(lightCopy.b * 255); + vertex->color.a = (GLubyte)(lightCopy.a * 255); + vertex->color2.r = (GLubyte)(darkCopy.r * 255); + vertex->color2.g = (GLubyte)(darkCopy.g * 255); + vertex->color2.b = (GLubyte)(darkCopy.b * 255); + vertex->color2.a = (GLubyte)darkColor.a; + } + } else { + for (int v = 0, vn = trianglesTwoColor.vertCount; v < vn; ++v) { + V2F_T2F_C4B_C4B* vertex = trianglesTwoColor.verts + v; + vertex->color.r = (GLubyte)color.r; + vertex->color.g = (GLubyte)color.g; + vertex->color.b = (GLubyte)color.b; + vertex->color.a = (GLubyte)color.a; + vertex->color2.r = (GLubyte)darkColor.r; + vertex->color2.g = (GLubyte)darkColor.g; + vertex->color2.b = (GLubyte)darkColor.b; + vertex->color2.a = (GLubyte)darkColor.a; } } } - - texture = attachmentVertices->_texture; + } + + texture = attachmentVertices->_texture; curTextureIndex = attachmentVertices->_texture->getNativeTexture()->getHandle(); - // If texture or blendMode change,will change material. + // If texture or blendMode change,will change material. if (preTextureIndex != curTextureIndex || preBlendMode != slot->getData().getBlendMode() || isFull) { - flush(); + flush(); } } else { diff --git a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonRenderer.h b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonRenderer.h index 59e83a92..38dd9add 100644 --- a/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonRenderer.h +++ b/cocos2d-x/cocos/editor-support/spine-creator-support/SkeletonRenderer.h @@ -50,7 +50,7 @@ namespace spine { /** Draws a skeleton. */ - class SkeletonRenderer: public cocos2d::middleware::IMiddleware, public cocos2d::Ref { + class SkeletonRenderer: public cocos2d::Ref, public cocos2d::middleware::IMiddleware { public: static SkeletonRenderer* create (); static SkeletonRenderer* createWithSkeleton(Skeleton* skeleton, bool ownsSkeleton = false, bool ownsSkeletonData = false); @@ -99,7 +99,7 @@ namespace spine { void setUseTint(bool enabled); void setUseMulti(bool enabled); - + /* Sets the vertex effect to be used, set to 0 to disable vertex effects */ void setVertexEffectDelegate(VertexEffectDelegate* effectDelegate); /* Sets the range of slots that should be rendered. Use -1, -1 to clear the range */ @@ -126,6 +126,7 @@ namespace spine { virtual void stopSchedule(); void onEnable(); void onDisable(); + virtual void destroy(); CC_CONSTRUCTOR_ACCESS: SkeletonRenderer (); diff --git a/cocos2d-x/cocos/platform/openharmony/OpenHarmonyPlatform.cpp b/cocos2d-x/cocos/platform/openharmony/OpenHarmonyPlatform.cpp index e6d94e62..ab25406e 100644 --- a/cocos2d-x/cocos/platform/openharmony/OpenHarmonyPlatform.cpp +++ b/cocos2d-x/cocos/platform/openharmony/OpenHarmonyPlatform.cpp @@ -273,19 +273,31 @@ void OpenHarmonyPlatform::onSurfaceChanged(OH_NativeXComponent* component, void* void OpenHarmonyPlatform::onSurfaceDestroyed(OH_NativeXComponent* component, void* window) { } -void OpenHarmonyPlatform::tick() { - static std::chrono::steady_clock::time_point prevTime; - static std::chrono::steady_clock::time_point now; - static float dt = 0.f; - static float dtSum = 0.f; - static uint32_t jsbInvocationTotalCount = 0; - static uint32_t jsbInvocationTotalFrames = 0; - std::shared_ptr scheduler = g_app->getScheduler(); - scheduler->update(dt); - EventDispatcher::dispatchTickEvent(dt); - PoolManager::getInstance()->getCurrentPool()->clear(); - now = std::chrono::steady_clock::now(); - dt = std::chrono::duration_cast(now - prevTime).count() / 1000000.f; - prevTime = std::chrono::steady_clock::now(); +void OpenHarmonyPlatform::setPreferedFramePersecond(int fps) { + if (fps == 0) { + return; + } + _prefererredNanosecondsPerFrame = static_cast(1.0 / fps * NANOSECONDS_PER_SECOND); // NOLINT(google-runtime-int) } + +void OpenHarmonyPlatform::tick() { + static std::chrono::steady_clock::time_point prevTime; + static std::chrono::steady_clock::time_point now; + static float dt = 0.f; + static double dtNS = NANOSECONDS_60FPS; + if (dtNS < static_cast(_prefererredNanosecondsPerFrame)) { + std::this_thread::sleep_for(std::chrono::nanoseconds( + _prefererredNanosecondsPerFrame - static_cast(dtNS))); + dtNS = static_cast(_prefererredNanosecondsPerFrame); + } + prevTime = std::chrono::steady_clock::now(); + std::shared_ptr scheduler = g_app->getScheduler(); + scheduler->update(dt); + EventDispatcher::dispatchTickEvent(dt); + PoolManager::getInstance()->getCurrentPool()->clear(); + now = std::chrono::steady_clock::now(); + dtNS = dtNS * 0.1 + 0.9 * static_cast(std::chrono::duration_cast(now - prevTime).count()); + dt = static_cast(dtNS) / NANOSECONDS_PER_SECOND; +} + }; // namespace cc diff --git a/cocos2d-x/cocos/platform/openharmony/OpenHarmonyPlatform.h b/cocos2d-x/cocos/platform/openharmony/OpenHarmonyPlatform.h index 6606cbf9..dda8cac1 100644 --- a/cocos2d-x/cocos/platform/openharmony/OpenHarmonyPlatform.h +++ b/cocos2d-x/cocos/platform/openharmony/OpenHarmonyPlatform.h @@ -78,7 +78,9 @@ public: static void onMessageCallback(const uv_async_t* req); static void timerCb(uv_timer_t* handle); void tick(); + void setPreferedFramePersecond(int fps); + int64_t _prefererredNanosecondsPerFrame{NANOSECONDS_60FPS}; OH_NativeXComponent* _component{nullptr}; OH_NativeXComponent_Callback _callback; uv_timer_t _timerHandle; diff --git a/cocos2d-x/cocos/platform/openharmony/modules/CCApplication-openharmony.cpp b/cocos2d-x/cocos/platform/openharmony/modules/CCApplication-openharmony.cpp index 7bd28e9c..fffeff7b 100644 --- a/cocos2d-x/cocos/platform/openharmony/modules/CCApplication-openharmony.cpp +++ b/cocos2d-x/cocos/platform/openharmony/modules/CCApplication-openharmony.cpp @@ -121,7 +121,8 @@ void Application::onResume() void Application::setPreferredFramesPerSecond(int fps) { _fps = fps; - // setPreferredFramesPerSecondJNI(_fps); + cocos2d::OpenHarmonyPlatform* platform = cocos2d::OpenHarmonyPlatform::getInstance(); + platform->setPreferedFramePersecond(_fps); } bool Application::isDisplayStats() { diff --git a/cocos2d-x/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp b/cocos2d-x/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp index eb56dce6..8b76f15a 100644 --- a/cocos2d-x/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp +++ b/cocos2d-x/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp @@ -13203,6 +13203,21 @@ static bool js_cocos2dx_spine_SkeletonRenderer_paused(se::State& s) } SE_BIND_FUNC(js_cocos2dx_spine_SkeletonRenderer_paused) +static bool js_cocos2dx_spine_SkeletonRenderer_destroy(se::State& s) +{ + spine::SkeletonRenderer* cobj = (spine::SkeletonRenderer*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_cocos2dx_spine_SkeletonRenderer_destroy : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + if (argc == 0) { + cobj->destroy(); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); + return false; +} +SE_BIND_FUNC(js_cocos2dx_spine_SkeletonRenderer_destroy) + static bool js_cocos2dx_spine_SkeletonRenderer_setAttachment(se::State& s) { CC_UNUSED bool ok = true; @@ -14133,6 +14148,7 @@ bool js_register_cocos2dx_spine_SkeletonRenderer(se::Object* obj) cls->defineFunction("setAttachUtil", _SE(js_cocos2dx_spine_SkeletonRenderer_setAttachUtil)); cls->defineFunction("setOpacityModifyRGB", _SE(js_cocos2dx_spine_SkeletonRenderer_setOpacityModifyRGB)); cls->defineFunction("paused", _SE(js_cocos2dx_spine_SkeletonRenderer_paused)); + cls->defineFunction("destroy", _SE(js_cocos2dx_spine_SkeletonRenderer_destroy)); cls->defineFunction("setAttachment", _SE(js_cocos2dx_spine_SkeletonRenderer_setAttachment)); cls->defineFunction("setBonesToSetupPose", _SE(js_cocos2dx_spine_SkeletonRenderer_setBonesToSetupPose)); cls->defineFunction("onEnable", _SE(js_cocos2dx_spine_SkeletonRenderer_onEnable)); @@ -14600,6 +14616,21 @@ static bool js_cocos2dx_spine_SkeletonAnimation_setEndListener(se::State& s) } SE_BIND_FUNC(js_cocos2dx_spine_SkeletonAnimation_setEndListener) +static bool js_cocos2dx_spine_SkeletonAnimation_destroy(se::State& s) +{ + spine::SkeletonAnimation* cobj = (spine::SkeletonAnimation*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_cocos2dx_spine_SkeletonAnimation_destroy : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + if (argc == 0) { + cobj->destroy(); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); + return false; +} +SE_BIND_FUNC(js_cocos2dx_spine_SkeletonAnimation_destroy) + static bool js_cocos2dx_spine_SkeletonAnimation_getState(se::State& s) { spine::SkeletonAnimation* cobj = (spine::SkeletonAnimation*)s.nativeThisObject(); @@ -15284,6 +15315,7 @@ bool js_register_cocos2dx_spine_SkeletonAnimation(se::Object* obj) cls->defineFunction("setTrackCompleteListenerNative", _SE(js_cocos2dx_spine_SkeletonAnimation_setTrackCompleteListener)); cls->defineFunction("setAnimationStateData", _SE(js_cocos2dx_spine_SkeletonAnimation_setAnimationStateData)); cls->defineFunction("setEndListener", _SE(js_cocos2dx_spine_SkeletonAnimation_setEndListener)); + cls->defineFunction("destroy", _SE(js_cocos2dx_spine_SkeletonAnimation_destroy)); cls->defineFunction("getState", _SE(js_cocos2dx_spine_SkeletonAnimation_getState)); cls->defineFunction("setCompleteListenerNative", _SE(js_cocos2dx_spine_SkeletonAnimation_setCompleteListener)); cls->defineFunction("setTrackDisposeListener", _SE(js_cocos2dx_spine_SkeletonAnimation_setTrackDisposeListener)); @@ -15652,6 +15684,21 @@ static bool js_cocos2dx_spine_SkeletonCacheAnimation_paused(se::State& s) } SE_BIND_FUNC(js_cocos2dx_spine_SkeletonCacheAnimation_paused) +static bool js_cocos2dx_spine_SkeletonCacheAnimation_destroy(se::State& s) +{ + spine::SkeletonCacheAnimation* cobj = (spine::SkeletonCacheAnimation*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_cocos2dx_spine_SkeletonCacheAnimation_destroy : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + if (argc == 0) { + cobj->destroy(); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); + return false; +} +SE_BIND_FUNC(js_cocos2dx_spine_SkeletonCacheAnimation_destroy) + static bool js_cocos2dx_spine_SkeletonCacheAnimation_setAttachment(se::State& s) { CC_UNUSED bool ok = true; @@ -16334,6 +16381,7 @@ bool js_register_cocos2dx_spine_SkeletonCacheAnimation(se::Object* obj) cls->defineFunction("findAnimation", _SE(js_cocos2dx_spine_SkeletonCacheAnimation_findAnimation)); cls->defineFunction("setAttachUtil", _SE(js_cocos2dx_spine_SkeletonCacheAnimation_setAttachUtil)); cls->defineFunction("paused", _SE(js_cocos2dx_spine_SkeletonCacheAnimation_paused)); + cls->defineFunction("destroy", _SE(js_cocos2dx_spine_SkeletonCacheAnimation_destroy)); cls->defineFunction("setAttachment", _SE(js_cocos2dx_spine_SkeletonCacheAnimation_setAttachment)); cls->defineFunction("setAnimation", _SE(js_cocos2dx_spine_SkeletonCacheAnimation_setAnimation)); cls->defineFunction("setBonesToSetupPose", _SE(js_cocos2dx_spine_SkeletonCacheAnimation_setBonesToSetupPose)); diff --git a/cocos2d-x/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp b/cocos2d-x/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp index cc86d543..74e4934e 100644 --- a/cocos2d-x/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp +++ b/cocos2d-x/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp @@ -923,6 +923,7 @@ SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_initWithUUID); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_setAttachUtil); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_setOpacityModifyRGB); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_paused); +SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_destroy); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_setAttachment); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_setBonesToSetupPose); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_onEnable); @@ -973,6 +974,7 @@ SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonAnimation_setTrackInterruptListener); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonAnimation_setTrackCompleteListener); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonAnimation_setAnimationStateData); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonAnimation_setEndListener); +SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonAnimation_destroy); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonAnimation_getState); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonAnimation_setCompleteListener); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonAnimation_setTrackDisposeListener); @@ -1022,6 +1024,7 @@ SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonCacheAnimation_setTimeScale); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonCacheAnimation_findAnimation); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonCacheAnimation_setAttachUtil); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonCacheAnimation_paused); +SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonCacheAnimation_destroy); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonCacheAnimation_setAttachment); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonCacheAnimation_setAnimation); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonCacheAnimation_setBonesToSetupPose); diff --git a/cocos2d-x/cocos/scripting/js-bindings/jswrapper/napi/Object.cpp b/cocos2d-x/cocos/scripting/js-bindings/jswrapper/napi/Object.cpp index 973ae92f..c10d5b8e 100644 --- a/cocos2d-x/cocos/scripting/js-bindings/jswrapper/napi/Object.cpp +++ b/cocos2d-x/cocos/scripting/js-bindings/jswrapper/napi/Object.cpp @@ -509,10 +509,9 @@ void Object::setPrivateData(void* data){ //issue https://github.com/nodejs/node/issues/23999 auto tmpThis = _objRef.getValue(_env); //_objRef.deleteRef(); - napi_ref result = nullptr; NODE_API_CALL(status, _env, napi_wrap(_env, tmpThis, data, weakCallback, - (void*)this /* finalize_hint */, &result)); + (void*)this /* finalize_hint */, nullptr)); //_objRef.setWeakref(_env, result); setProperty("__native_ptr__", se::Value(static_cast(reinterpret_cast(data)))); } diff --git a/cocos2d-x/cocos/scripting/js-bindings/manual/jsb_module_register.cpp b/cocos2d-x/cocos/scripting/js-bindings/manual/jsb_module_register.cpp index a7213569..e9b65249 100644 --- a/cocos2d-x/cocos/scripting/js-bindings/manual/jsb_module_register.cpp +++ b/cocos2d-x/cocos/scripting/js-bindings/manual/jsb_module_register.cpp @@ -180,13 +180,13 @@ bool jsb_register_all_modules() se->addRegisterCallback(register_all_video); #endif -#if USE_WEBVIEW +#if USE_WEB_VIEW se->addRegisterCallback(register_all_webview); #endif #elif (CC_TARGET_PLATFORM == CC_PLATFORM_OPENHARMONY) -#if USE_WEBVIEW +#if USE_WEB_VIEW se->addRegisterCallback(register_all_webview); #endif diff --git a/cocos2d-x/cocos/scripting/js-bindings/manual/jsb_xmlhttprequest.cpp b/cocos2d-x/cocos/scripting/js-bindings/manual/jsb_xmlhttprequest.cpp index 8adc6d71..0f1eba39 100644 --- a/cocos2d-x/cocos/scripting/js-bindings/manual/jsb_xmlhttprequest.cpp +++ b/cocos2d-x/cocos/scripting/js-bindings/manual/jsb_xmlhttprequest.cpp @@ -379,6 +379,12 @@ void XMLHttpRequest::getHeader(const std::string& header) // Transform field name to lower case as they are case-insensitive std::transform(http_field.begin(), http_field.end(), http_field.begin(), ::tolower); + if (CC_TARGET_PLATFORM == CC_PLATFORM_OPENHARMONY && _httpHeader.find(http_field) != _httpHeader.end()) { + _httpHeader[http_field].insert(strlen(_httpHeader[http_field].c_str()) - 1, ","); + _httpHeader[http_field].insert(strlen(_httpHeader[http_field].c_str()) - 1, http_value); + http_value = _httpHeader[http_field]; + } + _httpHeader[http_field] = http_value; } diff --git a/cocos2d-x/external/config.json b/cocos2d-x/external/config.json index 18b35c71..99aeac57 100644 --- a/cocos2d-x/external/config.json +++ b/cocos2d-x/external/config.json @@ -1,6 +1,6 @@ { - "version": "v24-11", - "zip_file_size": "181264997", + "version": "v24-12", + "zip_file_size": "181682416", "repo_name": "cocos-engine-external", "repo_parent": "https://github.com/cocos/" } diff --git a/cocos2d-x/external/openharmony/arm64-v8a/include/websockets/lws_config.h b/cocos2d-x/external/openharmony/arm64-v8a/include/websockets/lws_config.h index 78976336..8e894aa6 100644 --- a/cocos2d-x/external/openharmony/arm64-v8a/include/websockets/lws_config.h +++ b/cocos2d-x/external/openharmony/arm64-v8a/include/websockets/lws_config.h @@ -6,7 +6,7 @@ #endif #endif -#define LWS_INSTALL_DATADIR "/home/cloud_dragon/lsy/lycium/usr/libwebsockets-arm64-v8a-install/share" +#define LWS_INSTALL_DATADIR "/Users/cocos/Github/cocos2d-x-3rd-party-libs-src/contrib/install-android/arm64/share" /* Define to 1 to use wolfSSL/CyaSSL as a replacement for OpenSSL. * LWS_OPENSSL_SUPPORT needs to be set also for this to work. */ @@ -35,7 +35,7 @@ #define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH /* The current git commit hash that we're building from */ -/* #undef LWS_BUILD_HASH */ +#define LWS_BUILD_HASH "cocos@cocoss-MacBook-Pro.local-v3.4-182-g408ba56" /* Build with OpenSSL support */ #define LWS_OPENSSL_SUPPORT @@ -83,16 +83,16 @@ /* #undef LWS_MINGW_SUPPORT */ /* Use the BSD getifaddrs that comes with libwebsocket, for uclibc support */ -/* #undef LWS_BUILTIN_GETIFADDRS */ +#define LWS_BUILTIN_GETIFADDRS /* use SHA1() not internal libwebsockets_SHA1 */ /* #undef LWS_SHA1_USE_OPENSSL_NAME */ /* SSL server using ECDH certificate */ /* #undef LWS_SSL_SERVER_WITH_ECDH_CERT */ -#define LWS_HAVE_SSL_CTX_set1_param -#define LWS_HAVE_X509_VERIFY_PARAM_set1_host -#define LWS_HAVE_RSA_SET0_KEY +/* #undef LWS_HAVE_SSL_CTX_set1_param */ +/* #undef LWS_HAVE_X509_VERIFY_PARAM_set1_host */ +/* #undef LWS_HAVE_RSA_SET0_KEY */ /* #undef LWS_HAVE_UV_VERSION_H */ @@ -147,9 +147,9 @@ /* OpenSSL various APIs */ -#define LWS_HAVE_TLS_CLIENT_METHOD -#define LWS_HAVE_TLSV1_2_CLIENT_METHOD -#define LWS_HAVE_SSL_SET_INFO_CALLBACK +/* #undef LWS_HAVE_TLS_CLIENT_METHOD */ +/* #undef LWS_HAVE_TLSV1_2_CLIENT_METHOD */ +/* #undef LWS_HAVE_SSL_SET_INFO_CALLBACK */ #define LWS_HAS_INTPTR_T diff --git a/cocos2d-x/external/openharmony/arm64-v8a/lib/libwebsockets.a b/cocos2d-x/external/openharmony/arm64-v8a/lib/libwebsockets.a index 1af53d82..5cd30c5b 100644 Binary files a/cocos2d-x/external/openharmony/arm64-v8a/lib/libwebsockets.a and b/cocos2d-x/external/openharmony/arm64-v8a/lib/libwebsockets.a differ diff --git a/cocos2d-x/package.json b/cocos2d-x/package.json index d4ca8a4f..84a5ac30 100644 --- a/cocos2d-x/package.json +++ b/cocos2d-x/package.json @@ -1,6 +1,6 @@ { "name": "cocos2d-x-lite", - "version": "2.4.12", + "version": "2.4.13", "description": "Cocos2d-x, compact version", "main": "gulpfile.js", "devDependencies": { diff --git a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/cpp/types/libcocos/index.d.ts b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/cpp/types/libcocos/index.d.ts new file mode 100644 index 00000000..8e739faa --- /dev/null +++ b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/cpp/types/libcocos/index.d.ts @@ -0,0 +1,27 @@ +import { ContextType } from '../../../ets/common/Constants'; + +interface context { + onPageShow: () => void; + onPageHide: () => void; + workerInit: () => void; + postMessage: (msgType: string, msgData: string) => void; + postSyncMessage: (msgType: string, msgData: string) => Promise; + setPostMessageFunction: (postMessage: (msgType: string, msgData: string) => void) => void; + setPostSyncMessageFunction: (postSyncMessage: (msgType: string, msgData: string) => void) => void; + nativeEngineInit: () => void; + nativeEngineStart: () => void; + onTextChange: (param: string) => void; + onComplete: (param: string) => void; + shouldStartLoading: (viewTag: number, url: string) => void; + finishLoading: (viewTag: number, url: string) => void; + failLoading: (viewTag: number, url: string) => void; + onBackPress: () => void; + onCreate: () => void; + onDestroy: () => void; + onShow: () => void; + onHide: () => void; + resourceManagerInit: (resourceManager: any) => void; + writablePathInit: (cacheDir: string) => void; +} + +export const getContext: (type: ContextType) => context; diff --git a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/cpp/types/libcocos/oh-package.json5 b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/cpp/types/libcocos/oh-package.json5 new file mode 100644 index 00000000..20aaf4fb --- /dev/null +++ b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/cpp/types/libcocos/oh-package.json5 @@ -0,0 +1,6 @@ +{ + "name": "libcocos.so", + "types": "./index.d.ts", + "version": "", + "description": "Please describe the basic information." +} \ No newline at end of file diff --git a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/WorkerManager.ets b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/WorkerManager.ets index 37459e29..0ed83457 100644 --- a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/WorkerManager.ets +++ b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/WorkerManager.ets @@ -24,31 +24,34 @@ ****************************************************************************/ import worker from '@ohos.worker'; -import {Constants} from '../common/Constants' +import { Constants } from '../common/Constants' export class WorkerManager { - private static instance: WorkerManager; - private cocosWorker: any; + private cocosWorker: worker.Worker; - private constructor() { - this.cocosWorker = new worker.Worker("entry/ets/workers/cocos_worker.ts", {type:"classic", name: "CocosWorker"}); - this.cocosWorker.onerror = function (e) { - var msg = e.message; - var filename = e.filename; - var lineno = e.lineno; - var colno = e.colno; - console.error(`on Error ${msg} ${filename} ${lineno} ${colno}`); - } + private constructor() { + this.cocosWorker = new worker.Worker("entry/ets/workers/cocos_worker.ts", { + type: "classic", + name: "CocosWorker" + }); + this.cocosWorker.onerror = (e) => { + let msg = e.message; + let filename = e.filename; + let lineno = e.lineno; + let colno = e.colno; + console.error(`on Error ${msg} ${filename} ${lineno} ${colno}`); } + } - public static getInstance(): WorkerManager { - if (AppStorage.Get(Constants.APP_KEY_WORKER_MANAGER) == null) { - AppStorage.SetOrCreate(Constants.APP_KEY_WORKER_MANAGER, new WorkerManager); - } - return AppStorage.Get(Constants.APP_KEY_WORKER_MANAGER); - } - public getWorker(): any { - return this.cocosWorker; + public static getInstance(): WorkerManager { + if (AppStorage.Get(Constants.APP_KEY_WORKER_MANAGER) as WorkerManager == undefined) { + AppStorage.SetOrCreate(Constants.APP_KEY_WORKER_MANAGER, new WorkerManager); } + return AppStorage.Get(Constants.APP_KEY_WORKER_MANAGER) as WorkerManager; + } + + public getWorker(): worker.Worker { + return this.cocosWorker; + } } diff --git a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/game.ts b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/game.ts index 52972af1..23a0357f 100644 --- a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/game.ts +++ b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/game.ts @@ -1,4 +1,5 @@ -globalThis.oh = {}; +globalThis.oh = {} as any; + function boot() { const cc = globalThis.cc; var settings = globalThis._CCSettings; @@ -74,8 +75,8 @@ function boot() { } } - globalThis.oh.loadJsList(settings.jsList,cb); - + globalThis.oh.loadJsList(settings.jsList, cb); + for (var i = 0; i < bundleRoot.length; i++) { cc.assetManager.loadBundle(bundleRoot[i], cb); } diff --git a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/common/PortProxy.ts b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/common/PortProxy.ts index a28d396f..d2f84c92 100644 --- a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/common/PortProxy.ts +++ b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/common/PortProxy.ts @@ -21,57 +21,56 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -****************************************************************************/ -import worker from '@ohos.worker'; -import {DedicatedWorkerGlobalScope} from '@ohos.worker'; -// NOTE: don't use this import all statement, because this has compile issue. -// import * as wk from '@ohos.worker'; + ****************************************************************************/ +import { DedicatedWorkerGlobalScope } from '@ohos.worker'; import { MessageEvent } from '@ohos.worker'; export class PortProxy { - private autoId: number = 0; - public actionHandleMap = {} - private port :DedicatedWorkerGlobalScope = null; + private autoId: number = 0; + public actionHandleMap = {} + private port: DedicatedWorkerGlobalScope = null; - public _messageHandle?:(e: MessageEvent) => void; + public _messageHandle?: (e: MessageEvent) => void; - constructor (port) { - this.port = port; - this.port.onmessage = this.onMessage.bind(this); - } + constructor(worker) { + this.port = worker; + this.port.onmessage = this.onMessage.bind(this); + } - public onMessage(e) { - let data = e['data']; - if(data.type != "syncResult" && this._messageHandle) { - this._messageHandle(e); - } else if(data.type == "syncResult") { - const {id, response} = data.data; - if (!this.actionHandleMap[id]) { - return; - } - this.actionHandleMap[id].call(this, response) - delete this.actionHandleMap[id]; - } - } - public postReturnMessage(e:any, res: any) { - if(e.type == "sync" && res != null && res != undefined) { - this.port.postMessage({type:"syncResult", data:{id:e.data.cbId, response:res}}); - } - } - public postMessage(msgName: string, msgData:any) { - this.port.postMessage({type:"async", data:{name:msgName, param:msgData}}); + public onMessage(e) { + let data = e['data']; + if (data.type != "syncResult" && this._messageHandle) { + this._messageHandle(e); + } else if (data.type == "syncResult") { + const { id, response } = data.data; + if (!this.actionHandleMap[id]) { + return; + } + this.actionHandleMap[id].call(this, response); + delete this.actionHandleMap[id]; } + } - public postSyncMessage(msgName: string, msgData:any) { - const id = this.autoId++; - return new Promise((resolve, reject) => { - const message = { - type:"sync", data:{cbId:id, name:msgName, param:msgData} - } - this.port.postMessage(message); - this.actionHandleMap[id] = (response) => { - resolve(response) - } - }) + public postReturnMessage(e: any, res: any) { + if (e.type == "sync" && res != null && res != undefined) { + this.port.postMessage({ type: "syncResult", data: { id: e.data.cbId, response: res } }); } + } + + public postMessage(msgName: string, msgData: any) { + this.port.postMessage({ type: "async", data: { name: msgName, param: msgData } }); + } + + public postSyncMessage(msgName: string, msgData: any) { + const id = this.autoId++; + return new Promise((resolve, reject) => { + const message = { + type: "sync", data: { cbId: id, name: msgName, param: msgData } + } + this.port.postMessage(message); + this.actionHandleMap[id] = (response) => { + resolve(response) + } + }) + } } \ No newline at end of file diff --git a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosVideoPlayer.ets b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosVideoPlayer.ets index 2ad12845..b55165f5 100644 --- a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosVideoPlayer.ets +++ b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosVideoPlayer.ets @@ -21,9 +21,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -****************************************************************************/ -import { WorkerManager } from '../cocos/WorkerManager' -import { PortProxy } from '../common/PortProxy' + ****************************************************************************/ +import { PortProxy } from '../common/PortProxy'; enum EventType { PLAYING = 0, @@ -35,7 +34,13 @@ enum EventType { READY_TO_PLAY, UPDATE, QUIT_FULLSCREEN = 1000 -}; +} + +interface param { + videoTag?: number, + videoEvent?: EventType, + args?: number +} @Observed export class VideoInfo { @@ -44,24 +49,21 @@ export class VideoInfo { public w: number = 0; public h: number = 0; // url - public url: string | Resource = "" - public viewTag: string = '' - public visible: boolean = true - + public url: string | Resource = ""; + public viewTag: number = 0; + public visible: boolean = true; public duration: number = 0; public currentTime: number = 0; public isFullScreen: boolean = false; - public currentProgressRate:number | string | PlaybackSpeed; - + public currentProgressRate?: number | string | PlaybackSpeed; public resourceType: number = 0; - /** * https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/reference/arkui-ts/ts-media-components-video.md#videocontroller * */ public controller: VideoController = new VideoController() - constructor(x: number, y: number, w: number, h: number, viewTag: string) { + constructor(x: number, y: number, w: number, h: number, viewTag: number) { this.x = x; this.y = y; this.w = w; @@ -70,49 +72,70 @@ export class VideoInfo { } } - @Component export struct CocosVideoPlayer { @ObjectLink videoInfo: VideoInfo; - public workPort: PortProxy; + public workPort: PortProxy | null = null; + build() { - Video({ src: this.videoInfo.url, controller: this.videoInfo.controller, currentProgressRate:this.videoInfo.currentProgressRate }) + Video({ + src: this.videoInfo.url, + controller: this.videoInfo.controller, + currentProgressRate: this.videoInfo.currentProgressRate as number | string | PlaybackSpeed + }) .position({ x: this.videoInfo.x, y: this.videoInfo.y }) .width(this.videoInfo.w) .height(this.videoInfo.h) .controls(false) .autoPlay(false) .onStart(() => { - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.PLAYING}); + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag as number, + videoEvent: EventType.PLAYING as EventType + } as param); }) .onPause(() => { - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.PAUSED}); + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag as number, + videoEvent: EventType.PAUSED as EventType + } as param); }) .onFinish(() => { - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.COMPLETED}); + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag, + videoEvent: EventType.COMPLETED + } as param); }) - .onPrepared((event: { - duration: number; - }) => { - this.videoInfo.duration = event.duration; - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.READY_TO_PLAY, args:event.duration}); + .onPrepared((event): void => { + this.videoInfo.duration = event?.duration as number; + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag, + videoEvent: EventType.READY_TO_PLAY, + args: event?.duration + } as param); }) - .onClick((event: ClickEvent) => { - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.CLICKED}); + .onClick((event): void => { + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag, + videoEvent: EventType.CLICKED + } as param); }) - .onUpdate((event?: { - time: number; - }) => { - this.videoInfo.currentTime = event.time - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.UPDATE, args:event.time}); + .onUpdate((event) => { + this.videoInfo.currentTime = event?.time as number; + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag, + videoEvent: EventType.UPDATE, + args: event?.time + } as param); }) - .onFullscreenChange((event?: { - fullscreen: boolean; - }) => { - if (!event.fullscreen) { - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.QUIT_FULLSCREEN}); + .onFullscreenChange((event) => { + if (!event?.fullscreen) { + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag, + videoEvent: EventType.QUIT_FULLSCREEN + } as param); } - this.videoInfo.isFullScreen = event.fullscreen + this.videoInfo.isFullScreen = event?.fullscreen as boolean; }) .visibility(this.videoInfo.visible ? Visibility.Visible : Visibility.None) } diff --git a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosWebView.ets b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosWebView.ets index 1e57ebca..b93a477d 100644 --- a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosWebView.ets +++ b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosWebView.ets @@ -22,9 +22,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -import { WorkerManager } from '../cocos/WorkerManager' -import { PortProxy } from '../common/PortProxy' -import web from '@ohos.web.webview' +import { PortProxy } from '../common/PortProxy'; +import web from '@ohos.web.webview'; + +interface param { + viewTag: number, + url: string, +} + @Observed export class WebViewInfo { // position @@ -34,27 +39,26 @@ export class WebViewInfo { public w: number = 0; public h: number = 0; // url - public url: string = '' + public url: string = ''; // tag - public viewTag: string = '' + public viewTag: number = 0; // Whether to display - public visible: boolean = true - + public visible: boolean = true; /* * doc : https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-web.md#webcontroller */ - public controller: WebController = new WebController() + public controller: web.WebviewController = new web.WebviewController(); - constructor(x: number, y: number, w: number, h: number, viewTag: string) { + constructor(x: number, y: number, w: number, h: number, viewTag: number) { this.x = x; this.y = y; this.w = w; this.h = h; this.viewTag = viewTag; - web.once("webInited", ()=>{ - if (this.url!= '') { - this.controller.loadUrl({url: this.url}); + web.once("webInited", () => { + if (this.url != '') { + this.controller.loadUrl(this.url); } }); } @@ -63,33 +67,33 @@ export class WebViewInfo { @Component export struct CocosWebView { @ObjectLink viewInfo: WebViewInfo; - public workPort: PortProxy; + public workPort: PortProxy | null = null; + build() { - Web({ src: "", controller: this.viewInfo.controller }) + Web({ src: this.viewInfo.url, controller: this.viewInfo.controller }) .position({ x: this.viewInfo.x, y: this.viewInfo.y }) .width(this.viewInfo.w) .height(this.viewInfo.h) .border({ width: 1 }) .onPageBegin((event) => { - this.workPort.postMessage("onPageBegin", {viewTag:this.viewInfo.viewTag, url:event.url}); + this.workPort?.postMessage("onPageBegin", { + viewTag: this.viewInfo.viewTag as number, + url: event?.url as string + } as param); }) .onPageEnd((event) => { - this.workPort.postMessage("onPageEnd", {viewTag:this.viewInfo.viewTag, url:event.url}) + this.workPort?.postMessage("onPageEnd", { viewTag: this.viewInfo.viewTag as number, url: event?.url as string } as param) }) .onErrorReceive((event) => { - this.workPort.postMessage("onErrorReceive", {viewTag:this.viewInfo.viewTag, url:this.viewInfo.url}) + this.workPort?.postMessage("onErrorReceive", { viewTag: this.viewInfo.viewTag as number, url: this.viewInfo.url as string } as param) }) .onHttpErrorReceive((event) => { - this.workPort.postMessage("onErrorReceive", {viewTag:this.viewInfo.viewTag, url:this.viewInfo.url}) + this.workPort?.postMessage("onErrorReceive", { viewTag: this.viewInfo.viewTag as number, url: this.viewInfo.url as string } as param) }) - // 开启DOM存储权限 - .domStorageAccess(true) - // 开启数据库存储权限 - .databaseAccess(true) - // 图片加载相关权限 - .imageAccess(true) - // 支持JS代码运行 - .javaScriptAccess(true) + .domStorageAccess(true)// enable DOM storage permissions + .databaseAccess(true)// enable database storage permissions + .imageAccess(true)// enable image loading permissions + .javaScriptAccess(true)// support JS code running .visibility(this.viewInfo.visible ? Visibility.Visible : Visibility.None) } } \ No newline at end of file diff --git a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/EditBoxDialog.ets b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/EditBoxDialog.ets index 643c0532..198ee169 100644 --- a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/EditBoxDialog.ets +++ b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/EditBoxDialog.ets @@ -21,16 +21,16 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -****************************************************************************/ + ****************************************************************************/ @CustomDialog export struct EditBoxDialog { private showMessage: string = '' private inputMessage: string = '' - onTextChange: (msg: string) => void - accept: (msg: string) => void - controller: CustomDialogController - cancel: () => void - confirm: () => void + onTextChange?: (msg: string) => void; + accept?: (msg: string) => void; + controller?: CustomDialogController; + cancel?: () => void; + confirm?: () => void; build() { Column() { @@ -48,14 +48,14 @@ export struct EditBoxDialog { if (this.accept) { this.accept(this.inputMessage); } - this.controller.close(); + this.controller?.close(); }) Blank(8).width(16) Button('完成').onClick(() => { if (this.accept) { this.accept(this.inputMessage); } - this.controller.close(); + this.controller?.close(); }) }.padding({ left: 8, right: 8, top: 8, bottom: 8 }) .backgroundColor(Color.Gray) diff --git a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/entryability/EntryAbility.ts b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/entryability/EntryAbility.ts index fcda85b3..f73adf28 100644 --- a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/entryability/EntryAbility.ts +++ b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/entryability/EntryAbility.ts @@ -1,6 +1,6 @@ import UIAbility from '@ohos.app.ability.UIAbility'; -import cocos from "libcocos.so"; -import { ContextType } from "../common/Constants" +import cocos from 'libcocos.so'; +import { ContextType } from '../common/Constants'; import window from '@ohos.window'; const nativeContext = cocos.getContext(ContextType.ENGINE_UTILS); @@ -29,9 +29,9 @@ export default class EntryAbility extends UIAbility { } windowClass = data; console.info('Succeeded in obtaining the main window. Data: ' + JSON.stringify(data)); - + // 设置窗口为全屏布局，配合设置导航栏、状态栏是否显示，与主窗口显示保持协调一致。 - let isLayoutFullScreen= true; + let isLayoutFullScreen = true; windowClass.setWindowLayoutFullScreen(isLayoutFullScreen, (err) => { if (err.code) { console.error('Failed to set the window layout to full-screen mode. Cause: ' + JSON.stringify(err)); @@ -39,7 +39,7 @@ export default class EntryAbility extends UIAbility { } console.info('Succeeded in setting the window layout to full-screen mode.'); }); - + // 设置状态栏和导航栏是否显示。例如，需全部显示，该参数设置为['status', 'navigation']；不设置，则默认不显示。 let visibleBar = []; windowClass.setWindowSystemBarEnable(visibleBar, (err) => { diff --git a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/pages/index.ets b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/pages/index.ets index 71a2ab80..d28dc286 100644 --- a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/pages/index.ets +++ b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/pages/index.ets @@ -21,227 +21,264 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -****************************************************************************/ -import nativerender from "libcocos.so"; + ****************************************************************************/ +import nativerender from 'libcocos.so'; -import { WorkerManager } from '../cocos/WorkerManager' -import { ContextType } from "../common/Constants" -import featureAbility from '@ohos.ability.featureAbility' -import { EditBoxDialog } from '../components/EditBoxDialog' -import { WebViewInfo, CocosWebView } from '../components/CocosWebView' -import { VideoInfo, CocosVideoPlayer } from '../components/CocosVideoPlayer' +import { WorkerManager } from '../cocos/WorkerManager'; +import { ContextType } from '../common/Constants'; +import { EditBoxDialog } from '../components/EditBoxDialog'; +import { CocosWebView, WebViewInfo } from '../components/CocosWebView'; +import { CocosVideoPlayer, VideoInfo } from '../components/CocosVideoPlayer'; +import { MessageEvent } from '@ohos.worker'; +import { PortProxy } from '../common/PortProxy'; -import {PortProxy} from '../common/PortProxy' const nativePageLifecycle = nativerender.getContext(ContextType.JSPAGE_LIFECYCLE); const engineUtils = nativerender.getContext(ContextType.ENGINE_UTILS); +interface WorkerMessage { + type: string; + data: data; +} + +interface data { + id: string, + name: string, + param: number | string | param +} + +interface param { + tag?: number, + url?: string, + contents?: string, + mimeType?: string, + encoding?: string, + baseUrl?: string, + jsContents?: string, + x?: number, + y?: number, + w?: number, + h?: number, + visible?: boolean, + resourceType?: number, + time?: number, + fullScreen?: boolean +} + @Entry @Component struct Index { @State showMessage: string = '' @State webViewArray: WebViewInfo[] = []; - @State videoArray:VideoInfo[] = []; - //private index: number = 0; - private webViewIndexMap: Map = new Map; - private videoIndexMap: Map = new Map; - - private workPort : PortProxy = new PortProxy(WorkerManager.getInstance().getWorker()); + @State videoArray: VideoInfo[] = []; + private webViewIndexMap: Map = new Map(); + private videoIndexMap: Map = new Map(); + private workPort: PortProxy = new PortProxy(WorkerManager.getInstance().getWorker()); dialogController: CustomDialogController = new CustomDialogController({ builder: EditBoxDialog({ showMessage: this.showMessage, - onTextChange: (msg: string) => { + onTextChange: (msg: string): void => { this.showMessage = msg; - this.workPort.postMessage('onTextInput', msg) + this.workPort.postMessage('onTextInput', msg); }, - accept: (msg: string) => { + accept: (msg: string): void => { this.showMessage = msg; - this.workPort.postMessage('onComplete', msg) - }, + this.workPort.postMessage('onComplete', msg); + } }), - cancel: () => { - this.workPort.postMessage('onComplete', this.showMessage) + cancel: (): void => { + this.workPort.postMessage('onComplete', this.showMessage); }, autoCancel: true, alignment: DialogAlignment.Bottom, customStyle: true, }) - aboutToAppear(): void { + aboutToAppear(): void { console.log('[LIFECYCLE-Index] cocos aboutToAppear'); - this.workPort._messageHandle = (e) => { - //let data = e['data']; - var data = e.data; - var msg = data.data; - var result; + this.workPort._messageHandle = async (e: MessageEvent): Promise => { + let data: WorkerMessage = e.data; + let msg = data.data; + let result: boolean | string | number | null = null; switch (msg.name) { - // EditBox + // EditBox case "showEditBox": { - this.showMessage = msg.param - this.dialogController.open() + this.showMessage = msg.param as string; + this.dialogController.open(); break; } case "hideEditBox": { - this.showMessage = '' - this.dialogController.close() + this.showMessage = ''; + this.dialogController.close(); break; } - // WebView + // WebView case "createWebView": { - this.webViewArray.push(new WebViewInfo(0, 0, 0, 0, msg.param)) - this.webViewIndexMap.set(msg.param, this.webViewArray.length - 1); + this.webViewArray.push(new WebViewInfo(0, 0, 0, 0, msg.param as number)); + this.webViewIndexMap.set(msg.param as number, this.webViewArray.length - 1); break; } case "removeWebView": { if (this.webViewArray.length > 0) { - this.webViewArray.splice(this.webViewIndexMap.get(msg.param), 1) + this.webViewArray.splice(this.webViewIndexMap.get(msg?.param as number) as number, 1); } break; } case "loadUrl": { - var web = msg.param; - var index = this.webViewIndexMap.get(web.tag); - this.webViewArray[index].url = web.url; - this.webViewArray[index].controller.loadUrl({url: web.url}); + let web = msg.param as param; + let index = this.webViewIndexMap.get(web?.tag as number) as number; + this.webViewArray[index].url = web?.url as string; + this.webViewArray[index].controller.loadUrl(web?.url as string); break; } case "loadHTMLString": { - var web = msg.param; - var index = this.webViewIndexMap.get(web.tag); - this.webViewArray[index].controller.loadData({data: web.contents, mimeType:"text/html",encoding:"UTF-8", baseUrl:web.baseUrl}); + let web = msg.param as param; + let index = this.webViewIndexMap.get(web?.tag as number) as number; + this.webViewArray[index].controller.loadData( + web?.contents as string, + "text/html", + "UTF-8", + web?.baseUrl + ); break; } case "loadData": { - var web = msg.param; - var index = this.webViewIndexMap.get(web.tag); - this.webViewArray[index].controller.loadData({data: web.contents, mimeType:web.mimeType,encoding:web.encoding, baseUrl:web.baseUrl}); + let web = msg.param as param; + let index = this.webViewIndexMap.get(web?.tag as number) as number; + this.webViewArray[index].controller.loadData( + web?.contents as string, + web?.mimeType as string, + web?.encoding as string, + web?.baseUrl as string + ); break; } case "evaluateJS": { - var web = msg.param; - var index = this.webViewIndexMap.get(web.tag) - this.webViewArray[index].controller.runJavaScript({ - script: web.jsContents - }); + let web = msg.param as param; + let index = this.webViewIndexMap.get(web?.tag as number) as number; + this.webViewArray[index].controller.runJavaScript(web?.jsContents as string); break; } case "reload": { - var index = this.webViewIndexMap.get(msg.param); + let index = this.webViewIndexMap.get(msg.param as number) as number; this.webViewArray[index].controller.refresh(); break; } case "stopLoading": { - var index = this.webViewIndexMap.get(msg.param); + let index = this.webViewIndexMap.get(msg.param as number) as number; this.webViewArray[index].controller.stop(); break; } case "canGoForward": { - var index = this.webViewIndexMap.get(msg.param); + let index = this.webViewIndexMap.get(msg.param as number) as number; result = this.webViewArray[index].controller.accessForward(); break; } case "canGoBack": { - var index = this.webViewIndexMap.get(msg.param); + let index = this.webViewIndexMap.get(msg.param as number) as number; result = this.webViewArray[index].controller.accessBackward(); break; } case "goForward": { - var index = this.webViewIndexMap.get(msg.param); + let index = this.webViewIndexMap.get(msg.param as number) as number; this.webViewArray[index].controller.forward(); break; } case "goBack": { - var index = this.webViewIndexMap.get(msg.param); + let index = this.webViewIndexMap.get(msg.param as number) as number; this.webViewArray[index].controller.backward(); break; } case "setWebViewRect": { - var web = msg.param; - var index = this.webViewIndexMap.get(web.tag); - this.webViewArray[index].x = px2vp(web.x); - this.webViewArray[index].y = px2vp(web.y); - this.webViewArray[index].w = px2vp(web.w); - this.webViewArray[index].h = px2vp(web.h); + let web = msg.param as param + let index = this.webViewIndexMap.get(web?.tag as number) as number; + this.webViewArray[index].x = px2vp(web?.x as number) as number; + this.webViewArray[index].y = px2vp(web?.y as number) as number; + this.webViewArray[index].w = px2vp(web?.w as number) as number; + this.webViewArray[index].h = px2vp(web?.h as number) as number; break; } - case "setVisible": - var web = msg.param; - var index = this.webViewIndexMap.get(web.tag); - this.webViewArray[index].visible = web.visible; + case "setVisible": { + let web = msg.param as param; + let index = this.webViewIndexMap.get(web?.tag as number) as number; + this.webViewArray[index].visible = web?.visible as boolean; break; - // video - case "createVideo": - this.videoArray.push(new VideoInfo(0, 0, 0, 0, msg.param)) - this.videoIndexMap.set(msg.param, this.videoArray.length - 1); + } + // video + case "createVideo": { + this.videoArray.push(new VideoInfo(0, 0, 0, 0, msg.param as number)); + this.videoIndexMap.set(msg.param as number, this.videoArray.length - 1); break; - case "removeVideo": + } + case "removeVideo": { if (this.videoArray.length > 0) { - this.videoArray.splice(this.videoIndexMap.get(msg.param), 1) + this.videoArray.splice(this.videoIndexMap.get(msg.param as number) as number, 1); } break; + } case "setVideoUrl": - var video = msg.param; - var index = this.videoIndexMap.get(video.tag); - var resourceType = video.resourceType; + let video = msg.param as param; + let index = this.videoIndexMap.get(video?.tag as number) as number; + let resourceType = video.resourceType; if (resourceType == 1) { - this.videoArray[index].url = $rawfile(video.url); + this.videoArray[index].url = $rawfile(video.url as string); } else { - this.videoArray[index].url = video.url; + this.videoArray[index].url = video.url as string; } break; case "setVideoRect": { - var video = msg.param; - var index = this.videoIndexMap.get(video.tag); - this.videoArray[index].x = px2vp(video.x); - this.videoArray[index].y = px2vp(video.y); - this.videoArray[index].w = px2vp(video.w); - this.videoArray[index].h = px2vp(video.h); + let video = msg.param as param; + let index = this.videoIndexMap.get(video?.tag as number) as number; + this.videoArray[index].x = px2vp(video?.x as number) as number; + this.videoArray[index].y = px2vp(video?.y as number) as number; + this.videoArray[index].w = px2vp(video?.w as number) as number; + this.videoArray[index].h = px2vp(video?.h as number) as number; break; } case "startVideo": { - var index = this.videoIndexMap.get(msg.param); + let index = this.videoIndexMap.get(msg.param as number) as number; this.videoArray[index].controller.start(); break; } - case "pauseVideo" : { - var index = this.videoIndexMap.get(msg.param); + case "pauseVideo": { + let index = this.videoIndexMap.get(msg.param as number) as number; this.videoArray[index].controller.pause(); break; } - case "stopVideo" : { - var index = this.videoIndexMap.get(msg.param); + case "stopVideo": { + let index = this.videoIndexMap.get(msg.param as number) as number; this.videoArray[index].controller.stop(); break; } case "resumeVideo": { - var index = this.videoIndexMap.get(msg.param); + let index = this.videoIndexMap.get(msg.param as number) as number; this.videoArray[index].controller.start(); break; } case "getVideoDuration": { - var index = this.videoIndexMap.get(msg.param); + let index = this.videoIndexMap.get(msg.param as number) as number; result = this.videoArray[index].duration; break; } - case "seekVideoTo" : { - var video = msg.param; - var index = this.videoIndexMap.get(video.tag); - this.videoArray[index].controller.setCurrentTime(video.time, SeekMode.Accurate); + case "seekVideoTo": { + let video = msg.param as param; + let index = this.videoIndexMap.get(video?.tag as number) as number; + this.videoArray[index].controller.setCurrentTime(video?.time as number, SeekMode.Accurate); break; } - case "setVideoVisible" : { - var video = msg.param; - var index = this.videoIndexMap.get(video.tag); - this.videoArray[index].visible = video.visible; + case "setVideoVisible": { + let video = msg.param as param; + let index = this.videoIndexMap.get(video?.tag as number) as number; + this.videoArray[index].visible = video.visible as boolean; break; } case "setFullScreenEnabled": { - var video = msg.param; - var index = this.videoIndexMap.get(video.tag); - this.videoArray[index].isFullScreen = video.fullScreen; + let video = msg.param as param; + let index = this.videoIndexMap.get(video?.tag as number) as number; + this.videoArray[index].isFullScreen = video.fullScreen as boolean; break; } case "currentTime": { - var index = this.videoIndexMap.get(msg.param); + let index = this.videoIndexMap.get(msg.param as number) as number; result = this.videoArray[index].currentTime; break; } @@ -257,16 +294,16 @@ struct Index { aboutToDisappear(): void { console.log('[LIFECYCLE-Index] cocos aboutToDisappear'); -// this.cocosWorker.postMessage({type: "JSPageLifecycle", data: "aboutToAppear"}); -// nativePageLifecycle.aboutToDisappear(); + // this.cocosWorker.postMessage({type: "JSPageLifecycle", data: "aboutToAppear"}); + // nativePageLifecycle.aboutToDisappear(); } - onPageShow(): void { + onPageShow(): void { console.log('[LIFECYCLE-Page] cocos onPageShow'); nativePageLifecycle.onPageShow(); } - onPageHide(): void { + onPageHide(): void { console.log('[LIFECYCLE-Page] cocos onPageHide'); nativePageLifecycle.onPageHide(); } @@ -279,8 +316,12 @@ struct Index { } build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - XComponent({ id: 'xcomponentId', type: 'surface', libraryname: 'cocos'}) + Flex({ + direction: FlexDirection.Column, + alignItems: ItemAlign.Center, + justifyContent: FlexAlign.Center + } as FlexOptions) { + XComponent({ id: 'xcomponentId', type: 'surface', libraryname: 'cocos' }) .onLoad((context) => { // Set the cache directory in the ts layer. this.workPort.postMessage("onXCLoad", "XComponent"); @@ -289,13 +330,13 @@ struct Index { console.log('cocos onDestroy') }) - ForEach(this.webViewArray, (item: WebViewInfo, index: number) => { - CocosWebView({ viewInfo: item, workPort: this.workPort}) - }, item => item.viewTag) + ForEach(this.webViewArray, (item: WebViewInfo) => { + CocosWebView({ viewInfo: item, workPort: this.workPort }) + }, (item: WebViewInfo): string => item.viewTag.toString()) - ForEach(this.videoArray, (item: VideoInfo, index: number) => { - CocosVideoPlayer({ videoInfo: item, workPort: this.workPort}) - }, item => item.viewTag) + ForEach(this.videoArray, (item: VideoInfo) => { + CocosVideoPlayer({ videoInfo: item, workPort: this.workPort }) + }, (item: VideoInfo): string => item.viewTag.toString()) } .width('100%') .height('100%') diff --git a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/workers/cocos_worker.ts b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/workers/cocos_worker.ts index 4b0b4bcd..54c46966 100644 --- a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/workers/cocos_worker.ts +++ b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/workers/cocos_worker.ts @@ -22,16 +22,15 @@ import hilog from '@ohos.hilog'; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -****************************************************************************/ - + ****************************************************************************/ import worker from '@ohos.worker'; -import cocos from "libcocos.so"; -import { ContextType } from "../common/Constants" -import { launchEngine } from '../cocos/game' +import cocos from 'libcocos.so'; +import { ContextType } from '../common/Constants'; +import { launchEngine } from '../cocos/game'; import { PortProxy } from '../common/PortProxy'; const nativeContext = cocos.getContext(ContextType.WORKER_INIT); -nativeContext.workerInit() +nativeContext.workerInit(); const nativeEditBox = cocos.getContext(ContextType.EDITBOX_UTILS); const nativeWebView = cocos.getContext(ContextType.WEBVIEW_UTILS); @@ -39,73 +38,66 @@ const appLifecycle = cocos.getContext(ContextType.APP_LIFECYCLE); let uiPort = new PortProxy(worker.parentPort); -nativeContext.postMessage = function(msgType: string, msgData:string) { - uiPort.postMessage(msgType, msgData); +nativeContext.postMessage = function (msgType: string, msgData: string): void { + uiPort.postMessage(msgType, msgData); } -nativeContext.postSyncMessage = async function(msgType: string, msgData:string) { - const result = await uiPort.postSyncMessage(msgType, msgData); - return result; +nativeContext.postSyncMessage = async function (msgType: string, msgData: string): Promise { + const result = await uiPort.postSyncMessage(msgType, msgData) as boolean | string | number; + return result; } // The purpose of this is to avoid being GC nativeContext.setPostMessageFunction.call(nativeContext, nativeContext.postMessage) nativeContext.setPostSyncMessageFunction.call(nativeContext, nativeContext.postSyncMessage) -uiPort._messageHandle = function(e) { - var data = e.data; - var msg = data.data; - hilog.info(0x0000, 'testTag',msg.name,msg.param); +uiPort._messageHandle = function (e) { + var data = e.data; + var msg = data.data; - switch(msg.name) { - case "onXCLoad": - hilog.info(0x0000, 'testTag', '%{public}s', '_messageHandle onXCLoad'); - console.info("cocos worker:_messageHandle onXCLoad"); - const renderContext = cocos.getContext(ContextType.NATIVE_RENDER_API); - renderContext.nativeEngineInit(); - hilog.info(0x0000, 'testTag', '%{public}s', 'begin invoke launchEngine'); - launchEngine().then(() => { - hilog.info(0x0000, 'testTag', '%{public}s', 'launch CC engine finished'); - console.info('launch CC engine finished'); - }).catch(e => { - hilog.info(0x0000, 'testTag', '%{public}s', 'launch CC engine failed'); - console.error('launch CC engine failed'); - }); - - // @ts-ignore - globalThis.oh.postMessage = nativeContext.postMessage; - // @ts-ignore - globalThis.oh.postSyncMessage = nativeContext.postSyncMessage; - renderContext.nativeEngineStart(); - break; - case "onTextInput": - nativeEditBox.onTextChange(msg.param); - break; - case "onComplete": - nativeEditBox.onComplete(msg.param); - break; - case "onPageBegin": - nativeWebView.shouldStartLoading(msg.param.viewTag, msg.param.url); - break; - case "onPageEnd": - nativeWebView.finishLoading(msg.param.viewTag, msg.param.url); - break; - case "onErrorReceive": - nativeWebView.failLoading(msg.param.viewTag, msg.param.url); - break; - case "onVideoEvent": - // @ts-ignore - if(globalThis.oh && typeof globalThis.oh.onVideoEvent === "function") { - // @ts-ignore - globalThis.oh.onVideoEvent(msg.param.videoTag, msg.param.videoEvent, msg.param.args); - } - break; - case "backPress": - appLifecycle.onBackPress(); - break; - default: - hilog.info(0x0000, 'testTag', 'cocos worker: message type unknown:%{public}s', msg.name); - console.error("cocos worker: message type unknown"); - break; - } + switch (msg.name) { + case "onXCLoad": + const renderContext = cocos.getContext(ContextType.NATIVE_RENDER_API); + renderContext.nativeEngineInit(); + launchEngine().then(() => { + console.info('launch CC engine finished'); + }).catch(e => { + console.error('launch CC engine failed'); + }); + // @ts-ignore + globalThis.oh.postMessage = nativeContext.postMessage; + // @ts-ignore + globalThis.oh.postSyncMessage = nativeContext.postSyncMessage; + renderContext.nativeEngineStart(); + break; + case "onTextInput": + nativeEditBox.onTextChange(msg.param); + break; + case "onComplete": + nativeEditBox.onComplete(msg.param); + break; + case "onPageBegin": + nativeWebView.shouldStartLoading(msg.param.viewTag, msg.param.url); + break; + case "onPageEnd": + nativeWebView.finishLoading(msg.param.viewTag, msg.param.url); + break; + case "onErrorReceive": + nativeWebView.failLoading(msg.param.viewTag, msg.param.url); + break; + case "onVideoEvent": + // @ts-ignore + if (globalThis.oh && typeof globalThis.oh.onVideoEvent === "function") { + // @ts-ignore + globalThis.oh.onVideoEvent(msg.param.videoTag, msg.param.videoEvent, msg.param.args); + } + break; + case "backPress": + appLifecycle.onBackPress(); + break; + default: + hilog.info(0x0000, 'testTag', 'cocos worker: message type unknown:%{public}s', msg.name); + console.error("cocos worker: message type unknown"); + break; + } } diff --git a/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/hvigor/hvigor-wrapper.js b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/hvigor/hvigor-wrapper.js new file mode 100644 index 00000000..2be61f68 --- /dev/null +++ b/cocos2d-x/templates/js-template-default/frameworks/runtime-src/proj.openharmony/hvigor/hvigor-wrapper.js @@ -0,0 +1 @@ +"use strict";var u=require("path"),D=require("os"),e=require("fs"),t=require("child_process"),r=require("crypto"),n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},i={},C={},F=n&&n.__importDefault||function(u){return u&&u.__esModule?u:{default:u}};Object.defineProperty(C,"__esModule",{value:!0}),C.maxPathLength=C.isMac=C.isLinux=C.isWindows=void 0;const E=F(D),A="Windows_NT",o="Darwin";function a(){return E.default.type()===A}function c(){return E.default.type()===o}C.isWindows=a,C.isLinux=function(){return"Linux"===E.default.type()},C.isMac=c,C.maxPathLength=function(){return c()?1016:a()?259:4095},function(e){var t=n&&n.__createBinding||(Object.create?function(u,D,e,t){void 0===t&&(t=e);var r=Object.getOwnPropertyDescriptor(D,e);r&&!("get"in r?!D.__esModule:r.writable||r.configurable)||(r={enumerable:!0,get:function(){return D[e]}}),Object.defineProperty(u,t,r)}:function(u,D,e,t){void 0===t&&(t=e),u[t]=D[e]}),r=n&&n.__setModuleDefault||(Object.create?function(u,D){Object.defineProperty(u,"default",{enumerable:!0,value:D})}:function(u,D){u.default=D}),i=n&&n.__importStar||function(u){if(u&&u.__esModule)return u;var D={};if(null!=u)for(var e in u)"default"!==e&&Object.prototype.hasOwnProperty.call(u,e)&&t(D,u,e);return r(D,u),D};Object.defineProperty(e,"__esModule",{value:!0}),e.WORK_SPACE=e.HVIGOR_PROJECT_WRAPPER_HOME=e.HVIGOR_PROJECT_ROOT_DIR=e.HVIGOR_PROJECT_CACHES_HOME=e.HVIGOR_PNPM_STORE_PATH=e.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH=e.PROJECT_CACHES=e.HVIGOR_WRAPPER_TOOLS_HOME=e.HVIGOR_USER_HOME=e.DEFAULT_PACKAGE_JSON=e.DEFAULT_HVIGOR_CONFIG_JSON_FILE_NAME=e.PNPM=e.HVIGOR=e.NPM_TOOL=e.PNPM_TOOL=e.HVIGOR_ENGINE_PACKAGE_NAME=void 0;const F=i(D),E=i(u),A=C;e.HVIGOR_ENGINE_PACKAGE_NAME="@ohos/hvigor",e.PNPM_TOOL=(0,A.isWindows)()?"pnpm.cmd":"pnpm",e.NPM_TOOL=(0,A.isWindows)()?"npm.cmd":"npm",e.HVIGOR="hvigor",e.PNPM="pnpm",e.DEFAULT_HVIGOR_CONFIG_JSON_FILE_NAME="hvigor-config.json5",e.DEFAULT_PACKAGE_JSON="package.json",e.HVIGOR_USER_HOME=E.resolve(F.homedir(),".hvigor"),e.HVIGOR_WRAPPER_TOOLS_HOME=E.resolve(e.HVIGOR_USER_HOME,"wrapper","tools"),e.PROJECT_CACHES="project_caches",e.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH=E.resolve(e.HVIGOR_WRAPPER_TOOLS_HOME,"node_modules",".bin",e.PNPM_TOOL),e.HVIGOR_PNPM_STORE_PATH=E.resolve(e.HVIGOR_USER_HOME,"caches"),e.HVIGOR_PROJECT_CACHES_HOME=E.resolve(e.HVIGOR_USER_HOME,e.PROJECT_CACHES),e.HVIGOR_PROJECT_ROOT_DIR=process.cwd(),e.HVIGOR_PROJECT_WRAPPER_HOME=E.resolve(e.HVIGOR_PROJECT_ROOT_DIR,e.HVIGOR),e.WORK_SPACE="workspace"}(i);var s={},l={};Object.defineProperty(l,"__esModule",{value:!0}),l.logInfoPrintConsole=l.logErrorAndExit=void 0,l.logErrorAndExit=function(u){u instanceof Error?console.error(u.message):console.error(u),process.exit(-1)},l.logInfoPrintConsole=function(u){console.log(u)};var B=n&&n.__createBinding||(Object.create?function(u,D,e,t){void 0===t&&(t=e);var r=Object.getOwnPropertyDescriptor(D,e);r&&!("get"in r?!D.__esModule:r.writable||r.configurable)||(r={enumerable:!0,get:function(){return D[e]}}),Object.defineProperty(u,t,r)}:function(u,D,e,t){void 0===t&&(t=e),u[t]=D[e]}),d=n&&n.__setModuleDefault||(Object.create?function(u,D){Object.defineProperty(u,"default",{enumerable:!0,value:D})}:function(u,D){u.default=D}),f=n&&n.__importStar||function(u){if(u&&u.__esModule)return u;var D={};if(null!=u)for(var e in u)"default"!==e&&Object.prototype.hasOwnProperty.call(u,e)&&B(D,u,e);return d(D,u),D};Object.defineProperty(s,"__esModule",{value:!0});var _=s.executeBuild=void 0;const p=f(e),O=f(u),h=l;_=s.executeBuild=function(u){const D=O.resolve(u,"node_modules","@ohos","hvigor","bin","hvigor.js");try{const u=p.realpathSync(D);require(u)}catch(e){(0,h.logErrorAndExit)(`Error: ENOENT: no such file ${D},delete ${u} and retry.`)}};var P={},v={},g={},m={};Object.defineProperty(m,"__esModule",{value:!0}),m.Unicode=void 0;class R{}m.Unicode=R,R.SPACE_SEPARATOR=/[\u1680\u2000-\u200A\u202F\u205F\u3000]/,R.ID_START=/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312E\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEA\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF2D-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE83\uDE86-\uDE89\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFEC]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4\uDD00-\uDD43]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]/,R.ID_CONTINUE=/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u08D4-\u08E1\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u09FC\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9-\u0AFF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C80-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D00-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D54-\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1CD0-\u1CD2\u1CD4-\u1CF9\u1D00-\u1DF9\u1DFB-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312E\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEA\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C5\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF2D-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE3E\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC00-\uDC4A\uDC50-\uDC59\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDE00-\uDE3E\uDE47\uDE50-\uDE83\uDE86-\uDE99\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC36\uDC38-\uDC40\uDC50-\uDC59\uDC72-\uDC8F\uDC92-\uDCA7\uDCA9-\uDCB6\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD36\uDD3A\uDD3C\uDD3D\uDD3F-\uDD47\uDD50-\uDD59]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFEC]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD838[\uDC00-\uDC06\uDC08-\uDC18\uDC1B-\uDC21\uDC23\uDC24\uDC26-\uDC2A]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6\uDD00-\uDD4A\uDD50-\uDD59]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/,Object.defineProperty(g,"__esModule",{value:!0}),g.JudgeUtil=void 0;const y=m;g.JudgeUtil=class{static isIgnoreChar(u){return"string"==typeof u&&("\t"===u||"\v"===u||"\f"===u||" "===u||" "===u||"\ufeff"===u||"\n"===u||"\r"===u||"\u2028"===u||"\u2029"===u)}static isSpaceSeparator(u){return"string"==typeof u&&y.Unicode.SPACE_SEPARATOR.test(u)}static isIdStartChar(u){return"string"==typeof u&&(u>="a"&&u<="z"||u>="A"&&u<="Z"||"$"===u||"_"===u||y.Unicode.ID_START.test(u))}static isIdContinueChar(u){return"string"==typeof u&&(u>="a"&&u<="z"||u>="A"&&u<="Z"||u>="0"&&u<="9"||"$"===u||"_"===u||"‌"===u||"‍"===u||y.Unicode.ID_CONTINUE.test(u))}static isDigitWithoutZero(u){return/[1-9]/.test(u)}static isDigit(u){return"string"==typeof u&&/[0-9]/.test(u)}static isHexDigit(u){return"string"==typeof u&&/[0-9A-Fa-f]/.test(u)}};var I=n&&n.__importDefault||function(u){return u&&u.__esModule?u:{default:u}};Object.defineProperty(v,"__esModule",{value:!0}),v.parseJsonText=v.parseJsonFile=void 0;const N=I(e),b=I(D),S=I(u),w=g;var H;!function(u){u[u.Char=0]="Char",u[u.EOF=1]="EOF",u[u.Identifier=2]="Identifier"}(H||(H={}));let x,M,T,V,G,j,J="start",U=[],W=0,L=1,$=0,k=!1,K="default",z="'",q=1;function Z(u,D=!1){M=String(u),J="start",U=[],W=0,L=1,$=0,V=void 0,k=D;do{x=X(),ru[J]()}while("eof"!==x.type);return V}function X(){for(K="default",G="",z="'",q=1;;){j=Q();const u=uu[K]();if(u)return u}}function Q(){if(M[W])return String.fromCodePoint(M.codePointAt(W))}function Y(){const u=Q();return"\n"===u?(L++,$=0):u?$+=u.length:$++,u&&(W+=u.length),u}v.parseJsonFile=function(u,D=!1,e="utf-8"){const t=N.default.readFileSync(S.default.resolve(u),{encoding:e});try{return Z(t,D)}catch(D){if(D instanceof SyntaxError){const e=D.message.split("at");if(2===e.length)throw new Error(`${e[0].trim()}${b.default.EOL}\t at ${u}:${e[1].trim()}`)}throw new Error(`${u} is not in valid JSON/JSON5 format.`)}},v.parseJsonText=Z;const uu={default(){switch(j){case"/":return Y(),void(K="comment");case void 0:return Y(),Du("eof")}if(!w.JudgeUtil.isIgnoreChar(j)&&!w.JudgeUtil.isSpaceSeparator(j))return uu[J]();Y()},start(){K="value"},beforePropertyName(){switch(j){case"$":case"_":return G=Y(),void(K="identifierName");case"\\":return Y(),void(K="identifierNameStartEscape");case"}":return Du("punctuator",Y());case'"':case"'":return z=j,Y(),void(K="string")}if(w.JudgeUtil.isIdStartChar(j))return G+=Y(),void(K="identifierName");throw Fu(H.Char,Y())},afterPropertyName(){if(":"===j)return Du("punctuator",Y());throw Fu(H.Char,Y())},beforePropertyValue(){K="value"},afterPropertyValue(){switch(j){case",":case"}":return Du("punctuator",Y())}throw Fu(H.Char,Y())},beforeArrayValue(){if("]"===j)return Du("punctuator",Y());K="value"},afterArrayValue(){switch(j){case",":case"]":return Du("punctuator",Y())}throw Fu(H.Char,Y())},end(){throw Fu(H.Char,Y())},comment(){switch(j){case"*":return Y(),void(K="multiLineComment");case"/":return Y(),void(K="singleLineComment")}throw Fu(H.Char,Y())},multiLineComment(){switch(j){case"*":return Y(),void(K="multiLineCommentAsterisk");case void 0:throw Fu(H.Char,Y())}Y()},multiLineCommentAsterisk(){switch(j){case"*":return void Y();case"/":return Y(),void(K="default");case void 0:throw Fu(H.Char,Y())}Y(),K="multiLineComment"},singleLineComment(){switch(j){case"\n":case"\r":case"\u2028":case"\u2029":return Y(),void(K="default");case void 0:return Y(),Du("eof")}Y()},value(){switch(j){case"{":case"[":return Du("punctuator",Y());case"n":return Y(),eu("ull"),Du("null",null);case"t":return Y(),eu("rue"),Du("boolean",!0);case"f":return Y(),eu("alse"),Du("boolean",!1);case"-":case"+":return"-"===Y()&&(q=-1),void(K="numerical");case".":case"0":case"I":case"N":return void(K="numerical");case'"':case"'":return z=j,Y(),G="",void(K="string")}if(void 0===j||!w.JudgeUtil.isDigitWithoutZero(j))throw Fu(H.Char,Y());K="numerical"},numerical(){switch(j){case".":return G=Y(),void(K="decimalPointLeading");case"0":return G=Y(),void(K="zero");case"I":return Y(),eu("nfinity"),Du("numeric",q*(1/0));case"N":return Y(),eu("aN"),Du("numeric",NaN)}if(void 0!==j&&w.JudgeUtil.isDigitWithoutZero(j))return G=Y(),void(K="decimalInteger");throw Fu(H.Char,Y())},zero(){switch(j){case".":case"e":case"E":return void(K="decimal");case"x":case"X":return G+=Y(),void(K="hexadecimal")}return Du("numeric",0)},decimalInteger(){switch(j){case".":case"e":case"E":return void(K="decimal")}if(!w.JudgeUtil.isDigit(j))return Du("numeric",q*Number(G));G+=Y()},decimal(){switch(j){case".":G+=Y(),K="decimalFraction";break;case"e":case"E":G+=Y(),K="decimalExponent"}},decimalPointLeading(){if(w.JudgeUtil.isDigit(j))return G+=Y(),void(K="decimalFraction");throw Fu(H.Char,Y())},decimalFraction(){switch(j){case"e":case"E":return G+=Y(),void(K="decimalExponent")}if(!w.JudgeUtil.isDigit(j))return Du("numeric",q*Number(G));G+=Y()},decimalExponent(){switch(j){case"+":case"-":return G+=Y(),void(K="decimalExponentSign")}if(w.JudgeUtil.isDigit(j))return G+=Y(),void(K="decimalExponentInteger");throw Fu(H.Char,Y())},decimalExponentSign(){if(w.JudgeUtil.isDigit(j))return G+=Y(),void(K="decimalExponentInteger");throw Fu(H.Char,Y())},decimalExponentInteger(){if(!w.JudgeUtil.isDigit(j))return Du("numeric",q*Number(G));G+=Y()},hexadecimal(){if(w.JudgeUtil.isHexDigit(j))return G+=Y(),void(K="hexadecimalInteger");throw Fu(H.Char,Y())},hexadecimalInteger(){if(!w.JudgeUtil.isHexDigit(j))return Du("numeric",q*Number(G));G+=Y()},identifierNameStartEscape(){if("u"!==j)throw Fu(H.Char,Y());Y();const u=tu();switch(u){case"$":case"_":break;default:if(!w.JudgeUtil.isIdStartChar(u))throw Fu(H.Identifier)}G+=u,K="identifierName"},identifierName(){switch(j){case"$":case"_":case"‌":case"‍":return void(G+=Y());case"\\":return Y(),void(K="identifierNameEscape")}if(!w.JudgeUtil.isIdContinueChar(j))return Du("identifier",G);G+=Y()},identifierNameEscape(){if("u"!==j)throw Fu(H.Char,Y());Y();const u=tu();switch(u){case"$":case"_":case"‌":case"‍":break;default:if(!w.JudgeUtil.isIdContinueChar(u))throw Fu(H.Identifier)}G+=u,K="identifierName"},string(){switch(j){case"\\":return Y(),void(G+=function(){const u=Q(),D=function(){switch(Q()){case"b":return Y(),"\b";case"f":return Y(),"\f";case"n":return Y(),"\n";case"r":return Y(),"\r";case"t":return Y(),"\t";case"v":return Y(),"\v"}return}();if(D)return D;switch(u){case"0":if(Y(),w.JudgeUtil.isDigit(Q()))throw Fu(H.Char,Y());return"\0";case"x":return Y(),function(){let u="",D=Q();if(!w.JudgeUtil.isHexDigit(D))throw Fu(H.Char,Y());if(u+=Y(),D=Q(),!w.JudgeUtil.isHexDigit(D))throw Fu(H.Char,Y());return u+=Y(),String.fromCodePoint(parseInt(u,16))}();case"u":return Y(),tu();case"\n":case"\u2028":case"\u2029":return Y(),"";case"\r":return Y(),"\n"===Q()&&Y(),""}if(void 0===u||w.JudgeUtil.isDigitWithoutZero(u))throw Fu(H.Char,Y());return Y()}());case'"':case"'":if(j===z){const u=Du("string",G);return Y(),u}return void(G+=Y());case"\n":case"\r":case void 0:throw Fu(H.Char,Y());case"\u2028":case"\u2029":!function(u){console.warn(`JSON5: '${Cu(u)}' in strings is not valid ECMAScript; consider escaping.`)}(j)}G+=Y()}};function Du(u,D){return{type:u,value:D,line:L,column:$}}function eu(u){for(const D of u){if(Q()!==D)throw Fu(H.Char,Y());Y()}}function tu(){let u="",D=4;for(;D-- >0;){const D=Q();if(!w.JudgeUtil.isHexDigit(D))throw Fu(H.Char,Y());u+=Y()}return String.fromCodePoint(parseInt(u,16))}const ru={start(){if("eof"===x.type)throw Fu(H.EOF);nu()},beforePropertyName(){switch(x.type){case"identifier":case"string":return T=x.value,void(J="afterPropertyName");case"punctuator":return void iu();case"eof":throw Fu(H.EOF)}},afterPropertyName(){if("eof"===x.type)throw Fu(H.EOF);J="beforePropertyValue"},beforePropertyValue(){if("eof"===x.type)throw Fu(H.EOF);nu()},afterPropertyValue(){if("eof"===x.type)throw Fu(H.EOF);switch(x.value){case",":return void(J="beforePropertyName");case"}":iu()}},beforeArrayValue(){if("eof"===x.type)throw Fu(H.EOF);"punctuator"!==x.type||"]"!==x.value?nu():iu()},afterArrayValue(){if("eof"===x.type)throw Fu(H.EOF);switch(x.value){case",":return void(J="beforeArrayValue");case"]":iu()}},end(){}};function nu(){const u=function(){let u;switch(x.type){case"punctuator":switch(x.value){case"{":u={};break;case"[":u=[]}break;case"null":case"boolean":case"numeric":case"string":u=x.value}return u}();if(k&&"object"==typeof u&&(u._line=L,u._column=$),void 0===V)V=u;else{const D=U[U.length-1];Array.isArray(D)?k&&"object"!=typeof u?D.push({value:u,_line:L,_column:$}):D.push(u):D[T]=k&&"object"!=typeof u?{value:u,_line:L,_column:$}:u}!function(u){if(u&&"object"==typeof u)U.push(u),J=Array.isArray(u)?"beforeArrayValue":"beforePropertyName";else{const u=U[U.length-1];J=u?Array.isArray(u)?"afterArrayValue":"afterPropertyValue":"end"}}(u)}function iu(){U.pop();const u=U[U.length-1];J=u?Array.isArray(u)?"afterArrayValue":"afterPropertyValue":"end"}function Cu(u){const D={"'":"\\'",'"':'\\"',"\\":"\\\\","\b":"\\b","\f":"\\f","\n":"\\n","\r":"\\r","\t":"\\t","\v":"\\v","\0":"\\0","\u2028":"\\u2028","\u2029":"\\u2029"};if(D[u])return D[u];if(u<" "){const D=u.charCodeAt(0).toString(16);return`\\x${`00${D}`.substring(D.length)}`}return u}function Fu(u,D){let e="";switch(u){case H.Char:e=void 0===D?`JSON5: invalid end of input at ${L}:${$}`:`JSON5: invalid character '${Cu(D)}' at ${L}:${$}`;break;case H.EOF:e=`JSON5: invalid end of input at ${L}:${$}`;break;case H.Identifier:$-=5,e=`JSON5: invalid identifier character at ${L}:${$}`}const t=new Eu(e);return t.lineNumber=L,t.columnNumber=$,t}class Eu extends SyntaxError{}var Au={},ou=n&&n.__createBinding||(Object.create?function(u,D,e,t){void 0===t&&(t=e);var r=Object.getOwnPropertyDescriptor(D,e);r&&!("get"in r?!D.__esModule:r.writable||r.configurable)||(r={enumerable:!0,get:function(){return D[e]}}),Object.defineProperty(u,t,r)}:function(u,D,e,t){void 0===t&&(t=e),u[t]=D[e]}),au=n&&n.__setModuleDefault||(Object.create?function(u,D){Object.defineProperty(u,"default",{enumerable:!0,value:D})}:function(u,D){u.default=D}),cu=n&&n.__importStar||function(u){if(u&&u.__esModule)return u;var D={};if(null!=u)for(var e in u)"default"!==e&&Object.prototype.hasOwnProperty.call(u,e)&&ou(D,u,e);return au(D,u),D},su=n&&n.__importDefault||function(u){return u&&u.__esModule?u:{default:u}};Object.defineProperty(Au,"__esModule",{value:!0}),Au.isFileExists=Au.offlinePluginConversion=Au.executeCommand=Au.getNpmPath=Au.hasNpmPackInPaths=void 0;const lu=t,Bu=su(e),du=cu(u),fu=i,_u=l;Au.hasNpmPackInPaths=function(u,D){try{return require.resolve(u,{paths:[...D]}),!0}catch(u){return!1}},Au.getNpmPath=function(){const u=process.execPath;return du.join(du.dirname(u),fu.NPM_TOOL)},Au.executeCommand=function(u,D,e){0!==(0,lu.spawnSync)(u,D,e).status&&(0,_u.logErrorAndExit)(`Error: ${u} ${D} execute failed.See above for details.`)},Au.offlinePluginConversion=function(u,D){return D.startsWith("file:")||D.endsWith(".tgz")?du.resolve(u,fu.HVIGOR,D.replace("file:","")):D},Au.isFileExists=function(u){return Bu.default.existsSync(u)&&Bu.default.statSync(u).isFile()};var pu={};!function(u){var D=n&&n.__importDefault||function(u){return u&&u.__esModule?u:{default:u}};Object.defineProperty(u,"__esModule",{value:!0}),u.hashFile=u.hash=u.createHash=void 0;const t=D(r),i=D(e);u.createHash=(u="MD5")=>t.default.createHash(u);u.hash=(D,e)=>(0,u.createHash)(e).update(D).digest("hex");u.hashFile=(D,e)=>{if(i.default.existsSync(D))return(0,u.hash)(i.default.readFileSync(D,"utf-8"),e)}}(pu);var Ou=n&&n.__createBinding||(Object.create?function(u,D,e,t){void 0===t&&(t=e);var r=Object.getOwnPropertyDescriptor(D,e);r&&!("get"in r?!D.__esModule:r.writable||r.configurable)||(r={enumerable:!0,get:function(){return D[e]}}),Object.defineProperty(u,t,r)}:function(u,D,e,t){void 0===t&&(t=e),u[t]=D[e]}),hu=n&&n.__setModuleDefault||(Object.create?function(u,D){Object.defineProperty(u,"default",{enumerable:!0,value:D})}:function(u,D){u.default=D}),Pu=n&&n.__importStar||function(u){if(u&&u.__esModule)return u;var D={};if(null!=u)for(var e in u)"default"!==e&&Object.prototype.hasOwnProperty.call(u,e)&&Ou(D,u,e);return hu(D,u),D},vu=n&&n.__importDefault||function(u){return u&&u.__esModule?u:{default:u}};Object.defineProperty(P,"__esModule",{value:!0});var gu=P.initProjectWorkSpace=void 0;const mu=Pu(e),Ru=Pu(u),yu=i,Iu=v,Nu=l,bu=Au,Su=vu(D),wu=pu;let Hu,xu,Mu;function Tu(u,D,e){return void 0!==e.dependencies&&(0,bu.offlinePluginConversion)(yu.HVIGOR_PROJECT_ROOT_DIR,D.dependencies[u])===Ru.normalize(e.dependencies[u])}function Vu(){const u=Ru.join(Mu,yu.WORK_SPACE);if((0,Nu.logInfoPrintConsole)("Hvigor cleaning..."),!mu.existsSync(u))return;const D=mu.readdirSync(u);if(!D||0===D.length)return;const e=Ru.resolve(Mu,"node_modules","@ohos","hvigor","bin","hvigor.js");mu.existsSync(e)&&(0,bu.executeCommand)(process.argv[0],[e,"--stop-daemon"],{});try{D.forEach((D=>{mu.rmSync(Ru.resolve(u,D),{recursive:!0})}))}catch(D){(0,Nu.logErrorAndExit)(`The hvigor build tool cannot be installed. Please manually clear the workspace directory and synchronize the project again.\n\n Workspace Path: ${u}.`)}}gu=P.initProjectWorkSpace=function(){if(Hu=function(){const u=Ru.resolve(yu.HVIGOR_PROJECT_WRAPPER_HOME,yu.DEFAULT_HVIGOR_CONFIG_JSON_FILE_NAME);mu.existsSync(u)||(0,Nu.logErrorAndExit)(`Error: Hvigor config file ${u} does not exist.`);return(0,Iu.parseJsonFile)(u)}(),Mu=function(u){let D,e=u.hvigorVersion;e.endsWith(".tgz")&&(e=function(u){let D=Ru.normalize(u);const e=D.lastIndexOf(Ru.sep);-1!==e&&(D=D.substring(e+1));D=D.replace(".tgz","");let t=0;for(let u=0;u="0"&&D.charAt(u)<="9"){t=u;break}return D=D.substring(t),D}(e));D=e>"2.5.0"?function(u){let D=`${yu.HVIGOR_ENGINE_PACKAGE_NAME}@${u.hvigorVersion}`;const e=u.dependencies;if(e){Object.getOwnPropertyNames(e).sort().forEach((u=>{D+=`,${u}@${e[u]}`}))}return(0,wu.hash)(D)}(u):(0,wu.hash)(process.cwd());return Ru.resolve(Su.default.homedir(),".hvigor","project_caches",D)}(Hu),xu=function(){const u=Ru.resolve(Mu,yu.WORK_SPACE,yu.DEFAULT_PACKAGE_JSON);return mu.existsSync(u)?(0,Iu.parseJsonFile)(u):{dependencies:{}}}(),!(0,bu.hasNpmPackInPaths)(yu.HVIGOR_ENGINE_PACKAGE_NAME,[Ru.join(Mu,yu.WORK_SPACE)])||(0,bu.offlinePluginConversion)(yu.HVIGOR_PROJECT_ROOT_DIR,Hu.hvigorVersion)!==xu.dependencies[yu.HVIGOR_ENGINE_PACKAGE_NAME]||!function(){function u(u){const D=null==u?void 0:u.dependencies;return void 0===D?0:Object.getOwnPropertyNames(D).length}const D=u(Hu),e=u(xu);if(D+1!==e)return!1;for(const u in null==Hu?void 0:Hu.dependencies)if(!(0,bu.hasNpmPackInPaths)(u,[Ru.join(Mu,yu.WORK_SPACE)])||!Tu(u,Hu,xu))return!1;return!0}()){Vu();try{!function(){(0,Nu.logInfoPrintConsole)("Hvigor installing...");for(const u in Hu.dependencies)Hu.dependencies[u]&&(Hu.dependencies[u]=(0,bu.offlinePluginConversion)(yu.HVIGOR_PROJECT_ROOT_DIR,Hu.dependencies[u]));const u={dependencies:{...Hu.dependencies}};u.dependencies[yu.HVIGOR_ENGINE_PACKAGE_NAME]=(0,bu.offlinePluginConversion)(yu.HVIGOR_PROJECT_ROOT_DIR,Hu.hvigorVersion);const D=Ru.join(Mu,yu.WORK_SPACE);try{mu.mkdirSync(D,{recursive:!0});const e=Ru.resolve(D,yu.DEFAULT_PACKAGE_JSON);mu.writeFileSync(e,JSON.stringify(u))}catch(u){(0,Nu.logErrorAndExit)(u)}(function(){const u=["config","set","store-dir",yu.HVIGOR_PNPM_STORE_PATH],D={cwd:Ru.join(Mu,yu.WORK_SPACE),stdio:["inherit","inherit","inherit"]};(0,bu.executeCommand)(yu.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH,u,D)})(),function(){const u=["install"],D={cwd:Ru.join(Mu,yu.WORK_SPACE),stdio:["inherit","inherit","inherit"]};(0,bu.executeCommand)(yu.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH,u,D)}(),(0,Nu.logInfoPrintConsole)("Hvigor install success.")}()}catch(u){Vu()}}return Mu};var Gu={};!function(r){var C=n&&n.__createBinding||(Object.create?function(u,D,e,t){void 0===t&&(t=e);var r=Object.getOwnPropertyDescriptor(D,e);r&&!("get"in r?!D.__esModule:r.writable||r.configurable)||(r={enumerable:!0,get:function(){return D[e]}}),Object.defineProperty(u,t,r)}:function(u,D,e,t){void 0===t&&(t=e),u[t]=D[e]}),F=n&&n.__setModuleDefault||(Object.create?function(u,D){Object.defineProperty(u,"default",{enumerable:!0,value:D})}:function(u,D){u.default=D}),E=n&&n.__importStar||function(u){if(u&&u.__esModule)return u;var D={};if(null!=u)for(var e in u)"default"!==e&&Object.prototype.hasOwnProperty.call(u,e)&&C(D,u,e);return F(D,u),D},A=n&&n.__importDefault||function(u){return u&&u.__esModule?u:{default:u}};Object.defineProperty(r,"__esModule",{value:!0}),r.executeInstallPnpm=r.isPnpmInstalled=r.environmentHandler=r.checkNpmConifg=r.PNPM_VERSION=void 0;const o=t,a=E(e),c=A(D),s=E(u),B=i,d=l,f=Au;r.PNPM_VERSION="7.30.0",r.checkNpmConifg=function(){const u=s.resolve(B.HVIGOR_PROJECT_ROOT_DIR,".npmrc"),D=s.resolve(c.default.homedir(),".npmrc");if((0,f.isFileExists)(u)||(0,f.isFileExists)(D))return;const e=(0,f.getNpmPath)(),t=(0,o.spawnSync)(e,["config","get","prefix"],{cwd:B.HVIGOR_PROJECT_ROOT_DIR});if(0!==t.status||!t.stdout)return void(0,d.logErrorAndExit)("Error: The hvigor depends on the npmrc file. Configure the npmrc file first.");const r=s.resolve(`${t.stdout}`.replace(/[\r\n]/gi,""),".npmrc");(0,f.isFileExists)(r)||(0,d.logErrorAndExit)("Error: The hvigor depends on the npmrc file. Configure the npmrc file first.")},r.environmentHandler=function(){process.env["npm_config_update-notifier"]="false"},r.isPnpmInstalled=function(){return!!a.existsSync(B.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH)&&(0,f.hasNpmPackInPaths)("pnpm",[B.HVIGOR_WRAPPER_TOOLS_HOME])},r.executeInstallPnpm=function(){(0,d.logInfoPrintConsole)(`Installing pnpm@${r.PNPM_VERSION}...`);const u=(0,f.getNpmPath)();!function(){const u=s.resolve(B.HVIGOR_WRAPPER_TOOLS_HOME,B.DEFAULT_PACKAGE_JSON);try{a.existsSync(B.HVIGOR_WRAPPER_TOOLS_HOME)||a.mkdirSync(B.HVIGOR_WRAPPER_TOOLS_HOME,{recursive:!0});const D={dependencies:{}};D.dependencies[B.PNPM]=r.PNPM_VERSION,a.writeFileSync(u,JSON.stringify(D))}catch(D){(0,d.logErrorAndExit)(`Error: EPERM: operation not permitted,create ${u} failed.`)}}(),(0,f.executeCommand)(u,["install","pnpm"],{cwd:B.HVIGOR_WRAPPER_TOOLS_HOME,stdio:["inherit","inherit","inherit"],env:process.env}),(0,d.logInfoPrintConsole)("Pnpm install success.")}}(Gu),function(){Gu.checkNpmConifg(),Gu.environmentHandler(),Gu.isPnpmInstalled()||Gu.executeInstallPnpm();const D=gu();_(u.join(D,i.WORK_SPACE))}(); \ No newline at end of file diff --git a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/cpp/types/libcocos/index.d.ts b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/cpp/types/libcocos/index.d.ts new file mode 100644 index 00000000..8e739faa --- /dev/null +++ b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/cpp/types/libcocos/index.d.ts @@ -0,0 +1,27 @@ +import { ContextType } from '../../../ets/common/Constants'; + +interface context { + onPageShow: () => void; + onPageHide: () => void; + workerInit: () => void; + postMessage: (msgType: string, msgData: string) => void; + postSyncMessage: (msgType: string, msgData: string) => Promise; + setPostMessageFunction: (postMessage: (msgType: string, msgData: string) => void) => void; + setPostSyncMessageFunction: (postSyncMessage: (msgType: string, msgData: string) => void) => void; + nativeEngineInit: () => void; + nativeEngineStart: () => void; + onTextChange: (param: string) => void; + onComplete: (param: string) => void; + shouldStartLoading: (viewTag: number, url: string) => void; + finishLoading: (viewTag: number, url: string) => void; + failLoading: (viewTag: number, url: string) => void; + onBackPress: () => void; + onCreate: () => void; + onDestroy: () => void; + onShow: () => void; + onHide: () => void; + resourceManagerInit: (resourceManager: any) => void; + writablePathInit: (cacheDir: string) => void; +} + +export const getContext: (type: ContextType) => context; diff --git a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/cpp/types/libcocos/oh-package.json5 b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/cpp/types/libcocos/oh-package.json5 new file mode 100644 index 00000000..20aaf4fb --- /dev/null +++ b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/cpp/types/libcocos/oh-package.json5 @@ -0,0 +1,6 @@ +{ + "name": "libcocos.so", + "types": "./index.d.ts", + "version": "", + "description": "Please describe the basic information." +} \ No newline at end of file diff --git a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/WorkerManager.ets b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/WorkerManager.ets index 37459e29..0ed83457 100644 --- a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/WorkerManager.ets +++ b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/WorkerManager.ets @@ -24,31 +24,34 @@ ****************************************************************************/ import worker from '@ohos.worker'; -import {Constants} from '../common/Constants' +import { Constants } from '../common/Constants' export class WorkerManager { - private static instance: WorkerManager; - private cocosWorker: any; + private cocosWorker: worker.Worker; - private constructor() { - this.cocosWorker = new worker.Worker("entry/ets/workers/cocos_worker.ts", {type:"classic", name: "CocosWorker"}); - this.cocosWorker.onerror = function (e) { - var msg = e.message; - var filename = e.filename; - var lineno = e.lineno; - var colno = e.colno; - console.error(`on Error ${msg} ${filename} ${lineno} ${colno}`); - } + private constructor() { + this.cocosWorker = new worker.Worker("entry/ets/workers/cocos_worker.ts", { + type: "classic", + name: "CocosWorker" + }); + this.cocosWorker.onerror = (e) => { + let msg = e.message; + let filename = e.filename; + let lineno = e.lineno; + let colno = e.colno; + console.error(`on Error ${msg} ${filename} ${lineno} ${colno}`); } + } - public static getInstance(): WorkerManager { - if (AppStorage.Get(Constants.APP_KEY_WORKER_MANAGER) == null) { - AppStorage.SetOrCreate(Constants.APP_KEY_WORKER_MANAGER, new WorkerManager); - } - return AppStorage.Get(Constants.APP_KEY_WORKER_MANAGER); - } - public getWorker(): any { - return this.cocosWorker; + public static getInstance(): WorkerManager { + if (AppStorage.Get(Constants.APP_KEY_WORKER_MANAGER) as WorkerManager == undefined) { + AppStorage.SetOrCreate(Constants.APP_KEY_WORKER_MANAGER, new WorkerManager); } + return AppStorage.Get(Constants.APP_KEY_WORKER_MANAGER) as WorkerManager; + } + + public getWorker(): worker.Worker { + return this.cocosWorker; + } } diff --git a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/game.ts b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/game.ts index 52972af1..23a0357f 100644 --- a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/game.ts +++ b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/game.ts @@ -1,4 +1,5 @@ -globalThis.oh = {}; +globalThis.oh = {} as any; + function boot() { const cc = globalThis.cc; var settings = globalThis._CCSettings; @@ -74,8 +75,8 @@ function boot() { } } - globalThis.oh.loadJsList(settings.jsList,cb); - + globalThis.oh.loadJsList(settings.jsList, cb); + for (var i = 0; i < bundleRoot.length; i++) { cc.assetManager.loadBundle(bundleRoot[i], cb); } diff --git a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/index.js b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/index.js index 89117694..c6a884d6 100644 --- a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/index.js +++ b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/cocos/index.js @@ -11,4 +11,4 @@ globalThis.oh.loadModule = (name) => { }; globalThis.oh.loadJsList = (jsList, cb) => { globalThis.cc.assetManager.loadScript(jsList.map(function (x) { return x; }), cb); -}; +}; \ No newline at end of file diff --git a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/common/PortProxy.ts b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/common/PortProxy.ts index a28d396f..d2f84c92 100644 --- a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/common/PortProxy.ts +++ b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/common/PortProxy.ts @@ -21,57 +21,56 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -****************************************************************************/ -import worker from '@ohos.worker'; -import {DedicatedWorkerGlobalScope} from '@ohos.worker'; -// NOTE: don't use this import all statement, because this has compile issue. -// import * as wk from '@ohos.worker'; + ****************************************************************************/ +import { DedicatedWorkerGlobalScope } from '@ohos.worker'; import { MessageEvent } from '@ohos.worker'; export class PortProxy { - private autoId: number = 0; - public actionHandleMap = {} - private port :DedicatedWorkerGlobalScope = null; + private autoId: number = 0; + public actionHandleMap = {} + private port: DedicatedWorkerGlobalScope = null; - public _messageHandle?:(e: MessageEvent) => void; + public _messageHandle?: (e: MessageEvent) => void; - constructor (port) { - this.port = port; - this.port.onmessage = this.onMessage.bind(this); - } + constructor(worker) { + this.port = worker; + this.port.onmessage = this.onMessage.bind(this); + } - public onMessage(e) { - let data = e['data']; - if(data.type != "syncResult" && this._messageHandle) { - this._messageHandle(e); - } else if(data.type == "syncResult") { - const {id, response} = data.data; - if (!this.actionHandleMap[id]) { - return; - } - this.actionHandleMap[id].call(this, response) - delete this.actionHandleMap[id]; - } - } - public postReturnMessage(e:any, res: any) { - if(e.type == "sync" && res != null && res != undefined) { - this.port.postMessage({type:"syncResult", data:{id:e.data.cbId, response:res}}); - } - } - public postMessage(msgName: string, msgData:any) { - this.port.postMessage({type:"async", data:{name:msgName, param:msgData}}); + public onMessage(e) { + let data = e['data']; + if (data.type != "syncResult" && this._messageHandle) { + this._messageHandle(e); + } else if (data.type == "syncResult") { + const { id, response } = data.data; + if (!this.actionHandleMap[id]) { + return; + } + this.actionHandleMap[id].call(this, response); + delete this.actionHandleMap[id]; } + } - public postSyncMessage(msgName: string, msgData:any) { - const id = this.autoId++; - return new Promise((resolve, reject) => { - const message = { - type:"sync", data:{cbId:id, name:msgName, param:msgData} - } - this.port.postMessage(message); - this.actionHandleMap[id] = (response) => { - resolve(response) - } - }) + public postReturnMessage(e: any, res: any) { + if (e.type == "sync" && res != null && res != undefined) { + this.port.postMessage({ type: "syncResult", data: { id: e.data.cbId, response: res } }); } + } + + public postMessage(msgName: string, msgData: any) { + this.port.postMessage({ type: "async", data: { name: msgName, param: msgData } }); + } + + public postSyncMessage(msgName: string, msgData: any) { + const id = this.autoId++; + return new Promise((resolve, reject) => { + const message = { + type: "sync", data: { cbId: id, name: msgName, param: msgData } + } + this.port.postMessage(message); + this.actionHandleMap[id] = (response) => { + resolve(response) + } + }) + } } \ No newline at end of file diff --git a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosVideoPlayer.ets b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosVideoPlayer.ets index 2ad12845..b55165f5 100644 --- a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosVideoPlayer.ets +++ b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosVideoPlayer.ets @@ -21,9 +21,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -****************************************************************************/ -import { WorkerManager } from '../cocos/WorkerManager' -import { PortProxy } from '../common/PortProxy' + ****************************************************************************/ +import { PortProxy } from '../common/PortProxy'; enum EventType { PLAYING = 0, @@ -35,7 +34,13 @@ enum EventType { READY_TO_PLAY, UPDATE, QUIT_FULLSCREEN = 1000 -}; +} + +interface param { + videoTag?: number, + videoEvent?: EventType, + args?: number +} @Observed export class VideoInfo { @@ -44,24 +49,21 @@ export class VideoInfo { public w: number = 0; public h: number = 0; // url - public url: string | Resource = "" - public viewTag: string = '' - public visible: boolean = true - + public url: string | Resource = ""; + public viewTag: number = 0; + public visible: boolean = true; public duration: number = 0; public currentTime: number = 0; public isFullScreen: boolean = false; - public currentProgressRate:number | string | PlaybackSpeed; - + public currentProgressRate?: number | string | PlaybackSpeed; public resourceType: number = 0; - /** * https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/reference/arkui-ts/ts-media-components-video.md#videocontroller * */ public controller: VideoController = new VideoController() - constructor(x: number, y: number, w: number, h: number, viewTag: string) { + constructor(x: number, y: number, w: number, h: number, viewTag: number) { this.x = x; this.y = y; this.w = w; @@ -70,49 +72,70 @@ export class VideoInfo { } } - @Component export struct CocosVideoPlayer { @ObjectLink videoInfo: VideoInfo; - public workPort: PortProxy; + public workPort: PortProxy | null = null; + build() { - Video({ src: this.videoInfo.url, controller: this.videoInfo.controller, currentProgressRate:this.videoInfo.currentProgressRate }) + Video({ + src: this.videoInfo.url, + controller: this.videoInfo.controller, + currentProgressRate: this.videoInfo.currentProgressRate as number | string | PlaybackSpeed + }) .position({ x: this.videoInfo.x, y: this.videoInfo.y }) .width(this.videoInfo.w) .height(this.videoInfo.h) .controls(false) .autoPlay(false) .onStart(() => { - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.PLAYING}); + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag as number, + videoEvent: EventType.PLAYING as EventType + } as param); }) .onPause(() => { - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.PAUSED}); + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag as number, + videoEvent: EventType.PAUSED as EventType + } as param); }) .onFinish(() => { - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.COMPLETED}); + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag, + videoEvent: EventType.COMPLETED + } as param); }) - .onPrepared((event: { - duration: number; - }) => { - this.videoInfo.duration = event.duration; - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.READY_TO_PLAY, args:event.duration}); + .onPrepared((event): void => { + this.videoInfo.duration = event?.duration as number; + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag, + videoEvent: EventType.READY_TO_PLAY, + args: event?.duration + } as param); }) - .onClick((event: ClickEvent) => { - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.CLICKED}); + .onClick((event): void => { + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag, + videoEvent: EventType.CLICKED + } as param); }) - .onUpdate((event?: { - time: number; - }) => { - this.videoInfo.currentTime = event.time - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.UPDATE, args:event.time}); + .onUpdate((event) => { + this.videoInfo.currentTime = event?.time as number; + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag, + videoEvent: EventType.UPDATE, + args: event?.time + } as param); }) - .onFullscreenChange((event?: { - fullscreen: boolean; - }) => { - if (!event.fullscreen) { - this.workPort.postMessage("onVideoEvent",{videoTag:this.videoInfo.viewTag, videoEvent:EventType.QUIT_FULLSCREEN}); + .onFullscreenChange((event) => { + if (!event?.fullscreen) { + this.workPort?.postMessage("onVideoEvent", { + videoTag: this.videoInfo.viewTag, + videoEvent: EventType.QUIT_FULLSCREEN + } as param); } - this.videoInfo.isFullScreen = event.fullscreen + this.videoInfo.isFullScreen = event?.fullscreen as boolean; }) .visibility(this.videoInfo.visible ? Visibility.Visible : Visibility.None) } diff --git a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosWebView.ets b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosWebView.ets index 1e57ebca..b93a477d 100644 --- a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosWebView.ets +++ b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/CocosWebView.ets @@ -22,9 +22,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -import { WorkerManager } from '../cocos/WorkerManager' -import { PortProxy } from '../common/PortProxy' -import web from '@ohos.web.webview' +import { PortProxy } from '../common/PortProxy'; +import web from '@ohos.web.webview'; + +interface param { + viewTag: number, + url: string, +} + @Observed export class WebViewInfo { // position @@ -34,27 +39,26 @@ export class WebViewInfo { public w: number = 0; public h: number = 0; // url - public url: string = '' + public url: string = ''; // tag - public viewTag: string = '' + public viewTag: number = 0; // Whether to display - public visible: boolean = true - + public visible: boolean = true; /* * doc : https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-web.md#webcontroller */ - public controller: WebController = new WebController() + public controller: web.WebviewController = new web.WebviewController(); - constructor(x: number, y: number, w: number, h: number, viewTag: string) { + constructor(x: number, y: number, w: number, h: number, viewTag: number) { this.x = x; this.y = y; this.w = w; this.h = h; this.viewTag = viewTag; - web.once("webInited", ()=>{ - if (this.url!= '') { - this.controller.loadUrl({url: this.url}); + web.once("webInited", () => { + if (this.url != '') { + this.controller.loadUrl(this.url); } }); } @@ -63,33 +67,33 @@ export class WebViewInfo { @Component export struct CocosWebView { @ObjectLink viewInfo: WebViewInfo; - public workPort: PortProxy; + public workPort: PortProxy | null = null; + build() { - Web({ src: "", controller: this.viewInfo.controller }) + Web({ src: this.viewInfo.url, controller: this.viewInfo.controller }) .position({ x: this.viewInfo.x, y: this.viewInfo.y }) .width(this.viewInfo.w) .height(this.viewInfo.h) .border({ width: 1 }) .onPageBegin((event) => { - this.workPort.postMessage("onPageBegin", {viewTag:this.viewInfo.viewTag, url:event.url}); + this.workPort?.postMessage("onPageBegin", { + viewTag: this.viewInfo.viewTag as number, + url: event?.url as string + } as param); }) .onPageEnd((event) => { - this.workPort.postMessage("onPageEnd", {viewTag:this.viewInfo.viewTag, url:event.url}) + this.workPort?.postMessage("onPageEnd", { viewTag: this.viewInfo.viewTag as number, url: event?.url as string } as param) }) .onErrorReceive((event) => { - this.workPort.postMessage("onErrorReceive", {viewTag:this.viewInfo.viewTag, url:this.viewInfo.url}) + this.workPort?.postMessage("onErrorReceive", { viewTag: this.viewInfo.viewTag as number, url: this.viewInfo.url as string } as param) }) .onHttpErrorReceive((event) => { - this.workPort.postMessage("onErrorReceive", {viewTag:this.viewInfo.viewTag, url:this.viewInfo.url}) + this.workPort?.postMessage("onErrorReceive", { viewTag: this.viewInfo.viewTag as number, url: this.viewInfo.url as string } as param) }) - // 开启DOM存储权限 - .domStorageAccess(true) - // 开启数据库存储权限 - .databaseAccess(true) - // 图片加载相关权限 - .imageAccess(true) - // 支持JS代码运行 - .javaScriptAccess(true) + .domStorageAccess(true)// enable DOM storage permissions + .databaseAccess(true)// enable database storage permissions + .imageAccess(true)// enable image loading permissions + .javaScriptAccess(true)// support JS code running .visibility(this.viewInfo.visible ? Visibility.Visible : Visibility.None) } } \ No newline at end of file diff --git a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/EditBoxDialog.ets b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/EditBoxDialog.ets index 643c0532..198ee169 100644 --- a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/EditBoxDialog.ets +++ b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/components/EditBoxDialog.ets @@ -21,16 +21,16 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -****************************************************************************/ + ****************************************************************************/ @CustomDialog export struct EditBoxDialog { private showMessage: string = '' private inputMessage: string = '' - onTextChange: (msg: string) => void - accept: (msg: string) => void - controller: CustomDialogController - cancel: () => void - confirm: () => void + onTextChange?: (msg: string) => void; + accept?: (msg: string) => void; + controller?: CustomDialogController; + cancel?: () => void; + confirm?: () => void; build() { Column() { @@ -48,14 +48,14 @@ export struct EditBoxDialog { if (this.accept) { this.accept(this.inputMessage); } - this.controller.close(); + this.controller?.close(); }) Blank(8).width(16) Button('完成').onClick(() => { if (this.accept) { this.accept(this.inputMessage); } - this.controller.close(); + this.controller?.close(); }) }.padding({ left: 8, right: 8, top: 8, bottom: 8 }) .backgroundColor(Color.Gray) diff --git a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/entryability/EntryAbility.ts b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/entryability/EntryAbility.ts index fcda85b3..f73adf28 100644 --- a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/entryability/EntryAbility.ts +++ b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/entryability/EntryAbility.ts @@ -1,6 +1,6 @@ import UIAbility from '@ohos.app.ability.UIAbility'; -import cocos from "libcocos.so"; -import { ContextType } from "../common/Constants" +import cocos from 'libcocos.so'; +import { ContextType } from '../common/Constants'; import window from '@ohos.window'; const nativeContext = cocos.getContext(ContextType.ENGINE_UTILS); @@ -29,9 +29,9 @@ export default class EntryAbility extends UIAbility { } windowClass = data; console.info('Succeeded in obtaining the main window. Data: ' + JSON.stringify(data)); - + // 设置窗口为全屏布局，配合设置导航栏、状态栏是否显示，与主窗口显示保持协调一致。 - let isLayoutFullScreen= true; + let isLayoutFullScreen = true; windowClass.setWindowLayoutFullScreen(isLayoutFullScreen, (err) => { if (err.code) { console.error('Failed to set the window layout to full-screen mode. Cause: ' + JSON.stringify(err)); @@ -39,7 +39,7 @@ export default class EntryAbility extends UIAbility { } console.info('Succeeded in setting the window layout to full-screen mode.'); }); - + // 设置状态栏和导航栏是否显示。例如，需全部显示，该参数设置为['status', 'navigation']；不设置，则默认不显示。 let visibleBar = []; windowClass.setWindowSystemBarEnable(visibleBar, (err) => { diff --git a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/pages/index.ets b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/pages/index.ets index 71a2ab80..d28dc286 100644 --- a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/pages/index.ets +++ b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/pages/index.ets @@ -21,227 +21,264 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -****************************************************************************/ -import nativerender from "libcocos.so"; + ****************************************************************************/ +import nativerender from 'libcocos.so'; -import { WorkerManager } from '../cocos/WorkerManager' -import { ContextType } from "../common/Constants" -import featureAbility from '@ohos.ability.featureAbility' -import { EditBoxDialog } from '../components/EditBoxDialog' -import { WebViewInfo, CocosWebView } from '../components/CocosWebView' -import { VideoInfo, CocosVideoPlayer } from '../components/CocosVideoPlayer' +import { WorkerManager } from '../cocos/WorkerManager'; +import { ContextType } from '../common/Constants'; +import { EditBoxDialog } from '../components/EditBoxDialog'; +import { CocosWebView, WebViewInfo } from '../components/CocosWebView'; +import { CocosVideoPlayer, VideoInfo } from '../components/CocosVideoPlayer'; +import { MessageEvent } from '@ohos.worker'; +import { PortProxy } from '../common/PortProxy'; -import {PortProxy} from '../common/PortProxy' const nativePageLifecycle = nativerender.getContext(ContextType.JSPAGE_LIFECYCLE); const engineUtils = nativerender.getContext(ContextType.ENGINE_UTILS); +interface WorkerMessage { + type: string; + data: data; +} + +interface data { + id: string, + name: string, + param: number | string | param +} + +interface param { + tag?: number, + url?: string, + contents?: string, + mimeType?: string, + encoding?: string, + baseUrl?: string, + jsContents?: string, + x?: number, + y?: number, + w?: number, + h?: number, + visible?: boolean, + resourceType?: number, + time?: number, + fullScreen?: boolean +} + @Entry @Component struct Index { @State showMessage: string = '' @State webViewArray: WebViewInfo[] = []; - @State videoArray:VideoInfo[] = []; - //private index: number = 0; - private webViewIndexMap: Map = new Map; - private videoIndexMap: Map = new Map; - - private workPort : PortProxy = new PortProxy(WorkerManager.getInstance().getWorker()); + @State videoArray: VideoInfo[] = []; + private webViewIndexMap: Map = new Map(); + private videoIndexMap: Map = new Map(); + private workPort: PortProxy = new PortProxy(WorkerManager.getInstance().getWorker()); dialogController: CustomDialogController = new CustomDialogController({ builder: EditBoxDialog({ showMessage: this.showMessage, - onTextChange: (msg: string) => { + onTextChange: (msg: string): void => { this.showMessage = msg; - this.workPort.postMessage('onTextInput', msg) + this.workPort.postMessage('onTextInput', msg); }, - accept: (msg: string) => { + accept: (msg: string): void => { this.showMessage = msg; - this.workPort.postMessage('onComplete', msg) - }, + this.workPort.postMessage('onComplete', msg); + } }), - cancel: () => { - this.workPort.postMessage('onComplete', this.showMessage) + cancel: (): void => { + this.workPort.postMessage('onComplete', this.showMessage); }, autoCancel: true, alignment: DialogAlignment.Bottom, customStyle: true, }) - aboutToAppear(): void { + aboutToAppear(): void { console.log('[LIFECYCLE-Index] cocos aboutToAppear'); - this.workPort._messageHandle = (e) => { - //let data = e['data']; - var data = e.data; - var msg = data.data; - var result; + this.workPort._messageHandle = async (e: MessageEvent): Promise => { + let data: WorkerMessage = e.data; + let msg = data.data; + let result: boolean | string | number | null = null; switch (msg.name) { - // EditBox + // EditBox case "showEditBox": { - this.showMessage = msg.param - this.dialogController.open() + this.showMessage = msg.param as string; + this.dialogController.open(); break; } case "hideEditBox": { - this.showMessage = '' - this.dialogController.close() + this.showMessage = ''; + this.dialogController.close(); break; } - // WebView + // WebView case "createWebView": { - this.webViewArray.push(new WebViewInfo(0, 0, 0, 0, msg.param)) - this.webViewIndexMap.set(msg.param, this.webViewArray.length - 1); + this.webViewArray.push(new WebViewInfo(0, 0, 0, 0, msg.param as number)); + this.webViewIndexMap.set(msg.param as number, this.webViewArray.length - 1); break; } case "removeWebView": { if (this.webViewArray.length > 0) { - this.webViewArray.splice(this.webViewIndexMap.get(msg.param), 1) + this.webViewArray.splice(this.webViewIndexMap.get(msg?.param as number) as number, 1); } break; } case "loadUrl": { - var web = msg.param; - var index = this.webViewIndexMap.get(web.tag); - this.webViewArray[index].url = web.url; - this.webViewArray[index].controller.loadUrl({url: web.url}); + let web = msg.param as param; + let index = this.webViewIndexMap.get(web?.tag as number) as number; + this.webViewArray[index].url = web?.url as string; + this.webViewArray[index].controller.loadUrl(web?.url as string); break; } case "loadHTMLString": { - var web = msg.param; - var index = this.webViewIndexMap.get(web.tag); - this.webViewArray[index].controller.loadData({data: web.contents, mimeType:"text/html",encoding:"UTF-8", baseUrl:web.baseUrl}); + let web = msg.param as param; + let index = this.webViewIndexMap.get(web?.tag as number) as number; + this.webViewArray[index].controller.loadData( + web?.contents as string, + "text/html", + "UTF-8", + web?.baseUrl + ); break; } case "loadData": { - var web = msg.param; - var index = this.webViewIndexMap.get(web.tag); - this.webViewArray[index].controller.loadData({data: web.contents, mimeType:web.mimeType,encoding:web.encoding, baseUrl:web.baseUrl}); + let web = msg.param as param; + let index = this.webViewIndexMap.get(web?.tag as number) as number; + this.webViewArray[index].controller.loadData( + web?.contents as string, + web?.mimeType as string, + web?.encoding as string, + web?.baseUrl as string + ); break; } case "evaluateJS": { - var web = msg.param; - var index = this.webViewIndexMap.get(web.tag) - this.webViewArray[index].controller.runJavaScript({ - script: web.jsContents - }); + let web = msg.param as param; + let index = this.webViewIndexMap.get(web?.tag as number) as number; + this.webViewArray[index].controller.runJavaScript(web?.jsContents as string); break; } case "reload": { - var index = this.webViewIndexMap.get(msg.param); + let index = this.webViewIndexMap.get(msg.param as number) as number; this.webViewArray[index].controller.refresh(); break; } case "stopLoading": { - var index = this.webViewIndexMap.get(msg.param); + let index = this.webViewIndexMap.get(msg.param as number) as number; this.webViewArray[index].controller.stop(); break; } case "canGoForward": { - var index = this.webViewIndexMap.get(msg.param); + let index = this.webViewIndexMap.get(msg.param as number) as number; result = this.webViewArray[index].controller.accessForward(); break; } case "canGoBack": { - var index = this.webViewIndexMap.get(msg.param); + let index = this.webViewIndexMap.get(msg.param as number) as number; result = this.webViewArray[index].controller.accessBackward(); break; } case "goForward": { - var index = this.webViewIndexMap.get(msg.param); + let index = this.webViewIndexMap.get(msg.param as number) as number; this.webViewArray[index].controller.forward(); break; } case "goBack": { - var index = this.webViewIndexMap.get(msg.param); + let index = this.webViewIndexMap.get(msg.param as number) as number; this.webViewArray[index].controller.backward(); break; } case "setWebViewRect": { - var web = msg.param; - var index = this.webViewIndexMap.get(web.tag); - this.webViewArray[index].x = px2vp(web.x); - this.webViewArray[index].y = px2vp(web.y); - this.webViewArray[index].w = px2vp(web.w); - this.webViewArray[index].h = px2vp(web.h); + let web = msg.param as param + let index = this.webViewIndexMap.get(web?.tag as number) as number; + this.webViewArray[index].x = px2vp(web?.x as number) as number; + this.webViewArray[index].y = px2vp(web?.y as number) as number; + this.webViewArray[index].w = px2vp(web?.w as number) as number; + this.webViewArray[index].h = px2vp(web?.h as number) as number; break; } - case "setVisible": - var web = msg.param; - var index = this.webViewIndexMap.get(web.tag); - this.webViewArray[index].visible = web.visible; + case "setVisible": { + let web = msg.param as param; + let index = this.webViewIndexMap.get(web?.tag as number) as number; + this.webViewArray[index].visible = web?.visible as boolean; break; - // video - case "createVideo": - this.videoArray.push(new VideoInfo(0, 0, 0, 0, msg.param)) - this.videoIndexMap.set(msg.param, this.videoArray.length - 1); + } + // video + case "createVideo": { + this.videoArray.push(new VideoInfo(0, 0, 0, 0, msg.param as number)); + this.videoIndexMap.set(msg.param as number, this.videoArray.length - 1); break; - case "removeVideo": + } + case "removeVideo": { if (this.videoArray.length > 0) { - this.videoArray.splice(this.videoIndexMap.get(msg.param), 1) + this.videoArray.splice(this.videoIndexMap.get(msg.param as number) as number, 1); } break; + } case "setVideoUrl": - var video = msg.param; - var index = this.videoIndexMap.get(video.tag); - var resourceType = video.resourceType; + let video = msg.param as param; + let index = this.videoIndexMap.get(video?.tag as number) as number; + let resourceType = video.resourceType; if (resourceType == 1) { - this.videoArray[index].url = $rawfile(video.url); + this.videoArray[index].url = $rawfile(video.url as string); } else { - this.videoArray[index].url = video.url; + this.videoArray[index].url = video.url as string; } break; case "setVideoRect": { - var video = msg.param; - var index = this.videoIndexMap.get(video.tag); - this.videoArray[index].x = px2vp(video.x); - this.videoArray[index].y = px2vp(video.y); - this.videoArray[index].w = px2vp(video.w); - this.videoArray[index].h = px2vp(video.h); + let video = msg.param as param; + let index = this.videoIndexMap.get(video?.tag as number) as number; + this.videoArray[index].x = px2vp(video?.x as number) as number; + this.videoArray[index].y = px2vp(video?.y as number) as number; + this.videoArray[index].w = px2vp(video?.w as number) as number; + this.videoArray[index].h = px2vp(video?.h as number) as number; break; } case "startVideo": { - var index = this.videoIndexMap.get(msg.param); + let index = this.videoIndexMap.get(msg.param as number) as number; this.videoArray[index].controller.start(); break; } - case "pauseVideo" : { - var index = this.videoIndexMap.get(msg.param); + case "pauseVideo": { + let index = this.videoIndexMap.get(msg.param as number) as number; this.videoArray[index].controller.pause(); break; } - case "stopVideo" : { - var index = this.videoIndexMap.get(msg.param); + case "stopVideo": { + let index = this.videoIndexMap.get(msg.param as number) as number; this.videoArray[index].controller.stop(); break; } case "resumeVideo": { - var index = this.videoIndexMap.get(msg.param); + let index = this.videoIndexMap.get(msg.param as number) as number; this.videoArray[index].controller.start(); break; } case "getVideoDuration": { - var index = this.videoIndexMap.get(msg.param); + let index = this.videoIndexMap.get(msg.param as number) as number; result = this.videoArray[index].duration; break; } - case "seekVideoTo" : { - var video = msg.param; - var index = this.videoIndexMap.get(video.tag); - this.videoArray[index].controller.setCurrentTime(video.time, SeekMode.Accurate); + case "seekVideoTo": { + let video = msg.param as param; + let index = this.videoIndexMap.get(video?.tag as number) as number; + this.videoArray[index].controller.setCurrentTime(video?.time as number, SeekMode.Accurate); break; } - case "setVideoVisible" : { - var video = msg.param; - var index = this.videoIndexMap.get(video.tag); - this.videoArray[index].visible = video.visible; + case "setVideoVisible": { + let video = msg.param as param; + let index = this.videoIndexMap.get(video?.tag as number) as number; + this.videoArray[index].visible = video.visible as boolean; break; } case "setFullScreenEnabled": { - var video = msg.param; - var index = this.videoIndexMap.get(video.tag); - this.videoArray[index].isFullScreen = video.fullScreen; + let video = msg.param as param; + let index = this.videoIndexMap.get(video?.tag as number) as number; + this.videoArray[index].isFullScreen = video.fullScreen as boolean; break; } case "currentTime": { - var index = this.videoIndexMap.get(msg.param); + let index = this.videoIndexMap.get(msg.param as number) as number; result = this.videoArray[index].currentTime; break; } @@ -257,16 +294,16 @@ struct Index { aboutToDisappear(): void { console.log('[LIFECYCLE-Index] cocos aboutToDisappear'); -// this.cocosWorker.postMessage({type: "JSPageLifecycle", data: "aboutToAppear"}); -// nativePageLifecycle.aboutToDisappear(); + // this.cocosWorker.postMessage({type: "JSPageLifecycle", data: "aboutToAppear"}); + // nativePageLifecycle.aboutToDisappear(); } - onPageShow(): void { + onPageShow(): void { console.log('[LIFECYCLE-Page] cocos onPageShow'); nativePageLifecycle.onPageShow(); } - onPageHide(): void { + onPageHide(): void { console.log('[LIFECYCLE-Page] cocos onPageHide'); nativePageLifecycle.onPageHide(); } @@ -279,8 +316,12 @@ struct Index { } build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - XComponent({ id: 'xcomponentId', type: 'surface', libraryname: 'cocos'}) + Flex({ + direction: FlexDirection.Column, + alignItems: ItemAlign.Center, + justifyContent: FlexAlign.Center + } as FlexOptions) { + XComponent({ id: 'xcomponentId', type: 'surface', libraryname: 'cocos' }) .onLoad((context) => { // Set the cache directory in the ts layer. this.workPort.postMessage("onXCLoad", "XComponent"); @@ -289,13 +330,13 @@ struct Index { console.log('cocos onDestroy') }) - ForEach(this.webViewArray, (item: WebViewInfo, index: number) => { - CocosWebView({ viewInfo: item, workPort: this.workPort}) - }, item => item.viewTag) + ForEach(this.webViewArray, (item: WebViewInfo) => { + CocosWebView({ viewInfo: item, workPort: this.workPort }) + }, (item: WebViewInfo): string => item.viewTag.toString()) - ForEach(this.videoArray, (item: VideoInfo, index: number) => { - CocosVideoPlayer({ videoInfo: item, workPort: this.workPort}) - }, item => item.viewTag) + ForEach(this.videoArray, (item: VideoInfo) => { + CocosVideoPlayer({ videoInfo: item, workPort: this.workPort }) + }, (item: VideoInfo): string => item.viewTag.toString()) } .width('100%') .height('100%') diff --git a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/workers/cocos_worker.ts b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/workers/cocos_worker.ts index 4b0b4bcd..54c46966 100644 --- a/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/workers/cocos_worker.ts +++ b/cocos2d-x/templates/js-template-link/frameworks/runtime-src/proj.openharmony/entry/src/main/ets/workers/cocos_worker.ts @@ -22,16 +22,15 @@ import hilog from '@ohos.hilog'; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -****************************************************************************/ - + ****************************************************************************/ import worker from '@ohos.worker'; -import cocos from "libcocos.so"; -import { ContextType } from "../common/Constants" -import { launchEngine } from '../cocos/game' +import cocos from 'libcocos.so'; +import { ContextType } from '../common/Constants'; +import { launchEngine } from '../cocos/game'; import { PortProxy } from '../common/PortProxy'; const nativeContext = cocos.getContext(ContextType.WORKER_INIT); -nativeContext.workerInit() +nativeContext.workerInit(); const nativeEditBox = cocos.getContext(ContextType.EDITBOX_UTILS); const nativeWebView = cocos.getContext(ContextType.WEBVIEW_UTILS); @@ -39,73 +38,66 @@ const appLifecycle = cocos.getContext(ContextType.APP_LIFECYCLE); let uiPort = new PortProxy(worker.parentPort); -nativeContext.postMessage = function(msgType: string, msgData:string) { - uiPort.postMessage(msgType, msgData); +nativeContext.postMessage = function (msgType: string, msgData: string): void { + uiPort.postMessage(msgType, msgData); } -nativeContext.postSyncMessage = async function(msgType: string, msgData:string) { - const result = await uiPort.postSyncMessage(msgType, msgData); - return result; +nativeContext.postSyncMessage = async function (msgType: string, msgData: string): Promise { + const result = await uiPort.postSyncMessage(msgType, msgData) as boolean | string | number; + return result; } // The purpose of this is to avoid being GC nativeContext.setPostMessageFunction.call(nativeContext, nativeContext.postMessage) nativeContext.setPostSyncMessageFunction.call(nativeContext, nativeContext.postSyncMessage) -uiPort._messageHandle = function(e) { - var data = e.data; - var msg = data.data; - hilog.info(0x0000, 'testTag',msg.name,msg.param); +uiPort._messageHandle = function (e) { + var data = e.data; + var msg = data.data; - switch(msg.name) { - case "onXCLoad": - hilog.info(0x0000, 'testTag', '%{public}s', '_messageHandle onXCLoad'); - console.info("cocos worker:_messageHandle onXCLoad"); - const renderContext = cocos.getContext(ContextType.NATIVE_RENDER_API); - renderContext.nativeEngineInit(); - hilog.info(0x0000, 'testTag', '%{public}s', 'begin invoke launchEngine'); - launchEngine().then(() => { - hilog.info(0x0000, 'testTag', '%{public}s', 'launch CC engine finished'); - console.info('launch CC engine finished'); - }).catch(e => { - hilog.info(0x0000, 'testTag', '%{public}s', 'launch CC engine failed'); - console.error('launch CC engine failed'); - }); - - // @ts-ignore - globalThis.oh.postMessage = nativeContext.postMessage; - // @ts-ignore - globalThis.oh.postSyncMessage = nativeContext.postSyncMessage; - renderContext.nativeEngineStart(); - break; - case "onTextInput": - nativeEditBox.onTextChange(msg.param); - break; - case "onComplete": - nativeEditBox.onComplete(msg.param); - break; - case "onPageBegin": - nativeWebView.shouldStartLoading(msg.param.viewTag, msg.param.url); - break; - case "onPageEnd": - nativeWebView.finishLoading(msg.param.viewTag, msg.param.url); - break; - case "onErrorReceive": - nativeWebView.failLoading(msg.param.viewTag, msg.param.url); - break; - case "onVideoEvent": - // @ts-ignore - if(globalThis.oh && typeof globalThis.oh.onVideoEvent === "function") { - // @ts-ignore - globalThis.oh.onVideoEvent(msg.param.videoTag, msg.param.videoEvent, msg.param.args); - } - break; - case "backPress": - appLifecycle.onBackPress(); - break; - default: - hilog.info(0x0000, 'testTag', 'cocos worker: message type unknown:%{public}s', msg.name); - console.error("cocos worker: message type unknown"); - break; - } + switch (msg.name) { + case "onXCLoad": + const renderContext = cocos.getContext(ContextType.NATIVE_RENDER_API); + renderContext.nativeEngineInit(); + launchEngine().then(() => { + console.info('launch CC engine finished'); + }).catch(e => { + console.error('launch CC engine failed'); + }); + // @ts-ignore + globalThis.oh.postMessage = nativeContext.postMessage; + // @ts-ignore + globalThis.oh.postSyncMessage = nativeContext.postSyncMessage; + renderContext.nativeEngineStart(); + break; + case "onTextInput": + nativeEditBox.onTextChange(msg.param); + break; + case "onComplete": + nativeEditBox.onComplete(msg.param); + break; + case "onPageBegin": + nativeWebView.shouldStartLoading(msg.param.viewTag, msg.param.url); + break; + case "onPageEnd": + nativeWebView.finishLoading(msg.param.viewTag, msg.param.url); + break; + case "onErrorReceive": + nativeWebView.failLoading(msg.param.viewTag, msg.param.url); + break; + case "onVideoEvent": + // @ts-ignore + if (globalThis.oh && typeof globalThis.oh.onVideoEvent === "function") { + // @ts-ignore + globalThis.oh.onVideoEvent(msg.param.videoTag, msg.param.videoEvent, msg.param.args); + } + break; + case "backPress": + appLifecycle.onBackPress(); + break; + default: + hilog.info(0x0000, 'testTag', 'cocos worker: message type unknown:%{public}s', msg.name); + console.error("cocos worker: message type unknown"); + break; + } } diff --git a/cocos2d-x/tools/cocos2d-console/.gitignore b/cocos2d-x/tools/cocos2d-console/.gitignore index f640b645..1b5237be 100644 --- a/cocos2d-x/tools/cocos2d-console/.gitignore +++ b/cocos2d-x/tools/cocos2d-console/.gitignore @@ -46,6 +46,15 @@ xcuserdata/ DerivedData/ .idea/* +# Ignore the files from download +bin/sdkbox* +plugins/plugin_compile/build_web/bin +plugins/plugin_jscompile/ +plugins/plugin_luacompile/bin/msvcr110.dll +plugins/plugin_generate/proj_modifier/plutil-win32/ +version.json +v*-console-*.zip + # vim *~ diff --git a/cocos2d-x/tools/cocos2d-console/bin/cocos.py b/cocos2d-x/tools/cocos2d-console/bin/cocos.py index fcc0a1c5..1ea5abde 100644 --- a/cocos2d-x/tools/cocos2d-console/bin/cocos.py +++ b/cocos2d-x/tools/cocos2d-console/bin/cocos.py @@ -404,7 +404,7 @@ class CCPlugin(object): if os.path.isdir(cocos2dx_path): return cocos2dx_path - if cls.get_cocos2d_mode() is not "distro": + if cls.get_cocos2d_mode() != "distro": # In 'distro' mode this is not a warning since # the source code is not expected to be installed Logging.warning(MultiLanguage.get_string('COCOS_WARNING_ENGINE_NOT_FOUND')) @@ -940,7 +940,7 @@ def _check_python_version(): ret = False if not ret: - print(MultiLanguage.get_string('COCOS_PYTHON_VERSION_TIP_FMT') % (major_ver, minor_ver)) + print(str('COCOS PYTHON VERSION DOES NOT MATCH: %d.%d, WHILE 2.7+ IS REQUIRED') % (major_ver, minor_ver)) return ret diff --git a/cocos2d-x/tools/cocos2d-console/plugins/plugin_compile/build_android.py b/cocos2d-x/tools/cocos2d-console/plugins/plugin_compile/build_android.py index ca49e125..9c8dbffb 100755 --- a/cocos2d-x/tools/cocos2d-console/plugins/plugin_compile/build_android.py +++ b/cocos2d-x/tools/cocos2d-console/plugins/plugin_compile/build_android.py @@ -525,6 +525,12 @@ class AndroidBuilder(object): if match: package = match.group(1) break + else : + pattern = r'namespace[ \t]+[\'\"](.*)[\'\"]' + match = re.match(pattern, line_str) + if match: + package = match.group(1) + break if package is None: # get package name from AndroidManifest.xml package = self._xml_attr(manifest_path, 'AndroidManifest.xml', 'manifest', 'package') diff --git a/cocos2d-x/tools/simulator/libsimulator/lib/platform/win32/PlayerWin.h b/cocos2d-x/tools/simulator/libsimulator/lib/platform/win32/PlayerWin.h index e4abe720..e0cf2b04 100755 --- a/cocos2d-x/tools/simulator/libsimulator/lib/platform/win32/PlayerWin.h +++ b/cocos2d-x/tools/simulator/libsimulator/lib/platform/win32/PlayerWin.h @@ -38,7 +38,7 @@ PLAYER_NS_BEGIN -class CC_LIBSIM_DLL PlayerWin : public PlayerProtocol, public cocos2d::Ref +class CC_LIBSIM_DLL PlayerWin : public cocos2d::Ref, public PlayerProtocol { public: static PlayerWin *createWithHwnd(HWND hWnd); diff --git a/engine/cocos2d/core/components/CCLabelOutline.js b/engine/cocos2d/core/components/CCLabelOutline.js index a9593c83..6f3f5dfb 100644 --- a/engine/cocos2d/core/components/CCLabelOutline.js +++ b/engine/cocos2d/core/components/CCLabelOutline.js @@ -43,6 +43,7 @@ let LabelOutline = cc.Class({ extends: require('./CCComponent'), editor: CC_EDITOR && { menu: 'i18n:MAIN_MENU.component.renderers/LabelOutline', + help: 'i18n:COMPONENT.help_url.labelOutline', executeInEditMode: true, requireComponent: cc.Label, }, diff --git a/engine/cocos2d/core/components/CCLabelShadow.js b/engine/cocos2d/core/components/CCLabelShadow.js index d03d752e..6e97fec4 100644 --- a/engine/cocos2d/core/components/CCLabelShadow.js +++ b/engine/cocos2d/core/components/CCLabelShadow.js @@ -43,6 +43,7 @@ let LabelShadow = cc.Class({ extends: require('./CCComponent'), editor: CC_EDITOR && { menu: 'i18n:MAIN_MENU.component.renderers/LabelShadow', + help: 'i18n:COMPONENT.help_url.labelShadow', executeInEditMode: true, requireComponent: cc.Label, }, diff --git a/engine/editor/i18n/en/localization.js b/engine/editor/i18n/en/localization.js index a8a7b5bb..7a9fbfdc 100755 --- a/engine/editor/i18n/en/localization.js +++ b/engine/editor/i18n/en/localization.js @@ -5,6 +5,8 @@ module.exports = { "animation": "https://docs.cocos.com/creator/2.4/manual/en/components/animation.html", "sprite": "https://docs.cocos.com/creator/2.4/manual/en/components/sprite.html", "label": "https://docs.cocos.com/creator/2.4/manual/en/components/label.html", + "labelOutline": "https://docs.cocos.com/creator/2.4/manual/en/components/label-outline.html", + "labelShadow": "https://docs.cocos.com/creator/2.4/manual/en/components/label-shadow.html", "canvas": "https://docs.cocos.com/creator/2.4/manual/en/components/canvas.html", "spine": "https://docs.cocos.com/creator/2.4/manual/en/components/spine.html", "widget": "https://docs.cocos.com/creator/2.4/manual/en/components/widget.html", diff --git a/engine/editor/i18n/zh/localization.js b/engine/editor/i18n/zh/localization.js index 0c996cc1..2ceacabc 100755 --- a/engine/editor/i18n/zh/localization.js +++ b/engine/editor/i18n/zh/localization.js @@ -5,6 +5,8 @@ module.exports = { "animation": "https://docs.cocos.com/creator/2.4/manual/zh/components/animation.html", "sprite": "https://docs.cocos.com/creator/2.4/manual/zh/components/sprite.html", "label": "https://docs.cocos.com/creator/2.4/manual/zh/components/label.html", + "labelOutline": "https://docs.cocos.com/creator/2.4/manual/zh/components/label-outline.html", + "labelShadow": "https://docs.cocos.com/creator/2.4/manual/zh/components/label-shadow.html", "canvas": "https://docs.cocos.com/creator/2.4/manual/zh/components/canvas.html", "spine": "https://docs.cocos.com/creator/2.4/manual/zh/components/spine.html", "widget": "https://docs.cocos.com/creator/2.4/manual/zh/components/widget.html", diff --git a/engine/extensions/dragonbones/lib/dragonBones.js b/engine/extensions/dragonbones/lib/dragonBones.js index 0dba874c..81be63f2 100644 --- a/engine/extensions/dragonbones/lib/dragonBones.js +++ b/engine/extensions/dragonbones/lib/dragonBones.js @@ -12631,6 +12631,7 @@ var dragonBones; var rawTimeline = rawTimelines_3[_b]; this._parseSlotTimeline(rawTimeline); } + this._actionFrames.sort((a, b) => { return a.frameStart - b.frameStart; }); } if (dragonBones.DataParser.FFD in rawData) { var rawTimelines = rawData[dragonBones.DataParser.FFD]; diff --git a/engine/package.json b/engine/package.json index 447aaa10..071344e5 100644 --- a/engine/package.json +++ b/engine/package.json @@ -1,6 +1,6 @@ { "name": "cocos-creator-js", - "version": "2.4.12", + "version": "2.4.13", "description": "Cocos Creator is a complete package of game development tools and workflow, including a game engine, resource management, scene editing, game preview, debug and publish one project to multiple platforms.", "homepage": "https://www.cocos.com", "license": "MIT", diff --git a/engine/predefine.js b/engine/predefine.js index 764b701f..3324cd25 100644 --- a/engine/predefine.js +++ b/engine/predefine.js @@ -211,5 +211,5 @@ if (CC_DEV) { * If you post a bug to forum, please attach this flag. * @property {String} ENGINE_VERSION */ -const engineVersion = '2.4.12'; +const engineVersion = '2.4.13'; _global['CocosEngine'] = cc.ENGINE_VERSION = engineVersion; diff --git a/jsb-adapter/engine/jsb-spine-skeleton.js b/jsb-adapter/engine/jsb-spine-skeleton.js index 23648b1e..c332aa73 100644 --- a/jsb-adapter/engine/jsb-spine-skeleton.js +++ b/jsb-adapter/engine/jsb-spine-skeleton.js @@ -354,8 +354,8 @@ const cacheManager = require('./jsb-cache-manager'); } if (this._nativeSkeleton) { - this._nativeSkeleton.stopSchedule(); this._nativeSkeleton._comp = null; + this._nativeSkeleton.destroy(); this._nativeSkeleton = null; } @@ -763,8 +763,8 @@ const cacheManager = require('./jsb-cache-manager'); this.animation = this.defaultAnimation; } else { if (this._nativeSkeleton) { - this._nativeSkeleton.stopSchedule(); this._nativeSkeleton._comp = null; + this._nativeSkeleton.destroy(); this._nativeSkeleton = null; } } @@ -774,8 +774,8 @@ const cacheManager = require('./jsb-cache-manager'); skeleton.onDestroy = function(){ _onDestroy.call(this); if (this._nativeSkeleton) { - this._nativeSkeleton.stopSchedule(); this._nativeSkeleton._comp = null; + this._nativeSkeleton.destroy(); this._nativeSkeleton = null; } this._stateData = null; diff --git a/jsb-adapter/engine/jsb-videoplayer-openharmony.js b/jsb-adapter/engine/jsb-videoplayer-openharmony.js index f2244c24..44e68578 100644 --- a/jsb-adapter/engine/jsb-videoplayer-openharmony.js +++ b/jsb-adapter/engine/jsb-videoplayer-openharmony.js @@ -35,7 +35,7 @@ var _topLeft = new vec3(); var _bottomRight = new vec3(); - let kWebViewTag = 0; + let kVideoTag = 0; let videoPlayers = []; const VideoEvent = { PLAYING: 0, @@ -143,6 +143,16 @@ video.setVisible(false) let cbs = this.__eventListeners; + + video.removeEventListener("loadedmetadata", cbs.loadedmetadata); + video.removeEventListener("ended", cbs.ended); + video.removeEventListener("play", cbs.play); + video.removeEventListener("pause", cbs.pause); + video.removeEventListener("click", cbs.click); + video.removeEventListener("canplay", cbs.onCanPlay); + video.removeEventListener("canplaythrough", cbs.onCanPlay); + video.removeEventListener("suspend", cbs.onCanPlay); + cbs.loadedmetadata = null; cbs.ended = null; cbs.play = null; @@ -218,7 +228,7 @@ let video = this._video; if (!video || !this._visible) return; // TODO(qgh) : In the openharmony platform, there is no stop event when the video stops, instead a pause event is sent. - // We can't ignore the pause event here. + // We can't ignore the pause event here. // this._ignorePause = true; video.seekTo(0); video.stop(); @@ -480,7 +490,7 @@ this._events = {}; this._currentTime = 0; this._duration = 0; - this._videoIndex = kWebViewTag++; + this._videoIndex = kVideoTag++; this._matViewProj_temp = new mat4(); window.oh.postMessage("createVideo", this._videoIndex); videoPlayers.push(this);