Commit cfbe931c767e31a3bf2f95eda0418fa5510afd0a

Authored by zhangxiaowen
1 parent 691a6f3a

no message

CNLiveScioLive.xcodeproj/project.pbxproj
@@ -3635,6 +3635,7 @@ @@ -3635,6 +3635,7 @@
3635 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 3635 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
3636 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; 3636 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
3637 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3637 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
  3638 + CODE_SIGN_IDENTITY = "Apple Development";
3638 CODE_SIGN_STYLE = Automatic; 3639 CODE_SIGN_STYLE = Automatic;
3639 DEVELOPMENT_TEAM = 94X49GG3ZW; 3640 DEVELOPMENT_TEAM = 94X49GG3ZW;
3640 ENABLE_BITCODE = NO; 3641 ENABLE_BITCODE = NO;
@@ -3672,6 +3673,7 @@ @@ -3672,6 +3673,7 @@
3672 ); 3673 );
3673 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1; 3674 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3674 PRODUCT_NAME = "$(TARGET_NAME)"; 3675 PRODUCT_NAME = "$(TARGET_NAME)";
  3676 + PROVISIONING_PROFILE_SPECIFIER = "";
3675 TARGETED_DEVICE_FAMILY = 1; 3677 TARGETED_DEVICE_FAMILY = 1;
3676 }; 3678 };
3677 name = Debug; 3679 name = Debug;
@@ -3683,6 +3685,7 @@ @@ -3683,6 +3685,7 @@
3683 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 3685 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
3684 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; 3686 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
3685 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3687 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
  3688 + CODE_SIGN_IDENTITY = "Apple Development";
3686 CODE_SIGN_STYLE = Automatic; 3689 CODE_SIGN_STYLE = Automatic;
3687 DEVELOPMENT_TEAM = 94X49GG3ZW; 3690 DEVELOPMENT_TEAM = 94X49GG3ZW;
3688 ENABLE_BITCODE = NO; 3691 ENABLE_BITCODE = NO;
@@ -3720,6 +3723,7 @@ @@ -3720,6 +3723,7 @@
3720 ); 3723 );
3721 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1; 3724 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3722 PRODUCT_NAME = "$(TARGET_NAME)"; 3725 PRODUCT_NAME = "$(TARGET_NAME)";
  3726 + PROVISIONING_PROFILE_SPECIFIER = "";
3723 TARGETED_DEVICE_FAMILY = 1; 3727 TARGETED_DEVICE_FAMILY = 1;
3724 }; 3728 };
3725 name = Release; 3729 name = Release;
CNLiveScioLive/Pages/Base/CNLiveENTabBarController.m
@@ -151,9 +151,8 @@ @@ -151,9 +151,8 @@
151 pulse.autoreverses= YES; 151 pulse.autoreverses= YES;
152 pulse.fromValue= [NSNumber numberWithFloat:0.7]; 152 pulse.fromValue= [NSNumber numberWithFloat:0.7];
153 pulse.toValue= [NSNumber numberWithFloat:1.3]; 153 pulse.toValue= [NSNumber numberWithFloat:1.3];
154 - [[tabbarbuttonArray[index] layer]  
155 - addAnimation:pulse forKey:nil];  
156 - 154 + UIView *tabBarButton = tabbarbuttonArray[index];
  155 + [[tabBarButton layer] addAnimation:pulse forKey:nil];
157 _indexFlag = index; 156 _indexFlag = index;
158 157
159 } 158 }
CNLiveScioLive/Pages/Base/CNLiveTabBarController.m
@@ -163,9 +163,8 @@ @@ -163,9 +163,8 @@
163 pulse.autoreverses= YES; 163 pulse.autoreverses= YES;
164 pulse.fromValue= [NSNumber numberWithFloat:0.9]; 164 pulse.fromValue= [NSNumber numberWithFloat:0.9];
165 pulse.toValue= [NSNumber numberWithFloat:1.1]; 165 pulse.toValue= [NSNumber numberWithFloat:1.1];
166 - [[tabbarbuttonArray[index] layer]  
167 - addAnimation:pulse forKey:nil];  
168 - 166 + UIView *tabBarButton = tabbarbuttonArray[index];
  167 + [[tabBarButton layer] addAnimation:pulse forKey:nil];
169 _indexFlag = index; 168 _indexFlag = index;
170 169
171 } 170 }
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/JGMusicManager.m
@@ -127,18 +127,35 @@ @@ -127,18 +127,35 @@
127 127
128 // 播放, 暂停, 上下曲的命令默认都是启用状态, 即enabled默认为YES 128 // 播放, 暂停, 上下曲的命令默认都是启用状态, 即enabled默认为YES
129 // 播放 129 // 播放
130 - [commandCenter.playCommand addTarget:self action:@selector(playAction:)]; 130 + @try {
  131 +
  132 + //问题代码
  133 +
  134 + [commandCenter.playCommand addTarget:self action:@selector(playAction:)];//playAction:)
131 // 暂停 135 // 暂停
132 - [commandCenter.pauseCommand addTarget:self action:@selector(pauseAction:)];  
133 - // 上一曲  
134 - [commandCenter.previousTrackCommand addTarget:self action:@selector(previousTrackAction:)];  
135 - // 下一曲  
136 - [commandCenter.nextTrackCommand addTarget:self action:@selector(nextTrackAction:)]; 136 + [commandCenter.pauseCommand addTarget:self action:@selector(pauseAction:)];
  137 +
  138 + // 上一曲
  139 + [commandCenter.previousTrackCommand addTarget:self action:@selector(previousTrackAction:)];
  140 + // 下一曲
  141 + [commandCenter.nextTrackCommand addTarget:self action:@selector(nextTrackAction:)];
  142 +
  143 + // 启用耳机的播放/暂停命令 (耳机上的播放按钮触发的命令)
  144 + commandCenter.togglePlayPauseCommand.enabled = YES;
  145 + // 为耳机的按钮操作添加相关的响应事件
  146 + [commandCenter.togglePlayPauseCommand addTarget:self action:@selector(playOrPauseAction:)];
  147 + }
  148 +
  149 + @catch (NSException *exception) {
  150 +
  151 + NSLog(@"exception = %@", exception);
  152 +
  153 + }
  154 +
  155 + @finally {
  156 +
  157 + }
137 158
138 - // 启用耳机的播放/暂停命令 (耳机上的播放按钮触发的命令)  
139 - commandCenter.togglePlayPauseCommand.enabled = YES;  
140 - // 为耳机的按钮操作添加相关的响应事件  
141 - [commandCenter.togglePlayPauseCommand addTarget:self action:@selector(playOrPauseAction:)];  
142 } 159 }
143 160
144 - (void)playAction:(MPRemoteCommandCenter *)sender { 161 - (void)playAction:(MPRemoteCommandCenter *)sender {