南鑫林 5 роки тому
батько
коміт
3795d4bfcb

+ 3 - 3
RainbowPlanet/Podfile

@@ -115,8 +115,8 @@ target 'RainbowPlanet' do
 
   #=====================融云IMSDK===========
   #融云 IM 通讯能力库
-  pod 'RongCloudIM/IMLib'
+  pod 'RongCloudIM/IMLib', '2.9.24'
   #融云 IM 界面组件
-  pod 'RongCloudIM/IMKit'
-  
+  pod 'RongCloudIM/IMKit', '2.9.24'
+
 end

+ 6 - 6
RainbowPlanet/Podfile.lock

@@ -61,9 +61,9 @@ PODS:
   - PPBadgeViewSwift (3.1.0)
   - QuCore-ThirdParty (3.10.0)
   - Result (4.1.0)
-  - RongCloudIM/IMKit (2.9.25):
+  - RongCloudIM/IMKit (2.9.24):
     - RongCloudIM/IMLib
-  - RongCloudIM/IMLib (2.9.25)
+  - RongCloudIM/IMLib (2.9.24)
   - RxCocoa (4.5.0):
     - RxSwift (>= 4.4.2, ~> 4.4)
   - RxSwift (4.5.0)
@@ -131,8 +131,8 @@ DEPENDENCIES:
   - ObjectMapper
   - PPBadgeViewSwift
   - QuCore-ThirdParty
-  - RongCloudIM/IMKit
-  - RongCloudIM/IMLib
+  - RongCloudIM/IMKit (= 2.9.24)
+  - RongCloudIM/IMLib (= 2.9.24)
   - RxCocoa
   - RxSwift
   - SnapKit
@@ -238,7 +238,7 @@ SPEC CHECKSUMS:
   PPBadgeViewSwift: 18a219a9897f418342c22dd1a54f7b18ac56546b
   QuCore-ThirdParty: 60a6f08864631569569fa1e2c6208a7746698923
   Result: bd966fac789cc6c1563440b348ab2598cc24d5c7
-  RongCloudIM: cd6836aa86fbf6c02f7b6b5c895ea4caa894d67f
+  RongCloudIM: dfacebd46a313242c4c15b05ed4127c10d6d8a20
   RxCocoa: cbf70265dc65a981d4ac982e513c10cf23df24a0
   RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
@@ -255,6 +255,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
 
-PODFILE CHECKSUM: 3b5dd2292cf05c2ea5c982166e303fae64f35b96
+PODFILE CHECKSUM: e28b16f655a536fe034b8be76c48be0b09d791c9
 
 COCOAPODS: 1.8.0

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

@@ -6230,7 +6230,6 @@
 					"$(inherited)",
 					"\"${PODS_ROOT}/Headers/Public\"",
 					"\"${PODS_ROOT}/Headers/Public/UMCShare\"",
-					"\"$(SRCROOT)/RainbowPlanet/Lib/AlipaySDK\"",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/RainbowPlanet/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -6238,10 +6237,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/RainbowPlanet/Lib/WeChatSDK",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MARKETING_VERSION = 1.0.2;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -6486,7 +6482,6 @@
 					"$(inherited)",
 					"\"${PODS_ROOT}/Headers/Public\"",
 					"\"${PODS_ROOT}/Headers/Public/UMCShare\"",
-					"\"$(SRCROOT)/RainbowPlanet/Lib/AlipaySDK\"",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/RainbowPlanet/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -6494,10 +6489,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/RainbowPlanet/Lib/WeChatSDK",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MARKETING_VERSION = 1.0.2;
 				OTHER_CFLAGS = (
 					"$(inherited)",

+ 2 - 1
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicVolumnView.swift

@@ -230,7 +230,8 @@ class PublishMusicVolumnView: FWPopupView {
         NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ChangeAudioVolumnNoti"), object: paraDic)
     }
     
-    func tapGesClick(tap: UITapGestureRecognizer) {
+    override func tapGesClick(tap: UITapGestureRecognizer) {
+        super.tapGesClick(tap: tap)
         var paraDic = Dictionary<String, Any>()
         paraDic.updateValue(originVolumn!, forKey: "origin")
         paraDic.updateValue(backVolumn!, forKey: "back")

+ 12 - 6
RainbowPlanet/RainbowPlanet/Tools/StartupPageView/StartupPageView.swift

@@ -63,12 +63,18 @@ class StartupPageView: UIView {
         SwiftMoyaNetWorkServiceConfig.shared().configStartupApi(completion: {
             [weak self] (startupModel) -> (Void) in
             self?.startupModel = startupModel as? StartupModel
-            self?.imageView.kf.setImage(with: kURLImage(name: self?.startupModel?.img ?? ""), placeholder: kImage(name: "default_image"),completionHandler:{
-                [weak self] (image, error, cacheType, imageURL) in
-                self?.drawCircleProgressButton.startAnimationDuration(3, with: {
-                    [weak self] in
-                    self?.skipAction()
-                })
+            
+            self?.imageView.kf.setImage(with: kURLImage(name: self?.startupModel?.img ?? ""), placeholder: kImage(name: "default_image"), completionHandler: { (result) in
+                switch result {
+                case .success(_):
+                    self?.drawCircleProgressButton.startAnimationDuration(3, with: {
+                        [weak self] in
+                        self?.skipAction()
+                    })
+                    break
+                case .failure(_):
+                    break
+                }
             })
 
         }) { [weak self] (loadingStatus) in