From 27fa30a5e1a2f689d9f01e17d9bf72647af2f3e8 Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Mon, 8 Apr 2024 10:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=EF=BC=9Acode=20review=20&=20?= =?UTF-8?q?=E7=B2=BE=E7=AE=80=E6=97=A0=E7=94=A8=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- README_en.md | 7 +++---- .../sms/forwarder/core/webview/MiddlewareWebViewClient.kt | 2 +- .../com/idormy/sms/forwarder/fragment/LogsFragment.kt | 1 + .../idormy/sms/forwarder/fragment/action/AlarmFragment.kt | 1 + .../res/layout/fragment_tasks_condition_bluetooth.xml | 3 ++- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index a536e4b9..63336695 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ * 隐私声明： **SmsForwarder 不会收集任何您的隐私数据！！！** APP启动时发送版本信息发送到友盟统计；手动检查新版本时发送版本号用于检查新版本；除此之外，没有任何数据！！！ -* 防诈提醒： `SmsForwarder`完全免费开源，请您在 [打赏](https://gitee.com/pp/SmsForwarder/wikis/pages?sort_id=4912193&doc_id=1821427) 前务必确认是否出于自愿？本项目不参与任何刷单返利担保！**请您远离刷单返利陷阱，谨防网络诈骗！** +* 防诈提醒： `SmsForwarder`完全免费开源，请您在 [打赏](https://gitee.com/pp/SmsForwarder/wikis/pages?sort_id=4912193&doc_id=1821427) 前务必确认是否出于自愿？本项目不参与任何刷单返利担保！**请您远离刷单返利陷阱，谨防网络诈骗！** -------- @@ -75,9 +75,9 @@ + 提交issues 或 pr + 加入交流群（群内都是机油互帮互助，禁止发任何与SmsForwarder使用无关的内容） -| TG Group | -| :--: | -| ![TG Group](pic/tg.png "TG Group") | +| TG Group | +|:---------------------------------------------------:| +| ![TG Group](pic/tg.png "TG Group") | | [+QBZgnL_fxYM0NjE9](https://t.me/+QBZgnL_fxYM0NjE9) | ## 感谢 diff --git a/README_en.md b/README_en.md index 8505707f..f2587e9a 100644 --- a/README_en.md +++ b/README_en.md @@ -67,12 +67,11 @@ See more screenshots：https://github.com/pppscn/SmsForwarder/wiki + Submit an issue or Pull Request. + Join group chat (only Chinese groups/channels available currently) -| Telegram Group | -| :--: | -| ![Telegram Group](pic/tg.png "Telegram Group") | +| Telegram Group | +|:---------------------------------------------------:| +| ![Telegram Group](pic/tg.png "Telegram Group") | | [+QBZgnL_fxYM0NjE9](https://t.me/+QBZgnL_fxYM0NjE9) | - ## Acknowledgements > [Thanks to all the enthusiastic netizens who sponsored this project --> Reward list](https://gitee.com/pp/SmsForwarder/wikis/pages?sort_id=4912193&doc_id=1821427) diff --git a/app/src/main/java/com/idormy/sms/forwarder/core/webview/MiddlewareWebViewClient.kt b/app/src/main/java/com/idormy/sms/forwarder/core/webview/MiddlewareWebViewClient.kt index b65d3fe1..8f266454 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/core/webview/MiddlewareWebViewClient.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/core/webview/MiddlewareWebViewClient.kt @@ -2,13 +2,13 @@ package com.idormy.sms.forwarder.core.webview import android.net.Uri import android.os.Build -import com.idormy.sms.forwarder.utils.Log import android.webkit.WebResourceRequest import android.webkit.WebResourceResponse import android.webkit.WebView import androidx.annotation.RequiresApi import com.idormy.sms.forwarder.R import com.idormy.sms.forwarder.core.webview.WebViewInterceptDialog.Companion.show +import com.idormy.sms.forwarder.utils.Log import com.just.agentweb.core.client.MiddlewareWebClientBase import com.xuexiang.xutil.resource.ResUtils.getStringArray import java.util.Locale diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt index 13e87104..898cf071 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt @@ -214,6 +214,7 @@ class LogsFragment : BaseFragment(), MsgPagingAdapter.OnIt binding!!.recyclerView.scrollToPosition(0) } + @Suppress("SameParameterValue") private fun initLogsFilterDialog(needInit: Boolean = false) { if (logsFilterPopup == null || needInit) { currentFilter = mutableMapOf() diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/action/AlarmFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/action/AlarmFragment.kt index 7cb32efd..cf2f6f62 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/action/AlarmFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/action/AlarmFragment.kt @@ -241,6 +241,7 @@ class AlarmFragment : BaseFragment(), View.OnC } //检查设置 + @Suppress("SameParameterValue") @SuppressLint("SetTextI18n") private fun checkSetting(updateView: Boolean = false): AlarmSetting { val volume = binding!!.xsbVolume.selectedNumber diff --git a/app/src/main/res/layout/fragment_tasks_condition_bluetooth.xml b/app/src/main/res/layout/fragment_tasks_condition_bluetooth.xml index 1860f5fc..69bd6542 100644 --- a/app/src/main/res/layout/fragment_tasks_condition_bluetooth.xml +++ b/app/src/main/res/layout/fragment_tasks_condition_bluetooth.xml @@ -119,7 +119,8 @@ android:layout_height="wrap_content" android:layout_marginStart="15dp" android:layout_marginEnd="@dimen/config_margin_10dp" - android:orientation="horizontal"> + android:orientation="horizontal" + android:visibility="gone">