diff --git a/app/build.gradle b/app/build.gradle
index 177cfadd..55330fa2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@ android {
     compileSdkVersion versions.compile
     buildToolsVersion versions.buildTool
     defaultConfig {
-        applicationId "org.anonymous.fuck.tb"
+        applicationId "com.taobao.idlefishs"
         minSdkVersion versions.mini
         targetSdkVersion versions.target
         versionCode versions.appVersionCode
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1e3cea32..bab94594 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
 
     <application
         xmlns:tools="http://schemas.android.com/tools"
-        android:name="org.anonymous.fuck.tb.App"
+        android:name="com.taobao.idlefishs.App"
         android:allowBackup="false"
         android:icon="@drawable/autojs_material"
         android:label="@string/app_name"
diff --git a/app/src/main/java/org/autojs/autojs/App.kt b/app/src/main/java/org/autojs/autojs/App.kt
index af40931a..fc6eef49 100644
--- a/app/src/main/java/org/autojs/autojs/App.kt
+++ b/app/src/main/java/org/autojs/autojs/App.kt
@@ -1,4 +1,4 @@
-package org.anonymous.fuck.tb
+package com.taobao.idlefishs
 
 import android.annotation.SuppressLint
 import android.content.Intent
diff --git a/app/src/main/java/org/autojs/autojs/timing/TimedTaskManager.java b/app/src/main/java/org/autojs/autojs/timing/TimedTaskManager.java
index cb6f0840..71a31519 100644
--- a/app/src/main/java/org/autojs/autojs/timing/TimedTaskManager.java
+++ b/app/src/main/java/org/autojs/autojs/timing/TimedTaskManager.java
@@ -7,7 +7,7 @@ import android.text.TextUtils;
 
 import com.stardust.app.GlobalAppContext;
 
-import org.anonymous.fuck.tb.App;
+import com.taobao.idlefishs.App;
 import org.autojs.autojs.storage.database.IntentTaskDatabase;
 import org.autojs.autojs.storage.database.ModelChange;
 import org.autojs.autojs.storage.database.TimedTaskDatabase;
diff --git a/app/src/main/java/org/autojs/autojs/tool/AccessibilityServiceTool.java b/app/src/main/java/org/autojs/autojs/tool/AccessibilityServiceTool.java
index d266cd1c..9d105804 100644
--- a/app/src/main/java/org/autojs/autojs/tool/AccessibilityServiceTool.java
+++ b/app/src/main/java/org/autojs/autojs/tool/AccessibilityServiceTool.java
@@ -8,7 +8,7 @@ import com.stardust.app.GlobalAppContext;
 import org.autojs.autojs.Pref;
 import org.autojs.autojs.R;
 
-import org.anonymous.fuck.tb.AccessibilityService;
+import com.taobao.idlefish.AccessibilityService;
 import com.stardust.autojs.core.util.ProcessShell;
 import com.stardust.view.accessibility.AccessibilityServiceUtils;
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java b/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java
index ad79d661..148617d2 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java
@@ -157,7 +157,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
         // 尝试自动设置无障碍权限，需要ADB授权 adb shell pm grant ${BuildConfig.APPLICATION_ID} android.permission.WRITE_SECURE_SETTINGS
         try {
             String enabledServices = Settings.Secure.getString(getApplicationContext().getContentResolver(), Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-            String services = enabledServices + ":" + BuildConfig.APPLICATION_ID + "/org.anonymous.fuck.tb.AccessibilityService";
+            String services = enabledServices + ":" + BuildConfig.APPLICATION_ID + "/com.taobao.idlefish.AccessibilityService";
             Settings.Secure.putString(getApplicationContext().getContentResolver(), Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, services);
             Settings.Secure.putString(getApplicationContext().getContentResolver(), Settings.Secure.ACCESSIBILITY_ENABLED, "1");
             autoEnableAccessibility = true;
diff --git a/autojs/src/main/AndroidManifest.xml b/autojs/src/main/AndroidManifest.xml
index 98c22f40..cc67fdc0 100644
--- a/autojs/src/main/AndroidManifest.xml
+++ b/autojs/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
             android:theme="@style/ScriptTheme.Transparent"/>
 
         <service
-            android:name="org.anonymous.fuck.tb.AccessibilityService"
+            android:name="com.taobao.idlefish.AccessibilityService"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>
                 <action android:name="android.accessibilityservice.AccessibilityService"/>
diff --git a/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvasView.kt b/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvasView.kt
index afbb721b..77a67862 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvasView.kt
+++ b/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvasView.kt
@@ -53,7 +53,7 @@ class ScriptCanvasView(context: Context, private val mScriptRuntime: ScriptRunti
                 var time = SystemClock.uptimeMillis()
                 val scriptCanvas = ScriptCanvas()
                 try {
-                    while (mDrawing) {
+                    while (mDrawing && !mScriptRuntime.isStopped) {
                         canvas = lockCanvas()
                         scriptCanvas.setCanvas(canvas)
                         emit("draw", scriptCanvas, this@ScriptCanvasView)
diff --git a/autojs/src/main/java/org/anonymous/fuck/tb/AccessibilityService.kt b/autojs/src/main/java/com/taobao/idlefish/AccessibilityService.kt
similarity index 97%
rename from autojs/src/main/java/org/anonymous/fuck/tb/AccessibilityService.kt
rename to autojs/src/main/java/com/taobao/idlefish/AccessibilityService.kt
index 3f82b829..11048eaa 100644
--- a/autojs/src/main/java/org/anonymous/fuck/tb/AccessibilityService.kt
+++ b/autojs/src/main/java/com/taobao/idlefish/AccessibilityService.kt
@@ -1,4 +1,4 @@
-package org.anonymous.fuck.tb
+package com.taobao.idlefish
 
 import android.accessibilityservice.AccessibilityServiceInfo
 import android.os.Build