Skip to content

Commit 9cfc0c7

Browse files
author
zsw666
authored
v10.6.1 (#429)
1 parent 8e4bc13 commit 9cfc0c7

151 files changed

Lines changed: 779 additions & 803 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -601,12 +601,12 @@
601601
INFOPLIST_KEY_UIMainStoryboardFile = Main;
602602
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
603603
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
604-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
604+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
605605
LD_RUNPATH_SEARCH_PATHS = (
606606
"$(inherited)",
607607
"@executable_path/Frameworks",
608608
);
609-
MARKETING_VERSION = 10.5.3;
609+
MARKETING_VERSION = 10.6.1;
610610
PRODUCT_BUNDLE_IDENTIFIER = com.netease.yunxin.app.im;
611611
PRODUCT_NAME = "$(TARGET_NAME)";
612612
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -637,12 +637,12 @@
637637
INFOPLIST_KEY_UIMainStoryboardFile = Main;
638638
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
639639
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
640-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
640+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
641641
LD_RUNPATH_SEARCH_PATHS = (
642642
"$(inherited)",
643643
"@executable_path/Frameworks",
644644
);
645-
MARKETING_VERSION = 10.5.3;
645+
MARKETING_VERSION = 10.6.1;
646646
PRODUCT_BUNDLE_IDENTIFIER = com.netease.yunxin.app.im;
647647
PRODUCT_NAME = "$(TARGET_NAME)";
648648
SWIFT_EMIT_LOC_STRINGS = YES;

‎IMUIKitOC/IMUIKitOCExample/IMUIKitOCExample/Main/AppDelegate.m‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,15 @@ - (BOOL)application:(UIApplication *)application
4242
}
4343

