Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ dependencies {
implementation "com.facebook.react:react-native:+"
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
/// dependencies start
api 'cn.shengwang.rtc:agora-full-preview:4.6.2-dev.14'
implementation 'cn.shengwang.rtc:full-screen-sharing-special:4.6.2-dev.14'
api 'io.agora.rtc:iris-rtc:4.6.2-dev.14'
api 'cn.shengwang.rtc:full-sdk:4.6.2'
implementation 'cn.shengwang.rtc:full-screen-sharing:4.6.2'
api 'io.agora.rtc:iris-rtc:4.6.2-dev.15'
/// dependencies end
}

Expand Down
2 changes: 1 addition & 1 deletion examples/expo/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ end

target 'ScreenShare' do
#dependencies start
pod 'AgoraRtcEngine_iOS_Preview', '4.6.2-dev.14'
pod 'ShengwangRtcEngine_iOS', '4.6.2'
#dependencies end
end
58 changes: 48 additions & 10 deletions examples/expo/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
PODS:
- AgoraIrisRTC_iOS (4.6.2-dev.14)
- AgoraRtcEngine_iOS_Preview (4.6.2-dev.14)
- AgoraIrisRTC_iOS (4.6.2-dev.15)
- boost (1.84.0)
- DoubleConversion (1.1.6)
- EXConstants (17.1.7):
Expand Down Expand Up @@ -1645,8 +1644,7 @@ PODS:
- React-RCTFBReactNativeSpec
- ReactCommon/turbomodule/core
- react-native-agora (4.5.2-build.2-rc.1):
- AgoraIrisRTC_iOS (= 4.6.2-dev.14)
- AgoraRtcEngine_iOS_Preview (= 4.6.2-dev.14)
- AgoraIrisRTC_iOS (= 4.6.2-dev.15)
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1669,6 +1667,7 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- ShengwangRtcEngine_iOS (= 4.6.2)
- Yoga
- react-native-image-tools (0.8.1):
- React
Expand Down Expand Up @@ -2394,6 +2393,43 @@ PODS:
- Yoga
- RNVectorIcons (9.2.0):
- React-Core
- ShengwangInfra_iOS (1.3.5)
- ShengwangRtcEngine_iOS (4.6.2):
- ShengwangRtcEngine_iOS/AIAEC (= 4.6.2)
- ShengwangRtcEngine_iOS/AIAECLL (= 4.6.2)
- ShengwangRtcEngine_iOS/AINS (= 4.6.2)
- ShengwangRtcEngine_iOS/AINSLL (= 4.6.2)
- ShengwangRtcEngine_iOS/AudioBeauty (= 4.6.2)
- ShengwangRtcEngine_iOS/ClearVision (= 4.6.2)
- ShengwangRtcEngine_iOS/ContentInspect (= 4.6.2)
- ShengwangRtcEngine_iOS/FaceCapture (= 4.6.2)
- ShengwangRtcEngine_iOS/FaceDetection (= 4.6.2)
- ShengwangRtcEngine_iOS/LipSync (= 4.6.2)
- ShengwangRtcEngine_iOS/ReplayKit (= 4.6.2)
- ShengwangRtcEngine_iOS/RtcBasic (= 4.6.2)
- ShengwangRtcEngine_iOS/SpatialAudio (= 4.6.2)
- ShengwangRtcEngine_iOS/VideoAv1CodecEnc (= 4.6.2)
- ShengwangRtcEngine_iOS/VideoCodecEnc (= 4.6.2)
- ShengwangRtcEngine_iOS/VirtualBackground (= 4.6.2)
- ShengwangRtcEngine_iOS/VQA (= 4.6.2)
- ShengwangRtcEngine_iOS/AIAEC (4.6.2)
- ShengwangRtcEngine_iOS/AIAECLL (4.6.2)
- ShengwangRtcEngine_iOS/AINS (4.6.2)
- ShengwangRtcEngine_iOS/AINSLL (4.6.2)
- ShengwangRtcEngine_iOS/AudioBeauty (4.6.2)
- ShengwangRtcEngine_iOS/ClearVision (4.6.2)
- ShengwangRtcEngine_iOS/ContentInspect (4.6.2)
- ShengwangRtcEngine_iOS/FaceCapture (4.6.2)
- ShengwangRtcEngine_iOS/FaceDetection (4.6.2)
- ShengwangRtcEngine_iOS/LipSync (4.6.2)
- ShengwangRtcEngine_iOS/ReplayKit (4.6.2)
- ShengwangRtcEngine_iOS/RtcBasic (4.6.2):
- ShengwangInfra_iOS (= 1.3.5)
- ShengwangRtcEngine_iOS/SpatialAudio (4.6.2)
- ShengwangRtcEngine_iOS/VideoAv1CodecEnc (4.6.2)
- ShengwangRtcEngine_iOS/VideoCodecEnc (4.6.2)
- ShengwangRtcEngine_iOS/VirtualBackground (4.6.2)
- ShengwangRtcEngine_iOS/VQA (4.6.2)
- SocketRocket (0.7.1)
- Yoga (0.0.0)
- ZXingObjC/Core (3.6.9)
Expand All @@ -2403,7 +2439,6 @@ PODS:
- ZXingObjC/Core

