From fefa4b0ab3f997c2532918bddd8d80347aa4c8ec Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Wed, 8 Jun 2022 09:09:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=EF=BC=9A=E6=B8=85=E7=90=86?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84TODO=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/idormy/sms/forwarder/activity/MainActivity.kt | 2 +- .../forwarder/adapter/spinner/AppListAdapterItem.kt | 2 +- .../sms/forwarder/adapter/spinner/SenderAdapterItem.kt | 2 +- .../forwarder/core/webview/WebViewInterceptDialog.kt | 6 +++--- .../idormy/sms/forwarder/fragment/RulesEditFragment.kt | 6 +++--- .../idormy/sms/forwarder/fragment/SendersFragment.kt | 2 +- .../sms/forwarder/fragment/senders/TelegramFragment.kt | 2 +- .../forwarder/fragment/senders/WeworkAgentFragment.kt | 2 +- .../forwarder/server/component/LoggerInterceptor.kt | 2 +- .../java/com/idormy/sms/forwarder/utils/PhoneUtils.kt | 10 +++++----- .../idormy/sms/forwarder/utils/sender/TelegramUtils.kt | 1 - .../sms/forwarder/utils/update/CustomUpdateParser.kt | 2 +- .../sms/forwarder/utils/update/UpdateTipDialog.kt | 4 ++-- 13 files changed, 21 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt b/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt index 14f4f74c..722cedc2 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt @@ -331,7 +331,7 @@ class MainActivity : BaseActivity(), @Suppress("UNCHECKED_CAST") PageOption.to(Class.forName(widgetInfo.classPath) as Class) //跳转的fragment .setNewActivity(true) - .putInt(KEY_SENDER_TYPE, pos) //TODO：需要注意这里，目前刚好是这个顺序而已 + .putInt(KEY_SENDER_TYPE, pos) //注意：目前刚好是这个顺序而已 .open(this) } catch (e: Exception) { e.printStackTrace() diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/spinner/AppListAdapterItem.kt b/app/src/main/java/com/idormy/sms/forwarder/adapter/spinner/AppListAdapterItem.kt index aeee8a37..eddfba29 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/adapter/spinner/AppListAdapterItem.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/adapter/spinner/AppListAdapterItem.kt @@ -24,7 +24,7 @@ class AppListAdapterItem { constructor(name: String) : this(name, null, null) constructor(name: String, drawableId: Int, packageName: String) : this(name, ResUtils.getDrawable(drawableId), packageName) - //TODO:注意自定义实体，需要重写对象的toString方法 + //注意：自定义实体需要重写对象的toString方法 override fun toString(): String { return name } diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/spinner/SenderAdapterItem.kt b/app/src/main/java/com/idormy/sms/forwarder/adapter/spinner/SenderAdapterItem.kt index d9561af9..3ce02dba 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/adapter/spinner/SenderAdapterItem.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/adapter/spinner/SenderAdapterItem.kt @@ -71,7 +71,7 @@ class SenderAdapterItem { return this } - //TODO:注意自定义实体，需要重写对象的toString方法 + //注意：自定义实体需要重写对象的toString方法 override fun toString(): String { return title.toString() } diff --git a/app/src/main/java/com/idormy/sms/forwarder/core/webview/WebViewInterceptDialog.kt b/app/src/main/java/com/idormy/sms/forwarder/core/webview/WebViewInterceptDialog.kt index 51cbf980..0c664360 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/core/webview/WebViewInterceptDialog.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/core/webview/WebViewInterceptDialog.kt @@ -94,9 +94,9 @@ class WebViewInterceptDialog : AppCompatActivity(), DialogInterface.OnDismissLis companion object { private const val KEY_INTERCEPT_URL = "key_intercept_url" - // TODO: 2019-10-30 这里修改你的applink - const val APP_LINK_HOST = "xuexiangjys.club" - const val APP_LINK_ACTION = "com.xuexiang.xui.applink" + // TODO: 修改你的applink + const val APP_LINK_HOST = "ppps.cn" + const val APP_LINK_ACTION = "com.idormy.sms.forwarder" /** * 显示WebView拦截提示 diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/RulesEditFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/RulesEditFragment.kt index 6ba0e3b3..60a7f96d 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/RulesEditFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/RulesEditFragment.kt @@ -477,9 +477,9 @@ class RulesEditFragment : BaseFragment(), View.OnClic else -> CHECK_SIM_SLOT_ALL } val status = if (binding!!.sbStatus.isChecked) STATUS_ON else STATUS_OFF - if (status == STATUS_OFF) { - throw Exception(getString(R.string.invalid_rule_status)) - } + //if (status == STATUS_OFF) { + // throw Exception(getString(R.string.invalid_rule_status)) + //} return Rule(ruleId, ruleType, filed, check, value, senderId, smsTemplate, regexReplace, simSlot, status) } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/SendersFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/SendersFragment.kt index 2aa661af..ebfc92fb 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/SendersFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/SendersFragment.kt @@ -65,7 +65,7 @@ class SendersFragment : BaseFragment(), SenderPagingAda binding!!.tabBar.setOnTabClickListener { _, position -> //XToastUtils.toast("点击了$title--$position") //currentStatus = statusValueArray[position] - currentStatus = 1 - position //TODO:取巧，这里刚好相反 + currentStatus = 1 - position //注意：这里刚好相反，可以取巧 viewModel.setStatus(currentStatus) adapter.refresh() binding!!.recyclerView.scrollToPosition(0) diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/TelegramFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/TelegramFragment.kt index 0492c9ea..19ffbf0f 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/TelegramFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/TelegramFragment.kt @@ -154,7 +154,7 @@ class TelegramFragment : BaseFragment(), View.O } override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) { - //TODO: 这里只有一个监听不需要判断id + //注意：因为只有一个监听，暂不需要判断id binding!!.layoutProxyAuthenticator.visibility = if (isChecked) View.VISIBLE else View.GONE } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WeworkAgentFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WeworkAgentFragment.kt index 73974ac8..2cdc1b61 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WeworkAgentFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/WeworkAgentFragment.kt @@ -139,7 +139,7 @@ class WeworkAgentFragment : BaseFragment(), @SuppressLint("SetTextI18n") override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) { - //TODO: 这里只有一个监听不需要判断id + //注意：因为只有一个监听，暂不需要判断id if (isChecked) { binding!!.etToUser.setText("@all") binding!!.layoutToUser.visibility = View.GONE diff --git a/app/src/main/java/com/idormy/sms/forwarder/server/component/LoggerInterceptor.kt b/app/src/main/java/com/idormy/sms/forwarder/server/component/LoggerInterceptor.kt index 9018adc1..69b836db 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/server/component/LoggerInterceptor.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/server/component/LoggerInterceptor.kt @@ -45,7 +45,7 @@ class LoggerInterceptor : HandlerInterceptor { } /* - //TODO:这里读取body会导致 MessageConverter 报错：RequestBody is missing. + //注意：这里读取body会导致 MessageConverter 报错：RequestBody is missing. val body = request.body?.string() Log.i(TAG, "Body: $body") */ diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt index 7464350f..da078835 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt @@ -120,7 +120,7 @@ class PhoneUtils private constructor() { val sendPI = PendingIntent.getBroadcast(XUtil.getContext(), 0, Intent(), sendFlags) val smsManager = if (subId > -1 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) SmsManager.getSmsManagerForSubscriptionId(subId) else SmsManager.getDefault() - //TODO: Android 5.1.1 以下使用反射指定卡槽 + // Android 5.1.1 以下使用反射指定卡槽 if (subId > -1 && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { Log.d(TAG, "Android 5.1.1 以下使用反射指定卡槽") val clz = SmsManager::class.java @@ -129,7 +129,7 @@ class PhoneUtils private constructor() { field.set(smsManager, subId) } - //TODO: 切割长短信 + // 切割长短信 if (message.length >= 70) { val deliverFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) PendingIntent.FLAG_IMMUTABLE else 0 val deliverPI = PendingIntent.getBroadcast(XUtil.getContext(), 0, Intent("DELIVERED_SMS_ACTION"), deliverFlags) @@ -172,7 +172,7 @@ class PhoneUtils private constructor() { Log.d(TAG, "selection = $selection") Log.d(TAG, "selectionArgs = $selectionArgs") - //TODO：避免超过总数后循环取出 + // 避免超过总数后循环取出 val cursorTotal = Core.app.contentResolver.query( CallLog.Calls.CONTENT_URI, null, @@ -279,7 +279,7 @@ class PhoneUtils private constructor() { Log.d(TAG, "selection = $selection") Log.d(TAG, "selectionArgs = $selectionArgs") - //TODO：避免超过总数后循环取出 + // 避免超过总数后循环取出 val cursorTotal = Core.app.contentResolver.query( ContactsContract.CommonDataKinds.Phone.CONTENT_URI, null, @@ -376,7 +376,7 @@ class PhoneUtils private constructor() { Log.d(TAG, "selection = $selection") Log.d(TAG, "selectionArgs = $selectionArgs") - //TODO：避免超过总数后循环取出 + // 避免超过总数后循环取出 val cursorTotal = Core.app.contentResolver.query( Uri.parse("content://sms/"), null, diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/TelegramUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/TelegramUtils.kt index ff1688c1..9f87a533 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/TelegramUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/TelegramUtils.kt @@ -19,7 +19,6 @@ import java.net.Proxy import java.net.URLEncoder import java.util.concurrent.TimeUnit -//TODO:待迁移！！！ @Suppress("PrivatePropertyName", "UNUSED_PARAMETER", "unused") class TelegramUtils { companion object { diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/update/CustomUpdateParser.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/update/CustomUpdateParser.kt index f85ac970..9729c0bc 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/update/CustomUpdateParser.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/update/CustomUpdateParser.kt @@ -14,7 +14,7 @@ import com.xuexiang.xupdate.proxy.impl.AbstractUpdateParser class CustomUpdateParser : AbstractUpdateParser() { @Throws(Exception::class) override fun parseJson(json: String): UpdateEntity? { - // TODO: 2020-02-18 这里填写你需要自定义的json格式，如果使用默认的API就不需要设置 + // 填写自定义的json格式，如果使用默认的API就不需要设置 return null } } \ No newline at end of file diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/update/UpdateTipDialog.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/update/UpdateTipDialog.kt index 73c0d561..113a3e61 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/update/UpdateTipDialog.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/update/UpdateTipDialog.kt @@ -39,10 +39,10 @@ class UpdateTipDialog : AppCompatActivity(), DialogInterface.OnDismissListener { companion object { const val KEY_CONTENT = "com.idormy.sms.forwarder.utils.update.KEY_CONTENT" - // TODO: 2021/5/11 填写你应用下载类型名 + // 填写你应用下载类型名 const val DOWNLOAD_TYPE_NAME = "酷安" - // TODO: 2021/5/11 填写你应用下载页面的链接 + // 填写你应用下载页面的链接 private const val DOWNLOAD_URL = "https://www.coolapk.com/apk/com.idormy.sms.forwarder" /**