Explorar el Código

Merge branch 'psDev'

wenweiwei hace 3 años
padre
commit
3b97852357

+ 1 - 0
Introduce/Record/INPhotoVideosController.swift

@@ -11,6 +11,7 @@ import BFUIKit
 import BFMaterialKit
 import BFRecordScreenKit
 import Photos
+import BFCommonKit
 
 class INPhotoVideosController: BFBaseViewController {
     var chosedAsset:[PHAsset]?

+ 0 - 1
Introduce/Record/INRecorderController.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 import BFUIKit
-import BFFramework
 import BFRecordScreenKit
 import BFMaterialKit
 

+ 40 - 14
Podfile

@@ -7,24 +7,50 @@ source 'https://github.com/CocoaPods/Specs.git'
 source 'https://git.yishihui.com/iOS/BFSpecs.git'
 
 target 'Introduce' do
-#  pod 'BFMaterialKit',         :path => '../BFMaterialKit/'
+## Pods-for-AppStore
+#  pod 'BFCommonKit',           '1.4.9'
+#  pod 'BFNetRequestKit',       '0.2.3'
+#  pod 'BFUIKit',               '0.1.1'
+#  pod 'BFMaterialKit',         '0.1.6'
+#  pod 'BFLogger',              '0.1.0'
+#  pod 'BFMediaKit',            '0.1.0'
+#  pod 'BFRecordScreenKit',     '0.1.0'
+
+## Pods-for-Archive(Jenkins)
+  pod 'BFCommonKit',           :git => 'https://git.yishihui.com/iOS/BFCommonKit.git'
+  pod 'BFNetRequestKit',       :git => 'https://git.yishihui.com/iOS/BFNetRequestKit.git'
+  pod 'BFUIKit',               :git => 'https://git.yishihui.com/iOS/BFUIKit.git'
+  pod 'BFMaterialKit',         :git => 'https://git.yishihui.com/iOS/BFMaterialKit.git'
+  pod 'BFLogger',              :git => 'https://git.yishihui.com/iOS/BFLogger.git'
+  pod 'BFMediaKit',            :git => 'https://git.yishihui.com/iOS/BFMediaKit.git'
+  pod 'BFRecordScreenKit',     :git => 'https://git.yishihui.com/iOS/BFRecordScreenKit.git'
+
+## ak:Pods-for-testing
+#  pod 'BFCommonKit',           :path => '/Users/ak/Desktop/TZFrameworks/BFCommonKit/'
+#  pod 'BFNetRequestKit',       :path => '/Users/ak/Desktop/TZFrameworks/BFNetRequestKit/'
+#  pod 'BFUIKit',               :path => '/Users/ak/Desktop/TZFrameworks/BFUIKit/'
+#  pod 'BFMaterialKit',         :path => '/Users/ak/Desktop/TZFrameworks/BFMaterialKit/'
+#  pod 'BFLogger',              :path => '/Users/ak/Desktop/TZFrameworks/BFLogger/'
+#  pod 'BFMediaKit',            :path => '/Users/ak/Desktop/TZFrameworks/BFMediaKit/'
+#  pod 'BFRecordScreenKit',     :path => '/Users/ak/Desktop/TZFrameworks/BFRecordScreenKit/'
+
+## zq:Pods-for-testing
 #  pod 'BFCommonKit',           :path => '../BFCommonKit/'
 #  pod 'BFNetRequestKit',       :path => '../BFNetRequestKit/'
-#  pod 'BFFramework',           :path => '../BFFramework/'
 #  pod 'BFUIKit',               :path => '../BFUIKit/'
-#  pod 'BFVideoEditKit',        :path => '../BFVideoEditKit/'
-#  pod 'BFAliyunNlsSDK-Swift',  :path => '../BFAliyunNlsSDK-Swift/'
-#  pod 'BFRecordScreenKit',     :path => '../BFRecordScreenKit'
-
-  pod "BFFramework",          :git => 'https://git.yishihui.com/iOS/BFFramework.git'
-  pod "BFMaterialKit",        :git => 'https://git.yishihui.com/iOS/BFMaterialKit.git'
-  pod "BFCommonKit",          :git => 'https://git.yishihui.com/iOS/BFCommonKit.git'
-  pod "BFNetRequestKit",      :git => 'https://git.yishihui.com/iOS/BFNetRequestKit.git'
-  pod "BFUIKit",              :git => 'https://git.yishihui.com/iOS/BFUIKit.git'
-  pod "BFAliyunNlsSDK-Swift", :git => 'https://git.yishihui.com/iOS/BFAliyunNlsSDK-Swift.git'
-  pod "BFVideoEditKit",       :git => 'https://git.yishihui.com/iOS/BFVideoEditKit.git'
-  pod "BFRecordScreenKit",    :git => 'https://git.yishihui.com/iOS/BFRecordScreenKit.git'
+#  pod 'BFMaterialKit',         :path => '../BFMaterialKit/'
+#  pod 'BFLogger',              :path => '../BFLogger/'
+#  pod 'BFMediaKit',            :path => '../BFMediaKit/'
+#  pod 'BFRecordScreenKit',     :path => '../BFRecordScreenKit/'
 
+## ww:Pods-for-testing
+#  pod 'BFCommonKit',            :path => '../../BFCommonKit/Trunk'
+#  pod 'BFNetRequestKit',        :path => '../../BFNetRequestKit/Trunk'
+#  pod 'BFUIKit',                :path => '../../BFUIKit/Trunk'
+#  pod 'BFMaterialKit',          :path => '../../BFMaterialKit/Trunk'
+#  pod 'BFLogger',               :path => '../../BFLogger/Trunk'
+#  pod 'BFMediaKit',             :path => '../../BFMediaKit/Trunk'
+#  pod 'BFRecordScreenKit',      :path => '../../BFRecordScreenKit/Trunk'
 
   
   post_install do |installer|