Release RongCloud CallKit SDK 4.0.2

sclcoder · Aug 19, 2020 · 63862d0 · 63862d0
1 parent 88ea940
commit 63862d0
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 117 deletions.
diff --git a/ios-rongcallkit/RongCallKit.xcodeproj/project.pbxproj b/ios-rongcallkit/RongCallKit.xcodeproj/project.pbxproj
@@ -412,7 +412,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "sh xcodebuild.sh";
+			shellScript = "sh xcodebuild.sh\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -448,85 +448,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
-		39C7F72120A5888300033968 /* Public */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = 9CVMN4UZK4;
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Public;
-		};
-		39C7F72220A5888300033968 /* Public */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BITCODE_GENERATION_MODE = bitcode;
-				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				COPY_PHASE_STRIP = YES;
-				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = "";
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/framework",
-				);
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PREPROCESSOR_DEFINITIONS = "PUBLIC=1";
-				INFOPLIST_FILE = RongCallKit/Info.plist;
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 2.10.5;
-				OTHER_CFLAGS = "";
-				PRODUCT_BUNDLE_IDENTIFIER = cn.rongcloud.im;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SKIP_INSTALL = YES;
-				VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
-			};
-			name = Public;
-		};
 		A6BE1A541CCE561200FF6BF7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -641,17 +562,17 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				INFOPLIST_FILE = RongCallKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 2.10.5;
+				MARKETING_VERSION = 4.0.2;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = cn.rongcloud.im;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
+				VALID_ARCHS = "arm64 armv7 x86_64";
 			};
 			name = Debug;
 		};
@@ -677,16 +598,16 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				INFOPLIST_FILE = RongCallKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 2.10.5;
+				MARKETING_VERSION = 4.0.2;
 				OTHER_CFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = cn.rongcloud.im;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
+				VALID_ARCHS = "arm64 armv7 x86_64";
 			};
 			name = Release;
 		};
