archive-gh-me/Bark
1
0
Fork 0
mirror of https://github.com/Finb/Bark.git synced 2025-12-08 21:36:01 +00:00
Code Issues Projects Releases Wiki Activity

调整标题

Browse Source
This commit is contained in:
Fin 2024-11-27 18:26:57 +08:00
parent ff866de90f
commit ba899f0a04
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Common/ServerManager.swift
View File

@ -17,6 +17,11 @@ class Server: Codable {
let address: String let address: String
var key: String var key: String
var state: Client.ClienState var state: Client.ClienState
var host: String {
return URL(string: address)?.host ?? ""
}
init(id: String = UUID().uuidString, address: String, key: String, state: Client.ClienState = .ok) { init(id: String = UUID().uuidString, address: String, key: String, state: Client.ClienState = .ok) {
self.id = id self.id = id
self.address = address self.address = address

6
Controller/HomeViewModel.swift
View File

@ -120,7 +120,7 @@ class HomeViewModel: ViewModel, ViewModelType {
] ]
func transform(input: Input) -> Output { func transform(input: Input) -> Output {
let title = BehaviorRelay(value: URL(string: ServerManager.shared.currentServer.address)?.host ?? "") let title = BehaviorRelay(value: ServerManager.shared.currentServer.host)
let sectionModel = SectionModel( let sectionModel = SectionModel(
model: "previews", model: "previews",
@ -195,7 +195,7 @@ class HomeViewModel: ViewModel, ViewModelType {
default: break default: break
} }
// 主要用于 url scheme 添加服务器时会有state状态改变事件，顺便更新下标题 // 主要用于 url scheme 添加服务器时会有state状态改变事件，顺便更新下标题
title.accept(ServerManager.shared.currentServer.address) title.accept(ServerManager.shared.currentServer.host)
}) })
.disposed(by: rx.disposeBag) .disposed(by: rx.disposeBag)
@ -207,7 +207,7 @@ class HomeViewModel: ViewModel, ViewModelType {
(model as! ServerListViewModel).currentServerChanged.asDriver(onErrorDriveWith: .empty()) (model as! ServerListViewModel).currentServerChanged.asDriver(onErrorDriveWith: .empty())
} }
.map { server -> String in .map { server -> String in
(try? server.address.asURL().host) ?? "" server.host
} }
.drive(title) .drive(title)
.disposed(by: rx.disposeBag) .disposed(by: rx.disposeBag)

2
Controller/NewServerViewModel.swift
View File

@ -81,7 +81,7 @@ class NewServerViewModel: ViewModel, ViewModelType {
ServerManager.shared.setCurrentServer(serverId: server.id) ServerManager.shared.setCurrentServer(serverId: server.id)
ServerManager.shared.syncAllServers() ServerManager.shared.syncAllServers()
strongSelf.pop.accept(strongSelf.url) strongSelf.pop.accept(URL(string: strongSelf.url)?.host ?? "")
showSnackbar.accept(NSLocalizedString("AddedSuccessfully")) showSnackbar.accept(NSLocalizedString("AddedSuccessfully"))
case .failure(let error): case .failure(let error):
showSnackbar.accept("\(NSLocalizedString("InvalidServer"))\(error.rawString())") showSnackbar.accept("\(NSLocalizedString("InvalidServer"))\(error.rawString())")