Commit eaf290ea cgx

优化白噪音(无缝播放、KTVHTTPCache)

1 个父辈 93cfbaff
...@@ -2003,9 +2003,9 @@ ...@@ -2003,9 +2003,9 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
D0B5ECB627F2D9E0003EDFE3 /* main.m */, D0B5ECB627F2D9E0003EDFE3 /* main.m */,
D0B5ECAD27F2D9DE003EDFE3 /* Main.storyboard */,
D0B5ECA427F2D9DE003EDFE3 /* AppDelegate.h */, D0B5ECA427F2D9DE003EDFE3 /* AppDelegate.h */,
D0B5ECA527F2D9DE003EDFE3 /* AppDelegate.m */, D0B5ECA527F2D9DE003EDFE3 /* AppDelegate.m */,
D0B5ECAD27F2D9DE003EDFE3 /* Main.storyboard */,
D0930F102801124E006B497A /* BaseNaviController.h */, D0930F102801124E006B497A /* BaseNaviController.h */,
D0930F112801124E006B497A /* BaseNaviController.m */, D0930F112801124E006B497A /* BaseNaviController.m */,
D04B3DA927F6EEB40022F8DF /* DSTabBarController.h */, D04B3DA927F6EEB40022F8DF /* DSTabBarController.h */,
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
// //
#import "DsCacheUtils.h" #import "DsCacheUtils.h"
#import <KTVHTTPCache/KTVHTTPCache.h>
@implementation DsCacheUtils @implementation DsCacheUtils
...@@ -26,11 +27,16 @@ ...@@ -26,11 +27,16 @@
// size = size + [[SDImageCache sharedImageCache] totalDiskSize]; // size = size + [[SDImageCache sharedImageCache] totalDiskSize];
} }
// YYImage缓存
YYImageCache *cache = [YYWebImageManager sharedManager].cache; YYImageCache *cache = [YYWebImageManager sharedManager].cache;
NSInteger discCache = cache.diskCache.totalCost; NSInteger discCache = cache.diskCache.totalCost;
NSInteger memoryCache = cache.memoryCache.totalCost; NSInteger memoryCache = cache.memoryCache.totalCost;
size = size + (discCache + memoryCache); size = size + (discCache + memoryCache);
// 音频缓存
NSInteger audioCacheSize = [KTVHTTPCache cacheTotalCacheLength];
size += audioCacheSize;
if (size < 0) { return @"0.0M"; } if (size < 0) { return @"0.0M"; }
double returnSize = size / 1024.0 / 1024.0; double returnSize = size / 1024.0 / 1024.0;
return [NSString stringWithFormat:@"%.1fM", returnSize]; return [NSString stringWithFormat:@"%.1fM", returnSize];
...@@ -69,6 +75,9 @@ ...@@ -69,6 +75,9 @@
// } // }
// }]; // }];
} }
// 清除音频缓存
[KTVHTTPCache cacheDeleteAllCaches];
} }
@end @end
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "NoisePlayItem.h" #import "NoisePlayItem.h"
#import <KTVHTTPCache/KTVHTTPCache.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
...@@ -15,6 +15,32 @@ ...@@ -15,6 +15,32 @@
@implementation NoisePlayerManager @implementation NoisePlayerManager
SingletonM(NoisePlayerManager) SingletonM(NoisePlayerManager)
- (instancetype)init {
if (self = [super init]) {
[self setupHTTPCache];
}
return self;
}
- (void)setupHTTPCache {
[KTVHTTPCache logSetConsoleLogEnable:NO];
NSError *error = nil;
[KTVHTTPCache proxyStart:&error];
if (error) {
DSLog(@"Proxy Start Failure, %@", error);
} else {
DSLog(@"Proxy Start Success");
}
[KTVHTTPCache encodeSetURLConverter:^NSURL *(NSURL *URL) {
DSLog(@"URL Filter reviced URL : %@", URL);
return URL;
}];
[KTVHTTPCache downloadSetUnacceptableContentTypeDisposer:^BOOL(NSURL *URL, NSString *contentType) {
DSLog(@"Unsupport Content-Type Filter reviced URL : %@, %@", URL, contentType);
return NO;
}];
}
#pragma mark - setter/getter #pragma mark - setter/getter
- (void)setIsPlaying:(BOOL)isPlaying { - (void)setIsPlaying:(BOOL)isPlaying {
_isPlaying = isPlaying; _isPlaying = isPlaying;
...@@ -71,7 +97,9 @@ SingletonM(NoisePlayerManager) ...@@ -71,7 +97,9 @@ SingletonM(NoisePlayerManager)
BOOL isPlaying = NO; BOOL isPlaying = NO;
for (NoisePlayItem *item in self.playItemList) { for (NoisePlayItem *item in self.playItemList) {
// 该状态存在不及时 // 该状态存在不及时
isPlaying = item.isPlaying; if (item.isPlaying) {
isPlaying = YES;
}
[item play]; [item play];
} }
self.isPlaying = isPlaying; self.isPlaying = isPlaying;
......
...@@ -14,6 +14,7 @@ target 'DreamSleep' do ...@@ -14,6 +14,7 @@ target 'DreamSleep' do
pod 'YYModel', '~> 1.0.4' pod 'YYModel', '~> 1.0.4'
pod 'FreeStreamer', '~> 4.0.0' pod 'FreeStreamer', '~> 4.0.0'
pod 'IQKeyboardManager', '~> 6.5.10' pod 'IQKeyboardManager', '~> 6.5.10'
pod 'KTVHTTPCache', '~> 2.0.1'
end end
# AFNetworking (4.0.1) # AFNetworking (4.0.1)
...@@ -31,3 +32,4 @@ end ...@@ -31,3 +32,4 @@ end
# FreeStreamer(4.0.0) # FreeStreamer(4.0.0)
# IQKeyboardManager(6.5.10) # IQKeyboardManager(6.5.10)
# JJException(0.2.12) # JJException(0.2.12)
# KTVHTTPCache(2.0.1)
...@@ -14,6 +14,7 @@ PODS: ...@@ -14,6 +14,7 @@ PODS:
- AFNetworking/Serialization (4.0.1) - AFNetworking/Serialization (4.0.1)
- AFNetworking/UIKit (4.0.1): - AFNetworking/UIKit (4.0.1):
- AFNetworking/NSURLSession - AFNetworking/NSURLSession
- CocoaAsyncSocket (7.6.5)
- DKNightVersion (2.4.3): - DKNightVersion (2.4.3):
- DKNightVersion/Core (= 2.4.3) - DKNightVersion/Core (= 2.4.3)
- DKNightVersion/CoreAnimation (= 2.4.3) - DKNightVersion/CoreAnimation (= 2.4.3)
...@@ -31,6 +32,10 @@ PODS: ...@@ -31,6 +32,10 @@ PODS:
- FreeStreamer (4.0.0): - FreeStreamer (4.0.0):
- Reachability (~> 3.0) - Reachability (~> 3.0)
- IQKeyboardManager (6.5.10) - IQKeyboardManager (6.5.10)
- KTVCocoaHTTPServer (1.0.0):
- CocoaAsyncSocket
- KTVHTTPCache (2.0.1):
- KTVCocoaHTTPServer
- lottie-ios (2.5.3) - lottie-ios (2.5.3)
- Masonry (1.1.0) - Masonry (1.1.0)
- MBProgressHUD (1.2.0) - MBProgressHUD (1.2.0)
...@@ -53,6 +58,7 @@ DEPENDENCIES: ...@@ -53,6 +58,7 @@ DEPENDENCIES:
- DOUAudioStreamer (~> 0.2.16) - DOUAudioStreamer (~> 0.2.16)
- FreeStreamer (~> 4.0.0) - FreeStreamer (~> 4.0.0)
- IQKeyboardManager (~> 6.5.10) - IQKeyboardManager (~> 6.5.10)
- KTVHTTPCache (~> 2.0.1)
- lottie-ios (~> 2.5.3) - lottie-ios (~> 2.5.3)
- Masonry (~> 1.1.0) - Masonry (~> 1.1.0)
- MBProgressHUD (~> 1.2.0) - MBProgressHUD (~> 1.2.0)
...@@ -64,10 +70,13 @@ DEPENDENCIES: ...@@ -64,10 +70,13 @@ DEPENDENCIES:
SPEC REPOS: SPEC REPOS:
trunk: trunk:
- AFNetworking - AFNetworking
- CocoaAsyncSocket
- DKNightVersion - DKNightVersion
- DOUAudioStreamer - DOUAudioStreamer
- FreeStreamer - FreeStreamer
- IQKeyboardManager - IQKeyboardManager
- KTVCocoaHTTPServer
- KTVHTTPCache
- lottie-ios - lottie-ios
- Masonry - Masonry
- MBProgressHUD - MBProgressHUD
...@@ -80,10 +89,13 @@ SPEC REPOS: ...@@ -80,10 +89,13 @@ SPEC REPOS:
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DKNightVersion: eaa80cc4014b4bae7d4b535fd87ecc6a3c2767b3 DKNightVersion: eaa80cc4014b4bae7d4b535fd87ecc6a3c2767b3
DOUAudioStreamer: c503ba2ecb9a54ff7bda0eff66963ad224f3c7dc DOUAudioStreamer: c503ba2ecb9a54ff7bda0eff66963ad224f3c7dc
FreeStreamer: 7e9c976045701ac2f7e9c14c17245203c37bf2ea FreeStreamer: 7e9c976045701ac2f7e9c14c17245203c37bf2ea
IQKeyboardManager: 45a1fa55c1a5b02c61ac0fd7fd5b62bb4ad20d97 IQKeyboardManager: 45a1fa55c1a5b02c61ac0fd7fd5b62bb4ad20d97
KTVCocoaHTTPServer: df8d7b861e603ff8037e9b2138aca2563a6b768d
KTVHTTPCache: 588c3eb16f6bd1e6fde1e230dabfb7bd4e490a4d
lottie-ios: a50d5c0160425cd4b01b852bb9578963e6d92d31 lottie-ios: a50d5c0160425cd4b01b852bb9578963e6d92d31
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
...@@ -94,6 +106,6 @@ SPEC CHECKSUMS: ...@@ -94,6 +106,6 @@ SPEC CHECKSUMS:
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30 YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928 YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928
PODFILE CHECKSUM: e4359ec13a52ba4e49c7d0c1466b596eceaf7b77 PODFILE CHECKSUM: b808024d124d43764129a7c9916691de21d3b921
COCOAPODS: 1.11.3 COCOAPODS: 1.11.3
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!