DEPENDENCIES:
- AgoraRtcEngine_iOS_Preview (= 4.6.2-dev.14)
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- EXConstants (from `../node_modules/expo-constants/ios`)
Expand Down Expand Up @@ -2503,12 +2538,14 @@ DEPENDENCIES:
- RNScreens (from `../node_modules/react-native-screens`)
- RNSVG (from `../node_modules/react-native-svg`)
- RNVectorIcons (from `../node_modules/react-native-vector-icons`)
- ShengwangRtcEngine_iOS (= 4.6.2)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
trunk:
- AgoraIrisRTC_iOS
- AgoraRtcEngine_iOS_Preview
- ShengwangInfra_iOS
- ShengwangRtcEngine_iOS
- SocketRocket
- ZXingObjC

Expand Down Expand Up @@ -2712,8 +2749,7 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
AgoraIrisRTC_iOS: 51a71535d1a66793e348686c65da5e226780aca8
AgoraRtcEngine_iOS_Preview: 4d26a374d24e75cf5a2dcce2e3ea65cc6e748346
AgoraIrisRTC_iOS: 5ab14bd0b9e140455acfd26296a76c71eac1625f
boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
EXConstants: 9d62a46a36eae6d28cb978efcbc68aef354d1704
Expand Down Expand Up @@ -2769,7 +2805,7 @@ SPEC CHECKSUMS:
React-logger: e6e6164f1753e46d1b7e2c8f0949cd7937eaf31b
React-Mapbuffer: 5b4959cbd91e7e8fae42ab0f4b7c25b86fd139a1
React-microtasksnativemodule: 1695ab137281dd03de967b7bbeb4e392601f6432
react-native-agora: 8cf3443dcd6abdacf3298b128716f97707397586
react-native-agora: c8629d665f4799ef38c8bce72cc76752b965fb5f
react-native-image-tools: 88218449791389bbf550a2c475a3b564c8233c8b
react-native-safe-area-context: 6863f9e225b541b481514b0f6d51be0867184c2c
react-native-slider: 351d1186b07d686b93dad14ce2b474ca62dea0fc
Expand Down Expand Up @@ -2811,10 +2847,12 @@ SPEC CHECKSUMS:
RNScreens: c2e3cc506212228c607b4785b315205e28acbf0f
RNSVG: ab2249cc665e5d0b2d30657a766a86c99a649a65
RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
ShengwangInfra_iOS: 0ae2d429ec428cdbaebb39ac883ec64c5c20f7bb
ShengwangRtcEngine_iOS: f2f2ae79c5909bb51d138bb4ec62c6761c0ab9a3
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
Yoga: adb397651e1c00672c12e9495babca70777e411e
ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5

PODFILE CHECKSUM: e68822b858a3ddcb97454a5e254614f5ee268915
PODFILE CHECKSUM: e3c472dd0d11eafdc13405fe4e79ab3503198bfd

