Skip to content

Commit

Permalink
chore: optimize
Browse files Browse the repository at this point in the history
  • Loading branch information
guoxianzhe committed Aug 22, 2024
1 parent ca69c94 commit 316b537
Show file tree
Hide file tree
Showing 15 changed files with 498 additions and 420 deletions.
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ dependencies {
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+"
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
api 'io.agora.rtc:agora-full-preview:4.3.2.2-pip.1'
implementation 'io.agora.rtc:full-screen-sharing-special:4.3.2.2-pip.1'
implementation 'io.agora.rtc:iris-rtc:4.3.2.2-pip.1'
api 'io.agora.rtc:agora-full-preview:4.3.2.2-pip.4'
implementation 'io.agora.rtc:full-screen-sharing-special:4.3.2.2-pip.4'
implementation 'io.agora.rtc:iris-rtc:4.3.2.2-pip.4'
}

if (isNewArchitectureEnabled()) {
Expand Down
48 changes: 22 additions & 26 deletions example/ios/AgoraRtcNgExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -587,9 +587,8 @@
baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-AgoraRtcNgExample-AgoraRtcNgExampleTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 58665V34ZZ;
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = PV44H27855;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
Expand All @@ -608,7 +607,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = io.agora.AgoraRtcNgExampleTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE_SPECIFIER = AgoraQA2021;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AgoraRtcNgExample.app/AgoraRtcNgExample";
};
name = Debug;
Expand All @@ -618,10 +617,9 @@
baseConfigurationReference = 89C6BE57DB24E9ADA2F236DE /* Pods-AgoraRtcNgExample-AgoraRtcNgExampleTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
DEVELOPMENT_TEAM = 58665V34ZZ;
DEVELOPMENT_TEAM = PV44H27855;
INFOPLIST_FILE = AgoraRtcNgExampleTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -636,7 +634,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = io.agora.AgoraRtcNgExampleTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE_SPECIFIER = AgoraQA2021;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AgoraRtcNgExample.app/AgoraRtcNgExample";
};
name = Release;
Expand All @@ -648,9 +646,9 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 58665V34ZZ;
DEVELOPMENT_TEAM = PV44H27855;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = AgoraRtcNgExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -663,9 +661,9 @@
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = io.agora.AgoraRtcNgExample11;
PRODUCT_BUNDLE_IDENTIFIER = io.agora.AgoraRtcNgExample;
PRODUCT_NAME = AgoraRtcNgExample;
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE_SPECIFIER = AgoraQA2021;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
Expand All @@ -683,9 +681,9 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 58665V34ZZ;
DEVELOPMENT_TEAM = PV44H27855;
INFOPLIST_FILE = AgoraRtcNgExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -697,9 +695,9 @@
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = io.agora.AgoraRtcNgExample11;
PRODUCT_BUNDLE_IDENTIFIER = io.agora.AgoraRtcNgExample;
PRODUCT_NAME = AgoraRtcNgExample;
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE_SPECIFIER = AgoraQA2021;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
Expand Down Expand Up @@ -865,11 +863,10 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 58665V34ZZ;
DEVELOPMENT_TEAM = PV44H27855;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = ScreenShare/Info.plist;
Expand All @@ -884,9 +881,9 @@
MARKETING_VERSION = 1.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.agora.AgoraRtcNgExample11.ScreenShare;
PRODUCT_BUNDLE_IDENTIFIER = io.agora.AgoraRtcNgExample.ScreenShare;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE_SPECIFIER = AgoraQA2021;
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -903,12 +900,11 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 58665V34ZZ;
DEVELOPMENT_TEAM = PV44H27855;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = ScreenShare/Info.plist;
Expand All @@ -922,9 +918,9 @@
);
MARKETING_VERSION = 1.0;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.agora.AgoraRtcNgExample11.ScreenShare;
PRODUCT_BUNDLE_IDENTIFIER = io.agora.AgoraRtcNgExample.ScreenShare;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE_SPECIFIER = AgoraQA2021;
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ target 'AgoraRtcNgExample' do
end

target 'ScreenShare' do
pod 'AgoraRtcEngine_iOS_Preview', '4.3.2.2-pip.3'
pod 'AgoraRtcEngine_iOS_Preview', '4.3.2.2-pip.4'
end
20 changes: 10 additions & 10 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- AgoraIrisRTC_iOS (4.3.2.2-pip.3)
- AgoraRtcEngine_iOS_Preview (4.3.2.2-pip.3)
- AgoraIrisRTC_iOS (4.3.2.2-pip.4)
- AgoraRtcEngine_iOS_Preview (4.3.2.2-pip.4)
- boost (1.76.0)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
Expand Down Expand Up @@ -378,8 +378,8 @@ PODS:
- React-logger (0.72.12):
- glog
- react-native-agora (4.3.2):
- AgoraIrisRTC_iOS (= 4.3.2.2-pip.3)
- AgoraRtcEngine_iOS_Preview (= 4.3.2.2-pip.3)
- AgoraIrisRTC_iOS (= 4.3.2.2-pip.4)
- AgoraRtcEngine_iOS_Preview (= 4.3.2.2-pip.4)
- RCT-Folly (= 2021.07.22.00)
- React-Core
- react-native-agora-rawdata (0.1.0):
Expand Down Expand Up @@ -519,7 +519,7 @@ PODS:
- Yoga (~> 1.14)

DEPENDENCIES:
- AgoraRtcEngine_iOS_Preview (= 4.3.2.2-pip.3)
- AgoraRtcEngine_iOS_Preview (= 4.3.2.2-pip.4)
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
Expand Down Expand Up @@ -596,7 +596,7 @@ DEPENDENCIES:
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
trunk:
https://github.com/CocoaPods/Specs.git:
- AgoraIrisRTC_iOS
- AgoraRtcEngine_iOS_Preview
- CocoaAsyncSocket
Expand Down Expand Up @@ -717,8 +717,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
AgoraIrisRTC_iOS: c01287a3d3f456b517de9e8864a06df096ef6bbd
AgoraRtcEngine_iOS_Preview: fee191a990014dc31b17bf5c9bc515f5617072f5
AgoraIrisRTC_iOS: 89147ab80e54f8d6ba9fe594963bd9f3545f0158
AgoraRtcEngine_iOS_Preview: 96921bbf977e5143a345a918f0cd33e492a9c1a4
boost: 7dcd2de282d72e344012f7d6564d024930a6a440
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
Expand Down Expand Up @@ -752,7 +752,7 @@ SPEC CHECKSUMS:
React-jsiexecutor: 95bdf0ab46024ca9849e08739b6abd8fe489cd33
React-jsinspector: 8e291ed0ab371314de269001d6b9b25db6aabf42
React-logger: d4010de0b0564e63637ad08373bc73b5d919974b
react-native-agora: 3c2bb4b3ae2260b9d9e243a7cdd3d1a61fa478a3
react-native-agora: d9b03fcedcb979ae4907fd90f03068297fc22efc
react-native-agora-rawdata: 097895cdccd8fcf3cff5dffe23372f5d3c89fd31
react-native-image-tools: 88218449791389bbf550a2c475a3b564c8233c8b
react-native-safe-area-context: 7aa8e6d9d0f3100a820efb1a98af68aa747f9284
Expand Down Expand Up @@ -784,6 +784,6 @@ SPEC CHECKSUMS:
Yoga: 87e59f6d458e5061d2421086c5de994b3f7cd151
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: ef3d3a332acf7c736fefe26bfe58cb60c321c97b
PODFILE CHECKSUM: 2f33ff809797107838df94ac954901d19174d3d4

COCOAPODS: 1.13.0
9 changes: 9 additions & 0 deletions example/src/components/ui/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,22 @@ export const AgoraStyle = StyleSheet.create({
bottom: 0,
left: 0,
},
videoPipContainer: {
position: 'absolute',
top: 0,
left: 0,
},
videoLarge: {
flex: 1,
},
videoSmall: {
width: 150,
height: 150,
},
videoPip: {
width: 30,
height: 30,
},
float: {
position: 'absolute',
right: 0,
Expand Down
Loading

0 comments on commit 316b537

Please sign in to comment.