Commit c56ed89f92b5987be8c7cf304e78a5505f6d04cb
1 parent
4cf35888
no message
Showing
4 changed files
with
6 additions
and
6 deletions
CNLiveVideoClassifyKit.podspec
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | 8 | ||
| 9 | Pod::Spec.new do |s| | 9 | Pod::Spec.new do |s| |
| 10 | s.name = 'CNLiveVideoClassifyKit' | 10 | s.name = 'CNLiveVideoClassifyKit' |
| 11 | - s.version = '0.0.3' | 11 | + s.version = '0.0.4' |
| 12 | s.summary = '视讯头部一二级菜单组件' | 12 | s.summary = '视讯头部一二级菜单组件' |
| 13 | 13 | ||
| 14 | # This description is used to generate tags and improve search results. | 14 | # This description is used to generate tags and improve search results. |
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
| @@ -139,7 +139,7 @@ | @@ -139,7 +139,7 @@ | ||
| 139 | [self.playingImgV addSubview:self.playTipImgV]; | 139 | [self.playingImgV addSubview:self.playTipImgV]; |
| 140 | [self.progressView addSubview:self.playingBtn]; | 140 | [self.progressView addSubview:self.playingBtn]; |
| 141 | YYCache * yyCache = [YYCache cacheWithName:[NSString stringWithFormat:@"CNLastPlayedAudio_%@",CNUserShareModel.uid]]; | 141 | YYCache * yyCache = [YYCache cacheWithName:[NSString stringWithFormat:@"CNLastPlayedAudio_%@",CNUserShareModel.uid]]; |
| 142 | - CNLiveAlbumAudioListModel *model = (CNLiveAlbumAudioListModel *)[yyCache objectForKey:[NSString stringWithFormat:@"%@_%@",wjjLastAudioInfoSaveKey,CNUserShareModel.uid]]; | 142 | + CNLiveAlbumAudioListModelModule *model = (CNLiveAlbumAudioListModelModule *)[yyCache objectForKey:[NSString stringWithFormat:@"%@_%@",wjjLastAudioInfoSaveKey,CNUserShareModel.uid]]; |
| 143 | if (model) { | 143 | if (model) { |
| 144 | if (model && !CNLiveStringIsEmpty(model.activityId)) { | 144 | if (model && !CNLiveStringIsEmpty(model.activityId)) { |
| 145 | self.playingBtn.userInteractionEnabled = YES; | 145 | self.playingBtn.userInteractionEnabled = YES; |
| @@ -232,7 +232,7 @@ | @@ -232,7 +232,7 @@ | ||
| 232 | // 通知方法 切换音乐时的显示 | 232 | // 通知方法 切换音乐时的显示 |
| 233 | - (void)audioPlayUpdateInfo:(NSNotification *)notifi { | 233 | - (void)audioPlayUpdateInfo:(NSNotification *)notifi { |
| 234 | 234 | ||
| 235 | - CNLiveAlbumAudioListModel *model = notifi.object; | 235 | + CNLiveAlbumAudioListModelModule *model = notifi.object; |
| 236 | if (model && !CNLiveStringIsEmpty(model.activityId)) { | 236 | if (model && !CNLiveStringIsEmpty(model.activityId)) { |
| 237 | self.playingBtn.userInteractionEnabled = YES; | 237 | self.playingBtn.userInteractionEnabled = YES; |
| 238 | self.progressView.hidden = NO; | 238 | self.progressView.hidden = NO; |
| @@ -448,7 +448,7 @@ | @@ -448,7 +448,7 @@ | ||
| 448 | - (void)playingAction:(UIButton *)sender { | 448 | - (void)playingAction:(UIButton *)sender { |
| 449 | 449 | ||
| 450 | YYCache * yyCache = [YYCache cacheWithName:[NSString stringWithFormat:@"CNLastPlayedAudio_%@",CNUserShareModel.uid]]; | 450 | YYCache * yyCache = [YYCache cacheWithName:[NSString stringWithFormat:@"CNLastPlayedAudio_%@",CNUserShareModel.uid]]; |
| 451 | - CNLiveAlbumAudioListModel *model = (CNLiveAlbumAudioListModel *)[yyCache objectForKey:[NSString stringWithFormat:@"%@_%@",wjjLastAudioInfoSaveKey,CNUserShareModel.uid]]; | 451 | + CNLiveAlbumAudioListModelModule *model = (CNLiveAlbumAudioListModelModule *)[yyCache objectForKey:[NSString stringWithFormat:@"%@_%@",wjjLastAudioInfoSaveKey,CNUserShareModel.uid]]; |
| 452 | if (model && model.activityId) { | 452 | if (model && model.activityId) { |
| 453 | [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushAudioPlayerVC]; | 453 | [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushAudioPlayerVC]; |
| 454 | } | 454 | } |
CNLiveVideoClassifyKit/Classes/Model/CNCategoryGetChannelModel.h
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | 51 | ||
| 52 | @end | 52 | @end |
| 53 | 53 | ||
| 54 | -@interface CNLiveAlbumAudioListModel : NSObject<NSCoding> | 54 | +@interface CNLiveAlbumAudioListModelModule : NSObject<NSCoding> |
| 55 | @property (nonatomic, copy) NSString *activityId; //活动ID | 55 | @property (nonatomic, copy) NSString *activityId; //活动ID |
| 56 | @property (nonatomic, copy) NSString *cmccActiveId;//音响播放id | 56 | @property (nonatomic, copy) NSString *cmccActiveId;//音响播放id |
| 57 | @property (nonatomic, copy) NSString *title; //标题名称 | 57 | @property (nonatomic, copy) NSString *title; //标题名称 |