diff --git a/app/src/main/java/com/example/studyapp/MainActivity.java b/app/src/main/java/com/example/studyapp/MainActivity.java index 2b2964a..81661c6 100644 --- a/app/src/main/java/com/example/studyapp/MainActivity.java +++ b/app/src/main/java/com/example/studyapp/MainActivity.java @@ -1,8 +1,7 @@ package com.example.studyapp; -import static com.example.studyapp.task.TaskUtil.infoUpload; +import static com.example.studyapp.task.TaskUtil.uploadFile; -import android.app.Activity; import android.app.AlertDialog; import android.net.Uri; import android.content.Context; @@ -15,7 +14,6 @@ import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.provider.Settings; -import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.Button; @@ -40,22 +38,17 @@ import com.example.studyapp.job.StartJobService; import com.example.studyapp.proxy.ClashUtil; import com.example.studyapp.service.MyAccessibilityService; import com.example.studyapp.task.TaskUtil; -import com.example.studyapp.update.ChangeCallBack; -import com.example.studyapp.update.UpdateUtil; import com.example.studyapp.utils.CountryCode; -import com.example.studyapp.utils.IpUtil; import com.example.studyapp.utils.LogFileUtil; import com.example.studyapp.utils.ShellUtils; import com.example.studyapp.worker.CheckAccessibilityWorker; -import java.io.IOException; import java.lang.ref.WeakReference; import java.util.UUID; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import org.json.JSONObject; public class MainActivity extends AppCompatActivity { @@ -210,7 +203,7 @@ public class MainActivity extends AppCompatActivity { initializeExecutorService(); executorService.submit(() -> { try { - TaskUtil.infoUpload(MainActivity.this, androidId, "wsj.reader_sp"); + TaskUtil.uploadFile(MainActivity.this, androidId, "wsj.reader_sp"); } catch (Exception e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/example/studyapp/job/ScriptJobService.kt b/app/src/main/java/com/example/studyapp/job/ScriptJobService.kt index 78bbfd3..45ae1af 100644 --- a/app/src/main/java/com/example/studyapp/job/ScriptJobService.kt +++ b/app/src/main/java/com/example/studyapp/job/ScriptJobService.kt @@ -56,7 +56,7 @@ class ScriptJobService : JobIntentService() { name, IpUtil.fetchGeoInfo() ) - TaskUtil.infoUpload(applicationContext, androidId, name) + TaskUtil.uploadFile(applicationContext, androidId, name) }.onFailure { callback.onJobFailed() } diff --git a/app/src/main/java/com/example/studyapp/task/TaskUtil.java b/app/src/main/java/com/example/studyapp/task/TaskUtil.java index 2f389a1..df7d374 100644 --- a/app/src/main/java/com/example/studyapp/task/TaskUtil.java +++ b/app/src/main/java/com/example/studyapp/task/TaskUtil.java @@ -183,7 +183,7 @@ public class TaskUtil { } - public static void infoUpload(Context context, String androidId, String packAge) throws IOException { + public static void uploadFile(Context context, String androidId, String packAge) throws IOException { Log.i("TaskUtil", "infoUpload called with androidId: " + androidId + ", package: " + packAge);