diff --git a/HarmonyOS_NEXT/APIExample/entry/oh-package-lock.json5 b/HarmonyOS_NEXT/APIExample/entry/oh-package-lock.json5 index 71a5ea407..60fc2b12c 100644 --- a/HarmonyOS_NEXT/APIExample/entry/oh-package-lock.json5 +++ b/HarmonyOS_NEXT/APIExample/entry/oh-package-lock.json5 @@ -6,12 +6,12 @@ "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { "AgoraRtcSdk@libs/AgoraRtcSdk.har": "AgoraRtcSdk@libs/AgoraRtcSdk.har", - "libagora_rtc_sdk.so@../oh_modules/.ohpm/AgoraRtcSdk@gnhkbsqhvur0p1kaytsefmbpezi=/oh_modules/AgoraRtcSdk/src/main/cpp/types/libagora_rtc_sdk": "libagora_rtc_sdk.so@../oh_modules/.ohpm/AgoraRtcSdk@gnhkbsqhvur0p1kaytsefmbpezi=/oh_modules/AgoraRtcSdk/src/main/cpp/types/libagora_rtc_sdk", + "libagora_rtc_sdk.so@../oh_modules/.ohpm/AgoraRtcSdk@psqmdffzbvli66vvuhpgemb+uuiby9okskr7kzozry4=/oh_modules/AgoraRtcSdk/src/main/cpp/types/libagora_rtc_sdk": "libagora_rtc_sdk.so@../oh_modules/.ohpm/AgoraRtcSdk@psqmdffzbvli66vvuhpgemb+uuiby9okskr7kzozry4=/oh_modules/AgoraRtcSdk/src/main/cpp/types/libagora_rtc_sdk", "librawdataprocessing.so@src/main/cpp/types/librawdataprocessing": "librawdataprocessing.so@src/main/cpp/types/librawdataprocessing" }, "packages": { "AgoraRtcSdk@libs/AgoraRtcSdk.har": { - "name": "agora_rtc_sdk", + "name": "AgoraRtcSdk", "version": "v4.3.0-beta.1", "resolved": "libs/AgoraRtcSdk.har", "registryType": "local", @@ -19,10 +19,10 @@ "libagora_rtc_sdk.so": "file:./src/main/cpp/types/libagora_rtc_sdk" } }, - "libagora_rtc_sdk.so@../oh_modules/.ohpm/AgoraRtcSdk@gnhkbsqhvur0p1kaytsefmbpezi=/oh_modules/AgoraRtcSdk/src/main/cpp/types/libagora_rtc_sdk": { + "libagora_rtc_sdk.so@../oh_modules/.ohpm/AgoraRtcSdk@psqmdffzbvli66vvuhpgemb+uuiby9okskr7kzozry4=/oh_modules/AgoraRtcSdk/src/main/cpp/types/libagora_rtc_sdk": { "name": "libagora_rtc_sdk.so", "version": "0.0.0", - "resolved": "../oh_modules/.ohpm/AgoraRtcSdk@gnhkbsqhvur0p1kaytsefmbpezi=/oh_modules/AgoraRtcSdk/src/main/cpp/types/libagora_rtc_sdk", + "resolved": "../oh_modules/.ohpm/AgoraRtcSdk@psqmdffzbvli66vvuhpgemb+uuiby9okskr7kzozry4=/oh_modules/AgoraRtcSdk/src/main/cpp/types/libagora_rtc_sdk", "registryType": "local" }, "librawdataprocessing.so@src/main/cpp/types/librawdataprocessing": { diff --git a/HarmonyOS_NEXT/APIExample/entry/oh-package.json5 b/HarmonyOS_NEXT/APIExample/entry/oh-package.json5 index cc2d344da..24e606565 100644 --- a/HarmonyOS_NEXT/APIExample/entry/oh-package.json5 +++ b/HarmonyOS_NEXT/APIExample/entry/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "", "dependencies": { - "AgoraRtcSdk": "file:./libs/AgoraRtcSdk.har", + "@shengwang/rtc-full": "file:./libs/AgoraRtcSdk.har", "librawdataprocessing.so": "file:./src/main/cpp/types/librawdataprocessing" } } diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/cpp/CMakeLists.txt b/HarmonyOS_NEXT/APIExample/entry/src/main/cpp/CMakeLists.txt index ad18be409..7ae131518 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/cpp/CMakeLists.txt +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/cpp/CMakeLists.txt @@ -11,7 +11,7 @@ endif() include_directories(${ROOT_PATH} ${ROOT_PATH}/include) -set(AGORA_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules/AgoraRtcSdk/libs) +set(AGORA_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules/@shengwang/rtc-full/libs) add_library(agora_rtc_sdk SHARED IMPORTED) set_target_properties(agora_rtc_sdk PROPERTIES IMPORTED_LOCATION ${AGORA_LIB_PATH}/${CMAKE_OHOS_ARCH_ABI}/libagora_rtc_sdk.so) diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/model/DataType.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/model/DataType.ets index 2380a9ab0..6aa3d91e5 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/model/DataType.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/model/DataType.ets @@ -1,4 +1,4 @@ -import { OrientationMode, VideoDimensions } from 'AgoraRtcSdk' +import { OrientationMode, VideoDimensions } from '@shengwang/rtc-full' export interface ExampleCategory{ title: Resource, diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/Data.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/Data.ets index 9a9dafb57..682eec7a3 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/Data.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/Data.ets @@ -1,4 +1,4 @@ -import { OrientationMode, VideoDimensions } from 'AgoraRtcSdk' +import { OrientationMode, VideoDimensions } from '@shengwang/rtc-full' import { ExampleCategory, ExampleItem, SettingsInfo } from '../model/DataType' export const BASIC_ITEMS: ExampleItem[] = diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/Settings.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/Settings.ets index 0115351e1..e6d6755df 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/Settings.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/Settings.ets @@ -1,4 +1,4 @@ -import { OrientationMode, RtcEngine, VideoDimensions } from 'AgoraRtcSdk' +import { OrientationMode, RtcEngine, VideoDimensions } from '@shengwang/rtc-full' import { TitleBar } from '../common/TitleBar' import { CommonItemSelect } from '../common/Widgets' import { GlobalInfo } from './Data' diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/ChannelEncryption.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/ChannelEncryption.ets index 8741ff78a..f85bb4915 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/ChannelEncryption.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/ChannelEncryption.ets @@ -4,7 +4,7 @@ import { EncryptionMode, RtcEngine, RtcEngineConfig, VideoCanvas, VideoEncoderConfiguration -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; @@ -125,7 +125,7 @@ struct ChannelEncryption { if (this.localUid != -1) { XComponent({ id: 'preview_local', - type: 'surface', + type: XComponentType.SURFACE, libraryname: Constants.AGORA_LIB_NAME, }).onLoad(() => { let localCanvas = new VideoCanvas("preview_local"); @@ -139,7 +139,7 @@ struct ChannelEncryption { if (this.remoteUid != -1) { XComponent({ id: 'preview_remote', - type: 'surface', + type: XComponentType.SURFACE, libraryname: Constants.AGORA_LIB_NAME, }).onLoad(() => { let localCanvas = new VideoCanvas("preview_remote"); diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/CustomAudioRenderWrap.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/CustomAudioRenderWrap.ets index 1826ae278..0db1755d7 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/CustomAudioRenderWrap.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/CustomAudioRenderWrap.ets @@ -3,7 +3,7 @@ import { Constants, RtcEngine, RtcEngineConfig -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/CustomAudioSource.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/CustomAudioSource.ets index 93d333552..27f9c16ae 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/CustomAudioSource.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/CustomAudioSource.ets @@ -1,5 +1,5 @@ import { AudioTrackConfig, ChannelMediaOptions, Constants, RtcEngine, RtcEngineConfig, - VideoEncoderConfiguration } from 'AgoraRtcSdk'; + VideoEncoderConfiguration } from '@shengwang/rtc-full'; import { common } from '@kit.AbilityKit'; import { AppID } from '../../common/KeyCenter'; import Logger from '../../util/Logger'; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/CustomVideoSource.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/CustomVideoSource.ets index 723408c70..1ab4a38a8 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/CustomVideoSource.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/CustomVideoSource.ets @@ -9,7 +9,7 @@ import { VideoEncoderConfiguration, VideoFrame, VideoPixelFormat -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; @@ -27,7 +27,6 @@ struct CustomVideoSource { private rtcEngine: RtcEngineEx | undefined = undefined; private pushingVideoFrame = false private intervalVideoNum = -1; - private customVideoTrack = -1; @State message: string = 'Hello World'; @State channelName: string = '' @State isJoin: boolean = false @@ -77,7 +76,7 @@ struct CustomVideoSource { this.rtcEngine.enableVideo() - this.customVideoTrack = this.rtcEngine.createCustomVideoTrack() + this.rtcEngine.setExternalVideoSource(true,false,Constants.ExternalVideoSourceType.VIDEO_FRAME); } aboutToDisappear(): void { @@ -87,8 +86,6 @@ struct CustomVideoSource { this.rtcEngine.leaveChannel(); } this.stopPushVideo() - this.rtcEngine.destroyCustomVideoTrack(this.customVideoTrack) - this.customVideoTrack = -1 Logger.info(TAG, "destroy begin") RtcEngine.destroy().then(() => { Logger.info(TAG, "destroy done") @@ -129,8 +126,8 @@ struct CustomVideoSource { frame.yStride = width; frame.height = height; frame.timestamp = 0; - let ret = this.rtcEngine?.pushExternalVideoFrameById(frame, this.customVideoTrack) - if (ret != 0) { + let ret = this.rtcEngine?.pushExternalVideoFrame(frame) + if (!ret) { Logger.error(TAG, "pushExternalVideoFrameEx failed: " + ret) } }, frame_interval_ms) @@ -165,7 +162,7 @@ struct CustomVideoSource { let localCanvas = new VideoCanvas("preview_local"); localCanvas.uid = this.localUid; localCanvas.renderMode = VideoCanvas.RENDER_MODE_HIDDEN; - localCanvas.mirrorMode = 0; + localCanvas.mirrorMode = VideoCanvas.VIDEO_MIRROR_MODE_DISABLED; // TODO set source type localCanvas.sourceType = Constants.VideoSourceType.CUSTOM this.rtcEngine?.setupLocalVideo(localCanvas); @@ -232,7 +229,6 @@ struct CustomVideoSource { } let mediaOption: ChannelMediaOptions = new ChannelMediaOptions(); mediaOption.publishCustomVideoTrack = true - mediaOption.customVideoTrackId = this.customVideoTrack mediaOption.publishMicrophoneTrack = true; mediaOption.autoSubscribeVideo = true; mediaOption.autoSubscribeAudio = true; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/HostCrossChannel.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/HostCrossChannel.ets index 4b7d6e25f..ef669626d 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/HostCrossChannel.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/HostCrossChannel.ets @@ -6,7 +6,7 @@ import { RtcEngineConfig, VideoCanvas, VideoEncoderConfiguration -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/JoinMultiChannel.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/JoinMultiChannel.ets index 37915eafa..38038f1e9 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/JoinMultiChannel.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/JoinMultiChannel.ets @@ -8,7 +8,7 @@ import { RtcEngineEx, VideoCanvas, VideoEncoderConfiguration -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import { common } from '@kit.AbilityKit'; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/LiveStreaming.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/LiveStreaming.ets index a2781edf9..b1b0f65b3 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/LiveStreaming.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/LiveStreaming.ets @@ -6,7 +6,7 @@ import { RtcEngineConfig, VideoCanvas, VideoEncoderConfiguration -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/LocalVideoTranscoding.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/LocalVideoTranscoding.ets index e6b88c618..863565e85 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/LocalVideoTranscoding.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/LocalVideoTranscoding.ets @@ -9,7 +9,7 @@ import { VideoCanvas, VideoEncoderConfiguration, ScreenCaptureParameters -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/MediaMetadataWrap.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/MediaMetadataWrap.ets index ebbc082d7..30992e746 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/MediaMetadataWrap.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/MediaMetadataWrap.ets @@ -4,7 +4,7 @@ import { RtcEngineConfig, VideoCanvas, VideoEncoderConfiguration -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; @@ -102,7 +102,7 @@ struct MediaMetadataWrap { if (this.localUid != 0) { XComponent({ id: 'preview_local', - type: 'surface', + type: XComponentType.SURFACE, libraryname: Constants.AGORA_LIB_NAME, }).onLoad(() => { let localCanvas = new VideoCanvas("preview_local"); @@ -116,7 +116,7 @@ struct MediaMetadataWrap { if (this.remoteUid != 0) { XComponent({ id: 'preview_remote', - type: 'surface', + type: XComponentType.SURFACE, libraryname: Constants.AGORA_LIB_NAME, }).onLoad(() => { let localCanvas = new VideoCanvas("preview_remote"); diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/MediaRecorder.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/MediaRecorder.ets index 82962ba01..57b92c7b3 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/MediaRecorder.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/MediaRecorder.ets @@ -10,7 +10,7 @@ import { RtcEngineConfig, VideoCanvas, VideoEncoderConfiguration -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; @@ -118,7 +118,7 @@ struct MediaRecorder { Stack() { XComponent({ id: 'preview_local', - type: 'surface', + type: XComponentType.SURFACE, libraryname: Constants.AGORA_LIB_NAME, }).onLoad(() => { let localCanvas = new VideoCanvas("preview_local"); @@ -191,7 +191,7 @@ struct MediaRecorder { Stack() { XComponent({ id: 'preview_remote', - type: 'surface', + type: XComponentType.SURFACE, libraryname: Constants.AGORA_LIB_NAME, }).onLoad(() => { let localCanvas = new VideoCanvas("preview_remote"); diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/OriginAudioDataWrap.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/OriginAudioDataWrap.ets index 8cb6e6163..2b37421bc 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/OriginAudioDataWrap.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/OriginAudioDataWrap.ets @@ -3,7 +3,7 @@ import { Constants, RtcEngine, RtcEngineConfig -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/OriginVideoDataWrap.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/OriginVideoDataWrap.ets index 88852ef9f..a85797bd0 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/OriginVideoDataWrap.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/OriginVideoDataWrap.ets @@ -4,7 +4,7 @@ import { RtcEngineConfig, VideoCanvas, VideoEncoderConfiguration -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; @@ -100,7 +100,7 @@ struct OriginVideoDataWrap { if (this.localUid != 0) { XComponent({ id: 'preview_local', - type: 'surface', + type: XComponentType.SURFACE, libraryname: Constants.AGORA_LIB_NAME, }).onLoad(() => { let localCanvas = new VideoCanvas("preview_local"); @@ -114,7 +114,7 @@ struct OriginVideoDataWrap { if (this.remoteUid != 0) { XComponent({ id: 'preview_remote', - type: 'surface', + type: XComponentType.SURFACE, libraryname: Constants.AGORA_LIB_NAME, }).onLoad(() => { let localCanvas = new VideoCanvas("preview_remote"); diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/PlayAudioFiles.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/PlayAudioFiles.ets index c317473a3..58500e04b 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/PlayAudioFiles.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/PlayAudioFiles.ets @@ -1,4 +1,4 @@ -import { ChannelMediaOptions, Constants, RtcEngine, RtcEngineConfig } from 'AgoraRtcSdk'; +import { ChannelMediaOptions, Constants, RtcEngine, RtcEngineConfig } from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/PreCallTest.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/PreCallTest.ets index 5c3b8d303..26fc3c965 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/PreCallTest.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/PreCallTest.ets @@ -5,7 +5,7 @@ import { RtcEngine, RtcEngineConfig, VideoCanvas -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { AppID } from '../../common/KeyCenter'; import Logger from '../../util/Logger'; import { common } from '@kit.AbilityKit'; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/RTMPStreaming.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/RTMPStreaming.ets index 18e4477f7..f5dd82993 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/RTMPStreaming.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/RTMPStreaming.ets @@ -6,7 +6,7 @@ import { TranscodingUser, VideoCanvas, VideoEncoderConfiguration -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/ScreenSharing.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/ScreenSharing.ets index 8134a5944..8414ebc88 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/ScreenSharing.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/advance/ScreenSharing.ets @@ -7,7 +7,7 @@ import { ScreenCaptureParameters, VideoCanvas, VideoEncoderConfiguration -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/basic/JoinAudioChannel.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/basic/JoinAudioChannel.ets index e8a70bbd9..02cdb295f 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/basic/JoinAudioChannel.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/basic/JoinAudioChannel.ets @@ -1,4 +1,4 @@ -import { ChannelMediaOptions, Constants, RtcEngine, RtcEngineEx, RtcEngineConfig, AudioVolumeInfo } from 'AgoraRtcSdk'; +import { ChannelMediaOptions, Constants, RtcEngine, RtcEngineEx, RtcEngineConfig, AudioVolumeInfo } from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/basic/JoinVideoChannel.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/basic/JoinVideoChannel.ets index e3c252ef0..451216568 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/basic/JoinVideoChannel.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/basic/JoinVideoChannel.ets @@ -1,5 +1,5 @@ import { ChannelMediaOptions, Constants, RtcEngine, RtcEngineConfig, VideoCanvas, - VideoEncoderConfiguration } from 'AgoraRtcSdk'; + VideoEncoderConfiguration } from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; @@ -93,7 +93,7 @@ struct JoinVideoChannel { if (this.localUid != 0) { XComponent({ id: 'preview_local', - type: 'surface', + type: XComponentType.SURFACE, libraryname: Constants.AGORA_LIB_NAME, }).onLoad(() => { let localCanvas = new VideoCanvas("preview_local"); @@ -107,7 +107,7 @@ struct JoinVideoChannel { if (this.remoteUid != 0) { XComponent({ id: 'preview_remote', - type: 'surface', + type: XComponentType.SURFACE, libraryname: Constants.AGORA_LIB_NAME, }).onLoad(() => { let localCanvas = new VideoCanvas("preview_remote"); diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/basic/JoinVideoChannelToken.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/basic/JoinVideoChannelToken.ets index 908a15e4e..0d489e23d 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/basic/JoinVideoChannelToken.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/pages/basic/JoinVideoChannelToken.ets @@ -5,7 +5,7 @@ import { RtcEngineConfig, VideoCanvas, VideoEncoderConfiguration -} from 'AgoraRtcSdk'; +} from '@shengwang/rtc-full'; import { TitleBar } from '../../common/TitleBar'; import Logger from '../../util/Logger'; import ShowToast from '../../util/ShowToast'; @@ -119,7 +119,7 @@ struct JoinVideoChannelToken { if (this.localUid != 0) { XComponent({ id: 'preview_local', - type: 'surface', + type: XComponentType.SURFACE, libraryname: Constants.AGORA_LIB_NAME, }).onLoad(() => { let localCanvas = new VideoCanvas("preview_local"); @@ -133,7 +133,7 @@ struct JoinVideoChannelToken { if (this.remoteUid != 0) { XComponent({ id: 'preview_remote', - type: 'surface', + type: XComponentType.SURFACE, libraryname: Constants.AGORA_LIB_NAME, }).onLoad(() => { let localCanvas = new VideoCanvas("preview_remote"); diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/util/AudioConfigContant.ets b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/util/AudioConfigContant.ets index 30116f271..9217c9b0d 100644 --- a/HarmonyOS_NEXT/APIExample/entry/src/main/ets/util/AudioConfigContant.ets +++ b/HarmonyOS_NEXT/APIExample/entry/src/main/ets/util/AudioConfigContant.ets @@ -1,4 +1,4 @@ -import { Constants } from 'AgoraRtcSdk'; +import { Constants } from '@shengwang/rtc-full'; export class AudioConfigHelper { public static readonly AUDIO_SCENARIO_DEFAULT = 'DEFAULT'