Skip to content

Commit 90acc38

Browse files
adamsfliuAbySwifter
adamsfliu
authored and
AbySwifter
committed
[iOS] update version to relesse-10.6.0.2824
1 parent 6a5901a commit 90acc38

28 files changed

+357
-324
lines changed

‎iOS/Example/App/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>10.4.0</string>
18+
<string>10.6.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>2632</string>
20+
<string>2824</string>
2121
<key>LSRequiresIPhoneOS</key>
2222
<true/>
2323
<key>NSMicrophoneUsageDescription</key>

‎iOS/Example/TUIChatSalonApp.xcodeproj/project.pbxproj‎

Lines changed: 63 additions & 63 deletions
Large diffs are not rendered by default.

‎iOS/Source/TUIChatSalonKit_Enterprise/TUIChatSalonKit.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// Pods
44
//
55
// Created by gg on 2021/5/18.
6+
// Copyright © 2021 Tencent. All rights reserved.
67
//
78

89
#ifndef TUIChatSalonKit_h

‎iOS/Source/TUIChatSalonKit_TRTC/TUIChatSalonKit.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// Pods
44
//
55
// Created by gg on 2021/5/18.
6+
// Copyright © 2021 Tencent. All rights reserved.
67
//
78

89
#ifndef TUIChatSalonKit_h

‎iOS/Source/localized/ChatSalonLocalized.h‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,22 @@ NS_ASSUME_NONNULL_BEGIN
1111

1212

1313
#pragma mark - Base
14-
extern NSBundle *ChatSalonBundle(void);
15-
extern NSString *TCSLocalizeFromTable(NSString *key, NSString *table);
16-
extern NSString *TCSLocalizeFromTableAndCommon(NSString *key, NSString *common, NSString *table);
14+
extern NSBundle *chatSalonBundle(void);
15+
extern NSString *tcsLocalizeFromTable(NSString *key, NSString *table);
16+
extern NSString *tcsLocalizeFromTableAndCommon(NSString *key, NSString *common, NSString *table);
1717

1818
#pragma mark - Replace String
19-
extern NSString *LocalizeReplaceXX(NSString *origin, NSString *xxx_replace);
20-
extern NSString *LocalizeReplace(NSString *origin, NSString *xxx_replace, NSString *yyy_replace);
21-
extern NSString *LocalizeReplaceThreeCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace);
22-
extern NSString *LocalizeReplaceFourCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace, NSString *mmm_replace);
23-
extern NSString *LocalizeReplaceFiveCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace, NSString *mmm_replace, NSString *nnn_replace);
19+
extern NSString *localizeReplaceXX(NSString *origin, NSString *xxx_replace);
20+
extern NSString *localizeReplace(NSString *origin, NSString *xxx_replace, NSString *yyy_replace);
21+
extern NSString *localizeReplaceThreeCharacter(NSString *origin, NSString *xxx_replace, NSString
22+
*yyy_replace, NSString *zzz_replace);
23+
extern NSString *localizeReplaceFourCharacter(NSString *origin, NSString *xxx_replace, NSString
24+
*yyy_replace, NSString *zzz_replace, NSString *mmm_replace);
25+
extern NSString *localizeReplaceFiveCharacter(NSString *origin, NSString *xxx_replace, NSString
26+
*yyy_replace, NSString *zzz_replace, NSString *mmm_replace, NSString *nnn_replace);
2427

2528
#pragma mark - TRTC
26-
extern NSString *const ChatSalon_Localize_TableName;
27-
extern NSString *ChatSalonLocalize(NSString *key);
29+
extern NSString *const chatSalon_Localize_TableName;
30+
extern NSString *chatSalonLocalize(NSString *key);
2831

2932
NS_ASSUME_NONNULL_END

‎iOS/Source/localized/ChatSalonLocalized.m‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,51 @@
88
#import "ChatSalonLocalized.h"
99

