@react-native-ohos/audio-toolkit 2.0.4-rc.3 → 2.1.0-rc.2

package/CHANGELOG.md

@@ -1,2 +1,6 @@
-# Changelog
-All notable changes to this project will be documented in this file.
+# v2.0.4-rc.2
+
+## 更新内容
+
+* 修改组织名为@react-native-ohos
+* 移除 codegenConfig 依赖，并将代码生成逻辑集成到库内部

package/COMMITTERS.md

@@ -0,0 +1,7 @@
+## Committers列表
+
+### 以下是此项目的committer人员
+
+不区分先后顺序
+
+- [xiafeng_xf_admin](https://gitee.com/xiafeng_xf_admin)

package/README.md

@@ -1,11 +1,17 @@
-# @react-native-ohos/audio-toolkit
+# @react-native-ohos/react-native-audio-toolkit
 
-This project is based on [react-native-audio-toolkit@2.0.3](https://github.com/react-native-audio-toolkit/react-native-audio-toolkit/tree/v2.0.3)
-## Documentation
+本项目基于 [react-native-audio-toolkit@2.0.3](https://github.com/react-native-audio-toolkit/react-native-audio-toolkit/tree/v2.0.3)
 
-[中文](https://gitee.com/react-native-oh-library/usage-docs/blob/master/zh-cn/react-native-audio-toolkit.md)
-[English](https://gitee.com/react-native-oh-library/usage-docs/blob/master/en/react-native-audio-toolkit.md)
+## 文档地址 / Documentation URL 
 
-## License
+[中文 / Chinese](https://gitee.com/react-native-oh-library/usage-docs/blob/master/zh-cn/react-native-audio-toolkit.md)
 
-This project is based on [The MIT License (MIT)](https://github.com/react-native-audio-toolkit/react-native-audio-toolkit/blob/master/LICENSE)
+## Codegen
+
+该库已接入 codegen，具体请查阅文档。
+
+The library has been integrated with codegen. Please refer to the documentation for details.
+
+## 请悉知 / Acknowledgements
+
+本项目基于 [The MIT License (MIT)](hhttps://github.com/react-native-audio-toolkit/react-native-audio-toolkit/blob/master/LICENSE) ，请自由地享受和参与开源。

package/harmony/audio_toolkit/BuildProfile.ets

@@ -0,0 +1,17 @@
+/**
+ * Use these variables when you tailor your ArkTS code. They must be of the const type.
+ */
+export const HAR_VERSION = '2.0.4-rc.2';
+export const BUILD_MODE_NAME = 'debug';
+export const DEBUG = true;
+export const TARGET_NAME = 'default';
+
+/**
+ * BuildProfile Class is used only for compatibility purposes.
+ */
+export default class BuildProfile { 
+	static readonly HAR_VERSION = HAR_VERSION;
+	static readonly BUILD_MODE_NAME = BUILD_MODE_NAME;
+	static readonly DEBUG = DEBUG;
+	static readonly TARGET_NAME = TARGET_NAME;
+}

package/harmony/audio_toolkit/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2015-present, Facebook, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+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.

package/harmony/audio_toolkit/NOTICE

@@ -0,0 +1,33 @@
+OPEN SOURCE SOFTWARE NOTICE
+
+Please note we provide an open source software notice for the third party open source software along with this software and/or this software component (in the following just “this SOFTWARE”). The open source software licenses are granted by the respective right holders.
+
+Warranty Disclaimer
+THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
+
+Copyright Notice and License Texts
+
+----------------------------------------------------------------------
+Software: @react-native-clipboard/clipboard V1.12.1
+
+MIT License
+
+Copyright (c) 2015-present, Facebook, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+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.

package/{OAT.xml → harmony/audio_toolkit/OAT.xml}

@@ -12,7 +12,6 @@
 				<filteritem type="filepath" name="hvigorw.bat" desc="工程模板，不修改版权头，以防有修改版权风险"/>
 				<filteritem type="filepath" name="hvigor/hvigor-wrapper.js" desc="工程模板，不修改版权头，以防有修改版权风险"/>
                 <filteritem type="filename" name="LICENSE" desc="工程文件，不修改版权头"/>
-                <filteritem type="filepath" name="src/.*" desc="第三方开源软件源码，不修改版权头，以防有修改版权风险"/>
 			</filefilter>
 			<filefilter name="defaultPolicyFilter" desc="Filters for compatibility，license header policies">
 				<filteritem type="filename" name="hvigorfile.ts" desc="hvigor构建脚本，DevEco Studio自动生成，不需要添加许可证头"/>
@@ -23,26 +22,17 @@
 				<filteritem type="filepath" name="hvigorw" desc="工程模板，不修改版权头，以防有修改版权风险"/>
 				<filteritem type="filepath" name="hvigorw.bat" desc="工程模板，不修改版权头，以防有修改版权风险"/>
 				<filteritem type="filepath" name="hvigor/hvigor-wrapper.js" desc="工程模板，不修改版权头，以防有修改版权风险"/>
-                <filteritem type="filepath" name="src/.*" desc="第三方开源软件源码，不修改版权头，以防有修改版权风险"/>
 			</filefilter>
 			<filefilter name="binaryFileTypePolicyFilter" desc="Filters for resources files policies">
 				<filteritem type="filename" name="icon.png" desc="应用图标"/>
 				<filteritem type="filename" name="app_icon.png" desc="应用图标"/>
 				<filteritem type="filename" name="warn.png" desc="页面展示图标"/>
-                <filteritem type="filepath" name="harmony/audio_toolkit.har" desc="项目打包文件"/>
 			</filefilter>
 		</filefilterlist>
         <policylist>
             <policy name="projectPolicy" desc="">
                 <policyitem type="license" name="MIT" path="*.*" desc="license under the MIT"/>
             </policy>
-            <policy name="projectPolicy" desc="">
-				<policyitem type="compatibility" name="GPL-2.0+" path=".*" desc="Process that runs independently, invoked by the X process."/>
-				<policyitem type="compatibility" name="Apache-2.0" path=".*" desc="不影响兼容性"/>
-				<policyitem type="compatibility" name="BSDStyleLicense" path=".*" desc="不影响兼容性" />
-				<policyitem type="compatibility" name="MIT" path=".*" desc="不影响兼容性" />
-				<policyitem type="compatibility" name="GPLStyleLicense" path=".*" desc="不影响兼容性" />
-			</policy>
         </policylist>
 	</oatconfig>
 </configuration>

package/harmony/audio_toolkit/README.OpenSource

@@ -0,0 +1,11 @@
+[
+    {
+        "Name": "@react-native-clipboard/clipboard",
+        "License": "MIT License",
+        "License File": "https://github.com/react-native-clipboard/clipboard/blob/master/LICENSE",
+        "Version Number": "1.12.1",
+        "Owner" : "M.Haris Baig <harisbaig100@gmail.com>"
+        "Upstream URL": "https://github.com/react-native-clipboard/clipboard",
+        "Description": "React Native Clipboard API for macOS, iOS, Android, and Windows."
+    }
+]

package/harmony/audio_toolkit/README.md

@@ -0,0 +1,17 @@
+# react-native-audio-toolkit
+
+本项目基于 [react-native-audio-toolkit](https://github.com/react-native-audio-toolkit/react-native-audio-toolkit)
+
+## 文档地址 / Documentation URL 
+
+[中文 / Chinese](https://gitee.com/react-native-oh-library/usage-docs/blob/master/zh-cn/react-native-audio-toolkit.md)
+
+## Codegen
+
+该库已接入 codegen，具体请查阅文档。
+
+The library has been integrated with codegen. Please refer to the documentation for details.
+
+## 请悉知 / Acknowledgements
+
+本项目基于 [The MIT License (MIT)](hhttps://github.com/react-native-audio-toolkit/react-native-audio-toolkit/blob/master/LICENSE) ，请自由地享受和参与开源。

package/harmony/audio_toolkit/index.ets

@@ -21,6 +21,5 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import { AudioModulesPackage as AudioToolkitPackage } from "./src/main/ets/AudioToolkitPackage";
-export * from './ts'
-export default AudioToolkitPackage;
+
+export * from './ts'

package/harmony/audio_toolkit/oh-package.json5

@@ -3,7 +3,7 @@
   "types": "",
   "devDependencies": {},
   "name": "@react-native-ohos/audio-toolkit",
-  "version": "2.0.4-rc.3",
+  "version": "2.1.0-rc.2",
   "description": "",
   "main": "index.ets",
   "dependencies": {

package/harmony/audio_toolkit/src/main/cpp/AudioToolkitPackage.h

@@ -1,15 +1,19 @@
-/*
-* Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
-* Use of this source code is governed by a MIT license that can be
-* found in the LICENSE file
-*/
+// Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a MIT license that can be
+// found in the LICENSE file.
 
-#include "generated/RNOH/generated/BaseReactNativeAudioToolkitPackage.h"
+#ifndef AUDIOTOOLKITPACKAGE_H
+#define AUDIOTOOLKITPACKAGE_H
+
+
+#include "generated/RNOH/generated/BaseAudioToolkitPackage.h"
 #pragma once
 
+
 namespace rnoh {
-class AudioToolkitPackage : public BaseReactNativeAudioToolkitPackage {
-    using Super = BaseReactNativeAudioToolkitPackage;
+class AudioToolkitPackage : public BaseAudioToolkitPackage {
+    using Super = BaseAudioToolkitPackage;
     using Super::Super;
 };
-} // namespace rnoh
+} // namespace rnoh
+#endif //AUDIOTOOLKITPACKAGE_H

package/harmony/audio_toolkit/src/main/cpp/CMakeLists.txt

@@ -2,9 +2,8 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
 set(rnoh_audio_toolkit_generated_dir "${CMAKE_CURRENT_SOURCE_DIR}/generated")
-
 file(GLOB_RECURSE rnoh_audio_toolkit_generated_SRC "${rnoh_audio_toolkit_generated_dir}/**/*.cpp")
 file(GLOB rnoh_audio_toolkit_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(rnoh_audio_toolkit SHARED ${rnoh_audio_toolkit_SRC} ${rnoh_audio_toolkit_generated_SRC})
-target_include_directories(rnoh_audio_toolkit PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${rnoh_audio_toolkit_generated_dir})
-target_link_libraries(rnoh_audio_toolkit PUBLIC rnoh)
+target_include_directories(rnoh_audio_toolkit PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${rnoh_audio_toolkit_generated_dir} ${CMAKE_CURRENT_SOURCE_DIR}/generated/RNOH/generated)
+target_link_libraries(rnoh_audio_toolkit PUBLIC rnoh)

package/harmony/audio_toolkit/src/main/cpp/generated/RNOH/generated/{BaseReactNativeAudioToolkitPackage.h → BaseAudioToolkitPackage.h}

@@ -11,7 +11,7 @@
 
 namespace rnoh {
 
-class BaseReactNativeAudioToolkitPackageTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
+class BaseAudioToolkitPackageTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
   public:
     SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
         if (name == "RCTAudioPlayer") {
@@ -24,29 +24,36 @@ class BaseReactNativeAudioToolkitPackageTurboModuleFactoryDelegate : public Turb
     };
 };
 
-class BaseReactNativeAudioToolkitPackageEventEmitRequestHandler : public EventEmitRequestHandler {
+class BaseAudioToolkitPackageEventEmitRequestHandler : public EventEmitRequestHandler {
   public:
     void handleEvent(Context const &ctx) override {
         auto eventEmitter = ctx.shadowViewRegistry->getEventEmitter<facebook::react::EventEmitter>(ctx.tag);
+        auto componentName = ctx.shadowViewRegistry->getComponentName(ctx.tag);
+
         if (eventEmitter == nullptr) {
             return;
         }
 
+        std::vector<std::string> supportedComponentNames = {
+        };
+
         std::vector<std::string> supportedEventNames = {
         };
-        if (std::find(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) {
+
+        if (std::find(supportedComponentNames.begin(), supportedComponentNames.end(), componentName) != supportedComponentNames.end() &&
+            std::find(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) {
             eventEmitter->dispatchEvent(ctx.eventName, ArkJS(ctx.env).getDynamic(ctx.payload));
         }    
     }
 };
 
 
-class BaseReactNativeAudioToolkitPackage : public Package {
+class BaseAudioToolkitPackage : public Package {
   public:
-    BaseReactNativeAudioToolkitPackage(Package::Context ctx) : Package(ctx){};
+    BaseAudioToolkitPackage(Package::Context ctx) : Package(ctx){};
 
     std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override {
-        return std::make_unique<BaseReactNativeAudioToolkitPackageTurboModuleFactoryDelegate>();
+        return std::make_unique<BaseAudioToolkitPackageTurboModuleFactoryDelegate>();
     }
 
     std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override {
@@ -61,7 +68,7 @@ class BaseReactNativeAudioToolkitPackage : public Package {
 
     EventEmitRequestHandlers createEventEmitRequestHandlers() override {
         return {
-            std::make_shared<BaseReactNativeAudioToolkitPackageEventEmitRequestHandler>(),
+            std::make_shared<BaseAudioToolkitPackageEventEmitRequestHandler>(),
         };
     }
 };

package/harmony/audio_toolkit/src/main/cpp/generated/react/renderer/components/{react_native_audio_toolkit → audio_toolkit}/ComponentDescriptors.h

@@ -10,13 +10,15 @@
 
 #pragma once
 
-#include <react/renderer/components/react_native_audio_toolkit/ShadowNodes.h>
+#include "ShadowNodes.h"
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+void audio_toolkit_registerComponentDescriptorsFromCodegen(
+  std::shared_ptr<const ComponentDescriptorProviderRegistry> registry);
+
+} // namespace facebook::react

package/harmony/audio_toolkit/src/main/cpp/generated/react/renderer/components/{react_native_audio_toolkit → audio_toolkit}/EventEmitters.cpp

@@ -8,11 +8,9 @@
  * @generated by codegen project: GenerateEventEmitterCpp.js
  */
 
-#include <react/renderer/components/react_native_audio_toolkit/EventEmitters.h>
+#include "EventEmitters.h"
 
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/audio_toolkit/src/main/cpp/generated/react/renderer/components/{react_native_audio_toolkit → audio_toolkit}/EventEmitters.h

@@ -12,8 +12,6 @@
 #include <react/renderer/components/view/ViewEventEmitter.h>
 
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/audio_toolkit/src/main/cpp/generated/react/renderer/components/{react_native_audio_toolkit → audio_toolkit}/Props.cpp

@@ -8,14 +8,12 @@
  * @generated by codegen project: GeneratePropsCpp.js
  */
 
-#include <react/renderer/components/react_native_audio_toolkit/Props.h>
+#include "Props.h"
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/audio_toolkit/src/main/cpp/generated/react/renderer/components/{react_native_audio_toolkit → audio_toolkit}/Props.h

@@ -11,10 +11,8 @@
 
 
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/audio_toolkit/src/main/cpp/generated/react/renderer/components/{react_native_audio_toolkit → audio_toolkit}/ShadowNodes.cpp

@@ -8,12 +8,10 @@
  * @generated by codegen project: GenerateShadowNodeCpp.js
  */
 
-#include <react/renderer/components/react_native_audio_toolkit/ShadowNodes.h>
+#include "ShadowNodes.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/audio_toolkit/src/main/cpp/generated/react/renderer/components/{react_native_audio_toolkit → audio_toolkit}/ShadowNodes.h

@@ -10,16 +10,14 @@
 
 #pragma once
 
-#include <react/renderer/components/react_native_audio_toolkit/EventEmitters.h>
-#include <react/renderer/components/react_native_audio_toolkit/Props.h>
-#include <react/renderer/components/react_native_audio_toolkit/States.h>
+#include "EventEmitters.h"
+#include "Props.h"
+#include "States.h"
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/audio_toolkit/src/main/cpp/generated/react/renderer/components/{react_native_audio_toolkit → audio_toolkit}/States.cpp

@@ -7,12 +7,10 @@
  *
  * @generated by codegen project: GenerateStateCpp.js
  */
-#include <react/renderer/components/react_native_audio_toolkit/States.h>
+#include "States.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/audio_toolkit/src/main/cpp/generated/react/renderer/components/{react_native_audio_toolkit → audio_toolkit}/States.h

@@ -10,14 +10,10 @@
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/harmony/audio_toolkit/src/main/ets/{AudioToolkitPackage.ets → AudioToolkitPackage.ts}

@@ -23,7 +23,6 @@
  */
 
 import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
-import { RNOHPackage } from '@rnoh/react-native-openharmony'
 import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
 import { RCTAudioPlayerTurboModule } from './RNCAudioPlayerTurboModule';
 import { RCTAudioRecorderTurboModule } from './RNCAudioRecorderTurboModule';
@@ -45,7 +44,7 @@ class AudioPlayer1TurboModulesFactory extends TurboModulesFactory {
   }
 }
 
-export class AudioModulesPackage extends RNOHPackage {
+export class AudioModulesPackage extends RNPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
     return new AudioPlayer1TurboModulesFactory(ctx);
   }

package/harmony/audio_toolkit/src/main/ets/RNCAudioPlayerTurboModule.ts

@@ -27,6 +27,10 @@ import { type BusinessError } from '@ohos.base';
 import media from '@ohos.multimedia.media';
 import fs from '@ohos.file.fs';
 import logger from './Logger';
+import { audio } from '@kit.AudioKit';
+
+// Continuous background audio task is managed by the app's EntryAbility.
+import avsession from '@ohos.multimedia.avsession';
 
 interface PlayConfig {
   volume?: number;
@@ -67,6 +71,17 @@ enum StateChange {
   RELEASED = 'released',
 }
 
+type BackgroundAudioTaskBridge = {
+  startAudioPlayback?: () => Promise<void>;
+  stopAudioPlayback?: () => Promise<void>;
+};
+
+const AUDIO_BG_BRIDGE_KEY: string = '__rnohAudioBackgroundTask';
+
+function getBackgroundAudioTaskBridge(): BackgroundAudioTaskBridge | undefined {
+  return Reflect.get(globalThis, AUDIO_BG_BRIDGE_KEY) as BackgroundAudioTaskBridge | undefined;
+}
+
 export class RCTAudioPlayerTurboModule extends TurboModule {
   private readonly SANDBOX_START = '/data/storage';
   private readonly FILE_MANAGER_START = 'file://';
@@ -76,6 +91,8 @@ export class RCTAudioPlayerTurboModule extends TurboModule {
   private playConfigMap: Map<number, PlayConfig> = new Map();
   private playInfoMap: Map<number, PlayInfo> = new Map();
   private playSeekCallbacks: Map<number, (err: string | Error, result?: PlayInfo) => void> = new Map();
+  private session!: avsession.AVSession;
+  private init: boolean = false;
 
   constructor(protected ctx: TurboModuleContext) {
     super(ctx);
@@ -135,10 +152,10 @@ export class RCTAudioPlayerTurboModule extends TurboModule {
   }
 
   onBackground(): void {
-    this.ctx.rnInstance.subscribeToLifecycleEvents('BACKGROUND', () => {
-      logger.debug(`app state is BACKGROUND`);
-      this.pauseOnBackground();
-    });
+    // this.ctx.rnInstance.subscribeToLifecycleEvents('BACKGROUND', () => {
+    //   logger.debug(`app state is BACKGROUND`);
+    //   this.pauseOnBackground();
+    // });
   }
 
   pauseOnBackground(): void {
@@ -213,7 +230,7 @@ export class RCTAudioPlayerTurboModule extends TurboModule {
       }
     });
     avPlayer.on('audioInterrupt', (reason) => {
-      logger.debug(`audioInterrupt start:${JSON.stringify(reason)}`);
+      logger.debug(`MMMMM audioInterrupt start:${JSON.stringify(reason)}`);
       this.toEmit(playerId, 'forcePause', {
         message: 'lost audio focus, playback paused',
       });
@@ -240,6 +257,10 @@ export class RCTAudioPlayerTurboModule extends TurboModule {
           avPlayer.release(); // 调用release接口销毁实例对象
           break;
         case StateChange.INITIALIZED: // avplayer 设置播放源后触发该状态上报
+          avPlayer.audioRendererInfo = {
+            usage: audio.StreamUsage.STREAM_USAGE_MUSIC,
+            rendererFlags: 0,
+          }
           avPlayer.prepare();
           break;
         case StateChange.PREPARED: // prepare调用成功后上报该状态机
@@ -276,8 +297,63 @@ export class RCTAudioPlayerTurboModule extends TurboModule {
     });
   }
 
+  async startContinuousTask() {
+    const bridge: BackgroundAudioTaskBridge | undefined = getBackgroundAudioTaskBridge();
+    if (!bridge?.startAudioPlayback) {
+      logger.warn('Background audio task bridge not initialized (EntryAbility)');
+      return;
+    }
+    await bridge.startAudioPlayback();
+  }
+
+  OnContinuousTaskCancel() {
+    // Kept for backward compatibility; cancellation is handled in EntryAbility.
+    return;
+  }
+
+  OffContinuousTaskCancel() {
+    // Kept for backward compatibility.
+    return;
+  }
+
+  async stopContinuousTask(): Promise<void> {
+    const bridge: BackgroundAudioTaskBridge | undefined = getBackgroundAudioTaskBridge();
+    if (!bridge?.stopAudioPlayback) {
+      return;
+    }
+    await bridge.stopAudioPlayback();
+  }
+
+  async initFun() {
+    if (this.init) {
+      return
+    }
+
+    avsession.createAVSession(this.ctx.uiAbilityContext, 'MMMMM_SESSION_NAME', 'audio').then(async (data: avsession.AVSession) => {
+      this.session = data;
+      this.session.activate()
+      console.info(`MMMMMM CreateAVSession : SUCCESS : sessionId = ${this.session.sessionId}`);
+
+      let metadata: avsession.AVMetadata = {
+        assetId: '0', // 由应用指定，用于标识应用媒体库里的媒体。
+        title: 'TITLE',
+        mediaImage: 'IMAGE',
+        artist: 'ARTIST',
+      };
+      this.session.setAVMetadata(metadata).then(() => {
+        console.info(`MMMMMM SetAVMetadata successfully`);
+      }).catch((err: BusinessError) => {
+        console.error(`MMMMMM Failed to set AVMetadata. Code: ${err.code}, message: ${err.message}`);
+      });
+    }).catch((err: BusinessError) => {
+      console.error(`MMMMMM CreateAVSession BusinessError: code: ${err.code}, message: ${err.message}`);
+    });
+    this.init = true;
+  }
+
   async createPlayer(pathStr: string, playerId: number, next: (object?) => void): Promise<void> {
     logger.debug(`createPlayer path:${pathStr}`);
+    this.initFun();
     try {
       const avPlayer: media.AVPlayer = await media.createAVPlayer();
       this.setAVPlayerCallback(avPlayer, playerId, next);
@@ -346,6 +422,13 @@ export class RCTAudioPlayerTurboModule extends TurboModule {
       }
       const player = this.getPlayer(playerId);
       await player.play();
+
+      this.startContinuousTask();
+      let playbackState: avsession.AVPlaybackState = {
+        state: avsession.PlaybackState.PLAYBACK_STATE_PLAY,
+      };
+      await this.session.setAVPlaybackState(playbackState);
+
       callback(null, this.getInfo(playerId));
     } catch (e) {
       let err: Error = {
@@ -363,6 +446,7 @@ export class RCTAudioPlayerTurboModule extends TurboModule {
     }
     const player = this.getPlayer(playerId);
     await player.pause();
+    await this.stopContinuousTask();
     this.toEmit(playerId, 'pause', {
       message: 'player paused',
     });
@@ -378,6 +462,7 @@ export class RCTAudioPlayerTurboModule extends TurboModule {
     const player = this.getPlayer(playerId);
     if (config?.autoDestroy) {
       await player.pause();
+      await this.stopContinuousTask();
       this.destroy(playerId);
       callback();
     } else {
@@ -393,6 +478,7 @@ export class RCTAudioPlayerTurboModule extends TurboModule {
       this.playSeekCallbacks.set(playerId, callback);
       player.seek(0);
       await player.pause();
+      await this.stopContinuousTask();
     }
   }
 

package/harmony/audio_toolkit/src/main/ets/generated/turboModules/RCTAudioPlayer.ts

@@ -13,12 +13,12 @@ export namespace RCTAudioPlayer {
     SoloAmbient = 3,
   }
 
-  export type setOptions = {volume: string, pan: string, wakeLock: string, looping: boolean, speed: boolean}
-  
   export type Option = {autoDestroy: boolean, continuesToPlayInBackground: boolean, category: PlaybackCategories, mixWithOthers: boolean}
   
   export type PlayInfo = {duration: number, position: number}
   
+  export type setOptions = {volume: string, pan: string, wakeLock: string, looping: boolean, speed: boolean}
+  
   export interface Spec {
     set(playerId: number, option: setOptions, next: () => void): void;
   

package/package.json

@@ -1,26 +1,20 @@
 {
   "name": "@react-native-ohos/audio-toolkit",
-  "version": "2.0.4-rc.3",
+  "version": "2.1.0-rc.2",
   "description": "Cross-platform audio library for React Native",
   "main": "./src/index.ts",
   "types": "typings/index.d.ts",
   "harmony": {
-    "alias": "@react-native-community/audio-toolkit",
-    "autolinking": {
-      "etsPackageClassName":"AudioToolkitPackage",
-      "cppPackageClassName":"AudioToolkitPackage",
-      "cmakeLibraryTargetName": "rnoh_audio_toolkit", 
-      "ohPackageName": "@react-native-ohos/audio-toolkit"
-    }
+    "alias": "@react-native-community/audio-toolkit"
   },
   "directories": {
     "doc": "docs"
   },
   "scripts": {
     "start": "react-native start",
-    "codegen-lib": "react-native codegen-lib-harmony --no-safety-check --npm-package-name audio-toolkit --cpp-output-path ./harmony/audio_toolkit/src/main/cpp/generated --ets-output-path ./harmony/audio_toolkit/src/main/ets/generated --turbo-modules-spec-paths ./src  --arkts-components-spec-paths ./src"
+    "codegen-lib": "react-native codegen-lib-harmony --no-safety-check --npm-package-name audio-toolkit --cpp-output-path ./harmony/audio_toolkit/src/main/cpp/generated --ets-output-path ./harmony/audio_toolkit/src/main/ets/generated --turbo-modules-spec-paths ./src"
   },
-  "homepage": "https://gitcode.com/openharmony-sig/rntpc_react-native-audio-toolkit",
+  "homepage": "https://gitcode.com/openharmony-sig/rntpc_react-native-audio-toolkit#readme",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -40,10 +34,15 @@
     "react native",
     "audio",
     "audio toolkit",
-    "audio-toolkit"
+    "audio-toolkit",
+    "harmony"
   ],
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
+  },
+  "devDependencies": {
+    "@rnoh/react-native-harmony-cli": "npm:@react-native-oh/react-native-harmony-cli@^0.0.27",
+    "@types/react-native": "^0.70.14"
   }
 }