Skip to content

Commit 2acf912

Browse files
author
hyb1996
committed
修复 UiCollection在JDK 8以下报错的问题
1 parent e4a9253 commit 2acf912

File tree

3 files changed

+0
-277
lines changed

3 files changed

+0
-277
lines changed

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

-4
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,18 @@
55

66
import com.stardust.autojs.BuildConfig;
77
import com.stardust.autojs.core.ui.ViewExtras;
8-
import com.stardust.autojs.rhino.NativeArrayLikeJavaObject;
98
import com.stardust.autojs.rhino.RhinoAndroidHelper;
109
import com.stardust.autojs.rhino.TopLevelScope;
1110
import com.stardust.autojs.runtime.ScriptRuntime;
1211
import com.stardust.autojs.script.JavaScriptSource;
1312
import com.stardust.autojs.script.StringScriptSource;
14-
import com.stardust.automator.UiObject;
1513
import com.stardust.automator.UiObjectCollection;
1614
import com.stardust.pio.PFiles;
1715
import com.stardust.pio.UncheckedIOException;
1816

1917
import org.mozilla.javascript.Context;
20-
import org.mozilla.javascript.NativeArray;
2118
import org.mozilla.javascript.Scriptable;
2219
import org.mozilla.javascript.ScriptableObject;
23-
import org.mozilla.javascript.TopLevel;
2420
import org.mozilla.javascript.commonjs.module.RequireBuilder;
2521
import org.mozilla.javascript.commonjs.module.provider.SoftCachingModuleScriptProvider;
2622

autojs/src/main/java/com/stardust/autojs/rhino/NativeArrayLikeJavaObject.java

-230
This file was deleted.

automator/src/main/java/com/stardust/automator/UiObjectCollection.java

-43
Original file line numberDiff line numberDiff line change
@@ -291,48 +291,6 @@ public int lastIndexOf(Object o) {
291291
return mNodes.lastIndexOf(o);
292292
}
293293

294-
@RequiresApi(api = Build.VERSION_CODES.N)
295-
296-
public ListIterator<UiObject> listIterator() {
297-
return mNodes.listIterator();
298-
}
299-
300-
@RequiresApi(api = Build.VERSION_CODES.N)
301-
302-
public ListIterator<UiObject> listIterator(int index) {
303-
return mNodes.listIterator(index);
304-
}
305-
306-
@RequiresApi(api = Build.VERSION_CODES.N)
307-
308-
public List<UiObject> subList(int fromIndex, int toIndex) {
309-
return mNodes.subList(fromIndex, toIndex);
310-
}
311-
312-
@RequiresApi(api = Build.VERSION_CODES.N)
313-
314-
public Spliterator<UiObject> spliterator() {
315-
return mNodes.spliterator();
316-
}
317-
318-
@RequiresApi(api = Build.VERSION_CODES.N)
319-
320-
public boolean removeIf(Predicate<? super UiObject> filter) {
321-
return mNodes.removeIf(filter);
322-
}
323-
324-
@RequiresApi(api = Build.VERSION_CODES.N)
325-
326-
public Stream<UiObject> stream() {
327-
return mNodes.stream();
328-
}
329-
330-
@RequiresApi(api = Build.VERSION_CODES.N)
331-
332-
public Stream<UiObject> parallelStream() {
333-
return mNodes.parallelStream();
334-
}
335-
336294
public int size() {
337295
return mNodes.size();
338296
}
@@ -347,7 +305,6 @@ public boolean contains(Object o) {
347305
return mNodes.contains(o);
348306
}
349307

350-
351308
public Iterator<UiObject> iterator() {
352309
return mNodes.iterator();
353310
}

0 commit comments

Comments
 (0)