Skip to content

Commit c22de87

Browse files
authored
Merge pull request #11 from lixm1988/main
update
2 parents 3ef1d73 + 0ead22f commit c22de87

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

Classes/Store/EaseCallConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
2222
* nickName 用户头像
2323
*/
2424
@property (nonatomic,strong) NSURL* _Nullable headImage;
25-
+(instancetype)userWithNickName:(NSString*)aNickName image:(NSURL*)aUrl;
25+
+(instancetype)userWithNickName:(NSString* _Nullable)aNickName image:(NSURL* _Nullable)aUrl;
2626
@end
2727

2828
// 增加铃声、标题文本、环信ID与昵称的映射

Classes/View/EaseCallStreamView.m

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,19 @@ - (void)setEnableVideo:(BOOL)enableVideo
102102
- (void)setIsTalking:(BOOL)isTalking
103103
{
104104
if(isTalking != _isTalking) {
105-
if(isTalking) {
106-
_statusView.image = [UIImage imageNamedFromBundle:@"talking_green"];
107-
if(!self.timeTimer)
108-
self.timeTimer = [NSTimer scheduledTimerWithTimeInterval:0.3 target:self selector:@selector(timeTalkingAction:) userInfo:nil repeats:NO];
109-
110-
}else{
111-
if(self.timeTimer) {
112-
[self.timeTimer invalidate];
113-
self.timeTimer = nil;
105+
dispatch_async(dispatch_get_main_queue(), ^{
106+
if(isTalking) {
107+
_statusView.image = [UIImage imageNamedFromBundle:@"talking_green"];
108+
if(!self.timeTimer)
109+
self.timeTimer = [NSTimer scheduledTimerWithTimeInterval:0.3 target:self selector:@selector(timeTalkingAction:) userInfo:nil repeats:NO];
110+
111+
}else{
112+
if(self.timeTimer) {
113+
[self.timeTimer invalidate];
114+
self.timeTimer = nil;
115+
}
114116
}
115-
}
117+
});
116118
}
117119
_isTalking = isTalking;
118120
}

EaseCallKit.podspec

Lines changed: 1 addition & 6 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 = '4.0.0'
3+
s.version = '4.4.0'
44
s.summary = 'A Ease Call UIKit'
55
s.description = <<-DESC
66
‘‘一套使用环信IM以及声网SDK实现音视频呼叫的UI库,可以实现单人语音、视频呼叫,以及多人音视频通话’’
@@ -25,9 +25,4 @@ Pod::Spec.new do |s|
2525
s.dependency 'Masonry'
2626
s.dependency 'AgoraRtcEngine_iOS/RtcBasic', '~>4.1.1'
2727
s.dependency 'SDWebImage'
28-
29-
s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64',
30-
'VALID_ARCHS' => 'arm64 armv7 x86_64','ENABLE_BITCODE' => 'NO'
31-
}
32-
s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64','ENABLE_BITCODE' => 'NO' }
3328
end

0 commit comments

Comments
 (0)