@@ -698,7 +619,6 @@
 			buildConfigurations = (
 				A6BE1A541CCE561200FF6BF7 /* Debug */,
 				A6BE1A551CCE561200FF6BF7 /* Release */,
-				39C7F72120A5888300033968 /* Public */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -708,7 +628,6 @@
 			buildConfigurations = (
 				A6BE1A571CCE561200FF6BF7 /* Debug */,
 				A6BE1A581CCE561200FF6BF7 /* Release */,
-				39C7F72220A5888300033968 /* Public */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

diff --git a/ios-rongcallkit/RongCallKit.xcodeproj/xcshareddata/xcschemes/RongCallKit.xcscheme b/ios-rongcallkit/RongCallKit.xcodeproj/xcshareddata/xcschemes/RongCallKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1150"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
@@ -42,17 +40,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A6BE1A4D1CCE561200FF6BF7"
-            BuildableName = "RongCallKit.framework"
-            BlueprintName = "RongCallKit"
-            ReferencedContainer = "container:RongCallKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/ios-rongcallkit/RongCallKit/Cell/RCCallTipMessageCell.m b/ios-rongcallkit/RongCallKit/Cell/RCCallTipMessageCell.m
@@ -27,7 +27,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
     if (self) {
         self.messageLabel = [RCTipLabel greyTipLabel];
         self.messageLabel.backgroundColor =
-            [RCKitUtility generateDynamicColor:rgba(0, 0, 0, 0.1) darkColor:hex_rgb(0x232323)];
+            [RCKitUtility generateDynamicColor:hex_rgb(0xc9c9c9) darkColor:hex_rgb(0x232323)];
         self.messageLabel.textColor = dynamic_color(0xffffff, 0x707070);
         [self.baseContentView addSubview:self.messageLabel];
         self.messageLabel.marginInsets = UIEdgeInsetsMake(0.5f, 0.5f, 0.5f, 0.5f);

diff --git a/ios-rongcallkit/RongCallKit/Controller/RCCallAudioMultiCallViewController.m b/ios-rongcallkit/RongCallKit/Controller/RCCallAudioMultiCallViewController.m
@@ -347,8 +347,14 @@ - (void)inviteNewUser {
     [existUserIdList addObject:currentUserId];
 
     __weak typeof(self) weakSelf = self;
-    if ([RCCall sharedRCCall].callInviteNewUserDelegate &&[[RCCall sharedRCCall].callInviteNewUserDelegate respondsToSelector:@selector(inviteNewUser:BaseOn:selectResult:)] && self.callSession) {
-        [[RCCall sharedRCCall].callInviteNewUserDelegate inviteNewUser:existUserIdList BaseOn:self selectResult:^(NSArray<NSString *> *userIdList) {
+    if ([RCCall sharedRCCall].callInviteNewUserDelegate
+        && [[RCCall sharedRCCall].callInviteNewUserDelegate respondsToSelector:@selector(inviteNewUser:targetId:mediaType:baseOn:selectResult:)]
+        && self.callSession) {
+        [[RCCall sharedRCCall].callInviteNewUserDelegate inviteNewUser:existUserIdList
+                                                              targetId:self.targetId
+                                                             mediaType:self.mediaType
+                                                                baseOn:self
+                                                          selectResult:^(NSArray<NSString *> *userIdList) {
             [weakSelf.callSession inviteRemoteUsers:userIdList mediaType:weakSelf.mediaType];
         }];
     } else {

diff --git a/ios-rongcallkit/RongCallKit/Controller/RCCallVideoMultiCallViewController.m b/ios-rongcallkit/RongCallKit/Controller/RCCallVideoMultiCallViewController.m
@@ -397,10 +397,15 @@ - (void)inviteNewUser {
         [existUserIdList addObject:userProfile.userId];
     }
     [existUserIdList addObject:currentUserId];
-
+    
     __weak typeof(self) weakSelf = self;
-    if ([RCCall sharedRCCall].callInviteNewUserDelegate &&[[RCCall sharedRCCall].callInviteNewUserDelegate respondsToSelector:@selector(inviteNewUser:BaseOn:selectResult:)]) {
-        [[RCCall sharedRCCall].callInviteNewUserDelegate inviteNewUser:existUserIdList BaseOn:self selectResult:^(NSArray<NSString *> *userIdList) {
+    if ([RCCall sharedRCCall].callInviteNewUserDelegate
+        && [[RCCall sharedRCCall].callInviteNewUserDelegate respondsToSelector:@selector(inviteNewUser:targetId:mediaType:baseOn:selectResult:)]) {
+        [[RCCall sharedRCCall].callInviteNewUserDelegate inviteNewUser:existUserIdList
+                                                              targetId:self.targetId
+                                                             mediaType:self.mediaType
+                                                                baseOn:self
+                                                          selectResult:^(NSArray<NSString *> *userIdList) {
             [weakSelf.callSession inviteRemoteUsers:userIdList mediaType:weakSelf.mediaType];
         }];
     } else {
@@ -417,7 +422,7 @@ - (void)inviteNewUser {
         dispatch_async(dispatch_get_main_queue(), ^{
             [weakSelf presentViewController:nav animated:YES completion:nil];
         });
-   }
+    }
 }
 
 - (void)inviteNewUserWithClickEvent {

diff --git a/ios-rongcallkit/RongCallKit/Info.plist b/ios-rongcallkit/RongCallKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ios-rongcallkit/RongCallKit/RCCall.h b/ios-rongcallkit/RongCallKit/RCCall.h
@@ -24,12 +24,12 @@ UIKIT_EXTERN NSNotificationName const RCCallNewSessionCreationNotification;
 /*!
  当前的通话会话实体
  */
-@property(nonatomic, strong, readonly) RCCallSession *currentCallSession;
+@property (nonatomic, strong, readonly) RCCallSession *currentCallSession;
 
 /*!
  音频通话支持的最大通话人数
  */
-@property(nonatomic, assign) int maxMultiAudioCallUserNumber;
+@property (nonatomic, assign) int maxMultiAudioCallUserNumber;
 
 /*!
  视频通话支持的最大通话人数
@@ -39,20 +39,20 @@ UIKIT_EXTERN NSNotificationName const RCCallNewSessionCreationNotification;
 /**
  系统来电显示的 app 名字
  */
-@property(nonatomic, copy) NSString *appLocalizedName;
+@property (nonatomic, copy) NSString *appLocalizedName;
 
 /**
  是否处理来电, 默认: YES 处理, 设置为 NO 时会直接挂断来电
 */
-@property(nonatomic, assign) BOOL canIncomingCall;
+@property (nonatomic, assign) BOOL canIncomingCall;
 
 /**
  多人音视频通话邀请用户代理
  
  @discussion 如果实现该代理则多人音视频通话界面将有用户自己定义否则使用 RongCallKit 自带的选人界面
  
  */
-@property(nonatomic, weak) id<RCMultiCallInviteNewUserDelegate> callInviteNewUserDelegate;
+@property (nonatomic, weak) id<RCMultiCallInviteNewUserDelegate> callInviteNewUserDelegate;
 
 
 /*!
@@ -61,7 +61,7 @@ UIKIT_EXTERN NSNotificationName const RCCallNewSessionCreationNotification;
  @warning  **已废弃，请勿使用。**
  升级说明：如果您之前使用了此属性，可以直接替换为[RCIM sharedRCIM]的groupMemberDataSource属性，行为和实现完全一致。
  */
-@property(nonatomic, weak) id<RCCallGroupMemberDataSource> groupMemberDataSource __deprecated_msg("已废弃，请勿使用。");
+@property (nonatomic, weak) id<RCCallGroupMemberDataSource> groupMemberDataSource __deprecated_msg("已废弃，请勿使用。");
 
 /*!
  获取融云通话界面组件CallKit的核心类单例

diff --git a/ios-rongcallkit/RongCallKit/RCMultiCallInviteNewUserDelegate.h b/ios-rongcallkit/RongCallKit/RCMultiCallInviteNewUserDelegate.h
@@ -11,16 +11,21 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol RCMultiCallInviteNewUserDelegate <NSObject>
+
 /**
  多人音视频通话将要弹出选人界面的回调（当用户需要自己实现多人音视频通话的选人界面时使用）
  
  @param existUserIdList 可被选择的所有音视频通话的用户
+ @param targetId        群组ID
+ @param type            发起的通话媒体类型
  @param viewController  多人音视频通话视图控制器
  @param resultBlock     选择用户之后的回调需要（需要用户自己调用该 block 传递所选择音视频通话的用户 id）
   @warming 用户使用该代理时则 RongCallKit 默认的多人音视频通话选人界面界面不会弹出，谨慎使用！
  */
 - (void)inviteNewUser:(NSMutableArray *)existUserIdList
-               BaseOn:(UIViewController *)viewController
+             targetId:(NSString *)targetId
+            mediaType:(RCCallMediaType)type
+               baseOn:(UIViewController *)viewController
          selectResult:(void (^)(NSArray<NSString *> *userIdList))resultBlock;
 @end