v10.6.1 (#429)

Author: zsw666

IMUIKitOC/IMUIKitOCExample/IMUIKitOCExample.xcodeproj/project.pbxproj

@@ -601,12 +601,12 @@
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 10.5.3;
+				MARKETING_VERSION = 10.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.netease.yunxin.app.im;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -637,12 +637,12 @@
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 10.5.3;
+				MARKETING_VERSION = 10.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.netease.yunxin.app.im;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

IMUIKitOC/IMUIKitOCExample/IMUIKitOCExample/Main/AppDelegate.m

@@ -42,10 +42,15 @@ - (BOOL)application:(UIApplication *)application
 }
 
 - (void)setupInit {
-  // 初始化NIMSDK
+  // 设置IM SDK的配置项，包括AppKey，推送配置和一些全局配置等
   NIMSDKOption *option = [NIMSDKOption optionWithAppKey:AppKey];
-  option.v2 = YES;
-  [[IMKitClient instance] setupIM:option];
+
+  // 设置IM SDK V2的配置项，包括是否使用旧的登录接口和是否使用云端会话
+  V2NIMSDKOption *v2Option = [[V2NIMSDKOption alloc] init];
+  v2Option.enableV2CloudConversation = false;
+
+  // 初始化IM UIKit，初始化Kit层和IM SDK，将配置信息透传给IM SDK。无需再次初始化IM SDK
+  [IMKitClient.instance setupIM2:option :v2Option];
 
   // 统一登录组件
   YXConfig *config = [[YXConfig alloc] init];

IMUIKitOC/IMUIKitOCExample/Podfile

@@ -1,5 +1,8 @@
+# 配置内容详见：../../PodConfigs/config_podspec.rb
+require_relative "../../PodConfigs/config_podspec.rb"
+
 # Uncomment the next line to define a global platform for your project
-platform :ios, '12.0'
+platform :ios, YXConfig.deployment_target
 source 'https://github.com/CocoaPods/Specs.git'
 
 target 'IMUIKitOCExample' do
@@ -10,43 +13,44 @@ target 'IMUIKitOCExample' do
   pod 'YXLogin', '1.1.0'
 
   # 基础库
-  pod 'NEChatKit', '10.5.3'
-  
-  # UI 组件，依次为通讯录组件、会话列表组件、会话（聊天）组件、群相关设置组件
-  pod 'NEChatUIKit', '10.5.3'
-  pod 'NEContactUIKit', '10.5.3'
-  pod 'NEConversationUIKit', '10.5.3'
-  pod 'NETeamUIKit', '10.5.3'
-  
-  # 扩展库 - 地理位置组件
-  pod 'NEMapKit', '10.5.3'
-  
-  # 扩展库 - AI 划词搜索
-  pod 'NEAISearchKit', '10.5.3'
-  
-    # 扩展库 - 呼叫组件
-  pod 'NERtcSDK/RtcBasic', '5.6.33'         #  RTC 音视频基础组件
+  pod 'NEChatKit', YXConfig.imuikit_version
+
+  # UI 组件，YXConfig.imuikit_version = 10.6.1
+#  pod 'NEChatUIKit', YXConfig.imuikit_version               # 会话（聊天）组件
+#  pod 'NEContactUIKit', YXConfig.imuikit_version            # 通讯录组件
+#  pod 'NEConversationUIKit', YXConfig.imuikit_version       # (云端)会话列表组件, 与本地会话组件二者选其一
+#  pod 'NELocalConversationUIKit', YXConfig.imuikit_version  # (本地)会话列表组件, 与云端会话组件二者选其一
+#  pod 'NETeamUIKit', YXConfig.imuikit_version               # 群相关设置组件
+#
+#  # 扩展库 - 地理位置组件
+#  pod 'NEMapKit', YXConfig.imuikit_version
+#
+#  # 扩展库 - AI 划词搜索
+#  pod 'NEAISearchKit', YXConfig.imuikit_version
+
+  # 扩展库 - 呼叫组件
+  pod 'NERtcSDK/RtcBasic'                   #  RTC 音视频基础组件
   pod 'NERtcSDK/Nenn'                       #  RTC 音视频神经网络组件（使用背景虚化功能需要集成）
   pod 'NERtcSDK/Segment'                    #  RTC 音视频背景分割组件（使用背景虚化功能需要集成）
-  pod 'NERtcCallKit/NOS_Special', '3.1.0'
-  pod 'NERtcCallUIKit/NOS_Special', '3.1.0' # (源码地址：https://github.com/netease-kit/NEVideoCall-1to1/tree/main/NLiteAVDemo-iOS-ObjC/CallKit)
-  
+  pod 'NERtcCallKit/NOS_Special', '3.5.0'
+  pod 'NERtcCallUIKit/NOS_Special', '3.5.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 '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依赖报错，可打开以下注释
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES'
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = YXConfig.deployment_target
     end
   end
 end

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

@@ -24,7 +24,7 @@ open class ChatHeaderView: UIView {
     super.init(coder: coder)
   }
 
-  func setupUI() {
+  open func setupUI() {
     clipsToBounds = false
     addSubview(titleLabel)
     NSLayoutConstraint.activate([

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

@@ -17,7 +17,7 @@ open class ChatSectionView: UITableViewHeaderFooterView {
     super.init(coder: coder)
   }
 
-  func commonUI() {
+  open func commonUI() {
     contentView.backgroundColor = .ne_lightBackgroundColor
     titleLabel.font = UIFont.systemFont(ofSize: 12)
     titleLabel.textColor = .ne_greyText

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

@@ -31,7 +31,7 @@ open class ChatUnfoldCell: ChatCornerCell {
     super.init(coder: coder)
   }
 
-  func setupUI() {
+  open func setupUI() {
     contentView.addSubview(contentLabel)
     NSLayoutConstraint.activate([
       contentLabel.centerYAnchor.constraint(equalTo: contentView.centerYAnchor),
@@ -45,11 +45,11 @@ open class ChatUnfoldCell: ChatCornerCell {
     ])
   }
 
-  func changeToArrowUp() {
+  open func changeToArrowUp() {
     arrowImageView.image = UIImage.ne_imageNamed(name: "arrowUp")
   }
 
-  func changeToArrowDown() {
+  open func changeToArrowDown() {
     arrowImageView.image = UIImage.ne_imageNamed(name: "arrowDown")
   }
 }

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

@@ -24,7 +24,7 @@ open class ChatUserHeaderView: UIImageView {
     super.init(coder: coder)
   }
 
-  func setupUI() {
+  open func setupUI() {
     isUserInteractionEnabled = true
     clipsToBounds = false
     addSubview(titleLabel)

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

@@ -82,7 +82,7 @@ open class NEChatBaseViewController: UIViewController, UIGestureRecognizerDelega
     }
   }
 
-  private func setupBackUI() {
+  open func setupBackUI() {
     let image = UIImage.ne_imageNamed(name: "backArrow")?.withRenderingMode(.alwaysOriginal)
     let backItem = UIBarButtonItem(
       image: image,
@@ -96,9 +96,9 @@ open class NEChatBaseViewController: UIViewController, UIGestureRecognizerDelega
     navigationController?.navigationBar.topItem?.backBarButtonItem?.tintColor = .ne_darkText
   }
 
-  func backEvent() {
+  open func backEvent() {
     navigationController?.popViewController(animated: true)
   }
 
-  func toSetting() {}
+  open func toSetting() {}
 }