[iOS] update version to relesse-10.6.0.2824

iOS/Example/App/Info.plist

@@ -15,9 +15,9 @@
 <key>CFBundlePackageType</key>
 <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 <key>CFBundleShortVersionString</key>
-<string>10.4.0</string>
+<string>10.6.0</string>
 <key>CFBundleVersion</key>
-<string>2632</string>
+<string>2824</string>
 <key>LSRequiresIPhoneOS</key>
 <true/>
 <key>NSMicrophoneUsageDescription</key>

iOS/Source/TUIChatSalonKit_Enterprise/TUIChatSalonKit.h

@@ -3,6 +3,7 @@
 // Pods
 //
 // Created by gg on 2021/5/18.
+// Copyright © 2021 Tencent. All rights reserved.
 //
 
 #ifndef TUIChatSalonKit_h

iOS/Source/TUIChatSalonKit_TRTC/TUIChatSalonKit.h

@@ -3,6 +3,7 @@
 // Pods
 //
 // Created by gg on 2021/5/18.
+// Copyright © 2021 Tencent. All rights reserved.
 //
 
 #ifndef TUIChatSalonKit_h

iOS/Source/localized/ChatSalonLocalized.h

@@ -11,19 +11,22 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 #pragma mark - Base
-extern NSBundle *ChatSalonBundle(void);
-extern NSString *TCSLocalizeFromTable(NSString *key, NSString *table);
-extern NSString *TCSLocalizeFromTableAndCommon(NSString *key, NSString *common, NSString *table);
+extern NSBundle *chatSalonBundle(void);
+extern NSString *tcsLocalizeFromTable(NSString *key, NSString *table);
+extern NSString *tcsLocalizeFromTableAndCommon(NSString *key, NSString *common, NSString *table);
 
 #pragma mark - Replace String
-extern NSString *LocalizeReplaceXX(NSString *origin, NSString *xxx_replace);
-extern NSString *LocalizeReplace(NSString *origin, NSString *xxx_replace, NSString *yyy_replace);
-extern NSString *LocalizeReplaceThreeCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace);
-extern NSString *LocalizeReplaceFourCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace, NSString *mmm_replace);
-extern NSString *LocalizeReplaceFiveCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace, NSString *mmm_replace, NSString *nnn_replace);
+extern NSString *localizeReplaceXX(NSString *origin, NSString *xxx_replace);
+extern NSString *localizeReplace(NSString *origin, NSString *xxx_replace, NSString *yyy_replace);
+extern NSString *localizeReplaceThreeCharacter(NSString *origin, NSString *xxx_replace, NSString
+ *yyy_replace, NSString *zzz_replace);
+extern NSString *localizeReplaceFourCharacter(NSString *origin, NSString *xxx_replace, NSString
+ *yyy_replace, NSString *zzz_replace, NSString *mmm_replace);
+extern NSString *localizeReplaceFiveCharacter(NSString *origin, NSString *xxx_replace, NSString
+ *yyy_replace, NSString *zzz_replace, NSString *mmm_replace, NSString *nnn_replace);
 
 #pragma mark - TRTC
-extern NSString *const ChatSalon_Localize_TableName;
-extern NSString *ChatSalonLocalize(NSString *key);
+extern NSString *const chatSalon_Localize_TableName;
+extern NSString *chatSalonLocalize(NSString *key);
 
 NS_ASSUME_NONNULL_END

iOS/Source/localized/ChatSalonLocalized.m

@@ -8,48 +8,51 @@
 #import "ChatSalonLocalized.h"
 
 #pragma mark - Base
