From b10660f5b1757a1f541200bd201b133d1dd4a7e6 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 27 Mar 2023 09:41:47 +0800 Subject: [PATCH] [skip ci]fix typo --- app/src/main/java/io/legado/app/web/WebSocketServer.kt | 3 +-- .../java/io/legado/app/web/socket/BookSearchWebSocket.kt | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/legado/app/web/WebSocketServer.kt b/app/src/main/java/io/legado/app/web/WebSocketServer.kt index fd130ae34..f2c7c27a0 100644 --- a/app/src/main/java/io/legado/app/web/WebSocketServer.kt +++ b/app/src/main/java/io/legado/app/web/WebSocketServer.kt @@ -2,8 +2,7 @@ package io.legado.app.web import fi.iki.elonen.NanoWSD import io.legado.app.service.WebService -import io.legado.app.web.socket.BookSourceDebugWebSocket -import io.legado.app.web.socket.RssSourceDebugWebSocket +import io.legado.app.web.socket.* class WebSocketServer(port: Int) : NanoWSD(port) { diff --git a/app/src/main/java/io/legado/app/web/socket/BookSearchWebSocket.kt b/app/src/main/java/io/legado/app/web/socket/BookSearchWebSocket.kt index 18e6b1e11..abb83af7f 100644 --- a/app/src/main/java/io/legado/app/web/socket/BookSearchWebSocket.kt +++ b/app/src/main/java/io/legado/app/web/socket/BookSearchWebSocket.kt @@ -22,7 +22,7 @@ class BookSearchWebSocket(handshakeRequest: NanoHTTPD.IHTTPSession) : private val normalClosure = NanoWSD.WebSocketFrame.CloseCode.NormalClosure private val searchModel = SearchModel(this, this) - private const val SEARCH_FINISH = "Search finish" + private val SEARCH_FINISH = "Search finish" override fun onOpen() { launch(IO) { @@ -61,7 +61,7 @@ class BookSearchWebSocket(handshakeRequest: NanoHTTPD.IHTTPSession) : close(normalClosure, SEARCH_FINISH, false) return@launch } - viewModel.search(System.currentTimeMillis(), key) + searchModel.search(System.currentTimeMillis(), key) } } } @@ -87,6 +87,6 @@ class BookSearchWebSocket(handshakeRequest: NanoHTTPD.IHTTPSession) : override fun onSearchFinish(isEmpty: Boolean) = close(normalClosure, SEARCH_FINISH, false) - override fun onSearchCancel(exception: Exception? = null) = close(normalClosure, exception?.toString() ?: SEARCH_FINISH, false) + override fun onSearchCancel(exception: Exception?) = close(normalClosure, exception?.toString() ?: SEARCH_FINISH, false) }