处理升级11.3出现的警告 & Update Pods

changsanjiang · Apr 2, 2018 · a5e43c7 · a5e43c7
1 parent 0e8a126
commit a5e43c7
Show file tree

Hide file tree

Showing 31 changed files with 278 additions and 441 deletions.
diff --git a/SJVideoPlayer.podspec b/SJVideoPlayer.podspec
@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
 s.name         = 'SJVideoPlayer'
-s.version      = '2.0.4.5'
+s.version      = '2.0.4.4'
 s.summary      = 'video player.'
 s.description  = 'https://github.com/changsanjiang/SJVideoPlayer/blob/master/README.md'
 s.homepage     = 'https://github.com/changsanjiang/SJVideoPlayer'

diff --git a/SJVideoPlayer/ControlView/SJVideoPlayerFilmEditingRecordView.m b/SJVideoPlayer/ControlView/SJVideoPlayerFilmEditingRecordView.m
@@ -99,10 +99,10 @@ - (void)countDownRefresh:(NSTimer *)timer {
     }
     ++_currentTime;
 
-    NSInteger seconds, minutes;
+    int seconds, minutes;
     minutes = (_currentTime) / 60;
     seconds = _currentTime % 60;
-    _progressLabel.text = [NSString stringWithFormat:@"%02zd:%02zd/02:00", minutes, seconds];
+    _progressLabel.text = [NSString stringWithFormat:@"%02d:%02d/02:00", minutes, seconds];
     _progressSlider.value = _currentTime * 1.0f / _time;
 
     if ( _currentTime == 3 ) {

diff --git a/SJVideoPlayerProject/.DS_Store b/SJVideoPlayerProject/.DS_Store
diff --git a/SJVideoPlayerProject/Podfile.lock b/SJVideoPlayerProject/Podfile.lock
@@ -2,17 +2,17 @@ PODS:
   - Masonry (1.1.0)
   - Reachability (3.2)
   - SJAttributesFactory (2.0.2)
-  - SJBaseVideoPlayer (1.0.6.3):
+  - SJBaseVideoPlayer (1.0.7):
     - Masonry
     - Reachability
-    - SJBaseVideoPlayer/Category (= 1.0.6.3)
-    - SJBaseVideoPlayer/Download (= 1.0.6.3)
-    - SJBaseVideoPlayer/GestureControl (= 1.0.6.3)
-    - SJBaseVideoPlayer/Header (= 1.0.6.3)
-    - SJBaseVideoPlayer/Model (= 1.0.6.3)
-    - SJBaseVideoPlayer/Present (= 1.0.6.3)
-    - SJBaseVideoPlayer/Registrar (= 1.0.6.3)
-    - SJBaseVideoPlayer/TimerControl (= 1.0.6.3)
+    - SJBaseVideoPlayer/Category (= 1.0.7)
+    - SJBaseVideoPlayer/Download (= 1.0.7)
+    - SJBaseVideoPlayer/GestureControl (= 1.0.7)
+    - SJBaseVideoPlayer/Header (= 1.0.7)
+    - SJBaseVideoPlayer/Model (= 1.0.7)
+    - SJBaseVideoPlayer/Present (= 1.0.7)
+    - SJBaseVideoPlayer/Registrar (= 1.0.7)
+    - SJBaseVideoPlayer/TimerControl (= 1.0.7)
     - SJBorderLineView
     - SJFullscreenPopGesture
     - SJObserverHelper
@@ -21,7 +21,7 @@ PODS:
     - SJUIFactory
     - SJVideoPlayerAssetCarrier
     - SJVolBrigControl
-  - SJBaseVideoPlayer/Category (1.0.6.3):
+  - SJBaseVideoPlayer/Category (1.0.7):
     - Masonry
     - Reachability
     - SJBorderLineView
@@ -32,7 +32,7 @@ PODS:
     - SJUIFactory
     - SJVideoPlayerAssetCarrier
     - SJVolBrigControl
-  - SJBaseVideoPlayer/Download (1.0.6.3):
+  - SJBaseVideoPlayer/Download (1.0.7):
     - Masonry
     - Reachability
     - SJBorderLineView
@@ -43,7 +43,7 @@ PODS:
     - SJUIFactory
     - SJVideoPlayerAssetCarrier
     - SJVolBrigControl
-  - SJBaseVideoPlayer/GestureControl (1.0.6.3):
+  - SJBaseVideoPlayer/GestureControl (1.0.7):
     - Masonry
     - Reachability
     - SJBorderLineView
@@ -54,7 +54,7 @@ PODS:
     - SJUIFactory
     - SJVideoPlayerAssetCarrier
     - SJVolBrigControl
-  - SJBaseVideoPlayer/Header (1.0.6.3):
+  - SJBaseVideoPlayer/Header (1.0.7):
     - Masonry
     - Reachability
     - SJBorderLineView
@@ -65,7 +65,7 @@ PODS:
     - SJUIFactory
     - SJVideoPlayerAssetCarrier
     - SJVolBrigControl
-  - SJBaseVideoPlayer/Model (1.0.6.3):
+  - SJBaseVideoPlayer/Model (1.0.7):
     - Masonry
     - Reachability
     - SJBorderLineView
@@ -76,7 +76,7 @@ PODS:
     - SJUIFactory
     - SJVideoPlayerAssetCarrier
     - SJVolBrigControl
-  - SJBaseVideoPlayer/Present (1.0.6.3):
+  - SJBaseVideoPlayer/Present (1.0.7):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
@@ -88,7 +88,7 @@ PODS:
     - SJUIFactory
     - SJVideoPlayerAssetCarrier
     - SJVolBrigControl
-  - SJBaseVideoPlayer/Registrar (1.0.6.3):
+  - SJBaseVideoPlayer/Registrar (1.0.7):
     - Masonry
     - Reachability
     - SJBorderLineView
@@ -99,7 +99,7 @@ PODS:
     - SJUIFactory
     - SJVideoPlayerAssetCarrier
     - SJVolBrigControl
-  - SJBaseVideoPlayer/TimerControl (1.0.6.3):
+  - SJBaseVideoPlayer/TimerControl (1.0.7):
     - Masonry
     - Reachability
     - SJBorderLineView
@@ -130,7 +130,7 @@ PODS:
   - SJUIFactory (0.0.15):
     - SJUIFactory/Category (= 0.0.15)
   - SJUIFactory/Category (0.0.15)
-  - SJVideoPlayerAssetCarrier (1.1.1):
+  - SJVideoPlayerAssetCarrier (1.1.1.1):
     - SJObserverHelper
   - SJVolBrigControl (1.0.0):
     - Masonry
@@ -182,7 +182,7 @@ SPEC CHECKSUMS:
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SJAttributesFactory: 01f680bab9e318b0bd11ddff58155a2c7475f2c3
-  SJBaseVideoPlayer: 8b45bf3c40033a42d19ed833435cf0ba5d3d43b3
+  SJBaseVideoPlayer: b78824dfbab2ed747f93ccca72e59e09a1e1d754
   SJBorderLineView: 5878e67fb57e812a2d5d029ca666068784b5448a
   SJFullscreenPopGesture: f16c9f31a32aa741d6f79d56952572bdd07860b8
   SJLoadingView: c3ff03e4b363a5b6a3ba0634d6bb9ce2647faf07
@@ -192,7 +192,7 @@ SPEC CHECKSUMS:
   SJScrollEntriesView: 6ad0595721a7152d9c3542ae5f6e1a27dec0f9b4
   SJSlider: 6f82b519e918c4933f834a7badf1603c1b4fc224
   SJUIFactory: 36f08c8bef27b2f6f123f7c3df1c1aeb1b750742
-  SJVideoPlayerAssetCarrier: ff894febfce17401dee8fe9ec0e5107d615eef4c
+  SJVideoPlayerAssetCarrier: bfaf9ba9bf121305637da96723d4b4641cd9702f
   SJVolBrigControl: dd639d187bf139b42d795e014edf372501352ea8
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
 

diff --git a/SJVideoPlayerProject/Pods/Manifest.lock b/SJVideoPlayerProject/Pods/Manifest.lock