1010
#pragma mark - Base
11-
NSBundle *ChatSalonBundle(void) {
11+
NSBundle *chatSalonBundle(void) {
1212
NSURL *callingKitBundleURL = [[NSBundle mainBundle] URLForResource:@"TUIChatSalonKitBundle" withExtension:@"bundle"];
1313
return [NSBundle bundleWithURL:callingKitBundleURL];
1414
}
1515

16-
NSString *TCSLocalizeFromTable(NSString *key, NSString *table) {
17-
return [ChatSalonBundle() localizedStringForKey:key value:@"" table:table];
16+
NSString *tcsLocalizeFromTable(NSString *key, NSString *table) {
17+
return [chatSalonBundle() localizedStringForKey:key value:@"" table:table];
1818
}
1919

20-
NSString *TCSLocalizeFromTableAndCommon(NSString *key, NSString *common, NSString *table) {
21-
return TCSLocalizeFromTable(key, table);
20+
NSString *tcsLocalizeFromTableAndCommon(NSString *key, NSString *common, NSString *table) {
21+
return tcsLocalizeFromTable(key, table);
2222
}
2323

2424
#pragma mark - Replace String
25-
NSString *LocalizeReplaceXX(NSString *origin, NSString *xxx_replace) {
25+
NSString *localizeReplaceXX(NSString *origin, NSString *xxx_replace) {
2626
if (xxx_replace == nil) { xxx_replace = @"";}
2727
return [origin stringByReplacingOccurrencesOfString:@"xxx" withString:xxx_replace];
2828
}
2929

30-
NSString *LocalizeReplace(NSString *origin, NSString *xxx_replace, NSString *yyy_replace) {
30+
NSString *localizeReplace(NSString *origin, NSString *xxx_replace, NSString *yyy_replace) {
3131
if (yyy_replace == nil) { yyy_replace = @"";}
32-
return [LocalizeReplaceXX(origin, xxx_replace) stringByReplacingOccurrencesOfString:@"yyy" withString:yyy_replace];
32+
return [localizeReplaceXX(origin, xxx_replace) stringByReplacingOccurrencesOfString:@"yyy" withString:yyy_replace];
3333
}
3434

35-
NSString *LocalizeReplaceThreeCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace) {
35+
NSString *localizeReplaceThreeCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace) {
3636
if (zzz_replace == nil) { zzz_replace = @"";}
37-
return [LocalizeReplace(origin, xxx_replace, yyy_replace) stringByReplacingOccurrencesOfString:@"zzz" withString:zzz_replace];
37+
return [localizeReplace(origin, xxx_replace, yyy_replace) stringByReplacingOccurrencesOfString:@"zzz" withString:zzz_replace];
3838
}
3939

40-
NSString *LocalizeReplaceFourCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace, NSString *mmm_replace) {
40+
NSString *localizeReplaceFourCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace, NSString *mmm_replace) {
4141
if (mmm_replace == nil) { mmm_replace = @"";}
42-
return [LocalizeReplaceThreeCharacter(origin, xxx_replace, yyy_replace, zzz_replace) stringByReplacingOccurrencesOfString:@"mmm" withString:mmm_replace];
42+
return [localizeReplaceThreeCharacter(origin, xxx_replace, yyy_replace, zzz_replace)
43+
stringByReplacingOccurrencesOfString:@"mmm" withString:mmm_replace];
4344
}
4445

45-
NSString *LocalizeReplaceFiveCharacter(NSString *origin, NSString *xxx_replace, NSString *yyy_replace, NSString *zzz_replace, NSString *mmm_replace, NSString *nnn_replace) {
46+
NSString *localizeReplaceFiveCharacter(NSString *origin, NSString *xxx_replace, NSString
47+
*yyy_replace, NSString *zzz_replace, NSString *mmm_replace, NSString *nnn_replace) {
4648
if (nnn_replace == nil) { nnn_replace = @"";}
47-
return [LocalizeReplaceFourCharacter(origin, xxx_replace, yyy_replace, zzz_replace, mmm_replace) stringByReplacingOccurrencesOfString:@"nnn" withString:nnn_replace];
49+
return [localizeReplaceFourCharacter(origin, xxx_replace, yyy_replace, zzz_replace,
50+
mmm_replace) stringByReplacingOccurrencesOfString:@"nnn" withString:nnn_replace];
4851
}
4952

5053

5154
#pragma mark - Calling
52-
NSString *const ChatSalon_Localize_TableName = @"ChatSalonLocalized";
53-
NSString *ChatSalonLocalize(NSString *key) {
54-
return TCSLocalizeFromTable(key, ChatSalon_Localize_TableName);
55+
NSString *const chatSalon_Localize_TableName = @"ChatSalonLocalized";
56+
NSString *chatSalonLocalize(NSString *key) {
57+
return tcsLocalizeFromTable(key, chatSalon_Localize_TableName);
5558
}

‎iOS/Source/model/Impl/TRTCChatSalon.m‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ @interface TRTCChatSalon ()<ChatSalonTRTCServiceDelegate, ITXRoomServiceDelegate
4545

4646
@implementation TRTCChatSalon
4747

48-
static TRTCChatSalon *_instance;
49-
static dispatch_once_t onceToken;
48+
static TRTCChatSalon *gInstance;
49+
static dispatch_once_t gOnceToken;
5050

5151
- (instancetype)init
5252
{
@@ -165,10 +165,12 @@ - (void)getAudienceList:(ChatSalonUserListCallback _Nullable)callback {
165165
}];
166166
}
167167

168-
- (void)enterTRTCRoomInnerWithRoomId:(NSString *)roomId userID:(NSString *)userID userSign:(NSString *)userSig role:(NSInteger)role callback:(ActionCallback)callback {
168+
- (void)enterTRTCRoomInnerWithRoomId:(NSString *)roomId userID:(NSString *)userID
169+
userSign:(NSString *)userSig role:(NSInteger)role callback:(ActionCallback)callback {
169170
TRTCLog(@"start enter trtc room.");
170171
@weakify(self)
171-
[self.roomTRTCService enterRoomWithSdkAppId:self.mSDKAppID roomId:roomId userID:userID userSign:userSig role:role callback:^(int code, NSString * _Nonnull message) {
172+
[self.roomTRTCService enterRoomWithSdkAppId:self.mSDKAppID roomId:roomId userID:userID
173+
userSign:userSig role:role callback:^(int code, NSString * _Nonnull message) {
172174
@strongify(self)
173175
if (!self) {
174176
return;
@@ -183,17 +185,17 @@ - (void)enterTRTCRoomInnerWithRoomId:(NSString *)roomId userID:(NSString *)userI
183185

184186
#pragma mark - TRTCChatSalon 实现
185187
+ (instancetype)sharedInstance {
186-
dispatch_once(&onceToken, ^{
187-
_instance = [[TRTCChatSalon alloc] init];
188-
[TXChatSalonService sharedInstance].delegate = _instance;
189-
[ChatSalonTRTCService sharedInstance].delegate = _instance;
188+
dispatch_once(&gOnceToken, ^{
189+
gInstance = [[TRTCChatSalon alloc] init];
190+
[TXChatSalonService sharedInstance].delegate = gInstance;
191+
[ChatSalonTRTCService sharedInstance].delegate = gInstance;
190192
});
191-
return _instance;
193+
return gInstance;
192194
}
193195

194196
+ (void)destroySharedInstance {
195-
onceToken = 0;
196-
_instance = nil;
197+
gOnceToken = 0;
198+
gInstance = nil;
197199
}
198200

199201
- (void)setDelegate:(id<TRTCChatSalonDelegate>)delegate{
@@ -304,7 +306,8 @@ - (void)createRoom:(int)roomID roomParam:(ChatSalonParam *)roomParam callback:(A
304306
return;
305307
}
306308
if (code == 0) {
307-
[self enterTRTCRoomInnerWithRoomId:self.roomID userID:self.userID userSign:self.userSig role:kTRTCRoleAnchorValue callback:^(int code, NSString * _Nonnull message) {
309+
[self enterTRTCRoomInnerWithRoomId:self.roomID userID:self.userID userSign:self.userSig
310+
role:KTRTCRoleAnchorValue callback:^(int code, NSString * _Nonnull message) {
308311
[self.roomTRTCService switchToAnchor:^(int code, NSString * _Nonnull message) {
309312
if (code == 0) {
310313
[self.roomService onSeatTakeWithUser:self.userID];
@@ -390,7 +393,8 @@ - (void)enterRoom:(NSInteger)roomID callback:(ActionCallback)callback {
390393
}
391394
}];
392395
} else {
393-
[self enterTRTCRoomInnerWithRoomId:self.roomID userID:self.userID userSign:self.userSig role:kTRTCRoleAudienceValue callback:^(int code, NSString * _Nonnull message) {
396+
[self enterTRTCRoomInnerWithRoomId:self.roomID userID:self.userID userSign:self.userSig
397+
role:KTRTCRoleAudienceValue callback:^(int code, NSString * _Nonnull message) {
394398
@strongify(self)
395399
if (!self) {
396400
return;
@@ -440,7 +444,8 @@ - (void)getRoomInfoList:(NSArray<NSNumber *> *)roomIdList callback:(ChatSalonInf
440444
for (NSNumber *roomId in roomIdList) {
441445
[roomIds addObject:[roomId stringValue]];
442446
}
443-
[self.roomService getRoomInfoList:roomIds calback:^(int code, NSString * _Nonnull message, NSArray<TXChatSalonRoomInfo *> * _Nonnull roomInfos) {
447+
[self.roomService getRoomInfoList:roomIds calback:^(int code, NSString * _Nonnull message,
448+
NSArray<TXChatSalonRoomInfo *> * _Nonnull roomInfos) {
444449
if (code == 0) {
445450
TRTCLog(@"roomInfos: %@", roomInfos);
446451
NSMutableArray* trtcRoomInfos = [[NSMutableArray alloc] initWithCapacity:2];
@@ -480,7 +485,8 @@ - (void)getUserInfoList:(NSArray<NSString *> *)userIDList callback:(ChatSalonUse
480485
[self getAudienceList:callback];
481486
return;
482487
}
483-
[self.roomService getUserInfo:userIDList callback:^(int code, NSString * _Nonnull message, NSArray<TXChatSalonUserInfo *> * _Nonnull userInfos) {
488+
[self.roomService getUserInfo:userIDList callback:^(int code, NSString * _Nonnull message,
489+
NSArray<TXChatSalonUserInfo *> * _Nonnull userInfos) {
484490
@strongify(self)
485491
if (!self) {
486492
return;
@@ -581,7 +587,7 @@ - (void)pickSeat:(NSString *)userID callback:(ActionCallback)callback{
581587
if ([self isOnSeatWithUserId:userID]) {
582588
[self runOnDelegateQueue:^{
583589
if (callback) {
584-
callback(-1, ChatSalonLocalize(@"Demo.TRTC.Salon.userisspeaker"));
590+
callback(-1, chatSalonLocalize(@"Demo.TRTC.Salon.userisspeaker"));
585591
}
586592
}];
587593
return;

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

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,37 @@
1111

1212
NS_ASSUME_NONNULL_BEGIN
1313

14-
static NSString* VOICE_ROOM_KEY_ATTR_VERSION = @"version";
15-
static NSString* VOICE_ROOM_VALUE_ATTR_VERSION = @"1.0";
16-
static NSString* VOICE_ROOM_KEY_ROOM_INFO = @"roomInfo";
17-
static NSString* VOICE_ROOM_KEY_SEAT = @"seat";
18-
19-
static NSString* VOICE_ROOM_KEY_CMD_VERSION = @"version";
20-
static NSString* VOICE_ROOM_VALUE_CMD_VERSION = @"1.0";
21-
static NSString* VOICE_ROOM_KEY_CMD_ACTION = @"action";
22-
static NSString* VOICE_ROOM_KEY_USER_ID = @"userId";
23-
24-
static NSString* VOICE_ROOM_KEY_INVITATION_VERSION = @"version";
25-
static NSString* VOICE_ROOM_VALUE_INVITATION_VERSION = @"1.0";
26-
static NSString* VOICE_ROOM_KEY_INVITATION_CMD = @"command";
27-
static NSString* VOICE_ROOM_KEY_INVITAITON_CONTENT = @"content";
28-
29-
static NSString* CHAT_SALON_KEY_CMD_VERSION = @"version";
30-
static NSString* CHAT_SALON_KEY_CMD_BUSINESSID = @"businessID";
31-
static NSString* CHAT_SALON_KEY_CMD_PLATFORM = @"platform";
32-
static NSString* CHAT_SALON_KEY_CMD_EXTINFO = @"extInfo";
33-
static NSString* CHAT_SALON_KEY_CMD_DATA = @"data";
34-
static NSString* CHAT_SALON_KEY_CMD_ROOMID = @"room_id";
35-
static NSString* CHAT_SALON_KEY_CMD_CMD = @"cmd";
36-
static NSString* CHAT_SALON_KEY_CMD_USERID = @"user_id";
37-
38-
static NSInteger CHAT_SALON_VALUE_CMD_BASIC_VERSION = 1;
39-
static NSInteger CHAT_SALON_VALUE_CMD_VERSION = 1;
40-
static NSString* CHAT_SALON_VALUE_CMD_BUSINESSID = @"ChatSalon";
41-
static NSString* CHAT_SALON_VALUE_CMD_PLATFORM = @"iOS";
42-
static NSString* CHAT_SALON_VALUE_CMD_PICK = @"pickUser";
43-
static NSString* CHAT_SALON_VALUE_CMD_TAKE = @"takeSeat";
44-
static NSString* CHAT_SALON_VALUE_CMD_KICK = @"kickUser";
14+
static NSString* gVOICE_ROOM_KEY_ATTR_VERSION = @"version";
15+
static NSString* gVOICE_ROOM_VALUE_ATTR_VERSION = @"1.0";
16+
static NSString* gVOICE_ROOM_KEY_ROOM_INFO = @"roomInfo";
17+
static NSString* gVOICE_ROOM_KEY_SEAT = @"seat";
18+
19+
static NSString* gVOICE_ROOM_KEY_CMD_VERSION = @"version";
20+
static NSString* gVOICE_ROOM_VALUE_CMD_VERSION = @"1.0";
21+
static NSString* gVOICE_ROOM_KEY_CMD_ACTION = @"action";
22+
static NSString* gVOICE_ROOM_KEY_USER_ID = @"userId";
23+
24+
static NSString* gVOICE_ROOM_KEY_INVITATION_VERSION = @"version";
25+
static NSString* gVOICE_ROOM_VALUE_INVITATION_VERSION = @"1.0";
26+
static NSString* gVOICE_ROOM_KEY_INVITATION_CMD = @"command";
27+
static NSString* gVOICE_ROOM_KEY_INVITAITON_CONTENT = @"content";
28+
29+
static NSString* gCHAT_SALON_KEY_CMD_VERSION = @"version";
30+
static NSString* gCHAT_SALON_KEY_CMD_BUSINESSID = @"businessID";
31+
static NSString* gCHAT_SALON_KEY_CMD_PLATFORM = @"platform";
32+
static NSString* gCHAT_SALON_KEY_CMD_EXTINFO = @"extInfo";
33+
static NSString* gCHAT_SALON_KEY_CMD_DATA = @"data";
34+
static NSString* gCHAT_SALON_KEY_CMD_ROOMID = @"room_id";
35+
static NSString* gCHAT_SALON_KEY_CMD_CMD = @"cmd";
36+
static NSString* gCHAT_SALON_KEY_CMD_USERID = @"user_id";
37+
38+
static NSInteger gCHAT_SALON_VALUE_CMD_BASIC_VERSION = 1;
39+
static NSInteger gCHAT_SALON_VALUE_CMD_VERSION = 1;
40+
static NSString* gCHAT_SALON_VALUE_CMD_BUSINESSID = @"ChatSalon";
41+
static NSString* gCHAT_SALON_VALUE_CMD_PLATFORM = @"iOS";
42+
static NSString* gCHAT_SALON_VALUE_CMD_PICK = @"pickUser";
43+
static NSString* gCHAT_SALON_VALUE_CMD_TAKE = @"takeSeat";
44+
static NSString* gCHAT_SALON_VALUE_CMD_KICK = @"kickUser";
4545

4646
typedef NS_ENUM(NSUInteger, TXChatSalonCustomCodeType) {
4747
kChatSalonCodeUnknown = 0,
@@ -53,7 +53,8 @@ typedef NS_ENUM(NSUInteger, TXChatSalonCustomCodeType) {
5353

5454
@interface TXChatSalonIMJsonHandle : NSObject
5555

56-
+ (NSDictionary<NSString *,NSString *> *)getInitRoomDicWithRoomInfo:(TXChatSalonRoomInfo *)roominfo seatInfoList:(NSDictionary<NSString *,TXChatSalonSeatInfo *> *)seatInfoList;
56+
+ (NSDictionary<NSString *,NSString *> *)getInitRoomDicWithRoomInfo:(TXChatSalonRoomInfo
57+
*)roominfo seatInfoList:(NSDictionary<NSString *,TXChatSalonSeatInfo *> *)seatInfoList;
5758

5859
+ (NSDictionary<NSString *, NSString *> *)getSeatInfoListJsonStrWithSeatInfoList:(NSArray<TXChatSalonSeatInfo *> *)seatInfoList;
5960

0 commit comments

Comments
 (0)