瀏覽代碼

版本升级维护

yyqxiaoyin 6 年之前
父節點
當前提交
1c6539eae7

+ 15 - 0
MKRRadioManager/Classes/MKRRadioManager/MKRAVPlayer/MKRAVPlayer.m

@@ -343,6 +343,19 @@ NSURL * MKRUrlWithString(NSString *string){
     }];
 }
 
+- (BOOL)isPlaying
+{
+    if (!isFloatZero(_player.rate)) {
+        return YES;
+    } else {
+        if (_isSeeking) {
+            return YES;
+        } else {
+            return NO;
+        }
+    }
+}
+
 - (void)setRate:(float)rate{
     _rate = rate;
     if (_player != nil && !isFloatZero(_player.rate)) {
@@ -376,6 +389,8 @@ NSURL * MKRUrlWithString(NSString *string){
     }
     _currentStatus.totalTime = self.totalTime;
     _currentStatus.currentTime = self.currentTime;
+    _currentStatus.isPlaying = [self isPlaying];
+    _currentStatus.playState = (MKRResourcePlayState)self.state;
     return _currentStatus;
 }
 

+ 19 - 0
MKRRadioManager/Classes/MKRRadioManager/MKRAVPlayer/MKRPlayResourceStatus.h

@@ -7,8 +7,27 @@
 
 #import <Foundation/Foundation.h>
 
+typedef NS_ENUM(NSUInteger, MKRResourcePlayState) {
+    MKRResourcePlayStateBuffering = 0,
+    MKRResourcePlayStatePlaying,
+    MKRResourcePlayStatePause,
+    MKRResourcePlayStateStopped,
+    MKRResourcePlayStateFinished,
+    MKRResourcePlayStateFaild,
+};
+
 @interface MKRPlayResourceStatus : NSObject
 
+/**
+ 当前播放状态
+ */
+@property (nonatomic, assign) MKRResourcePlayState playState;
+
+/**
+ 是否正在播放中
+ */
+@property (nonatomic, assign) BOOL isPlaying;
+
 /*
  * 当前播放秒数
  * */

+ 3 - 3
MKRRadioManager/Classes/MKRRadioManager/MKRAVPlayer/MKRPlayResourceStatus.m

@@ -15,8 +15,8 @@
     }
     int seconds = self.currentTime % 60;
     int minutes = (self.currentTime / 60) % 60;
-    int hours = self.currentTime / 3600;
-    if (hours){
+    int hours = (int)self.currentTime / 3600;
+    if (!hours){
         return [NSString stringWithFormat:@"%02d:%02d",minutes,seconds];
     } else{
         return [NSString stringWithFormat:@"%02d:%02d:%02d",hours,minutes,seconds];
@@ -29,7 +29,7 @@
     }
     int seconds = self.totalTime % 60;
     int minutes = (self.totalTime / 60) % 60;
-    int hours = self.totalTime / 3600;
+    int hours = (int)self.totalTime / 3600;
     if (!hours){
         return [NSString stringWithFormat:@"%02d:%02d",minutes,seconds];
     } else{

+ 10 - 10
fastlane/report.xml

@@ -5,52 +5,52 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: cocoapods" time="7.590527">
+      <testcase classname="fastlane.lanes" name="0: cocoapods" time="2.956327">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: git_add" time="0.025885">
+      <testcase classname="fastlane.lanes" name="1: git_add" time="0.030959">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: git_commit" time="0.051356">
+      <testcase classname="fastlane.lanes" name="2: git_commit" time="0.052781">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: push_to_git_remote" time="0.935735">
+      <testcase classname="fastlane.lanes" name="3: push_to_git_remote" time="1.056062">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: git_tag_exists" time="0.009337">
+      <testcase classname="fastlane.lanes" name="4: git_tag_exists" time="0.011175">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="5: remove_tag" time="0.78973">
+      <testcase classname="fastlane.lanes" name="5: remove_tag" time="0.834213">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="6: add_git_tag" time="0.015317">
+      <testcase classname="fastlane.lanes" name="6: add_git_tag" time="0.027332">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="7: push_git_tags" time="0.844">
+      <testcase classname="fastlane.lanes" name="7: push_git_tags" time="0.863355">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="8: pod_lib_lint" time="10.942697">
+      <testcase classname="fastlane.lanes" name="8: pod_lib_lint" time="11.667441">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="9: pod_push" time="9.649246">
+      <testcase classname="fastlane.lanes" name="9: pod_push" time="9.005332">
         
       </testcase>