4444
- (void)setupInit {
45-
// 初始化NIMSDK
45+
// 设置IM SDK的配置项，包括AppKey，推送配置和一些全局配置等
4646
NIMSDKOption *option = [NIMSDKOption optionWithAppKey:AppKey];
47-
option.v2 = YES;
48-
[[IMKitClient instance] setupIM:option];
47+
48+
// 设置IM SDK V2的配置项，包括是否使用旧的登录接口和是否使用云端会话
49+
V2NIMSDKOption *v2Option = [[V2NIMSDKOption alloc] init];
50+
v2Option.enableV2CloudConversation = false;
51+
52+
// 初始化IM UIKit，初始化Kit层和IM SDK，将配置信息透传给IM SDK。无需再次初始化IM SDK
53+
[IMKitClient.instance setupIM2:option :v2Option];
4954

5055
// 统一登录组件
5156
YXConfig *config = [[YXConfig alloc] init];

‎IMUIKitOC/IMUIKitOCExample/Podfile‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
# 配置内容详见：../../PodConfigs/config_podspec.rb
2+
require_relative "../../PodConfigs/config_podspec.rb"
3+
14
# Uncomment the next line to define a global platform for your project
2-
platform :ios, '12.0'
5+
platform :ios, YXConfig.deployment_target
36
source 'https://github.com/CocoaPods/Specs.git'
47

58
target 'IMUIKitOCExample' do
@@ -10,43 +13,44 @@ target 'IMUIKitOCExample' do
1013
pod 'YXLogin', '1.1.0'
1114

1215
# 基础库
13-
pod 'NEChatKit', '10.5.3'
14-
15-
# UI 组件，依次为通讯录组件、会话列表组件、会话（聊天）组件、群相关设置组件
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-
21-
# 扩展库 - 地理位置组件
22-
pod 'NEMapKit', '10.5.3'
23-
24-
# 扩展库 - AI 划词搜索
25-
pod 'NEAISearchKit', '10.5.3'
26-
27-
# 扩展库 - 呼叫组件
28-
pod 'NERtcSDK/RtcBasic', '5.6.33' # RTC 音视频基础组件
16+
pod 'NEChatKit', YXConfig.imuikit_version
17+
18+
# UI 组件，YXConfig.imuikit_version = 10.6.1
19+
# pod 'NEChatUIKit', YXConfig.imuikit_version # 会话（聊天）组件
20+
# pod 'NEContactUIKit', YXConfig.imuikit_version # 通讯录组件
21+
# pod 'NEConversationUIKit', YXConfig.imuikit_version # (云端)会话列表组件, 与本地会话组件二者选其一
22+
# pod 'NELocalConversationUIKit', YXConfig.imuikit_version # (本地)会话列表组件, 与云端会话组件二者选其一
23+
# pod 'NETeamUIKit', YXConfig.imuikit_version # 群相关设置组件
24+
#
25+
# # 扩展库 - 地理位置组件
26+
# pod 'NEMapKit', YXConfig.imuikit_version
27+
#
28+
# # 扩展库 - AI 划词搜索
29+
# pod 'NEAISearchKit', YXConfig.imuikit_version
30+
31+
# 扩展库 - 呼叫组件
32+
pod 'NERtcSDK/RtcBasic' # RTC 音视频基础组件
2933
pod 'NERtcSDK/Nenn' # RTC 音视频神经网络组件（使用背景虚化功能需要集成）
3034
pod 'NERtcSDK/Segment' # RTC 音视频背景分割组件（使用背景虚化功能需要集成）
31-
pod 'NERtcCallKit/NOS_Special', '3.1.0'
32-
pod 'NERtcCallUIKit/NOS_Special', '3.1.0' # (源码地址：https://github.com/netease-kit/NEVideoCall-1to1/tree/main/NLiteAVDemo-iOS-ObjC/CallKit)
33-
35+
pod 'NERtcCallKit/NOS_Special', '3.5.0'
36+
pod 'NERtcCallUIKit/NOS_Special', '3.5.0' # (源码地址：https://github.com/netease-kit/NEVideoCall-1to1/tree/main/NLiteAVDemo-iOS-ObjC/CallKit)
37+
3438
# 如果需要查看UI部分源码请注释掉以上在线依赖，打开下面的本地依赖
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-
39+
pod 'NEContactUIKit', :path => '../../NEContactUIKit/NEContactUIKit.podspec'
40+
pod 'NEConversationUIKit', :path => '../../NEConversationUIKit/NEConversationUIKit.podspec'
41+
pod 'NETeamUIKit', :path => '../../NETeamUIKit/NETeamUIKit.podspec'
42+
pod 'NEChatUIKit', :path => '../../NEChatUIKit/NEChatUIKit.podspec'
43+
pod 'NEMapKit', :path => '../../NEMapKit/NEMapKit.podspec'
44+
pod 'NEAISearchKit', :path => '../../NEAISearchKit/NEAISearchKit.podspec'
45+
4246
end
4347

4448
# ⚠️如果pod依赖报错，可打开以下注释
4549
post_install do |installer|
4650
installer.pods_project.targets.each do |target|
4751
target.build_configurations.each do |config|
4852
config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES'
49-
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
53+
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = YXConfig.deployment_target
5054
end
5155
end
5256
end

‎NEChatUIKit/NEChatUIKit/Classes/Base/BaseView/ChatHeaderView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ open class ChatHeaderView: UIView {
2424
super.init(coder: coder)
2525
}
2626

27-
func setupUI() {
27+
open func setupUI() {
2828
clipsToBounds = false
2929
addSubview(titleLabel)
3030
NSLayoutConstraint.activate([

‎NEChatUIKit/NEChatUIKit/Classes/Base/BaseView/ChatSectionView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ open class ChatSectionView: UITableViewHeaderFooterView {
1717
super.init(coder: coder)
1818
}
1919

20-
func commonUI() {
20+
open func commonUI() {
2121
contentView.backgroundColor = .ne_lightBackgroundColor
2222
titleLabel.font = UIFont.systemFont(ofSize: 12)
2323
titleLabel.textColor = .ne_greyText

‎NEChatUIKit/NEChatUIKit/Classes/Base/BaseView/ChatUnfoldCell.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ open class ChatUnfoldCell: ChatCornerCell {
3131
super.init(coder: coder)
3232
}
3333

34-
func setupUI() {
34+
open func setupUI() {
3535
contentView.addSubview(contentLabel)
3636
NSLayoutConstraint.activate([
3737
contentLabel.centerYAnchor.constraint(equalTo: contentView.centerYAnchor),
@@ -45,11 +45,11 @@ open class ChatUnfoldCell: ChatCornerCell {
4545
])
4646
}
4747

48-
func changeToArrowUp() {
48+
open func changeToArrowUp() {
4949
arrowImageView.image = UIImage.ne_imageNamed(name: "arrowUp")
5050
}
5151

52-
func changeToArrowDown() {
52+
open func changeToArrowDown() {
5353
arrowImageView.image = UIImage.ne_imageNamed(name: "arrowDown")
5454
}
5555
}

‎NEChatUIKit/NEChatUIKit/Classes/Base/BaseView/ChatUserHeaderView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ open class ChatUserHeaderView: UIImageView {
2424
super.init(coder: coder)
2525
}
2626

27-
func setupUI() {
27+
open func setupUI() {
2828
isUserInteractionEnabled = true
2929
clipsToBounds = false
3030
addSubview(titleLabel)

‎NEChatUIKit/NEChatUIKit/Classes/Base/BaseViewController/NEChatBaseViewController.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ open class NEChatBaseViewController: UIViewController, UIGestureRecognizerDelega
8282
}
8383
}
8484

85-
private func setupBackUI() {
85+
open func setupBackUI() {
8686
let image = UIImage.ne_imageNamed(name: "backArrow")?.withRenderingMode(.alwaysOriginal)
8787
let backItem = UIBarButtonItem(
8888
image: image,
@@ -96,9 +96,9 @@ open class NEChatBaseViewController: UIViewController, UIGestureRecognizerDelega
9696
navigationController?.navigationBar.topItem?.backBarButtonItem?.tintColor = .ne_darkText
9797
}
9898

99-
func backEvent() {
99+
open func backEvent() {
100100
navigationController?.popViewController(animated: true)
101101
}
102102

103-
func toSetting() {}
103+
open func toSetting() {}
104104
}

0 commit comments

Comments
 (0)