-NSBundle *ChatSalonBundle(void) {
+NSBundle *chatSalonBundle(void) {
  NSURL *callingKitBundleURL = [[NSBundle mainBundle] URLForResource:@"TUIChatSalonKitBundle" withExtension:@"bundle"];
  return [NSBundle bundleWithURL:callingKitBundleURL];
 }
 
-NSString *TCSLocalizeFromTable(NSString *key, NSString *table) {
- return [ChatSalonBundle() localizedStringForKey:key value:@"" table:table];
+NSString *tcsLocalizeFromTable(NSString *key, NSString *table) {
+ return [chatSalonBundle() localizedStringForKey:key value:@"" table:table];
 }
 
-NSString *TCSLocalizeFromTableAndCommon(NSString *key, NSString *common, NSString *table) {
- return TCSLocalizeFromTable(key, table);
+NSString *tcsLocalizeFromTableAndCommon(NSString *key, NSString *common, NSString *table) {
+ return tcsLocalizeFromTable(key, table);
 }
 
 #pragma mark - Replace String
-NSString *LocalizeReplaceXX(NSString *origin, NSString *xxx_replace) {
+NSString *localizeReplaceXX(NSString *origin, NSString *xxx_replace) {
  if (xxx_replace == nil) { xxx_replace = @"";}
  return [origin stringByReplacingOccurrencesOfString:@"xxx" withString:xxx_replace];
 }
 
-NSString *LocalizeReplace(NSString *origin, NSString *xxx_replace, NSString *yyy_replace) {
+NSString *localizeReplace(NSString *origin, NSString *xxx_replace, NSString *yyy_replace) {
  if (yyy_replace == nil) { yyy_replace = @"";}
- return [LocalizeReplaceXX(origin, xxx_replace) stringByReplacingOccurrencesOfString:@"yyy" withString:yyy_replace];
+ return [localizeReplaceXX(origin, xxx_replace) stringByReplacingOccurrencesOfString:@"yyy" withString:yyy_replace];
 }
 
-NSString *LocalizeReplaceThreeCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace) {
+NSString *localizeReplaceThreeCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace) {
  if (zzz_replace == nil) { zzz_replace = @"";}
- return [LocalizeReplace(origin, xxx_replace, yyy_replace) stringByReplacingOccurrencesOfString:@"zzz" withString:zzz_replace];
+ return [localizeReplace(origin, xxx_replace, yyy_replace) stringByReplacingOccurrencesOfString:@"zzz" withString:zzz_replace];
 }
 
-NSString *LocalizeReplaceFourCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace, NSString *mmm_replace) {
+NSString *localizeReplaceFourCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace, NSString *mmm_replace) {
  if (mmm_replace == nil) { mmm_replace = @"";}
- return [LocalizeReplaceThreeCharacter(origin, xxx_replace, yyy_replace, zzz_replace) stringByReplacingOccurrencesOfString:@"mmm" withString:mmm_replace];
+ return [localizeReplaceThreeCharacter(origin, xxx_replace, yyy_replace, zzz_replace)
+ stringByReplacingOccurrencesOfString:@"mmm" withString:mmm_replace];
 }
 
-NSString *LocalizeReplaceFiveCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace, NSString *mmm_replace, NSString *nnn_replace) {
+NSString *localizeReplaceFiveCharacter(NSString *origin, NSString *xxx_replace, NSString
+ *yyy_replace, NSString *zzz_replace, NSString *mmm_replace, NSString *nnn_replace) {
  if (nnn_replace == nil) { nnn_replace = @"";}
- return [LocalizeReplaceFourCharacter(origin, xxx_replace, yyy_replace, zzz_replace, mmm_replace) stringByReplacingOccurrencesOfString:@"nnn" withString:nnn_replace];
+ return [localizeReplaceFourCharacter(origin, xxx_replace, yyy_replace, zzz_replace,
+ mmm_replace) stringByReplacingOccurrencesOfString:@"nnn" withString:nnn_replace];
 }
 
 
 #pragma mark - Calling
-NSString *const ChatSalon_Localize_TableName = @"ChatSalonLocalized";
-NSString *ChatSalonLocalize(NSString *key) {
- return TCSLocalizeFromTable(key, ChatSalon_Localize_TableName);
+NSString *const chatSalon_Localize_TableName = @"ChatSalonLocalized";
+NSString *chatSalonLocalize(NSString *key) {
+ return tcsLocalizeFromTable(key, chatSalon_Localize_TableName);
 }

iOS/Source/model/Impl/TRTCChatSalon.m

@@ -45,8 +45,8 @@ @interface TRTCChatSalon ()<ChatSalonTRTCServiceDelegate, ITXRoomServiceDelegate
 
 @implementation TRTCChatSalon
 
-static TRTCChatSalon *_instance;
-static dispatch_once_t onceToken;
+static TRTCChatSalon *gInstance;
+static dispatch_once_t gOnceToken;
 
 - (instancetype)init
 {
@@ -165,10 +165,12 @@ - (void)getAudienceList:(ChatSalonUserListCallback _Nullable)callback {
  }];
 }
 
-- (void)enterTRTCRoomInnerWithRoomId:(NSString *)roomId userID:(NSString *)userID userSign:(NSString *)userSig role:(NSInteger)role callback:(ActionCallback)callback {
+- (void)enterTRTCRoomInnerWithRoomId:(NSString *)roomId userID:(NSString *)userID
+ userSign:(NSString *)userSig role:(NSInteger)role callback:(ActionCallback)callback {
  TRTCLog(@"start enter trtc room.");
  @weakify(self)
- [self.roomTRTCService enterRoomWithSdkAppId:self.mSDKAppID roomId:roomId userID:userID userSign:userSig role:role callback:^(int code, NSString * _Nonnull message) {
+ [self.roomTRTCService enterRoomWithSdkAppId:self.mSDKAppID roomId:roomId userID:userID
+ userSign:userSig role:role callback:^(int code, NSString * _Nonnull message) {
  @strongify(self)
  if (!self) {
  return;
@@ -183,17 +185,17 @@ - (void)enterTRTCRoomInnerWithRoomId:(NSString *)roomId userID:(NSString *)userI
 
 #pragma mark - TRTCChatSalon 实现
 + (instancetype)sharedInstance {
- dispatch_once(&onceToken, ^{
- _instance = [[TRTCChatSalon alloc] init];
- [TXChatSalonService sharedInstance].delegate = _instance;
- [ChatSalonTRTCService sharedInstance].delegate = _instance;
+ dispatch_once(&gOnceToken, ^{
+ gInstance = [[TRTCChatSalon alloc] init];
+ [TXChatSalonService sharedInstance].delegate = gInstance;
+ [ChatSalonTRTCService sharedInstance].delegate = gInstance;
  });
- return _instance;
+ return gInstance;
 }
 
 + (void)destroySharedInstance {
- onceToken = 0;
- _instance = nil;
+ gOnceToken = 0;
+ gInstance = nil;
 }
 
 - (void)setDelegate:(id<TRTCChatSalonDelegate>)delegate{
@@ -304,7 +306,8 @@ - (void)createRoom:(int)roomID roomParam:(ChatSalonParam *)roomParam callback:(A
  return;
  }
  if (code == 0) {
- [self enterTRTCRoomInnerWithRoomId:self.roomID userID:self.userID userSign:self.userSig role:kTRTCRoleAnchorValue callback:^(int code, NSString * _Nonnull message) {
+ [self enterTRTCRoomInnerWithRoomId:self.roomID userID:self.userID userSign:self.userSig
+ role:KTRTCRoleAnchorValue callback:^(int code, NSString * _Nonnull message) {
  [self.roomTRTCService switchToAnchor:^(int code, NSString * _Nonnull message) {
  if (code == 0) {
  [self.roomService onSeatTakeWithUser:self.userID];
@@ -390,7 +393,8 @@ - (void)enterRoom:(NSInteger)roomID callback:(ActionCallback)callback {
  }
  }];
  } else {
- [self enterTRTCRoomInnerWithRoomId:self.roomID userID:self.userID userSign:self.userSig role:kTRTCRoleAudienceValue callback:^(int code, NSString * _Nonnull message) {
+ [self enterTRTCRoomInnerWithRoomId:self.roomID userID:self.userID userSign:self.userSig
+ role:KTRTCRoleAudienceValue callback:^(int code, NSString * _Nonnull message) {
  @strongify(self)
  if (!self) {
  return;
@@ -440,7 +444,8 @@ - (void)getRoomInfoList:(NSArray<NSNumber *> *)roomIdList callback:(ChatSalonInf
  for (NSNumber *roomId in roomIdList) {
  [roomIds addObject:[roomId stringValue]];
  }
- [self.roomService getRoomInfoList:roomIds calback:^(int code, NSString * _Nonnull message, NSArray<TXChatSalonRoomInfo *> * _Nonnull roomInfos) {
+ [self.roomService getRoomInfoList:roomIds calback:^(int code, NSString * _Nonnull message,
+ NSArray<TXChatSalonRoomInfo *> * _Nonnull roomInfos) {
  if (code == 0) {
  TRTCLog(@"roomInfos: %@", roomInfos);
  NSMutableArray* trtcRoomInfos = [[NSMutableArray alloc] initWithCapacity:2];
@@ -480,7 +485,8 @@ - (void)getUserInfoList:(NSArray<NSString *> *)userIDList callback:(ChatSalonUse
  [self getAudienceList:callback];
  return;
  }
- [self.roomService getUserInfo:userIDList callback:^(int code, NSString * _Nonnull message, NSArray<TXChatSalonUserInfo *> * _Nonnull userInfos) {
+ [self.roomService getUserInfo:userIDList callback:^(int code, NSString * _Nonnull message,
+ NSArray<TXChatSalonUserInfo *> * _Nonnull userInfos) {
  @strongify(self)
  if (!self) {
  return;
@@ -581,7 +587,7 @@ - (void)pickSeat:(NSString *)userID callback:(ActionCallback)callback{
  if ([self isOnSeatWithUserId:userID]) {
  [self runOnDelegateQueue:^{
  if (callback) {
- callback(-1, ChatSalonLocalize(@"Demo.TRTC.Salon.userisspeaker"));
+ callback(-1, chatSalonLocalize(@"Demo.TRTC.Salon.userisspeaker"));
  }
  }];
  return;

iOS/Source/model/Impl/chatsalon/TXChatSalonIMJsonHandle.h

@@ -11,37 +11,37 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-static NSString* VOICE_ROOM_KEY_ATTR_VERSION = @"version";
-static NSString* VOICE_ROOM_VALUE_ATTR_VERSION = @"1.0";
-static NSString* VOICE_ROOM_KEY_ROOM_INFO = @"roomInfo";
-static NSString* VOICE_ROOM_KEY_SEAT = @"seat";
-
-static NSString* VOICE_ROOM_KEY_CMD_VERSION = @"version";
-static NSString* VOICE_ROOM_VALUE_CMD_VERSION = @"1.0";
-static NSString* VOICE_ROOM_KEY_CMD_ACTION = @"action";
-static NSString* VOICE_ROOM_KEY_USER_ID = @"userId";
-
-static NSString* VOICE_ROOM_KEY_INVITATION_VERSION = @"version";
-static NSString* VOICE_ROOM_VALUE_INVITATION_VERSION = @"1.0";
-static NSString* VOICE_ROOM_KEY_INVITATION_CMD = @"command";
-static NSString* VOICE_ROOM_KEY_INVITAITON_CONTENT = @"content";
-
-static NSString* CHAT_SALON_KEY_CMD_VERSION = @"version";
-static NSString* CHAT_SALON_KEY_CMD_BUSINESSID = @"businessID";
-static NSString* CHAT_SALON_KEY_CMD_PLATFORM = @"platform";
-static NSString* CHAT_SALON_KEY_CMD_EXTINFO = @"extInfo";
-static NSString* CHAT_SALON_KEY_CMD_DATA = @"data";
-static NSString* CHAT_SALON_KEY_CMD_ROOMID = @"room_id";
-static NSString* CHAT_SALON_KEY_CMD_CMD = @"cmd";
-static NSString* CHAT_SALON_KEY_CMD_USERID = @"user_id";
-
-static NSInteger CHAT_SALON_VALUE_CMD_BASIC_VERSION = 1;
-static NSInteger CHAT_SALON_VALUE_CMD_VERSION = 1;
-static NSString* CHAT_SALON_VALUE_CMD_BUSINESSID = @"ChatSalon";
-static NSString* CHAT_SALON_VALUE_CMD_PLATFORM = @"iOS";
-static NSString* CHAT_SALON_VALUE_CMD_PICK = @"pickUser";
-static NSString* CHAT_SALON_VALUE_CMD_TAKE = @"takeSeat";
-static NSString* CHAT_SALON_VALUE_CMD_KICK = @"kickUser";
+static NSString* gVOICE_ROOM_KEY_ATTR_VERSION = @"version";
+static NSString* gVOICE_ROOM_VALUE_ATTR_VERSION = @"1.0";
+static NSString* gVOICE_ROOM_KEY_ROOM_INFO = @"roomInfo";
+static NSString* gVOICE_ROOM_KEY_SEAT = @"seat";
+
+static NSString* gVOICE_ROOM_KEY_CMD_VERSION = @"version";
+static NSString* gVOICE_ROOM_VALUE_CMD_VERSION = @"1.0";
+static NSString* gVOICE_ROOM_KEY_CMD_ACTION = @"action";
+static NSString* gVOICE_ROOM_KEY_USER_ID = @"userId";
+
+static NSString* gVOICE_ROOM_KEY_INVITATION_VERSION = @"version";
+static NSString* gVOICE_ROOM_VALUE_INVITATION_VERSION = @"1.0";
+static NSString* gVOICE_ROOM_KEY_INVITATION_CMD = @"command";
+static NSString* gVOICE_ROOM_KEY_INVITAITON_CONTENT = @"content";
+
+static NSString* gCHAT_SALON_KEY_CMD_VERSION = @"version";
+static NSString* gCHAT_SALON_KEY_CMD_BUSINESSID = @"businessID";
+static NSString* gCHAT_SALON_KEY_CMD_PLATFORM = @"platform";
+static NSString* gCHAT_SALON_KEY_CMD_EXTINFO = @"extInfo";
+static NSString* gCHAT_SALON_KEY_CMD_DATA = @"data";
+static NSString* gCHAT_SALON_KEY_CMD_ROOMID = @"room_id";
+static NSString* gCHAT_SALON_KEY_CMD_CMD = @"cmd";
+static NSString* gCHAT_SALON_KEY_CMD_USERID = @"user_id";
+
+static NSInteger gCHAT_SALON_VALUE_CMD_BASIC_VERSION = 1;
+static NSInteger gCHAT_SALON_VALUE_CMD_VERSION = 1;
+static NSString* gCHAT_SALON_VALUE_CMD_BUSINESSID = @"ChatSalon";
+static NSString* gCHAT_SALON_VALUE_CMD_PLATFORM = @"iOS";
+static NSString* gCHAT_SALON_VALUE_CMD_PICK = @"pickUser";
+static NSString* gCHAT_SALON_VALUE_CMD_TAKE = @"takeSeat";
+static NSString* gCHAT_SALON_VALUE_CMD_KICK = @"kickUser";
 
 typedef NS_ENUM(NSUInteger, TXChatSalonCustomCodeType) {
  kChatSalonCodeUnknown = 0,
@@ -53,7 +53,8 @@ typedef NS_ENUM(NSUInteger, TXChatSalonCustomCodeType) {
 
 @interface TXChatSalonIMJsonHandle : NSObject
 
-+ (NSDictionary<NSString *,NSString *> *)getInitRoomDicWithRoomInfo:(TXChatSalonRoomInfo *)roominfo seatInfoList:(NSDictionary<NSString *,TXChatSalonSeatInfo *> *)seatInfoList;
++ (NSDictionary<NSString *,NSString *> *)getInitRoomDicWithRoomInfo:(TXChatSalonRoomInfo
+ *)roominfo seatInfoList:(NSDictionary<NSString *,TXChatSalonSeatInfo *> *)seatInfoList;
 
 + (NSDictionary<NSString *, NSString *> *)getSeatInfoListJsonStrWithSeatInfoList:(NSArray<TXChatSalonSeatInfo *> *)seatInfoList;