diff --git a/app/build.gradle b/app/build.gradle index 81169035..9267f067 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,9 +65,4 @@ dependencies { implementation "com.umeng.umsdk:common:9.3.6" implementation "com.umeng.umsdk:asms:1.2.0" - //XUpdate - implementation 'com.github.xuexiangjys:XUpdate:2.0.7' - implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-easy:1.0.0' - implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-downloader-aria:1.0.0' - } diff --git a/app/release/SmsForwarder_release_20210213_1.0.0.apk b/app/release/SmsForwarder_release_20210213_1.0.0.apk new file mode 100644 index 00000000..d6fcf466 Binary files /dev/null and b/app/release/SmsForwarder_release_20210213_1.0.0.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 00000000..c2dd6168 --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.idormy.sms.forwarder", + "variantName": "processReleaseResources", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "versionCode": 1, + "versionName": "1.0.0", + "outputFile": "SmsForwarder_release_20210213_1.0.0.apk" + } + ] +} \ No newline at end of file diff --git a/app/src/androidTest/java/com/idormy/sms/forwarder/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/idormy/sms/forwarder/ExampleInstrumentedTest.kt index 37a24c80..65663ed2 100644 --- a/app/src/androidTest/java/com/idormy/sms/forwarder/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/idormy/sms/forwarder/ExampleInstrumentedTest.kt @@ -1,7 +1,7 @@ package com.idormy.sms.forwarder -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/main/java/com/idormy/sms/forwarder/FrontService.java b/app/src/main/java/com/idormy/sms/forwarder/FrontService.java index 99409962..adfc2057 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/FrontService.java +++ b/app/src/main/java/com/idormy/sms/forwarder/FrontService.java @@ -7,9 +7,10 @@ import android.app.PendingIntent; import android.app.Service; import android.content.Intent; import android.os.IBinder; -import androidx.annotation.Nullable; import android.util.Log; +import androidx.annotation.Nullable; + public class FrontService extends Service { private static final String TAG = "FrontService"; 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 9c236ade..cf57622c 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java @@ -7,9 +7,6 @@ import android.content.IntentFilter; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Handler; -import androidx.core.app.ActivityCompat; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -17,6 +14,10 @@ import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; + import com.idormy.sms.forwarder.BroadCastReceiver.SmsForwarderBroadcastReceiver; import com.idormy.sms.forwarder.adapter.LogAdapter; import com.idormy.sms.forwarder.model.LogModel; diff --git a/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java b/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java index 30bb0f33..fccb6baa 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java @@ -2,8 +2,6 @@ package com.idormy.sms.forwarder; import android.content.DialogInterface; import android.os.Bundle; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -15,6 +13,9 @@ import android.widget.RadioGroup; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; + import com.idormy.sms.forwarder.adapter.RuleAdapter; import com.idormy.sms.forwarder.model.RuleModel; import com.idormy.sms.forwarder.model.SenderModel; diff --git a/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java b/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java index 02aff185..8136817c 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java @@ -4,8 +4,6 @@ import android.content.DialogInterface; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -15,6 +13,9 @@ import android.widget.ListView; import android.widget.Switch; import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; + import com.alibaba.fastjson.JSON; import com.idormy.sms.forwarder.adapter.SenderAdapter; import com.idormy.sms.forwarder.model.SenderModel; 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 c3b74108..464de1dd 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java @@ -18,7 +18,6 @@ import androidx.appcompat.app.AppCompatActivity; import com.idormy.sms.forwarder.BroadCastReceiver.RebootBroadcastReceiver; import com.idormy.sms.forwarder.utils.aUtil; -import com.xuexiang.xupdate.easy.EasyUpdate; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 433b1c79..9f31842f 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -4,6 +4,31 @@ android:layout_height="match_parent" android:orientation="vertical"> + + + + + + + + android:padding="20dp" + android:visibility="gone"> + android:text="检查新版本" + android:visibility="gone" /> @@ -136,7 +162,8 @@ android:background="@android:color/white" android:gravity="center_vertical" android:orientation="horizontal" - android:padding="20dp"> + android:padding="20dp" + android:visibility="gone">