Skip to content

Commit 72d46a3

Browse files
author
hyb1996
committed
修复 调试时在不能断点的地方打断点会崩溃的问题
1 parent 4b31ba3 commit 72d46a3

File tree

8 files changed

+423
-223
lines changed

8 files changed

+423
-223
lines changed

autojs/src/main/java/com/stardust/autojs/core/accessibility/UiCollection.java

-196
This file was deleted.

autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
import com.stardust.autojs.BuildConfig;
77
import com.stardust.autojs.core.ui.ViewExtras;
8+
import com.stardust.autojs.rhino.NativeArrayLikeJavaObject;
89
import com.stardust.autojs.rhino.RhinoAndroidHelper;
910
import com.stardust.autojs.rhino.TopLevelScope;
10-
import com.stardust.autojs.runtime.ScriptRuntime;
1111
import com.stardust.autojs.script.JavaScriptSource;
1212
import com.stardust.autojs.script.StringScriptSource;
1313
import com.stardust.automator.UiObject;
@@ -17,18 +17,16 @@
1717

1818
import org.mozilla.javascript.Context;
1919
import org.mozilla.javascript.NativeArray;
20-
import org.mozilla.javascript.NativeJavaObject;
2120
import org.mozilla.javascript.Scriptable;
2221
import org.mozilla.javascript.ScriptableObject;
22+
import org.mozilla.javascript.TopLevel;
2323
import org.mozilla.javascript.commonjs.module.RequireBuilder;
2424
import org.mozilla.javascript.commonjs.module.provider.SoftCachingModuleScriptProvider;
2525

2626
import java.io.File;
2727
import java.io.IOException;
2828
import java.io.Reader;
29-
import java.util.Collection;
3029
import java.util.Collections;
31-
import java.util.Iterator;
3230
import java.util.Locale;
3331
import java.util.concurrent.ConcurrentHashMap;
3432

@@ -177,8 +175,8 @@ public Object wrap(Context cx, Scriptable scope, Object obj, Class<?> staticType
177175
array[i] = wrapAsJavaObject(cx, scope, collection.get(i), UiObject.class);
178176
}
179177
NativeArray nativeArray = new NativeArray(array);
180-
nativeArray.setPrototype(new NativeJavaObject(scope, collection, staticType));
181-
result = nativeArray;
178+
nativeArray.setPrototype(TopLevel.getBuiltinPrototype(scope, TopLevel.Builtins.Array));
179+
result = new NativeArrayLikeJavaObject(scope, collection, staticType, nativeArray);
182180
} else {
183181
result = super.wrap(cx, scope, obj, staticType);
184182
}

0 commit comments

Comments
 (0)