tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(automator): 转换为kotlin

Browse Source
This commit is contained in:
hyb1996
2018-11-26 20:08:26 +08:00
parent 39de832dde
commit 306762a422
134 changed files with 4258 additions and 4845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inrt/build.gradle
View File

@@ -1,4 +1,6 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion versions.compile

2
inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityServiceTool.java
View File

@@ -39,7 +39,7 @@ public class AccessibilityServiceTool {
public static boolean enableAccessibilityServiceByRootAndWaitFor(Context context, long timeOut) {
if (enableAccessibilityServiceByRoot(context, com.stardust.view.accessibility.AccessibilityService.class)) {
com.stardust.view.accessibility.AccessibilityService.waitForEnabled(timeOut);
com.stardust.view.accessibility.AccessibilityService.Companion.waitForEnabled(timeOut);
return true;
}
return false;

10
inrt/src/main/java/com/stardust/auojs/inrt/autojs/AutoJs.java
View File

@@ -46,11 +46,11 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
@Override
public void ensureAccessibilityServiceEnabled() {
if (AccessibilityService.getInstance() != null) {
if (AccessibilityService.Companion.getInstance() != null) {
return;
}
String errorMessage = null;
if (AccessibilityServiceUtils.isAccessibilityServiceEnabled(getApplication(), AccessibilityService.class)) {
if (AccessibilityServiceUtils.INSTANCE.isAccessibilityServiceEnabled(getApplication(), AccessibilityService.class)) {
errorMessage = GlobalAppContext.getString(R.string.text_auto_operate_service_enabled_but_not_running);
} else {
if (Pref.shouldEnableAccessibilityServiceByRoot()) {
@@ -69,11 +69,11 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
@Override
public void waitForAccessibilityServiceEnabled() {
if (AccessibilityService.getInstance() != null) {
if (AccessibilityService.Companion.getInstance() != null) {
return;
}
String errorMessage = null;
if (AccessibilityServiceUtils.isAccessibilityServiceEnabled(getApplication(), AccessibilityService.class)) {
if (AccessibilityServiceUtils.INSTANCE.isAccessibilityServiceEnabled(getApplication(), AccessibilityService.class)) {
errorMessage = GlobalAppContext.getString(R.string.text_auto_operate_service_enabled_but_not_running);
} else {
if (Pref.shouldEnableAccessibilityServiceByRoot()) {
@@ -86,7 +86,7 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
}
if (errorMessage != null) {
AccessibilityServiceTool.goToAccessibilitySetting();
if (!AccessibilityService.waitForEnabled(-1)) {
if (!AccessibilityService.Companion.waitForEnabled(-1)) {
throw new ScriptInterruptedException();
}
}

2
inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.java
View File

@@ -23,7 +23,7 @@ public class GlobalKeyObserver implements OnKeyListener, ShellKeyObserver.KeyLis
private boolean mVolumeUpFromShell, mVolumeUpFromAccessibility;
GlobalKeyObserver() {
AccessibilityService.getStickOnKeyObserver()
AccessibilityService.Companion.getStickOnKeyObserver()
.addListener(this);
ShellKeyObserver observer = new ShellKeyObserver();
observer.setKeyListener(this);