From 4e803f8836973a6862fe457eb3225899aec7982c Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Wed, 29 Sep 2021 15:16:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E4=BA=8E=20&=20=E8=AE=BE=E7=BD=AE=20?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 11 ++-- app/proguard-rules.pro | 8 +++ app/src/main/AndroidManifest.xml | 9 ++-- .../idormy/sms/forwarder/AboutActivity.java | 12 +++-- .../idormy/sms/forwarder/MainActivity.java | 4 +- .../idormy/sms/forwarder/SettingActivity.java | 14 ++++- app/src/main/res/layout/activity_about.xml | 53 ++++++++++++++++--- build.gradle | 2 + 8 files changed, 90 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a64e68e8..a50e455b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -114,7 +114,7 @@ void cmdExecute(String cmd) { dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.0' testImplementation 'junit:junit:4.13.2' @@ -128,11 +128,10 @@ dependencies { //fastjson implementation "com.alibaba:fastjson:1.2.78" - // 友盟统计SDK - //友盟基础组件库（所有友盟业务SDK都依赖基础组件库） - implementation 'com.umeng.umsdk:common:9.3.8' - implementation 'com.umeng.umsdk:asms:1.2.2' - implementation 'com.umeng.umsdk:abtest:1.0.0' + //友盟统计SDK + implementation 'com.umeng.umsdk:common:9.4.4'// 必选 + implementation 'com.umeng.umsdk:asms:1.4.1'// 必选 + implementation 'com.umeng.umsdk:apm:1.4.2' // 错误分析升级为独立SDK，看crash数据请一定集成，可选 //XUpdate implementation 'com.github.xuexiangjys:XUpdate:2.1.0' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index ba3c9548..fe3bab2e 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -20,3 +20,11 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile -keep class com.idormy.sms.forwarder.model.**{*;} +-keep class com.umeng.** {*;} +-keepclassmembers class * { + public (org.json.JSONObject); +} +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 96f63822..423e295d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,12 @@ + + + + - diff --git a/app/src/main/java/com/idormy/sms/forwarder/AboutActivity.java b/app/src/main/java/com/idormy/sms/forwarder/AboutActivity.java index 4cdf6aa3..1066fc7a 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/AboutActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/AboutActivity.java @@ -97,9 +97,15 @@ public class AboutActivity extends AppCompatActivity { Toast.makeText(AboutActivity.this, "缓存清理完成", Toast.LENGTH_LONG).show(); }); - Button join_qq_group = findViewById(R.id.join_qq_group); - join_qq_group.setOnClickListener(v -> { - String key = "HvroJRfvK7GGfnQgaIQ4Rh1un9O83N7M"; + Button join_qq_group1 = findViewById(R.id.join_qq_group1); + join_qq_group1.setOnClickListener(v -> { + String key = "Mj5m39bqy6eodOImrFLI19Tdeqvv-9zf"; + joinQQGroup(key); + }); + + Button join_qq_group2 = findViewById(R.id.join_qq_group2); + join_qq_group2.setOnClickListener(v -> { + String key = "jPXy4YaUzA7Uo0yPPbZXdkb66NS1smU_"; joinQQGroup(key); }); diff --git a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java index 40d2bef8..f7b30189 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java @@ -159,13 +159,13 @@ public class MainActivity extends AppCompatActivity implements RefreshListView.I builder.setMessage(logVo.getFrom() + "\n\n" + logVo.getContent() + "\n\n" + logVo.getRule() + "\n\n" + aUtil.utc2Local(logVo.getTime()) + "\n\nResponse：" + logVo.getForwardResponse()); } //重发 - builder.setPositiveButton("重发", (dialog, which) -> { + /*builder.setPositiveButton("重发", (dialog, which) -> { Long id = logVo.getId(); Log.d(TAG, "id = " + id); Log.d(TAG, logVo.toString()); Toast.makeText(MainActivity.this, "你确定要重发吗？", Toast.LENGTH_SHORT).show(); dialog.dismiss(); - }); + });*/ //删除 builder.setNegativeButton("删除", (dialog, which) -> { Long id = logVo.getId(); diff --git a/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java b/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java index 32d06ecb..6392c304 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java @@ -150,7 +150,12 @@ public class SettingActivity extends AppCompatActivity { @Override public void afterTextChanged(Editable s) { - SettingUtil.setBatteryLevelAlarm(Integer.parseInt(et_battery_level_alarm.getText().toString())); + String batteryLevel = et_battery_level_alarm.getText().toString(); + if (!batteryLevel.isEmpty()) { + SettingUtil.setBatteryLevelAlarm(Integer.parseInt(batteryLevel)); + } else { + SettingUtil.setBatteryLevelAlarm(0); + } } }); } @@ -171,7 +176,12 @@ public class SettingActivity extends AppCompatActivity { @Override public void afterTextChanged(Editable s) { - SettingUtil.setRetryDelayTime(index, Integer.parseInt(et_retry_delay_time.getText().toString())); + String delayTime = et_retry_delay_time.getText().toString(); + if (!delayTime.isEmpty()) { + SettingUtil.setRetryDelayTime(index, Integer.parseInt(delayTime)); + } else { + SettingUtil.setRetryDelayTime(index, 0); + } } }); } diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index f839c855..0cd5c959 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -114,7 +114,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:text="更新日志" /> + android:text="开源地址" /> + + + + + + + @@ -146,22 +173,34 @@ + android:text="互帮互助QQ群" /> + android:gravity="start" + android:text="①群：562854376" /> + +