From a9eaa8c7911eafcd51625a39047537ce2be41b50 Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Fri, 7 Jul 2023 10:42:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=85=B7=E4=BD=93=E7=9A=84=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E6=96=B0=E5=A2=9E=EF=BC=9A`{{=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=97=B6=E9=97=B4}}`=20`{{CURRENT=5FTIME}}`=20?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=88=E4=BE=BF=E4=BA=8E=E8=B0=83=E8=AF=95?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 9 ++++----- .../main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt | 2 ++ app/src/main/res/values-en/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 116370f4..517bd579 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -188,7 +188,9 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //frpc implementation files('libs/frpclib.aar') - //kmnkt是基于Kotlin Multiplatform的跨平台socket通信统一接口。支持Android目标与JVM目标，支持UDP/TCP/MQTT协议使用同一套接口实现 + + //kmnkt基于Kotlin Multiplatform的跨平台socket通信统一接口，支持UDP/TCP/MQTT协议 + //https://github.com/xuankaicat/kmnkt implementation("org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5") implementation files('libs/socket.aar') @@ -262,7 +264,7 @@ dependencies { testImplementation "androidx.paging:paging-common-ktx:$paging_version" //权限请求框架：https://github.com/getActivity/XXPermissions - implementation 'com.github.getActivity:XXPermissions:18.0' + implementation 'com.github.getActivity:XXPermissions:18.2' def mail_version = '1.6.7' implementation "com.sun.mail:android-mail:$mail_version" @@ -281,9 +283,6 @@ dependencies { //Location 是一个通过 Android 自带的 LocationManager 来实现的定位功能：https://github.com/jenly1314/Location implementation 'com.github.pppscn:location:1.0.0' - - //跨平台socket通信统一接口：https://gitee.com/xuankaicat/kmnkt - //implementation 'com.github.pppscn.kmnkt:socket:2.0.0-alpha06' } //自动添加X-Library依赖 apply from: 'x-library.gradle' diff --git a/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt b/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt index 4fd2b6bb..570f96df 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/entity/MsgInfo.kt @@ -51,6 +51,7 @@ data class MsgInfo( .replace(getString(R.string.tag_title), title) .replace(getString(R.string.tag_scheme), scheme) .replace(getString(R.string.tag_receive_time), SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)) + .replace(getString(R.string.tag_current_time), SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Date())) .replace(getString(R.string.tag_device_name), deviceMark) .replace(getString(R.string.tag_app_version), versionName) .trim() @@ -97,6 +98,7 @@ data class MsgInfo( .replace(getString(R.string.tag_title), title) .replace(getString(R.string.tag_scheme), scheme) .replace(getString(R.string.tag_receive_time), SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)) + .replace(getString(R.string.tag_current_time), SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Date())) .replace(getString(R.string.tag_device_name), deviceMark) .replace(getString(R.string.tag_app_version), versionName) .trim() diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 7311bb97..bee56940 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -589,6 +589,7 @@ {{CARD_SLOT}} {{CARD_SUBID}} {{RECEIVE_TIME}} + {{CURRENT_TIME}} {{DEVICE_NAME}} {{APP_VERSION}} {{TITLE}} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 40de710c..c3a6e79a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -590,6 +590,7 @@ {{卡槽信息}} {{卡槽主键}} {{接收时间}} + {{当前时间}} {{设备名称}} {{当前应用版本号}} {{通知标题}}