v10.5.3 (#424)

* remove NERtcCallUIKit * v10.5.3 --------- Co-authored-by: 张诗文 <zhangshiwen@corp.netease.com>
netease-kit · Jan 13, 2025 · d47cab6 · d47cab6
1 parent a19002d
commit d47cab6
Show file tree

Hide file tree

Showing 142 changed files with 263 additions and 5,537 deletions.
diff --git a/IMUIKitOC/IMUIKitOCExample/IMUIKitOCExample.xcodeproj/project.pbxproj b/IMUIKitOC/IMUIKitOCExample/IMUIKitOCExample.xcodeproj/project.pbxproj
@@ -606,7 +606,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 9.2.9;
+				MARKETING_VERSION = 10.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.netease.yunxin.app.im;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -642,7 +642,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 9.2.9;
+				MARKETING_VERSION = 10.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.netease.yunxin.app.im;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/IMUIKitOC/IMUIKitOCExample/Podfile b/IMUIKitOC/IMUIKitOCExample/Podfile
@@ -1,5 +1,5 @@
 # Uncomment the next line to define a global platform for your project
- platform :ios, '12.0'
+platform :ios, '12.0'
 source 'https://github.com/CocoaPods/Specs.git'
 
 target 'IMUIKitOCExample' do
@@ -8,42 +8,37 @@ target 'IMUIKitOCExample' do
 
   #登录组件
   pod 'YXLogin', '1.1.0'
-
+  
   # 基础库
-  pod 'NEChatKit', '10.5.2'
-
+  pod 'NEChatKit', '10.5.3'
+  
   # UI 组件，依次为通讯录组件、会话列表组件、会话（聊天）组件、群相关设置组件
-  pod 'NEChatUIKit', '10.5.2'
-  pod 'NEContactUIKit', '10.5.2'
-  pod 'NEConversationUIKit', '10.5.2'
-  pod 'NETeamUIKit', '10.5.2'
-
+  pod 'NEChatUIKit', '10.5.3'
+  pod 'NEContactUIKit', '10.5.3'
+  pod 'NEConversationUIKit', '10.5.3'
+  pod 'NETeamUIKit', '10.5.3'
+  
   # 扩展库 - 地理位置组件
-  pod 'NEMapKit', '10.5.2'
+  pod 'NEMapKit', '10.5.3'
 
   # 扩展库 - AI 划词搜索
-  pod 'NEAISearchKit', '10.5.2'
-
-  # 扩展库 - 呼叫组件
+  pod 'NEAISearchKit', '10.5.3'
+
+    # 扩展库 - 呼叫组件
+  pod 'NERtcSDK/RtcBasic', '5.6.33'         #  RTC 音视频基础组件
+  pod 'NERtcSDK/Nenn'                       #  RTC 音视频神经网络组件（使用背景虚化功能需要集成）
+  pod 'NERtcSDK/Segment'                    #  RTC 音视频背景分割组件（使用背景虚化功能需要集成）
   pod 'NERtcCallKit/NOS_Special', '3.1.0'
-  pod 'NERtcCallUIKit/NOS_Special', '3.1.0'
-
-  # 扩展库，依次为 RTC 音视频基础组件、RTC 音视频神经网络组件（使用背景虚化功能需要集成）、RTC 音视频背景分割组件（使用背景虚化功能需要集成）
-  pod 'NERtcSDK/RtcBasic', '5.6.33'
-  pod 'NERtcSDK/Nenn'
-  pod 'NERtcSDK/Segment'
-
-
+  pod 'NERtcCallUIKit/NOS_Special', '3.1.0' # (源码地址：https://github.com/netease-kit/NEVideoCall-1to1/tree/main/NLiteAVDemo-iOS-ObjC/CallKit)
+
   # 如果需要查看UI部分源码请注释掉以上在线依赖，打开下面的本地依赖
-#   pod 'NEContactUIKit', :path => '../../NEContactUIKit/NEContactUIKit.podspec'
-#   pod 'NEConversationUIKit', :path => '../../NEConversationUIKit/NEConversationUIKit.podspec'
-#   pod 'NETeamUIKit', :path => '../../NETeamUIKit/NETeamUIKit.podspec'
-#   pod 'NEChatUIKit', :path => '../../NEChatUIKit/NEChatUIKit.podspec'
-#   pod 'NEMapKit', :path => '../../NEMapKit/NEMapKit.podspec'
-#   pod 'NEAISearchKit', :path => '../../NEAISearchKit/NEAISearchKit.podspec'
-#   pod 'NERtcCallUIKit', :path => '../../NERtcCallUIKit/NERtcCallUIKit.podspec'
-
-
+#  pod 'NEContactUIKit', :path => 'NEContactUIKit/NEContactUIKit.podspec'
+#  pod 'NEConversationUIKit', :path => 'NEConversationUIKit/NEConversationUIKit.podspec'
+#  pod 'NETeamUIKit', :path => 'NETeamUIKit/NETeamUIKit.podspec'
+#  pod 'NEChatUIKit', :path => 'NEChatUIKit/NEChatUIKit.podspec'
+#  pod 'NEMapKit', :path => 'NEMapKit/NEMapKit.podspec'
+#  pod 'NEAISearchKit', :path => 'NEAISearchKit/NEAISearchKit.podspec'
+
 end
 
 # ⚠️如果pod依赖报错，可打开以下注释

diff --git a/NEAISearchKit/NEAISearchKit.podspec b/NEAISearchKit/NEAISearchKit.podspec
@@ -6,38 +6,24 @@
 # To learn more about a Podspec see https://guides.cocoapods.org/syntax/podspec.html
 #
 
-Pod::Spec.new do |s|
-  s.name             = 'NEAISearchKit'
-  s.version          = '10.5.2'
-  s.summary          = 'Netease XKit'
-
-# This description is used to generate tags and improve search results.
-#   * Think: What does it do? Why did you write it? What is the focus?
-#   * Try to keep it short, snappy and to the point.
-#   * Write the description between the DESC delimiters below.
-#   * Finally, don't worry about the indent, CocoaPods strips it!
-
-  s.description      = <<-DESC
-TODO: Add long description of the pod here.
-                       DESC
-
-  s.homepage         = 'http://netease.im'
-  s.license          = { :'type' => 'Copyright', :'text' => ' Copyright 2022 Netease '}
-  s.author           = 'yunxin engineering department'
-  s.source           = { :git => 'https://github.com/netease/NEKitGroupUI.git', :tag => s.version.to_s }
-
-  s.pod_target_xcconfig = {
-    'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64',
-      'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES'
-    }
-
-  s.ios.deployment_target = '12.0'
-  s.swift_version = '5.0'
-
-  s.source_files = 'NEAISearchKit/Classes/**/*'
-  s.resource = 'NEAISearchKit/Assets/**/*'
-
-  s.dependency 'NEChatKit'
-  s.dependency 'NECommonUIKit'
+# 配置内容详见：../PodConfigs/config_podspec.rb
+require_relative "../PodConfigs/config_podspec.rb"
+
+Pod::Spec.new do |spec|
+  spec.name         = 'NEAISearchKit'
+  spec.version      = YXConfig.imuikit_version
+  spec.summary      = 'Netease XKit'
+  spec.homepage         = YXConfig.homepage
+  spec.license          = YXConfig.license
+  spec.author           = YXConfig.author
+  spec.ios.deployment_target = YXConfig.deployment_target
+  spec.swift_version = YXConfig.swift_version
+  spec.source           = { :git => '', :tag => spec.version.to_s }
+  spec.source_files = 'NEAISearchKit/Classes/**/*'
+  spec.resource = 'NEAISearchKit/Assets/**/*'
+  YXConfig.pod_target_xcconfig(spec)
+
+  spec.dependency 'NEChatKit'
+  spec.dependency 'NECommonUIKit'
 
 end
diff --git a/NEChatUIKit/NEChatUIKit.podspec b/NEChatUIKit/NEChatUIKit.podspec
@@ -6,46 +6,27 @@
 #  To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
 #
 
-Pod::Spec.new do |s|
+# 配置内容详见：../PodConfigs/config_podspec.rb
+require_relative "../PodConfigs/config_podspec.rb"
 
-  # ―――  Spec Metadata  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
-  #
-  #  These will help people to find your library, and whilst it
-  #  can feel like a chore to fill in it's definitely to your advantage. The
-  #  summary should be tweet-length, and the description more in depth.
-  #
-
-  s.name         = 'NEChatUIKit'
-  s.version      = '10.5.2'
-  s.summary      = 'Chat Module of IM.'
-
-  # This description is used to generate tags and improve search results.
-  #   * Think: What does it do? Why did you write it? What is the focus?
-  #   * Try to keep it short, snappy and to the point.
-  #   * Write the description between the DESC delimiters below.
-  #   * Finally, don't worry about the indent, CocoaPods strips it!
-    s.description      = <<-DESC
-TODO: Add long description of the pod here.
-                       DESC
-  s.homepage         = 'http://netease.im'
-  s.license          = { :'type' => 'Copyright', :'text' => ' Copyright 2022 Netease '}
-  s.author           = 'yunxin engineering department'
-  s.source           = { :git => 'ssh://git@g.hz.netease.com:22222/yunxin-app/xkit-ios.git', :tag => s.version.to_s }
-
-  s.ios.deployment_target = '12.0'
-  s.swift_version = '5.0'
-
-  s.source_files = 'NEChatUIKit/Classes/**/*'
-  s.pod_target_xcconfig = {
-    'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64',
-      'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES'
-    }
+Pod::Spec.new do |spec|
+  spec.name         = 'NEChatUIKit'
+  spec.version      = YXConfig.imuikit_version
+  spec.summary      = 'Netease XKit'
+  spec.homepage         = YXConfig.homepage
+  spec.license          = YXConfig.license
+  spec.author           = YXConfig.author
+  spec.ios.deployment_target = YXConfig.deployment_target
+  spec.swift_version = YXConfig.swift_version
+  spec.source           = { :git => '', :tag => spec.version.to_s }
+  spec.source_files = 'NEChatUIKit/Classes/**/*'
+  spec.resource = 'NEChatUIKit/Assets/**/*'
+  YXConfig.pod_target_xcconfig(spec)
 
-  s.resource = 'NEChatUIKit/Assets/**/*'
-  s.dependency 'NEChatKit'
-  s.dependency 'NECommonUIKit'
-  s.dependency 'MJRefresh'
-  s.dependency 'SDWebImageWebPCoder'
-  s.dependency 'SDWebImageSVGKitPlugin'
+  spec.dependency 'NEChatKit'
+  spec.dependency 'NECommonUIKit'
+  spec.dependency 'MJRefresh'
+  spec.dependency 'SDWebImageWebPCoder'
+  spec.dependency 'SDWebImageSVGKitPlugin'
 
 end
diff --git a/NEChatUIKit/NEChatUIKit/Classes/Chat/Controller/ChatViewController.swift b/NEChatUIKit/NEChatUIKit/Classes/Chat/Controller/ChatViewController.swift
@@ -1686,6 +1686,14 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
     }
   }
 
+  /// 本端发送消息后的回调，为 sendMessage 接口callback，可在回调中获取消息反垃圾结果
+  /// - Parameter completion: sendMessage 接口调用回调
+  open func sendMessageCallback(_ result: V2NIMSendMessageResult?, _ error: V2NIMError?, _ progress: UInt) {
+    if let block = ChatKitClient.shared.sendMessageCallback {
+      block(self, result, error, progress)
+    }
+  }
+
   /// 收到消息
   /// - Parameter messages: 消息列表
   open func onRecvMessages(_ messages: [V2NIMMessage], _ indexs: [IndexPath]) {