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 a86edfb..2c7adcb 100644 --- a/app/src/main/java/com/example/studyapp/job/ScriptJobService.kt +++ b/app/src/main/java/com/example/studyapp/job/ScriptJobService.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Handler import android.os.Looper +import android.text.TextUtils import android.util.Log import androidx.core.app.JobIntentService import com.example.studyapp.autoJS.AutoJsUtil @@ -47,12 +48,16 @@ class ScriptJobService : JobIntentService() { // ClashUtil.switchProxyGroup("PROXY", "my-socks5-proxy", "http://127.0.0.1:6170") val geoInfo: String = IpUtil.fetchGeoInfo() val timeZone: String = IpUtil.getTimeZone(geoInfo) + val packageName = if (TextUtils.isEmpty(name)){ + packageName + } else { + name + } changeDevice(packageName, bigoDevice, afDevice, timeZone, object : ChangeCallBack { override fun changeSuccess() { runCatching { AutoJsUtil.runAutojsScript(applicationContext) TaskUtil.execSaveTask( - applicationContext, androidId, taskId, name, 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 bf2fc61..6fdcd42 100644 --- a/app/src/main/java/com/example/studyapp/task/TaskUtil.java +++ b/app/src/main/java/com/example/studyapp/task/TaskUtil.java @@ -767,9 +767,10 @@ public class TaskUtil { return getDeviceInfoSync(androidId,taskId); } - public static void execSaveTask(Context context, String androidId, String taskId,String packName, String ipInfo) { - if (context == null) { - throw new IllegalArgumentException("Context or Package name cannot be null or empty"); + public static void execSaveTask(String androidId, String taskId,String packName, String ipInfo) { + if (packName == null || packName.isEmpty()) { + LogFileUtil.logAndWrite(Log.ERROR,"TaskUtil", "Package name is null or empty", null); + return; } if (androidId == null || androidId.isEmpty()) {