COCOAPODS: 1.16.2
Original file line number Diff line number Diff line change
Expand Up @@ -491,34 +491,35 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-reactnativeagoraexampleexpo/Pods-reactnativeagoraexampleexpo-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraIrisRTC_iOS/AgoraRtcWrapper.framework/AgoraRtcWrapper",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraAiEchoCancellationExtension.framework/AgoraAiEchoCancellationExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraAiEchoCancellationLLExtension.framework/AgoraAiEchoCancellationLLExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraAiNoiseSuppressionExtension.framework/AgoraAiNoiseSuppressionExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraAiNoiseSuppressionLLExtension.framework/AgoraAiNoiseSuppressionLLExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraAudioBeautyExtension.framework/AgoraAudioBeautyExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraClearVisionExtension.framework/AgoraClearVisionExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraContentInspectExtension.framework/AgoraContentInspectExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraFaceCaptureExtension.framework/AgoraFaceCaptureExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraFaceDetectionExtension.framework/AgoraFaceDetectionExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraLipSyncExtension.framework/AgoraLipSyncExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraReplayKitExtension.framework/AgoraReplayKitExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraRtcKit.framework/AgoraRtcKit",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraSoundTouch.framework/AgoraSoundTouch",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraSpatialAudioExtension.framework/AgoraSpatialAudioExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraVideoAv1EncoderExtension.framework/AgoraVideoAv1EncoderExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraVideoEncoderExtension.framework/AgoraVideoEncoderExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraVideoQualityAnalyzerExtension.framework/AgoraVideoQualityAnalyzerExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/AgoraVideoSegmentationExtension.framework/AgoraVideoSegmentationExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/Agorafdkaac.framework/Agorafdkaac",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/Agoraffmpeg.framework/Agoraffmpeg",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/aosl.framework/aosl",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/video_dec.framework/video_dec",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS_Preview/video_enc.framework/video_enc",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangInfra_iOS/aosl.framework/aosl",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/AIAEC/AgoraAiEchoCancellationExtension.framework/AgoraAiEchoCancellationExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/AIAECLL/AgoraAiEchoCancellationLLExtension.framework/AgoraAiEchoCancellationLLExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/AINS/AgoraAiNoiseSuppressionExtension.framework/AgoraAiNoiseSuppressionExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/AINSLL/AgoraAiNoiseSuppressionLLExtension.framework/AgoraAiNoiseSuppressionLLExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/AudioBeauty/AgoraAudioBeautyExtension.framework/AgoraAudioBeautyExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/ClearVision/AgoraClearVisionExtension.framework/AgoraClearVisionExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/ContentInspect/AgoraContentInspectExtension.framework/AgoraContentInspectExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/FaceCapture/AgoraFaceCaptureExtension.framework/AgoraFaceCaptureExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/FaceDetection/AgoraFaceDetectionExtension.framework/AgoraFaceDetectionExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/LipSync/AgoraLipSyncExtension.framework/AgoraLipSyncExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/ReplayKit/AgoraReplayKitExtension.framework/AgoraReplayKitExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/RtcBasic/AgoraRtcKit.framework/AgoraRtcKit",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/RtcBasic/Agorafdkaac.framework/Agorafdkaac",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/RtcBasic/Agoraffmpeg.framework/Agoraffmpeg",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/RtcBasic/AgoraSoundTouch.framework/AgoraSoundTouch",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/RtcBasic/video_dec.framework/video_dec",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/SpatialAudio/AgoraSpatialAudioExtension.framework/AgoraSpatialAudioExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/VQA/AgoraVideoQualityAnalyzerExtension.framework/AgoraVideoQualityAnalyzerExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/VideoAv1CodecEnc/AgoraVideoAv1EncoderExtension.framework/AgoraVideoAv1EncoderExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/VideoCodecEnc/AgoraVideoEncoderExtension.framework/AgoraVideoEncoderExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/VideoCodecEnc/video_enc.framework/video_enc",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/ShengwangRtcEngine_iOS/VirtualBackground/AgoraVideoSegmentationExtension.framework/AgoraVideoSegmentationExtension",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraRtcWrapper.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/aosl.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraAiEchoCancellationExtension.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraAiEchoCancellationLLExtension.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraAiNoiseSuppressionExtension.framework",
Expand All @@ -531,17 +532,16 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraLipSyncExtension.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraReplayKitExtension.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraRtcKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Agorafdkaac.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Agoraffmpeg.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraSoundTouch.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_dec.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraSpatialAudioExtension.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraVideoQualityAnalyzerExtension.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraVideoAv1EncoderExtension.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraVideoEncoderExtension.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraVideoQualityAnalyzerExtension.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraVideoSegmentationExtension.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Agorafdkaac.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Agoraffmpeg.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/aosl.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_dec.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_enc.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraVideoSegmentationExtension.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
2 changes: 1 addition & 1 deletion examples/legacy/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ end

target 'ScreenShare' do
#dependencies start
pod 'AgoraRtcEngine_iOS_Preview', '4.6.2-dev.14'
pod 'ShengwangRtcEngine_iOS', '4.6.2'
#dependencies end
end
4 changes: 2 additions & 2 deletions react-native-agora.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ Pod::Spec.new do |s|
end

#dependencies start
s.dependency 'AgoraRtcEngine_iOS_Preview', '4.6.2-dev.14'
s.dependency 'AgoraIrisRTC_iOS', '4.6.2-dev.14'
s.dependency 'ShengwangRtcEngine_iOS', '4.6.2'
s.dependency 'AgoraIrisRTC_iOS', '4.6.2-dev.15'
#dependencies end

s.libraries = 'stdc++'
Expand Down