v5.2.15

udesk · Jan 10, 2024 · 399832a · 399832a
1 parent a8fc96b
commit 399832a
Show file tree

Hide file tree

Showing 251 changed files with 45 additions and 18,406 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,8 +33,10 @@ xcuserdata
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
+
+Pods/
+/Pods/
+UdeskSDKExample/Pods
 
 # Carthage
 #

diff --git a/README.md b/README.md
@@ -10,6 +10,8 @@
 
 **如发现问题建议先升级到最新版本SDK，或者下载demo做一下验证**
 
+**如需兼容armv7架构 推荐使用 v5.2.9 或联系售后客服**
+
 
 ### SDK下载地址
 
@@ -1041,6 +1043,12 @@ chatViewManager.orientationMask = UIInterfaceOrientationMaskPortrait;
 
 #### 更新记录：
 
+sdk v5.2.15版本更新功能：
+
+1、优化富文本中图片尺寸解析能力
+ 
+-----
+
 sdk v5.2.14版本更新功能：
 
 1、优化用户反馈提交结果提示

diff --git a/UdeskSDK.podspec b/UdeskSDK.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name         = 'UdeskSDK'
-  s.version      = '5.2.14'
+  s.version      = '5.2.15'
   s.license      = 'MIT'
   s.summary      = 'Udesk SDK for iOS'
   s.homepage     = 'https://github.com/udesk/UdeskSDK-iOS'

diff --git a/UdeskSDK/SDK/libUdesk.a b/UdeskSDK/SDK/libUdesk.a
diff --git a/UdeskSDK/UDChatMessage/UDTools/Category/NSAttributedString/NSAttributedString+UdeskHTML.m b/UdeskSDK/UDChatMessage/UDTools/Category/NSAttributedString/NSAttributedString+UdeskHTML.m
@@ -334,7 +334,20 @@ + (NSAttributedString *)attributedStringFromNode:(xmlNodePtr)xmlNode customFont:
                         NSTextAttachment *imageAttachment = [[NSTextAttachment alloc] init];
                         imageAttachment.image = image;
 
-                        CGSize imageSize = [UdeskImageUtil richImageSize:image];
+                        CGSize imageSize;
+                        NSString *imageW;
+                        NSString *imageH;
+                        if ([attributeDictionary.allKeys containsObject:@"width"]) {
+                            imageW = attributeDictionary[@"width"];
+                        }
+                        if ([attributeDictionary.allKeys containsObject:@"height"]) {
+                            imageH = attributeDictionary[@"height"];
+                        }
+                        if (![UdeskSDKUtil isBlankString:imageW] && ![UdeskSDKUtil isBlankString:imageH]) {
+                            imageSize = CGSizeMake(imageW.floatValue, imageH.floatValue);
+                        } else {
+                            imageSize = [UdeskImageUtil richImageSize:image];
+                        }
                         imageAttachment.bounds = CGRectMake(0, 0, imageSize.width, imageSize.height);
 
                         NSAttributedString *imageAttributeString = [NSAttributedString attributedStringWithAttachment:imageAttachment];

diff --git a/UdeskSDKExample/Podfile.lock b/UdeskSDKExample/Podfile.lock
@@ -1,14 +1,14 @@
 PODS:
   - AgoraRtcEngine_iOS (2.0.2)
-  - BaiduMapKit (3.4.4)
+  - BaiduMapKit (4.1.1)
   - JCore (1.2.6)
   - JPush (3.0.9):
     - JCore (~> 1.2.0)
   - Masonry (1.1.0)
 
 DEPENDENCIES:
   - AgoraRtcEngine_iOS (~> 2.0.2)
-  - BaiduMapKit (~> 3.4.4)
+  - BaiduMapKit (~> 4.1.1)
   - JPush (~> 3.0.9)
   - Masonry (~> 1.1.0)
 
@@ -22,11 +22,11 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   AgoraRtcEngine_iOS: 67884f8bbe46aae8ed9af4195b0683562f083fde
-  BaiduMapKit: 4ac88f5a363500760392825b69709f4a0125f81e
+  BaiduMapKit: 51bba432a28316680676b4d453a70e5031f3a7eb
   JCore: cae516dd2bf1a73b578ce6e1065abd49e709e0f7
   JPush: 48041e8c5ad2ef9b48709eb0888af9640b36e9b0
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
 
-PODFILE CHECKSUM: fd6399e78d5874cb9db6fd044bc057c93b3b4377
+PODFILE CHECKSUM: ba68235e3c948161ed0c96f205e04b7d0e95a6f6
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.12.1
diff --git a/UdeskSDKExample/Pods/AgoraRtcEngine_iOS/AgoraRtcEngineKit.framework/AgoraRtcEngineKit b/UdeskSDKExample/Pods/AgoraRtcEngine_iOS/AgoraRtcEngineKit.framework/AgoraRtcEngineKit