From 30df9b03bdba4bc39011d898ac855a944a4ec13c Mon Sep 17 00:00:00 2001 From: gedoor Date: Mon, 26 Jul 2021 19:42:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/service/WebService.kt | 7 ++++--- app/src/main/res/values-es-rES/strings.xml | 2 -- app/src/main/res/values-ja-rJP/strings.xml | 2 -- app/src/main/res/values-pt-rBR/strings.xml | 2 -- app/src/main/res/values-zh-rHK/strings.xml | 2 -- app/src/main/res/values-zh-rTW/strings.xml | 2 -- app/src/main/res/values-zh/strings.xml | 2 -- app/src/main/res/values/non_translat.xml | 7 +++++++ app/src/main/res/values/strings.xml | 2 -- 9 files changed, 11 insertions(+), 17 deletions(-) create mode 100644 app/src/main/res/values/non_translat.xml diff --git a/app/src/main/java/io/legado/app/service/WebService.kt b/app/src/main/java/io/legado/app/service/WebService.kt index da350a90a..910e76497 100644 --- a/app/src/main/java/io/legado/app/service/WebService.kt +++ b/app/src/main/java/io/legado/app/service/WebService.kt @@ -73,11 +73,11 @@ class WebService : BaseService() { if (webSocketServer?.isAlive == true) { webSocketServer?.stop() } - val port = getPort() - httpServer = HttpServer(port) - webSocketServer = WebSocketServer(port + 1) val address = NetworkUtils.getLocalIPAddress() if (address != null) { + val port = getPort() + httpServer = HttpServer(port) + webSocketServer = WebSocketServer(port + 1) try { httpServer?.start() webSocketServer?.start(1000 * 30) // 通信超时设置 @@ -88,6 +88,7 @@ class WebService : BaseService() { upNotification() } catch (e: IOException) { toastOnUi(e.localizedMessage ?: "") + e.printStackTrace() stopSelf() } } else { diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 4e09bf224..4549049cf 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -87,7 +87,6 @@ Servicio Web Fuente de edición web y lectura de libros Editar fuentes de libros en la web - http://%1$s:%2$d Caché sin conexión Caché sin conexión precarga el o los capítulos(s) seleccionado(s) en Almacenamiento en caché @@ -157,7 +156,6 @@ Ocultar botones virtuales durante lectura Oculta barra de navegación Color de barra de navegación - GitHub Evaluación E-mail Error al abrir diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index f0a056267..e468022a3 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -87,7 +87,6 @@ Web service Web edit source and read book Edit book sources on the web - http://%1$s:%2$d Offline cache Offline cache cache the selected chapter(s) to Storage @@ -157,7 +156,6 @@ Hide virtual buttons when reading Hide navigation bar Navigation bar color - GitHub Rating Email Open failed diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 3ec84c761..46b9ae261 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -87,7 +87,6 @@ Serviço Web Fonte de edição web e livro lidos Editar fontes de livros na web - http://%1$s:%2$d Cache off-line Cache off-line salvar o(s) capítulo(s) selecionado(s) no Armazenamento em cache @@ -157,7 +156,6 @@ Esconder botões virtuais durante a leitura Ocultar a barra de navegação Cor da barra de navegação - GitHub Avaliação E-mail Falha ao abrir diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index a6beb041a..ae20044cc 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -84,7 +84,6 @@ Web 服務 瀏覽器寫源,看書 web 編輯書源 - http://%1$s:%2$d 離線緩存 離線緩存 緩存已選擇的章節到本地 @@ -154,7 +153,6 @@ 閲讀介面隱藏導航欄 隱藏導航欄 導航欄顏色 - GitHub 評分 發送電子郵件 無法打開 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8b35c89c6..841088d66 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -86,7 +86,6 @@ Web 服務 瀏覽器寫源,看書 web編輯書源 - http://%1$s:%2$d 離線快取 離線快取 快取選擇的章節到本機 @@ -156,7 +155,6 @@ 閱讀介面隱藏虛擬按鍵 隱藏導航欄 導航欄顏色 - GitHub 評分 發送郵件 無法打開 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index f558af817..c1b357d81 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -86,7 +86,6 @@ Web 服务 浏览器写源,看书 web编辑书源 - http://%1$s:%2$d 离线缓存 离线缓存 缓存选择的章节到本地 @@ -156,7 +155,6 @@ 阅读界面隐藏虚拟按键 隐藏导航栏 导航栏颜色 - GitHub 评分 发送邮件 无法打开 diff --git a/app/src/main/res/values/non_translat.xml b/app/src/main/res/values/non_translat.xml new file mode 100644 index 000000000..7a2416e9e --- /dev/null +++ b/app/src/main/res/values/non_translat.xml @@ -0,0 +1,7 @@ + + + + http://%1$s:%2$d + GitHub + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cb2095650..342ac7706 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -87,7 +87,6 @@ Web service Web edit source and read book Edit book sources on the web - http://%1$s:%2$d Offline cache Offline cache cache the selected chapter(s) to Storage @@ -157,7 +156,6 @@ Hide virtual buttons when reading Hide navigation bar Navigation bar color - GitHub Rating Email Open failed