适配iOS13

RainbowPlanet/Podfile

@@ -106,15 +106,15 @@ target 'RainbowPlanet' do
   #=====================AliyunVideoSDK===========
   #共同依赖的库
   pod 'QuCore-ThirdParty'
-#  pod 'AlivcConan', '0.9.5'
-  pod 'AlivcConan'
+  pod 'AlivcConan', '0.9.5'
+#  pod 'AlivcConan'
   #短视频SDK
-#  pod 'AliyunVideoSDKPro', '3.11.0'  #短视频核心库
-  pod 'AliyunVideoSDKPro'
+  pod 'AliyunVideoSDKPro', '3.11.0'  #短视频核心库
+#  pod 'AliyunVideoSDKPro'
   pod 'VODUpload'  #短视频上传,不使用上传功能可以不依赖此库
   #播放器SDK
-#  pod 'AliPlayerPartSDK_iOS', '4.7.1' #播放器和短视频SDK同时集成时使用这个
-   pod 'AliPlayerPartSDK_iOS'
+  pod 'AliPlayerPartSDK_iOS', '4.7.1' #播放器和短视频SDK同时集成时使用这个
+#   pod 'AliPlayerPartSDK_iOS'
   #    pod 'AliPlayerSDK_iOS', '4.7.1' #单独集成播放器时使用这个
   
   #=====================融云IMSDK===========

RainbowPlanet/Podfile.lock

@@ -18,11 +18,11 @@ PODS:
   - AliPlayerPartSDK_iOS (4.7.1):
     - AliPlayerPartSDK_iOS/AliPlayerPartSDK (= 4.7.1)
   - AliPlayerPartSDK_iOS/AliPlayerPartSDK (4.7.1)
-  - AlivcConan (1.0.0):
-    - AlivcConan/AlivcConan (= 1.0.0)
-  - AlivcConan/AlivcConan (1.0.0)
+  - AlivcConan (0.9.5):
+    - AlivcConan/AlivcConan (= 0.9.5)
+  - AlivcConan/AlivcConan (0.9.5)
   - AliyunOSSiOS (2.10.7)
-  - AliyunVideoSDKPro (3.12.0)
+  - AliyunVideoSDKPro (3.11.0)
   - BaiduMapKit (5.0.0)
   - BMKLocationKit (1.5.0)
   - Cache (5.2.0)
@@ -111,9 +111,9 @@ PODS:
 DEPENDENCIES:
   - AFNetworking (~> 3.0)
   - Alamofire
-  - AliPlayerPartSDK_iOS
-  - AlivcConan
-  - AliyunVideoSDKPro
+  - AliPlayerPartSDK_iOS (= 4.7.1)
+  - AlivcConan (= 0.9.5)
+  - AliyunVideoSDKPro (= 3.11.0)
   - BaiduMapKit
   - BMKLocationKit (= 1.5.0)
   - Cache
@@ -221,9 +221,9 @@ SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
   Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
   AliPlayerPartSDK_iOS: b7acc7cf47271f67a4eed38185438371e382b749
-  AlivcConan: 3e339a2bc6ce11e47c20ff4f2bd9c0a0dd90ebc8
+  AlivcConan: 9dccc32986024768bb5f50e14ad54490123903c7
   AliyunOSSiOS: 602b6a4e70e62a5f0a6431c20496343141d7e66f
-  AliyunVideoSDKPro: 3f19f021ab48fbc41ac667a08322a506950281de
+  AliyunVideoSDKPro: da710c1e7fb93b1e9a741b3619814c6608780b4b
   BaiduMapKit: 3a875b001293a9ee6692febd549d8bf82108dbac
   BMKLocationKit: 40d267478acd8704ddebd0e9deaddc727b13df9f
   Cache: 807c5d86d01a177f06ede9865add3aea269bbfd4
@@ -271,6 +271,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
 
-PODFILE CHECKSUM: b27e2ccae0be82e0a4ac1b5a2293ef59c10e73c5
+PODFILE CHECKSUM: ae0c1a3403fa6fc300fe512922451d01fa32f74a
 
 COCOAPODS: 1.8.4

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -5871,8 +5871,8 @@
 				A77F2C5A2231FB49001BD3F6 /* Frameworks */,
 				A77F2C5B2231FB49001BD3F6 /* Resources */,
 				A74D9D5F2327B54100F05C14 /* Embed App Extensions */,
