修改添加服务器配置时不回调 id自动生成

This commit is contained in:
Xwite
2023-03-10 19:43:29 +08:00
parent b5741f88a7
commit 82d7787746
3 changed files with 10 additions and 33 deletions
@@ -25,7 +25,7 @@ object AppConst {
const val MAX_THREAD = 9
const val DEFAULT_WEBDAV_ID = -1
const val DEFAULT_WEBDAV_ID = -1L
val SCRIPT_ENGINE: RhinoScriptEngine by lazy {
RhinoScriptEngine()
@@ -67,7 +67,6 @@ class ServerConfigDialog() : BaseDialogFragment(R.layout.dialog_webdav_server, t
}
private fun upConfigView(server: Server?) {
binding.etId.setText(server?.id?.toString())
binding.etName.setText(server?.name)
binding.spType.setSelection(
when (server?.type) {
@@ -109,14 +108,7 @@ class ServerConfigDialog() : BaseDialogFragment(R.layout.dialog_webdav_server, t
}
private fun getServer(): Server? {
val id = kotlin.runCatching {
binding.etId.text.toString().toLong()
}.getOrNull()
if (id == null) {
toastOnUi("id不能为空")
return null
}
val server = viewModel.mServer?.copy(id = id) ?: Server(id = id)
val server = viewModel.mServer?.copy() ?: Server()
server.name = binding.etName.text.toString()
server.type = when (binding.spType.selectedItemPosition) {
else -> Server.TYPE.WEBDAV
@@ -139,15 +131,15 @@ class ServerConfigDialog() : BaseDialogFragment(R.layout.dialog_webdav_server, t
}
override fun onDismiss(dialog: DialogInterface) {
super.onDismiss(dialog)
((parentFragment as? Callback) ?: (activity as? Callback))
?.onDialogDismiss("serverConfig")
}
// override fun onDismiss(dialog: DialogInterface) {
// super.onDismiss(dialog)
// ((parentFragment as? Callback) ?: (activity as? Callback))
// ?.onDialogDismiss("serverConfig")
// }
interface Callback {
// interface Callback {
fun onDialogDismiss(tag: String)
// fun onDialogDismiss(tag: String)
}
// }
}