Skip to content

Commit 8354c0f

Browse files
author
zhangchong
committed
rename EMMessage to EMChatMessage
1 parent 2f154fb commit 8354c0f

File tree

6 files changed

+19
-83
lines changed

6 files changed

+19
-83
lines changed

‎Assets/EaseCall.bundle/.DS_Store‎

-6 KB
Binary file not shown.

‎Classes/Process/EaseCallManager.m‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ - (void)messagesDidReceive:(NSArray *)aMessages
447447
{
448448
__weak typeof(self) weakself = self;
449449
dispatch_async(weakself.workQueue, ^{
450-
for (EMMessage *msg in aMessages) {
450+
for (EMChatMessage *msg in aMessages) {
451451
[weakself _parseMsg:msg];
452452
}
453453
});
@@ -457,7 +457,7 @@ - (void)cmdMessagesDidReceive:(NSArray *)aCmdMessages
457457
{
458458
__weak typeof(self) weakself = self;
459459
dispatch_async(weakself.workQueue, ^{
460-
for (EMMessage *msg in aCmdMessages) {
460+
for (EMChatMessage *msg in aCmdMessages) {
461461
[weakself _parseMsg:msg];
462462
}
463463
});
@@ -486,9 +486,9 @@ - (void)sendInviteMsgToCallee:(NSString*)aUid type:(EaseCallType)aType callId:(N
486486
// if(aType == EaseCallType1v1Video) {
487487
// [ext setObject:EMCOMMUNICATE_TYPE_VIDEO forKey:EMCOMMUNICATE_TYPE];
488488
// }
489-
EMMessage* msg = [[EMMessage alloc] initWithConversationID:aUid from:self.modal.curUserAccount to:aUid body:msgBody ext:ext];
489+
EMChatMessage* msg = [[EMChatMessage alloc] initWithConversationID:aUid from:self.modal.curUserAccount to:aUid body:msgBody ext:ext];
490490
__weak typeof(self) weakself = self;
491-
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMMessage *message, EMError *error) {
491+
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMChatMessage *message, EMError *error) {
492492
if(aCompletionBlock)
493493
aCompletionBlock(weakself.modal.currentCall.callId,nil);
494494
if(error) {
@@ -505,9 +505,9 @@ - (void)sendAlertMsgToCaller:(NSString*)aCallerUid callId:(NSString*)aCallId dev
505505
EMCmdMessageBody* msgBody = [[EMCmdMessageBody alloc] initWithAction:@"rtcCall"];
506506
msgBody.isDeliverOnlineOnly = YES;
507507
NSDictionary* ext = @{kMsgType:kMsgTypeValue,kAction:kAlertAction,kCallId:aCallId,kCalleeDevId:self.modal.curDevId,kCallerDevId:aDevId,kTs:[self getTs]};
508-
EMMessage* msg = [[EMMessage alloc] initWithConversationID:aCallerUid from:self.modal.curUserAccount to:aCallerUid body:msgBody ext:ext];
508+
EMChatMessage* msg = [[EMChatMessage alloc] initWithConversationID:aCallerUid from:self.modal.curUserAccount to:aCallerUid body:msgBody ext:ext];
509509
__weak typeof(self) weakself = self;
510-
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMMessage *message, EMError *error) {
510+
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMChatMessage *message, EMError *error) {
511511
if(error) {
512512
[weakself callBackError:EaseCallErrorTypeIM code:error.code description:error.errorDescription];
513513
}
@@ -522,9 +522,9 @@ - (void)sendComfirmRingMsgToCallee:(NSString*)aUid callId:(NSString*)aCallId isV
522522
EMCmdMessageBody* msgBody = [[EMCmdMessageBody alloc] initWithAction:@"rtcCall"];
523523
msgBody.isDeliverOnlineOnly = YES;
524524
NSDictionary* ext = @{kMsgType:kMsgTypeValue,kAction:kConfirmRingAction,kCallId:aCallId,kCallerDevId:self.modal.curDevId,kCallStatus:[NSNumber numberWithBool:aIsCallValid],kTs:[self getTs],kCalleeDevId:aCalleeDevId};
525-
EMMessage* msg = [[EMMessage alloc] initWithConversationID:aUid from:self.modal.curUserAccount to:aUid body:msgBody ext:ext];
525+
EMChatMessage* msg = [[EMChatMessage alloc] initWithConversationID:aUid from:self.modal.curUserAccount to:aUid body:msgBody ext:ext];
526526
__weak typeof(self) weakself = self;
527-
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMMessage *message, EMError *error) {
527+
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMChatMessage *message, EMError *error) {
528528
if(error) {
529529
[weakself callBackError:EaseCallErrorTypeIM code:error.code description:error.errorDescription];
530530
}
@@ -538,9 +538,9 @@ - (void)sendCancelCallMsgToCallee:(NSString*)aUid callId:(NSString*)aCallId
538538
return;
539539
EMCmdMessageBody* msgBody = [[EMCmdMessageBody alloc] initWithAction:@"rtcCall"];
540540
NSDictionary* ext = @{kMsgType:kMsgTypeValue,kAction:kCancelCallAction,kCallId:aCallId,kCallerDevId:self.modal.curDevId,kTs:[self getTs]};
541-
EMMessage* msg = [[EMMessage alloc] initWithConversationID:aUid from:self.modal.curUserAccount to:aUid body:msgBody ext:ext];
541+
EMChatMessage* msg = [[EMChatMessage alloc] initWithConversationID:aUid from:self.modal.curUserAccount to:aUid body:msgBody ext:ext];
542542
__weak typeof(self) weakself = self;
543-
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMMessage *message, EMError *error) {
543+
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMChatMessage *message, EMError *error) {
544544
if(error) {
545545
[weakself callBackError:EaseCallErrorTypeIM code:error.code description:error.errorDescription];
546546
}
@@ -557,9 +557,9 @@ - (void)sendAnswerMsg:(NSString*)aCallerUid callId:(NSString*)aCallId result:(NS
557557
NSMutableDictionary* ext = [@{kMsgType:kMsgTypeValue,kAction:kAnswerCallAction,kCallId:aCallId,kCalleeDevId:self.modal.curDevId,kCallerDevId:aDevId,kCallResult:aResult,kTs:[self getTs]} mutableCopy];
558558
if(self.modal.currentCall.callType == EaseCallType1v1Audio && self.bNeedSwitchToVoice)
559559
[ext setObject:[NSNumber numberWithBool:YES] forKey:kVideoToVoice];
560-
EMMessage* msg = [[EMMessage alloc] initWithConversationID:aCallerUid from:self.modal.curUserAccount to:aCallerUid body:msgBody ext:ext];
560+
EMChatMessage* msg = [[EMChatMessage alloc] initWithConversationID:aCallerUid from:self.modal.curUserAccount to:aCallerUid body:msgBody ext:ext];
561561
__weak typeof(self) weakself = self;
562-
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMMessage *message, EMError *error) {
562+
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMChatMessage *message, EMError *error) {
563563
if(error) {
564564
[weakself callBackError:EaseCallErrorTypeIM code:error.code description:error.errorDescription];
565565
}
@@ -575,9 +575,9 @@ - (void)sendConfirmAnswerMsgToCallee:(NSString*)aUid callId:(NSString*)aCallId r
575575
EMCmdMessageBody* msgBody = [[EMCmdMessageBody alloc] initWithAction:@"rtcCall"];
576576
msgBody.isDeliverOnlineOnly = YES;
577577
NSMutableDictionary* ext = [@{kMsgType:kMsgTypeValue,kAction:kConfirmCalleeAction,kCallId:aCallId,kCallerDevId:self.modal.curDevId,kCalleeDevId:aDevId,kCallResult:aResult,kTs:[self getTs]} mutableCopy];
578-
EMMessage* msg = [[EMMessage alloc] initWithConversationID:aUid from:self.modal.curUserAccount to:aUid body:msgBody ext:ext];
578+
EMChatMessage* msg = [[EMChatMessage alloc] initWithConversationID:aUid from:self.modal.curUserAccount to:aUid body:msgBody ext:ext];
579579
__weak typeof(self) weakself = self;
580-
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMMessage *message, EMError *error) {
580+
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMChatMessage *message, EMError *error) {
581581
if(error) {
582582
[weakself callBackError:EaseCallErrorTypeIM code:error.code description:error.errorDescription];
583583
}
@@ -594,9 +594,9 @@ - (void)sendVideoToVoiceMsg:(NSString*)aUid callId:(NSString*)aCallId
594594
return;
595595
EMCmdMessageBody* msgBody = [[EMCmdMessageBody alloc] initWithAction:@"rtcCall"];
596596
NSDictionary* ext = @{kMsgType:kMsgTypeValue,kAction:kVideoToVoice,kCallId:aCallId,kTs:[self getTs]};
597-
EMMessage* msg = [[EMMessage alloc] initWithConversationID:aUid from:self.modal.curUserAccount to:aUid body:msgBody ext:ext];
597+
EMChatMessage* msg = [[EMChatMessage alloc] initWithConversationID:aUid from:self.modal.curUserAccount to:aUid body:msgBody ext:ext];
598598
__weak typeof(self) weakself = self;
599-
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMMessage *message, EMError *error) {
599+
[[[EMClient sharedClient] chatManager] sendMessage:msg progress:nil completion:^(EMChatMessage *message, EMError *error) {
600600
if(error) {
601601
[weakself callBackError:EaseCallErrorTypeIM code:error.code description:error.errorDescription];
602602
}
@@ -610,7 +610,7 @@ - (NSNumber*)getTs
610610

611611
#pragma mark - 解析消息信令
612612

613-
- (void)_parseMsg:(EMMessage*)aMsg
613+
- (void)_parseMsg:(EMChatMessage*)aMsg
614614
{
615615
if(![aMsg.to isEqualToString:[EMClient sharedClient].currentUsername])
616616
return;

‎EaseCallDemo/EaseCallDemo.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
4D30261E8736318BB7BC58F4 /* Pods_EaseCallDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F7A5893A3FCEABE47D0FDFC /* Pods_EaseCallDemo.framework */; };
1110
902DA81E25DFA93D0098E6DF /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 902DA81D25DFA93D0098E6DF /* LoginViewController.m */; };
1211
902DA82225DFA9B80098E6DF /* UIStoryboard+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = 902DA82125DFA9B80098E6DF /* UIStoryboard+Category.m */; };
1312
902DA82525DFAA4E0098E6DF /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 902DA82425DFAA4E0098E6DF /* HomeViewController.m */; };
@@ -25,8 +24,6 @@
2524
/* End PBXBuildFile section */
2625

2726
/* Begin PBXFileReference section */
28-
20C5F65DD148A5D7C5F9AD77 /* Pods-EaseCallDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EaseCallDemo.release.xcconfig"; path = "../EaseCallDemo/Pods/Target Support Files/Pods-EaseCallDemo/Pods-EaseCallDemo.release.xcconfig"; sourceTree = "<group>"; };
29-
4F7A5893A3FCEABE47D0FDFC /* Pods_EaseCallDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_EaseCallDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3027
902DA81C25DFA93D0098E6DF /* LoginViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
3128
902DA81D25DFA93D0098E6DF /* LoginViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
3229
902DA82025DFA9B80098E6DF /* UIStoryboard+Category.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIStoryboard+Category.h"; sourceTree = "<group>"; };
@@ -50,31 +47,19 @@
5047
907CCB2525DE7ADF009AD53F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5148
907CCB2725DE7ADF009AD53F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5249
907CCB2825DE7ADF009AD53F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
53-
9A1BFEAED0E533B70A703537 /* Pods-EaseCallDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EaseCallDemo.debug.xcconfig"; path = "../EaseCallDemo/Pods/Target Support Files/Pods-EaseCallDemo/Pods-EaseCallDemo.debug.xcconfig"; sourceTree = "<group>"; };
5450
/* End PBXFileReference section */
5551

5652
/* Begin PBXFrameworksBuildPhase section */
5753
907CCB1025DE7ADC009AD53F /* Frameworks */ = {
5854
isa = PBXFrameworksBuildPhase;
5955
buildActionMask = 2147483647;
6056
files = (
61-
4D30261E8736318BB7BC58F4 /* Pods_EaseCallDemo.framework in Frameworks */,
6257
);
6358
runOnlyForDeploymentPostprocessing = 0;
6459
};
6560
/* End PBXFrameworksBuildPhase section */
6661

6762
/* Begin PBXGroup section */
68-
862D18EEE3A54626883F3B4B /* Pods */ = {
69-
isa = PBXGroup;
70-
children = (
71-
9A1BFEAED0E533B70A703537 /* Pods-EaseCallDemo.debug.xcconfig */,
72-
20C5F65DD148A5D7C5F9AD77 /* Pods-EaseCallDemo.release.xcconfig */,
73-
);
74-
name = Pods;
75-
path = ../Pods;
76-
sourceTree = "<group>";
77-
};
7863
902DA81A25DFA92D0098E6DF /* Classes */ = {
7964
isa = PBXGroup;
8065
children = (
@@ -125,7 +110,6 @@
125110
children = (
126111
907CCB1525DE7ADC009AD53F /* EaseCallDemo */,
127112
907CCB1425DE7ADC009AD53F /* Products */,
128-
862D18EEE3A54626883F3B4B /* Pods */,
129113
B9B6DCE0E351CF7916E03507 /* Frameworks */,
130114
);
131115
sourceTree = "<group>";
@@ -157,7 +141,6 @@
157141
B9B6DCE0E351CF7916E03507 /* Frameworks */ = {
158142
isa = PBXGroup;
159143
children = (
160-
4F7A5893A3FCEABE47D0FDFC /* Pods_EaseCallDemo.framework */,
161144
);
162145
name = Frameworks;
163146
sourceTree = "<group>";
@@ -425,7 +408,6 @@
425408
};
426409
907CCB2D25DE7ADF009AD53F /* Debug */ = {
427410
isa = XCBuildConfiguration;
428-
baseConfigurationReference = 9A1BFEAED0E533B70A703537 /* Pods-EaseCallDemo.debug.xcconfig */;
429411
buildSettings = {
430412
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
431413
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -447,7 +429,6 @@
447429
};
448430
907CCB2E25DE7ADF009AD53F /* Release */ = {
449431
isa = XCBuildConfiguration;
450-
baseConfigurationReference = 20C5F65DD148A5D7C5F9AD77 /* Pods-EaseCallDemo.release.xcconfig */;
451432
buildSettings = {
452433
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
453434
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;

‎EaseCallDemo/Podfile.lock‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎EaseCallKit.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'EaseCallKit'
3-
s.version = '3.8.9'
3+
s.version = '3.9.0'
44
s.summary = 'A Ease Call UIKit'
55
s.description = <<-DESC
66
‘‘一套使用环信IM以及声网SDK实现音视频呼叫的UI库，可以实现单人语音、视频呼叫，以及多人音视频通话’’
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
2121
'Classes/EaseCallUIKit.h',
2222
]
2323
s.resources = 'Assets/EaseCall.bundle'
24-
s.dependency 'HyphenateChat'
24+
#s.dependency 'HyphenateChat'
2525
s.dependency 'Masonry'
2626
s.dependency 'AgoraRtcEngine_iOS'
2727
s.dependency 'SDWebImage'

‎cocoapods/.DS_Store‎

-6 KB
Binary file not shown.

0 commit comments

Comments
 (0)