Merge remote-tracking branch 'origin/master'

NLiteAVDemo-iOS-ObjC/CallKit/NECallKitPstn/NECallKitPstn.podspec

@@ -28,7 +28,7 @@ TODO: Add long description of the pod here.
   s.source           = { :git => 'https://github.com/cy/NECallKitPstn.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
 
-  s.ios.deployment_target = '11.0'
+  s.ios.deployment_target = '12.0'
 
   s.source_files = 'NECallKitPstn/Classes/**/*'
 

NLiteAVDemo-iOS-ObjC/CallKit/NERtcCallUIKit/NERtcCallUIKit.podspec

@@ -8,49 +8,49 @@
 
 Pod::Spec.new do |s|
   s.name             = 'NERtcCallUIKit'
-  s.version          = '2.2.0'
+  s.version          = '2.5.0'
   s.summary          = 'Netease XKit'
   s.homepage         = 'http://netease.im'
   s.license          =  { :'type' => "Copyright", :'text' => " Copyright 2022 Netease " }
   s.author           = 'yunxin engineering department'
-  s.ios.deployment_target = '11.0'
+  s.ios.deployment_target = '12.0'
   s.source = { :http => "" }
   s.source_files = 'NERtcCallUIKit/Classes/**/*'
   s.resource = 'NERtcCallUIKit/Assets/**/*'
 
   s.subspec 'NOS' do |nos|
-    nos.dependency 'NERtcCallKit/NOS','2.2.2'
+    nos.dependency 'NERtcCallKit/NOS','2.5.0'
     nos.dependency 'SDWebImage'
-    nos.dependency 'NECoreKit','9.6.4'
+    nos.dependency 'NECoreKit'
     nos.dependency 'NECommonKit'
     nos.dependency 'NECommonUIKit'
     nos.dependency 'NERtcSDK'
   end
 
   s.subspec 'NOS_Special' do |nos|
-    nos.dependency 'NERtcCallKit/NOS_Special', "2.2.2"
+    nos.dependency 'NERtcCallKit/NOS_Special', '2.5.0'
     nos.dependency 'SDWebImage'
-    nos.dependency 'NECoreKit','9.6.4'
+    nos.dependency 'NECoreKit'
     nos.dependency 'NECommonKit'
     nos.dependency 'NECommonUIKit'
     nos.dependency 'NERtcSDK'
 
   end
 
   s.subspec 'FCS' do |fcs|
-    fcs.dependency 'NERtcCallKit/FCS','2.2.2'
+    fcs.dependency 'NERtcCallKit/FCS','2.5.0'
     fcs.dependency 'SDWebImage'
-    fcs.dependency 'NECoreKit','9.6.4'
+    fcs.dependency 'NECoreKit'
     fcs.dependency 'NECommonKit'
     fcs.dependency 'NECommonUIKit'
     fcs.dependency 'NERtcSDK'
 
   end
 
   s.subspec 'FCS_Special' do |fcs|
-    fcs.dependency 'NERtcCallKit/FCS_Special', "2.2.2"
+    fcs.dependency 'NERtcCallKit/FCS_Special', '2.5.0'
     fcs.dependency 'SDWebImage'
-    fcs.dependency 'NECoreKit','9.6.4'
+    fcs.dependency 'NECoreKit'
     fcs.dependency 'NECommonKit'
     fcs.dependency 'NECommonUIKit'
     fcs.dependency 'NERtcSDK'

NLiteAVDemo-iOS-ObjC/CallKit/NERtcCallUIKit/NERtcCallUIKit/Assets/en.lproj/Localizable.strings

@@ -4,40 +4,40 @@
 // found in the LICENSE file.
 
 
-"switch_to_audio"="Switch to audio";
-"switch_to_video"="Switch to video";
+"switch_to_audio"="Switch to Voice";
+"switch_to_video"="Switch to Video";
 "accept_failed"="Answer Failed";
-"network_error"="Network error, try later";
-"switch_error"="Switch Error";
-"remote_cancel"="Cancelled by the opposite";
-"remote_busy"="Busy-line";
-"remote_timeout"="No Responding";
-"remote_reject"="Reject";
-"other_client_accept"="Accept by other client";
-"other_client_reject"="Reject by other client";
+"network_error"="Network exception, please try again later";
+"switch_error"="Failed to switch";
+"remote_cancel"="The call was canceled";
+"remote_busy"="The subscriber you dialed is busy";
+"remote_timeout"="Timeout and no response";
+"remote_reject"="The user has declined your  call invitation";
+"other_client_accept"="The other client has answered the call";
+"other_client_reject"="The other client has rejected the call";
 
 "permission"="Permission Require";
 "reject"="Reject";
 "agree"="Agree";
-"audio_to_video"="Opposite requests to switch to video,  have to turn on your camera";
-"video_to_audio"="Opposite requests to switch to audio,  will turn off your camera directly";
-"reject_tip"="Request Denied";
+"audio_to_video"="A request to convert video to audio will turn off your camera directly";
+"The other party requests to convert audio to video, which requires turning on your camera";
+"reject_tip"="The invitation was rejected.";
 
-"invite_audio_call"="Invite for audio call";
-"invite_video_call"="Invite for video call";
+"invite_audio_call"="Invite you to voice call...";
+"invite_video_call"="Invite you to video call...";
 
-"waitting_remote_response"="Waiting for response";
+"waitting_remote_response"="Awaiting response...";
 "call_cancel"="Cancel";
 "call_reject"="Reject";
 "call_accept"="Accept";
-"call_micro_phone"="Microphone";
+"call_micro_phone"="Mic";
 "call_speaker"="Speaker";
-"waitting_remote_accept"="Waitting to connect";
+"waitting_remote_accept"="Waiting for the call...";
 "calling"="Calling";
 "cancel_failed"="The invitation has been accepted and cannot be canceled";
 
 "operation_failed"="operation failed";
 
-"device_not_support"="The current device does not support virtualization";
+"device_not_support"="This device does not support the blurring feature";
 
-"connecting"="Connecting…";
+"connecting"="Connecting...";

NLiteAVDemo-iOS-ObjC/CallKit/NERtcCallUIKit/NERtcCallUIKit/Assets/zh-Hans.lproj/Localizable.strings

@@ -11,32 +11,32 @@
 "remote_cancel"="对方取消";
 "remote_busy"="对方占线";
 "remote_timeout"="对方超时未响应";
-"remote_reject"="对方已拒绝";
-"other_client_accept"="已被其他端接受";
-"other_client_reject"="已被其他端拒绝";
+"remote_reject"="对方已经拒绝";
+"other_client_accept"="其他端已经接听";
+"other_client_reject"="其他端已经拒绝";
 
 "permission"="权限请求";
 "reject"="拒绝";
 "agree"="同意";
 "audio_to_video"="对方请求将音频转为视频，需要打开您的摄像头。";
 "video_to_audio"="对方请求将视频转为音频，将直接关闭您的摄像头。";
-"reject_tip"="对方拒绝了您请求";
+"reject_tip"="对方拒绝了您的请求";
 
-"invite_audio_call"="邀请您音频通话";
-"invite_video_call"="邀请您视频通话";
+"invite_audio_call"="邀请您音频通话...";
+"invite_video_call"="邀请您视频通话...";
 
 "waitting_remote_response"="正在等待对方响应...";
 "call_cancel"="取消";
 "call_reject"="拒绝";
 "call_accept"="接听";
 "call_micro_phone"="麦克风";
 "call_speaker"="扬声器";
-"waitting_remote_accept"="等待对方接听……";
+"waitting_remote_accept"="等待对方接听...";
 "calling"="正在呼叫";
 "cancel_failed"="邀请已接受无法取消";
 
 "operation_failed"="操作失败";
 
-"device_not_support"="当前设备不支持虚化";
+"device_not_support"="该设备不支持虚化功能";
 
-"connecting"="正在接通中…";
+"connecting"="正在接通中...";

NLiteAVDemo-iOS-ObjC/NLiteAVDemo.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -882,12 +882,12 @@
 				EXCLUDED_ARCHS = "";
 				GCC_PREFIX_HEADER = "$(SRCROOT)/NLiteAVDemo/PrefixHeader.pch";
 				INFOPLIST_FILE = NLiteAVDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.netease.NELiteAVDemo;
 				PRODUCT_NAME = videocall;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -909,12 +909,12 @@
 				EXCLUDED_ARCHS = "";
 				GCC_PREFIX_HEADER = "$(SRCROOT)/NLiteAVDemo/PrefixHeader.pch";
 				INFOPLIST_FILE = NLiteAVDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.netease.NELiteAVDemo;
 				PRODUCT_NAME = videocall;
 				PROVISIONING_PROFILE_SPECIFIER = NELiteAVDemo_Profile_InHouse;

NLiteAVDemo-iOS-ObjC/NLiteAVDemo/NERtcVideoCall/UI/ViewController/NERtcContactsViewController.m

@@ -316,8 +316,6 @@ - (void)didCallWithUser:(NEUser *)user withType:(NECallType)callType {
   }
 
   NEUICallParam *callParam = [[NEUICallParam alloc] init];
-  NEUser *localUser = [NEAccount shared].userModel;
-  callParam.currentUserAccid = localUser.imAccid;
   callParam.remoteUserAccid = user.imAccid;
   callParam.remoteShowName = user.mobile;
   callParam.remoteAvatar = user.avatar;

NLiteAVDemo-iOS-ObjC/Podfile

@@ -1,23 +1,23 @@
 # Uncomment the next line to define a global platform for your project
- platform :ios, '11.0'
+ platform :ios, '12.0'
 
 source 'https://github.com/CocoaPods/Specs.git'
 target 'NLiteAVDemo' do
   use_frameworks!
   # 云信基础SDK
   pod 'NERtcSDK', '5.5.2'
-  pod 'NIMSDK_LITE', '9.14.0'
+  pod 'NIMSDK_LITE', '9.16.1'
 
   pod 'NECallKitPstn', :path => 'CallKit/NECallKitPstn/NECallKitPstn.podspec'
 
   # 三方依赖
   pod 'Masonry'
 
   #呼叫组件API组件
-  pod 'NERtcCallKit', '2.2.2'
+  pod 'NERtcCallKit', '2.5.0'
 
   #呼叫组件UI组件
-  pod 'NERtcCallUIKit', '2.2.2'
+  pod 'NERtcCallUIKit', '2.5.0'
 
   pod 'NETranscodingKit'
 
@@ -26,3 +26,11 @@ target 'NLiteAVDemo' do
 
 
 end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
+    end
+  end
+end