fix: upgrade sdwebimage to 5.x (#119)

AgoraIO-Community · Dec 4, 2023 · 935d552 · 935d552
1 parent 04b6622
commit 935d552
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 30 deletions.
diff --git a/AUIKitCore.podspec b/AUIKitCore.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'AUIKitCore'
-  s.version          = '0.5.3'
+  s.version          = '0.5.4'
   s.summary          = 'A short description of AUIKit.'
 
   # This description is used to generate tags and improve search results.
@@ -43,7 +43,7 @@ Pod::Spec.new do |s|
     ss.dependency 'YYModel'
     ss.dependency 'SwiftyBeaver', '~>1.9.5'
     ss.dependency 'SwiftTheme'
-    ss.dependency 'SDWebImage', '~> 4.4.8'
+    ss.dependency 'SDWebImage', '~> 5.0.0'
     ss.dependency 'MJRefresh'
     ss.dependency 'ScoreEffectUI'
     ss.dependency 'AgoraLyricsScore'
@@ -98,7 +98,7 @@ Pod::Spec.new do |s|
     ss.dependency 'YYModel'
     ss.dependency 'SwiftyBeaver', '~>1.9.5'
     ss.dependency 'SwiftTheme'
-    ss.dependency 'SDWebImage', '~> 4.4.8'
+    ss.dependency 'SDWebImage', '~> 5.0.0'
     ss.dependency 'MJRefresh'
     ss.dependency 'ScoreEffectUI'
     ss.dependency 'AgoraLyricsScore'

diff --git a/iOS/AUIKitCore/Sources/Components/MicSeat/AUIMicSeatItemCell.swift b/iOS/AUIKitCore/Sources/Components/MicSeat/AUIMicSeatItemCell.swift
@@ -216,7 +216,7 @@ open class AUIMicSeatItemCell: UICollectionViewCell {
         avatarImageView.sd_setImage(with: URL(string: item?.avatarUrl ?? ""))
         seatLabel.text = item?.seatName
         if let subIcon = item?.subIcon,let subtitle = item?.subTitle {
-            SDWebImageManager.shared().loadImage(with: URL(string: subIcon), progress: nil) { [weak self] image, data, error, type, res, url in
+            SDWebImageManager.shared.loadImage(with: URL(string: subIcon), progress: nil) { [weak self] image, data, error, type, res, url in
                 guard let img = image else { return }
                 self?.subTitle.attributedText = NSAttributedString({
                     ImageAttachment(img,size: CGSize(width: 14, height: 14))

diff --git a/iOS/Example/AUIKit/TestServiceViewController.swift b/iOS/Example/AUIKit/TestServiceViewController.swift
@@ -107,11 +107,11 @@ extension TestServiceViewController {
     }
 
     func getRoomList() {
-        self.roomManager?.getRoomInfoList(lastCreateTime: nil, pageSize: 10, callback: { err, lists in
+        self.roomManager?.getRoomInfoList(lastCreateTime: 0, pageSize: 10, callback: { err, lists in
             if let lists = lists {
                 self.roomList.append(contentsOf: lists)
             }
-            aui_info("roomlist == \(lists?.debugDescription), err = \(err)", tag: "TestServiceViewController")
+            aui_info("roomlist == \(lists?.debugDescription ?? ""), err = \(err?.localizedDescription ?? "success")", tag: "TestServiceViewController")
         })
     }
 
@@ -123,7 +123,7 @@ extension TestServiceViewController {
         room.micSeatCount = 8
 
         self.roomManager?.createRoom(room: room, callback: { error, info in
-            aui_info("createRoom error == \(error), info = \(info)")
+            aui_info("createRoom error == \(error?.localizedDescription ?? "success"), info = \(info)")
         })
     }
 
@@ -135,7 +135,7 @@ extension TestServiceViewController {
             self.giftImpl?.bindRespDelegate(delegate: self)
 
             self.roomManager?.enterRoom(roomId: roomInfo.roomId, callback: { err in
-                aui_info("enterRoom err == \(err)")
+                aui_info("enterRoom err == \(err?.localizedDescription ?? "success")")
 
 
                 self.userManager = AUIUserServiceImpl(channelName: roomInfo.roomId, rtmManager: self.roomManager!.rtmManager, roomManager: self.roomManager!)

diff --git a/iOS/Example/Podfile b/iOS/Example/Podfile
@@ -3,13 +3,8 @@ use_frameworks!
 platform :ios, '13.0'
 
 target 'AUIKit_Example' do
-#  pod 'AUIKitCore','0.5.0'
 pod 'AUIKitCore', :path => '../../'
 #pod 'AUIKitCore/UI', :path => '../../'
-#  pod 'AgoraUIKit_Test/widgets', :path => '../'
-#  pod 'AgoraRtcEngine_iOS', :path => './libs'
-#  pod 'LookinServer'
-  pod 'SDWebImage', '4.4.8'
   pod 'AgoraLyricsScore', '1.1.2'
   pod 'libpag'
   post_install do |installer|

diff --git a/iOS/Example/Podfile.lock b/iOS/Example/Podfile.lock
@@ -3,28 +3,28 @@ PODS:
   - AgoraLyricsScore (1.1.2)
   - AgoraRtcEngine_Special_iOS (4.1.1.247)
   - AgoraRtm_iOS (2.1.4)
-  - Alamofire (5.8.0)
-  - AUIKitCore (0.5.2):
-    - AUIKitCore/All (= 0.5.2)
-  - AUIKitCore/All (0.5.2):
+  - Alamofire (5.8.1)
+  - AUIKitCore (0.5.4):
+    - AUIKitCore/All (= 0.5.4)
+  - AUIKitCore/All (0.5.4):
     - Agora_Chat_iOS
     - AgoraLyricsScore
     - AgoraRtcEngine_Special_iOS (~> 4.1.1.1)
     - AgoraRtm_iOS (= 2.1.4)
     - Alamofire
     - MJRefresh
     - ScoreEffectUI
-    - SDWebImage (~> 4.4.8)
+    - SDWebImage (~> 5.0.0)
     - SwiftTheme
     - SwiftyBeaver (~> 1.9.5)
     - YYModel
     - Zip
-  - libpag (4.3.21)
-  - MJRefresh (3.7.5)
+  - libpag (4.3.33)
+  - MJRefresh (3.7.6)
   - ScoreEffectUI (1.0.2)
-  - SDWebImage (4.4.8):
-    - SDWebImage/Core (= 4.4.8)
-  - SDWebImage/Core (4.4.8)
+  - SDWebImage (5.0.6):
+    - SDWebImage/Core (= 5.0.6)
+  - SDWebImage/Core (5.0.6)
   - SwiftTheme (0.6.4)
   - SwiftyBeaver (1.9.5)
   - YYModel (1.0.4)
@@ -34,7 +34,6 @@ DEPENDENCIES:
   - AgoraLyricsScore (= 1.1.2)
   - AUIKitCore (from `../../`)
   - libpag
-  - SDWebImage (= 4.4.8)
 
 SPEC REPOS:
   trunk:
@@ -61,17 +60,17 @@ SPEC CHECKSUMS:
   AgoraLyricsScore: 0c3e6b701dfe036ba26ba208fc65c3b65ecaeb06
   AgoraRtcEngine_Special_iOS: 1da915f9ea50947b0c01f3a7f9674df4e3c90820
   AgoraRtm_iOS: 11b767ee81a7202dcf09e045cd2d359b5abbc965
-  Alamofire: 0e92e751b3e9e66d7982db43919d01f313b8eb91
-  AUIKitCore: 388fb75a4cd26af9c46dac9b651457dd69e906a7
-  libpag: 8a5c6b406458d85db48b05145d5dba9c406f2097
-  MJRefresh: fdf5e979eb406a0341468932d1dfc8b7f9fce961
+  Alamofire: 3ca42e259043ee0dc5c0cdd76c4bc568b8e42af7
+  AUIKitCore: 2b733d274d370ce1535093d1585d5ac5e63b4209
+  libpag: 1283c103338f3185a8efa1dd904bc18054a62c24
+  MJRefresh: 2fe7fb43a5167ceda20bb7e63f130c04fd1814a5
   ScoreEffectUI: bf1195b4d41a73d43c236450b5d7f958989844aa
-  SDWebImage: 783af2c3fa36291a250030c4752ee370a9a51d13
+  SDWebImage: 920f1a2ff1ca8296ad34f6e0510a1ef1d70ac965
   SwiftTheme: 007cbaf1f9e171caf6448a4657533e54c682b285
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
   YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
   Zip: b3fef584b147b6e582b2256a9815c897d60ddc67
 
-PODFILE CHECKSUM: 050e6a717f7f3de6deae5ad8e18251326e3ded65
+PODFILE CHECKSUM: 88ed866c67b73bca5c415b209b8d487276b3ef5a
 
 COCOAPODS: 1.12.1