Skip to content

Commit abc89be

Browse files
author
zsw666
authored
update version and Podfile (#437)
* update app version * update Podfile ---------
1 parent 934902f commit abc89be

3 files changed

Lines changed: 21 additions & 8 deletions

File tree

NELocalConversationUIKit/NELocalConversationUIKit/Classes/NormalUI/Controller/LocalConversationController.swift

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ open class LocalConversationController: NEBaseLocalConversationController {
6767
}
6868
}
6969

70-
func changeLanguage() {
70+
open func changeLanguage() {
7171
requestData()
7272
initSystemNav()
7373
popListView = PopListView()
7474
brokenNetworkView.contentLabel.text = commonLocalizable("network_error")
7575
}
7676

77-
override func initSystemNav() {
77+
override open func initSystemNav() {
7878
super.initSystemNav()
7979

8080
let searchBarItem = UIBarButtonItem(customView: searchBarButton)
@@ -92,7 +92,12 @@ open class LocalConversationController: NEBaseLocalConversationController {
9292
navigationView.addBtn.isHidden = true
9393
navigationItem.rightBarButtonItems = [searchBarItem]
9494
}
95-
navigationView.brandBtn.setTitle(commonLocalizable("appName"), for: .normal)
95+
96+
if let brandTitle = LocalConversationUIConfig.shared.titleBarTitle {
97+
navigationView.brandBtn.setTitle(brandTitle, for: .normal)
98+
} else {
99+
navigationView.brandBtn.setTitle(commonLocalizable("appName"), for: .normal)
100+
}
96101
}
97102

98103
override open func setupSubviews() {

Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ target 'app' do
1515
# UI 组件,YXConfig.imuikit_version = 10.8.1
1616
pod 'NEChatUIKit', YXConfig.imuikit_version # 会话(聊天)组件
1717
pod 'NEContactUIKit', YXConfig.imuikit_version # 通讯录组件
18-
pod 'NEConversationUIKit', YXConfig.imuikit_version # (云端)会话列表组件, 与本地会话组件二者选其一
19-
pod 'NELocalConversationUIKit', YXConfig.imuikit_version # (本地)会话列表组件, 与云端会话组件二者选其一
18+
pod 'NEConversationUIKit', YXConfig.imuikit_version # (云端)会话列表组件
19+
pod 'NELocalConversationUIKit', YXConfig.imuikit_version # (本地)会话列表组件
2020
pod 'NETeamUIKit', YXConfig.imuikit_version # 群相关设置组件
2121

2222
# 扩展库 - 地理位置组件
@@ -32,7 +32,7 @@ target 'app' do
3232
pod 'NERtcCallKit/NOS_Special', '3.5.0'
3333
pod 'NERtcCallUIKit/NOS_Special', '3.5.0' # (源码地址:https://github.com/netease-kit/NEVideoCall-1to1/tree/main/NLiteAVDemo-iOS-ObjC/CallKit)
3434

35-
# 如果需要查看UI部分源码请注释掉以上在线依赖,打开下面的本地依赖,云端会话组件与本地会话组件二者选其一
35+
# 如果需要查看UI部分源码请注释掉以上在线依赖(不包含呼叫组件),打开下面的本地依赖
3636
# pod 'NEContactUIKit', :path => 'NEContactUIKit/NEContactUIKit.podspec'
3737
# pod 'NEConversationUIKit', :path => 'NEConversationUIKit/NEConversationUIKit.podspec'
3838
# pod 'NELocalConversationUIKit', :path => 'NELocalConversationUIKit/NELocalConversationUIKit.podspec'

app.xcodeproj/project.pbxproj

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,10 +420,14 @@
420420
inputFileListPaths = (
421421
"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-frameworks-${CONFIGURATION}-input-files.xcfilelist",
422422
);
423+
inputPaths = (
424+
);
423425
name = "[CP] Embed Pods Frameworks";
424426
outputFileListPaths = (
425427
"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-frameworks-${CONFIGURATION}-output-files.xcfilelist",
426428
);
429+
outputPaths = (
430+
);
427431
runOnlyForDeploymentPostprocessing = 0;
428432
shellPath = /bin/sh;
429433
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-frameworks.sh\"\n";
@@ -459,10 +463,14 @@
459463
inputFileListPaths = (
460464
"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources-${CONFIGURATION}-input-files.xcfilelist",
461465
);
466+
inputPaths = (
467+
);
462468
name = "[CP] Copy Pods Resources";
463469
outputFileListPaths = (
464470
"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources-${CONFIGURATION}-output-files.xcfilelist",
465471
);
472+
outputPaths = (
473+
);
466474
runOnlyForDeploymentPostprocessing = 0;
467475
shellPath = /bin/sh;
468476
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources.sh\"\n";
@@ -723,7 +731,7 @@
723731
"$(inherited)",
724732
"@executable_path/Frameworks",
725733
);
726-
MARKETING_VERSION = 10.8.0;
734+
MARKETING_VERSION = 10.8.1;
727735
PRODUCT_BUNDLE_IDENTIFIER = com.netease.yunxin.app.im;
728736
PRODUCT_NAME = "$(TARGET_NAME)";
729737
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -772,7 +780,7 @@
772780
"$(inherited)",
773781
"@executable_path/Frameworks",
774782
);
775-
MARKETING_VERSION = 10.8.0;
783+
MARKETING_VERSION = 10.8.1;
776784
PRODUCT_BUNDLE_IDENTIFIER = com.netease.yunxin.app.im;
777785
PRODUCT_NAME = "$(TARGET_NAME)";
778786
PROVISIONING_PROFILE_SPECIFIER = "";

0 commit comments

Comments
 (0)