Skip to content

Commit d47cab6

Browse files
zsw666张诗文
zsw666
and
张诗文
authored
v10.5.3 (#424)
* remove NERtcCallUIKit * v10.5.3 --------- Co-authored-by: 张诗文 <zhangshiwen@corp.netease.com>
1 parent a19002d commit d47cab6

142 files changed

Lines changed: 263 additions & 5537 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎IMUIKitOC/IMUIKitOCExample/IMUIKitOCExample.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@
606606
"$(inherited)",
607607
"@executable_path/Frameworks",
608608
);
609-
MARKETING_VERSION = 9.2.9;
609+
MARKETING_VERSION = 10.5.3;
610610
PRODUCT_BUNDLE_IDENTIFIER = com.netease.yunxin.app.im;
611611
PRODUCT_NAME = "$(TARGET_NAME)";
612612
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -642,7 +642,7 @@
642642
"$(inherited)",
643643
"@executable_path/Frameworks",
644644
);
645-
MARKETING_VERSION = 9.2.9;
645+
MARKETING_VERSION = 10.5.3;
646646
PRODUCT_BUNDLE_IDENTIFIER = com.netease.yunxin.app.im;
647647
PRODUCT_NAME = "$(TARGET_NAME)";
648648
SWIFT_EMIT_LOC_STRINGS = YES;

‎IMUIKitOC/IMUIKitOCExample/Podfile‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment the next line to define a global platform for your project
2-
platform :ios, '12.0'
2+
platform :ios, '12.0'
33
source 'https://github.com/CocoaPods/Specs.git'
44

55
target 'IMUIKitOCExample' do
@@ -8,42 +8,37 @@ target 'IMUIKitOCExample' do
88

99
#登录组件
1010
pod 'YXLogin', '1.1.0'
11-
11+
1212
# 基础库
13-
pod 'NEChatKit', '10.5.2'
14-
13+
pod 'NEChatKit', '10.5.3'
14+
1515
# UI 组件，依次为通讯录组件、会话列表组件、会话（聊天）组件、群相关设置组件
16-
pod 'NEChatUIKit', '10.5.2'
17-
pod 'NEContactUIKit', '10.5.2'
18-
pod 'NEConversationUIKit', '10.5.2'
19-
pod 'NETeamUIKit', '10.5.2'
20-
16+
pod 'NEChatUIKit', '10.5.3'
17+
pod 'NEContactUIKit', '10.5.3'
18+
pod 'NEConversationUIKit', '10.5.3'
19+
pod 'NETeamUIKit', '10.5.3'
20+
2121
# 扩展库 - 地理位置组件
22-
pod 'NEMapKit', '10.5.2'
22+
pod 'NEMapKit', '10.5.3'
2323

