Skip to content

Commit e5ae3bd

Browse files
committed
修复预加载delegate未回调的问题
1 parent c92cfe4 commit e5ae3bd

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

SJMediaCacheServer.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'SJMediaCacheServer'
11-
s.version = '2.0.2'
11+
s.version = '2.0.3'
1212
s.summary = <<-DESC
1313
SJMediaCacheServer 是一个高效的 HTTP 媒体缓存框架,旨在代理媒体数据请求并优先提供缓存数据,从而减少网络流量并增强播放的流畅性。该框架支持两种类型的远程资源:基于文件的媒体,如 MP3、AAC、WAV、FLAC、OGG、MP4 和 MOV 等常见格式,以及 HLS(HTTP Live Streaming)流。它会自动解析 HLS 播放列表并代理各个媒体片段。
1414
DESC

SJMediaCacheServer/Core/Prefetch/FILEPrefetcher.m

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ @interface FILEPrefetcher () <MCSAssetReaderDelegate> {
3838
@end
3939

4040
@implementation FILEPrefetcher
41-
@synthesize delegate = _delegate;
4241

4342
- (instancetype)initWithURL:(NSURL *)URL prefetchSize:(NSUInteger)bytes delegate:(nullable id<MCSPrefetcherDelegate>)delegate {
4443
NSParameterAssert(bytes != 0);
@@ -89,7 +88,7 @@ - (void)prepare {
8988

9089
FILEAsset *asset = [MCSAssetManager.shared assetWithURL:mURL];
9190
if ( asset == nil || ![asset isKindOfClass:FILEAsset.class] ) {
92-
[_delegate prefetcher:self didCompleteWithError:[NSError mcs_errorWithCode:MCSAbortError userInfo:@{
91+
[mDelegate prefetcher:self didCompleteWithError:[NSError mcs_errorWithCode:MCSAbortError userInfo:@{
9392
MCSErrorUserInfoObjectKey : self,
9493
MCSErrorUserInfoReasonKey : [NSString stringWithFormat:@"无效的预加载请求: URL=%@", mURL]
9594
}]];
@@ -98,7 +97,7 @@ - (void)prepare {
9897

9998
if ( asset.isStored ) {
10099
mProgress = 1;
101-
[_delegate prefetcher:self didCompleteWithError:nil];
100+
[mDelegate prefetcher:self didCompleteWithError:nil];
102101
return;
103102
}
104103

@@ -172,9 +171,7 @@ - (void)reader:(nonnull id<MCSAssetReader>)reader hasAvailableDataWithLength:(NS
172171

173172
MCSPrefetcherDebugLog(@"%@: <%p>.prefetch { prefetchSize: %lu, total: %lu, progress: %f };\n", NSStringFromClass(self.class), self, (unsigned long)mPrefetchSize, (unsigned long)reader.response.totalLength, progress);
174173

175-
if ( _delegate != nil ) {
176-
[_delegate prefetcher:self progressDidChange:progress];
177-
}
174+
[mDelegate prefetcher:self progressDidChange:progress];
178175

179176
if ( mCurReader.status == MCSReaderStatusFinished ) {
180177
[self _readDidFinish:reader];

0 commit comments

Comments
 (0)