Bladeren bron

mediaPick && AliyunSDK接入

Chris 5 jaren geleden
bovenliggende
commit
d3742713e6

+ 8 - 0
RainbowPlanet/Podfile

@@ -78,4 +78,12 @@ target 'RainbowPlanet' do
   pod 'BMKLocationKit', '1.5.0'
   # 百度地图SDK
   pod 'BaiduMapKit'
+  
+  #=====================AliyunVideoSDK===========
+  pod 'AliyunVideoSDKStd'
+  pod 'QuCore-ThirdParty'
+  pod 'VODUpload'
+  pod 'AliyunOSSiOS'
+  pod 'AlivcConan'
+  
 end

+ 24 - 1
RainbowPlanet/Podfile.lock

@@ -1,5 +1,10 @@
 PODS:
   - Alamofire (4.8.2)
+  - AlivcConan (0.9.4):
+    - AlivcConan/AlivcConan (= 0.9.4)
+  - AlivcConan/AlivcConan (0.9.4)
+  - AliyunOSSiOS (2.10.7)
+  - AliyunVideoSDKStd (3.10.0)
   - BaiduMapKit (4.3.2)
   - BMKLocationKit (1.5.0)
   - Cache (5.2.0)
@@ -26,6 +31,7 @@ PODS:
   - ObjectMapper (3.4.2)
   - pop (1.0.12)
   - PPBadgeViewSwift (3.1.0)
+  - QuCore-ThirdParty (3.8.0)
   - Result (4.1.0)
   - RxCocoa (4.5.0):
     - RxSwift (>= 4.4.2, ~> 4.4)
@@ -53,9 +59,14 @@ PODS:
   - UMCShare/UI (6.9.5):
     - UMCCommon
     - UMCShare/Core
+  - VODUpload (1.5.1):
+    - AliyunOSSiOS
 
 DEPENDENCIES:
   - Alamofire
+  - AlivcConan
+  - AliyunOSSiOS
+  - AliyunVideoSDKStd
   - BaiduMapKit
   - BMKLocationKit (= 1.5.0)
   - Cache
@@ -74,6 +85,7 @@ DEPENDENCIES:
   - ObjectMapper
   - pop
   - PPBadgeViewSwift
+  - QuCore-ThirdParty
   - RxCocoa
   - RxSwift
   - SnapKit
@@ -87,10 +99,14 @@ DEPENDENCIES:
   - UMCShare/Social/ReducedSina
   - UMCShare/Social/ReducedWeChat
   - UMCShare/UI
+  - VODUpload
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - Alamofire
+    - AlivcConan
+    - AliyunOSSiOS
+    - AliyunVideoSDKStd
     - BaiduMapKit
     - BMKLocationKit
     - Cache
@@ -109,6 +125,7 @@ SPEC REPOS:
     - ObjectMapper
     - pop
     - PPBadgeViewSwift
+    - QuCore-ThirdParty
     - Result
     - RxCocoa
     - RxSwift
@@ -120,9 +137,13 @@ SPEC REPOS:
     - UMCPush
     - UMCSecurityPlugins
     - UMCShare
+    - VODUpload
 
 SPEC CHECKSUMS:
   Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
+  AlivcConan: f75de70ee0c260cfcfc7885a7ee9c1efb877c974
+  AliyunOSSiOS: 602b6a4e70e62a5f0a6431c20496343141d7e66f
+  AliyunVideoSDKStd: 78851704275fb308448d30c0225ee65b2309cfc7
   BaiduMapKit: a5d9580553355d39a91b24c5eb91ebf298c64038
   BMKLocationKit: 40d267478acd8704ddebd0e9deaddc727b13df9f
   Cache: 807c5d86d01a177f06ede9865add3aea269bbfd4
@@ -141,6 +162,7 @@ SPEC CHECKSUMS:
   ObjectMapper: 0d4402610f4e468903ae64629eec4784531e5c51
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
   PPBadgeViewSwift: 18a219a9897f418342c22dd1a54f7b18ac56546b
+  QuCore-ThirdParty: 4856aa9d5b642fc6ae9375c5c8f9c760f5051142
   Result: bd966fac789cc6c1563440b348ab2598cc24d5c7
   RxCocoa: cbf70265dc65a981d4ac982e513c10cf23df24a0
   RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575
@@ -152,7 +174,8 @@ SPEC CHECKSUMS:
   UMCPush: 1edd856027dcf905333effb4040ace5d236a7316
   UMCSecurityPlugins: 0831a08f3988f3cea9f1d3a7626cd9bee4fef150
   UMCShare: 552b29753f1b4da87b51d96545ed19e6263df397
+  VODUpload: d180069b5fcee002079a892de2f310bacdb8e355
 
-PODFILE CHECKSUM: ce904adbb6da37ca3145c2921469be1ffc5965e0
+PODFILE CHECKSUM: 3536aeb6ca5b5603756bc4aa76088ff8ad767798
 
 COCOAPODS: 1.7.1

+ 2 - 2
RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -4947,7 +4947,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B4UG6NNMLL;
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/RainbowPlanet/Lib/AlipaySDK",
@@ -5194,7 +5194,7 @@
 				COPY_PHASE_STRIP = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = B4UG6NNMLL;
-				ENABLE_BITCODE = YES;
+				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/RainbowPlanet/Lib/AlipaySDK",

+ 2 - 1
RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -36,7 +36,8 @@ class BaseTabbarViewController: ESTabBarController {
         
         tabBarViewController.didHijackHandler = {
             tabbarController, viewController, index in
-
+            let pickVc = KSMediaPickerController(maxVideoItemCount: 1, maxPictureItemCount: 9)
+            tabbarController.present(pickVc, animated: true, completion: nil)
         }
         
         /// 社区

+ 1 - 4
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/Controller/KSMediaPickerController.swift

@@ -161,10 +161,7 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
     }
     
     @objc private func _didClick(closeButton: UIButton?) {
-//        navigationController?.dismiss(animated: true, completion: nil)
-        
-        print("----点击了返回")
-        navigationController?.popViewController(animated: true)
+        self.dismiss(animated: true, completion: nil)
     }
     
     @objc private func _didClick(nextButton: UIButton) {