2424
# 扩展库 - AI 划词搜索
25-
pod 'NEAISearchKit', '10.5.2'
26-
27-
# 扩展库 - 呼叫组件
25+
pod 'NEAISearchKit', '10.5.3'
26+
27+
# 扩展库 - 呼叫组件
28+
pod 'NERtcSDK/RtcBasic', '5.6.33' # RTC 音视频基础组件
29+
pod 'NERtcSDK/Nenn' # RTC 音视频神经网络组件（使用背景虚化功能需要集成）
30+
pod 'NERtcSDK/Segment' # RTC 音视频背景分割组件（使用背景虚化功能需要集成）
2831
pod 'NERtcCallKit/NOS_Special', '3.1.0'
29-
pod 'NERtcCallUIKit/NOS_Special', '3.1.0'
30-
31-
# 扩展库，依次为 RTC 音视频基础组件、RTC 音视频神经网络组件（使用背景虚化功能需要集成）、RTC 音视频背景分割组件（使用背景虚化功能需要集成）
32-
pod 'NERtcSDK/RtcBasic', '5.6.33'
33-
pod 'NERtcSDK/Nenn'
34-
pod 'NERtcSDK/Segment'
35-
36-
32+
pod 'NERtcCallUIKit/NOS_Special', '3.1.0' # (源码地址：https://github.com/netease-kit/NEVideoCall-1to1/tree/main/NLiteAVDemo-iOS-ObjC/CallKit)
33+
3734
# 如果需要查看UI部分源码请注释掉以上在线依赖，打开下面的本地依赖
38-
# pod 'NEContactUIKit', :path => '../../NEContactUIKit/NEContactUIKit.podspec'
39-
# pod 'NEConversationUIKit', :path => '../../NEConversationUIKit/NEConversationUIKit.podspec'
40-
# pod 'NETeamUIKit', :path => '../../NETeamUIKit/NETeamUIKit.podspec'
41-
# pod 'NEChatUIKit', :path => '../../NEChatUIKit/NEChatUIKit.podspec'
42-
# pod 'NEMapKit', :path => '../../NEMapKit/NEMapKit.podspec'
43-
# pod 'NEAISearchKit', :path => '../../NEAISearchKit/NEAISearchKit.podspec'
44-
# pod 'NERtcCallUIKit', :path => '../../NERtcCallUIKit/NERtcCallUIKit.podspec'
45-
46-
35+
# pod 'NEContactUIKit', :path => 'NEContactUIKit/NEContactUIKit.podspec'
36+
# pod 'NEConversationUIKit', :path => 'NEConversationUIKit/NEConversationUIKit.podspec'
37+
# pod 'NETeamUIKit', :path => 'NETeamUIKit/NETeamUIKit.podspec'
38+
# pod 'NEChatUIKit', :path => 'NEChatUIKit/NEChatUIKit.podspec'
39+
# pod 'NEMapKit', :path => 'NEMapKit/NEMapKit.podspec'
40+
# pod 'NEAISearchKit', :path => 'NEAISearchKit/NEAISearchKit.podspec'
41+
4742
end
4843

4944
# ⚠️如果pod依赖报错，可打开以下注释

‎NEAISearchKit/NEAISearchKit.podspec‎

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,24 @@
66
# To learn more about a Podspec see https://guides.cocoapods.org/syntax/podspec.html
77
#
88

9-
Pod::Spec.new do |s|
10-
s.name = 'NEAISearchKit'
11-
s.version = '10.5.2'
12-
s.summary = 'Netease XKit'
13-
14-
# This description is used to generate tags and improve search results.
15-
# * Think: What does it do? Why did you write it? What is the focus?
16-
# * Try to keep it short, snappy and to the point.
17-
# * Write the description between the DESC delimiters below.
18-
# * Finally, don't worry about the indent, CocoaPods strips it!
19-
20-
s.description = <<-DESC
21-
TODO: Add long description of the pod here.
22-
DESC
23-
24-
s.homepage = 'http://netease.im'
25-
s.license = { :'type' => 'Copyright', :'text' => ' Copyright 2022 Netease '}
26-
s.author = 'yunxin engineering department'
27-
s.source = { :git => 'https://github.com/netease/NEKitGroupUI.git', :tag => s.version.to_s }
28-
29-
s.pod_target_xcconfig = {
30-
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64',
31-
'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES'
32-
}
33-
34-
s.ios.deployment_target = '12.0'
35-
s.swift_version = '5.0'
36-
37-
s.source_files = 'NEAISearchKit/Classes/**/*'
38-
s.resource = 'NEAISearchKit/Assets/**/*'
39-
40-
s.dependency 'NEChatKit'
41-
s.dependency 'NECommonUIKit'
9+
# 配置内容详见：../PodConfigs/config_podspec.rb
10+
require_relative "../PodConfigs/config_podspec.rb"
11+
12+
Pod::Spec.new do |spec|
13+
spec.name = 'NEAISearchKit'
14+
spec.version = YXConfig.imuikit_version
15+
spec.summary = 'Netease XKit'
16+
spec.homepage = YXConfig.homepage
17+
spec.license = YXConfig.license
18+
spec.author = YXConfig.author
19+
spec.ios.deployment_target = YXConfig.deployment_target
20+
spec.swift_version = YXConfig.swift_version
21+
spec.source = { :git => '', :tag => spec.version.to_s }
22+
spec.source_files = 'NEAISearchKit/Classes/**/*'
23+
spec.resource = 'NEAISearchKit/Assets/**/*'
24+
YXConfig.pod_target_xcconfig(spec)
25+
26+
spec.dependency 'NEChatKit'
27+
spec.dependency 'NECommonUIKit'
4228