-				C0D89FCBED95B049ED1CE8E5 /* [CP] Embed Pods Frameworks */,
-				DFDF7A861CDCC750543A9D29 /* [CP] Copy Pods Resources */,
+				39935CBFD70D065C2E9C2DFF /* [CP] Embed Pods Frameworks */,
+				34B1F4486D247516EBA6664E /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -6054,7 +6054,24 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		C0D89FCBED95B049ED1CE8E5 /* [CP] Embed Pods Frameworks */ = {
+		34B1F4486D247516EBA6664E /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RainbowPlanet/Pods-RainbowPlanet-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RainbowPlanet/Pods-RainbowPlanet-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RainbowPlanet/Pods-RainbowPlanet-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		39935CBFD70D065C2E9C2DFF /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -6093,23 +6110,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		DFDF7A861CDCC750543A9D29 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RainbowPlanet/Pods-RainbowPlanet-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RainbowPlanet/Pods-RainbowPlanet-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RainbowPlanet/Pods-RainbowPlanet-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -124,6 +124,7 @@ extension AppDelegate {
         UITabBar.appearance().backgroundImage = UIImage();
         UITabBar.appearance().backgroundColor = UIColor.white
         UITabBar.appearance().shadowImage = UIImage(named: "tab_top_line")
+        UITabBar.appearance().tintColor = k333333Color
     }
     
     /// UITableView全局

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -48,14 +48,13 @@ class BaseTabbarViewController: NSObject {
     func tabBarViewController() -> ESTabBarController {
         esTabBarController = ESTabBarController()
         
-//        if #available(iOS 13.0, *) {
-//            esTabBarController.tabBar.standardAppearance.configureWithOpaqueBackground()
-//            esTabBarController.tabBar.standardAppearance.backgroundImage = UIImage.imageWithColor(color: UIColor.white)
-//            esTabBarController.tabBar.standardAppearance.shadowImage = UIImage(named: "navbar_shadow_pic_down")
-//            esTabBarController.tabBar.standardAppearance.shadowColor = UIColor.yellow
-//        } else {
+        if #available(iOS 13.0, *) {
+            esTabBarController.tabBar.standardAppearance.configureWithOpaqueBackground()
+            esTabBarController.tabBar.standardAppearance.backgroundImage = UIImage.imageWithColor(color: UIColor.white)
+            esTabBarController.tabBar.standardAppearance.shadowImage = UIImage(named: "navbar_shadow_pic_down")
+        } else {
             esTabBarController.tabBar.shadowImage = UIImage(named: "navbar_shadow_pic_down")
-//        }
+        }
         
         esTabBarController.shouldHijackHandler = {
            [weak self] (tabbarController, viewController, index) in

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicVolumnView.swift

@@ -277,5 +277,4 @@ class PublishMusicVolumnView: FWPopupView {
         
         return view
     }
-    
 }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishViewController.swift

@@ -244,6 +244,7 @@ extension PublishViewController :JXSegmentedListContainerViewDataSource {
             videoVc.quVideo = mediaConfig
             videoVc.dismissBlock = {
                 [weak self] in
+                UITabBar.appearance().tintColor = k333333Color
                 self?.dismiss(animated: true, completion: nil)
             }
             videoVc.editBlock = {

RainbowPlanet/RainbowPlanet/Tools/TLPhotoPicker/TLAlbumPopView.swift

@@ -71,7 +71,7 @@ open class TLAlbumPopView: UIView, PopupViewProtocol {
         self.bgView.addGestureRecognizer(tapGesture)
         self.tableView.register(UINib(nibName: "TLCollectionTableViewCell", bundle: TLBundle.bundle()), forCellReuseIdentifier: "TLCollectionTableViewCell")
         if #available(iOS 13.0, *) {
-//            self.popupView.backgroundColor = .systemBackground
+            self.popupView.backgroundColor = .systemBackground
         }
     }
     

RainbowPlanet/RainbowPlanet/Tools/TLPhotoPicker/TLCollectionTableViewCell.swift

@@ -19,7 +19,7 @@ open class TLCollectionTableViewCell: UITableViewCell {
             self.thumbImageView.accessibilityIgnoresInvertColors = true
         }
         if #available(iOS 13.0, *) {
-//            self.contentView.backgroundColor = .systemBackground
+            self.contentView.backgroundColor = .systemBackground
         }
     }
 }

RainbowPlanet/RainbowPlanet/Tools/TLPhotoPicker/TLPhotosPickerViewController.swift

@@ -228,7 +228,7 @@ open class TLPhotosPickerViewController: UIViewController {
             let userInterfaceStyle = self.traitCollection.userInterfaceStyle
             let image = TLBundle.podBundleImage(named: "pop_arrow")
             if userInterfaceStyle.rawValue == 2 {
-//                self.popArrowImageView.image = image?.colorMask(color: .systemBackground)
+                self.popArrowImageView.image = image?.colorMask(color: .systemBackground)
                 self.view.backgroundColor = .black
                 self.collectionView.backgroundColor = .black
             }else {