[engine] [cocos2d-x] [jsb-adapter] 适配引擎 v2.4.12 版本

cocos2d-x/cocos/audio/android/utils/Compat.h

@@ -17,7 +17,15 @@
 #ifndef COCOS_LIB_UTILS_COMPAT_H
 #define COCOS_LIB_UTILS_COMPAT_H
 
+#include "platform/CCPlatformDefine.h"
+#include <SLES/OpenSLES.h>
+#if CC_TARGET_PLATFORM == CC_PLATFORM_OPENHARMONY
+#include <SLES/OpenSLES_OpenHarmony.h>
+#include <SLES/OpenSLES_Platform.h>
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
+#include <SLES/OpenSLES_Android.h>
 #include <unistd.h>
+#endif
 
 #if defined(__APPLE__)
 
@@ -85,4 +93,13 @@ static inline ssize_t pwrite64(int fd, const void* buf, size_t nbytes, off64_t o
 #define OS_PATH_SEPARATOR '/'
 #endif
 
+#if CC_TARGET_PLATFORM == CC_PLATFORM_OPENHARMONY
+typedef SLOHBufferQueueItf CCSLBufferQueueItf;
+#define CC_SL_IDD_BUFFER_QUEUE SL_IID_OH_BUFFERQUEUE
+#define __unused
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
+typedef SLAndroidSimpleBufferQueueItf CCSLBufferQueueItf;
+#define CC_SL_IDD_BUFFER_QUEUE SL_IID_ANDROIDSIMPLEBUFFERQUEUE
+#endif
+
 #endif /* COCOS_LIB_UTILS_COMPAT_H */

cocos2d-x/cocos/audio/android/utils/Utils.cpp

@@ -23,7 +23,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "audio/android/utils/Utils.h"
+#include "platform/CCPlatformDefine.h"
+#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
 #include "platform/android/jni/JniHelper.h"
+#endif
 
 #ifndef JCLS_HELPER
 #define JCLS_HELPER "org/cocos2dx/lib/Cocos2dxHelper"
@@ -33,7 +36,12 @@ namespace cocos2d {
 
 int getSDKVersion()
 {
-    return JniHelper::callStaticIntMethod(JCLS_HELPER, "getSDKVersion");
+#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
+     return JniHelper::callStaticIntMethod(JCLS_HELPER, "getSDKVersion");
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_OPENHARMONY
+    //TODO: openharmony未实现
+  return 0;
+#endif
 }
 
 } // end of namespace cocos2d