4329
end

‎NEChatUIKit/NEChatUIKit.podspec‎

Lines changed: 20 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,27 @@
66
# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
77
#
88

9-
Pod::Spec.new do |s|
9+
# 配置内容详见：../PodConfigs/config_podspec.rb
10+
require_relative "../PodConfigs/config_podspec.rb"
1011

11-
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
12-
#
13-
# These will help people to find your library, and whilst it
14-
# can feel like a chore to fill in it's definitely to your advantage. The
15-
# summary should be tweet-length, and the description more in depth.
16-
#
17-
18-
s.name = 'NEChatUIKit'
19-
s.version = '10.5.2'
20-
s.summary = 'Chat Module of IM.'
21-
22-
# This description is used to generate tags and improve search results.
23-
# * Think: What does it do? Why did you write it? What is the focus?
24-
# * Try to keep it short, snappy and to the point.
25-
# * Write the description between the DESC delimiters below.
26-
# * Finally, don't worry about the indent, CocoaPods strips it!
27-
s.description = <<-DESC
28-
TODO: Add long description of the pod here.
29-
DESC
30-
s.homepage = 'http://netease.im'
31-
s.license = { :'type' => 'Copyright', :'text' => ' Copyright 2022 Netease '}
32-
s.author = 'yunxin engineering department'
33-
s.source = { :git => 'ssh://git@g.hz.netease.com:22222/yunxin-app/xkit-ios.git', :tag => s.version.to_s }
34-
35-
s.ios.deployment_target = '12.0'
36-
s.swift_version = '5.0'
37-
38-
s.source_files = 'NEChatUIKit/Classes/**/*'
39-
s.pod_target_xcconfig = {
40-
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64',
41-
'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES'
42-
}
12+
Pod::Spec.new do |spec|
13+
spec.name = 'NEChatUIKit'
14+
spec.version = YXConfig.imuikit_version
15+
spec.summary = 'Netease XKit'
16+
spec.homepage = YXConfig.homepage
17+
spec.license = YXConfig.license
18+
spec.author = YXConfig.author
19+
spec.ios.deployment_target = YXConfig.deployment_target
20+
spec.swift_version = YXConfig.swift_version
21+
spec.source = { :git => '', :tag => spec.version.to_s }
22+
spec.source_files = 'NEChatUIKit/Classes/**/*'
23+
spec.resource = 'NEChatUIKit/Assets/**/*'
24+
YXConfig.pod_target_xcconfig(spec)
4325

44-
s.resource = 'NEChatUIKit/Assets/**/*'
45-
s.dependency 'NEChatKit'
46-
s.dependency 'NECommonUIKit'
47-
s.dependency 'MJRefresh'
48-
s.dependency 'SDWebImageWebPCoder'
49-
s.dependency 'SDWebImageSVGKitPlugin'
26+
spec.dependency 'NEChatKit'
27+
spec.dependency 'NECommonUIKit'
28+
spec.dependency 'MJRefresh'
29+
spec.dependency 'SDWebImageWebPCoder'
30+
spec.dependency 'SDWebImageSVGKitPlugin'
5031

5132
end

‎NEChatUIKit/NEChatUIKit/Classes/Chat/Controller/ChatViewController.swift‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,6 +1686,14 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
16861686
}
16871687
}
16881688

1689+
/// 本端发送消息后的回调，为 sendMessage 接口callback，可在回调中获取消息反垃圾结果
1690+
/// - Parameter completion: sendMessage 接口调用回调
1691+
open func sendMessageCallback(_ result: V2NIMSendMessageResult?, _ error: V2NIMError?, _ progress: UInt) {
1692+
if let block = ChatKitClient.shared.sendMessageCallback {
1693+
block(self, result, error, progress)
1694+
}
1695+
}
1696+
16891697
/// 收到消息
16901698
/// - Parameter messages: 消息列表
16911699
open func onRecvMessages(_ messages: [V2NIMMessage], _ indexs: [IndexPath]) {

0 commit comments

Comments
 (0)