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

6
app/src/main/java/org/autojs/autojs/autojs/AutoJs.java
View File

@@ -126,7 +126,7 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
}
public void ensureAccessibilityServiceEnabled() {
if (AccessibilityService.getInstance() != null) {
if (AccessibilityService.Companion.getInstance() != null) {
return;
}
String errorMessage = null;
@@ -149,7 +149,7 @@ 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;
@@ -166,7 +166,7 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
}
if (errorMessage != null) {
AccessibilityServiceTool.goToAccessibilitySetting();
if (!org.autojs.autojs.accessibility.AccessibilityService.waitForEnabled(-1)) {
if (!org.autojs.autojs.accessibility.AccessibilityService.Companion.waitForEnabled(-1)) {
throw new ScriptInterruptedException();
}
}

2
app/src/main/java/org/autojs/autojs/autojs/key/GlobalKeyObserver.java
View File

@@ -34,7 +34,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);

2
app/src/main/java/org/autojs/autojs/external/tile/LayoutInspectTileService.java vendored
View File

@@ -50,7 +50,7 @@ public abstract class LayoutInspectTileService extends TileService implements La
super.onClick();
Log.d(getClass().getName(), "onClick");
sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
if (AccessibilityService.getInstance() == null) {
if (AccessibilityService.Companion.getInstance() == null) {
Toast.makeText(this, R.string.text_no_accessibility_permission_to_capture, Toast.LENGTH_SHORT).show();
AccessibilityServiceTool.goToAccessibilitySetting();
inactive();

8
app/src/main/java/org/autojs/autojs/tool/AccessibilityServiceTool.java
View File

@@ -38,7 +38,7 @@ public class AccessibilityServiceTool {
GlobalAppContext.toast(context.getString(R.string.text_please_choose) + context.getString(R.string._app_name));
}
try {
AccessibilityServiceUtils.goToAccessibilitySetting(context);
AccessibilityServiceUtils.INSTANCE.goToAccessibilitySetting(context);
} catch (ActivityNotFoundException e) {
GlobalAppContext.toast(context.getString(R.string.go_to_accessibility_settings) + context.getString(R.string._app_name));
}
@@ -66,19 +66,19 @@ public class AccessibilityServiceTool {
public static boolean enableAccessibilityServiceByRootAndWaitFor(long timeOut) {
if (enableAccessibilityServiceByRoot(sAccessibilityServiceClass)) {
return AccessibilityService.waitForEnabled(timeOut);
return AccessibilityService.Companion.waitForEnabled(timeOut);
}
return false;
}
public static void enableAccessibilityServiceByRootIfNeeded() {
if (AccessibilityService.getInstance() == null)
if (AccessibilityService.Companion.getInstance() == null)
if (Pref.shouldEnableAccessibilityServiceByRoot()) {
AccessibilityServiceTool.enableAccessibilityServiceByRoot(sAccessibilityServiceClass);
}
}
public static boolean isAccessibilityServiceEnabled(Context context) {
return AccessibilityServiceUtils.isAccessibilityServiceEnabled(context, sAccessibilityServiceClass);
return AccessibilityServiceUtils.INSTANCE.isAccessibilityServiceEnabled(context, sAccessibilityServiceClass);
}
}

2
app/src/main/java/org/autojs/autojs/tool/CrashHandler.java
View File

@@ -47,7 +47,7 @@ public class CrashHandler extends CrashReport.CrashHandleCallback implements Unc
}
return;
}
AccessibilityService service = AccessibilityService.getInstance();
AccessibilityService service = AccessibilityService.Companion.getInstance();
if (service != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
Log.d(TAG, "disable service: " + service);
service.disableSelf();

2
app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java
View File

@@ -218,7 +218,7 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp
mLayoutInspectDialog.dismiss();
mLayoutInspectDialog = null;
}
if (AccessibilityService.getInstance() == null) {
if (AccessibilityService.Companion.getInstance() == null) {
Toast.makeText(mContext, R.string.text_no_accessibility_permission_to_capture, Toast.LENGTH_SHORT).show();
AccessibilityServiceTool.goToAccessibilitySetting();
return;

2
app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutHierarchyView.java
View File

@@ -232,7 +232,7 @@ public class LayoutHierarchyView extends MultiLevelListView {
viewHolder = (ViewHolder) convertView.getTag();
}
viewHolder.nameView.setText(simplifyClassName(nodeInfo.className));
viewHolder.nameView.setText(simplifyClassName(nodeInfo.getClassName()));
viewHolder.nodeInfo = nodeInfo;
if (viewHolder.infoView.getVisibility() == VISIBLE)
viewHolder.infoView.setText(getItemInfoDsc(itemInfo));

6
app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java
View File

@@ -206,7 +206,7 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
if (checked && !isAccessibilityServiceEnabled) {
enableAccessibilityService();
} else if (!checked && isAccessibilityServiceEnabled) {
if (!AccessibilityService.disable()) {
if (!AccessibilityService.Companion.disable()) {
AccessibilityServiceTool.goToAccessibilitySetting();
}
}
@@ -216,7 +216,7 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
return;
}
boolean enabled = NotificationListenerService.getInstance() != null;
boolean enabled = NotificationListenerService.Companion.getInstance() != null;
boolean checked = holder.getSwitchCompat().isChecked();
if ((checked && !enabled) || (!checked && enabled)) {
startActivity(new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS));
@@ -390,7 +390,7 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
private void syncSwitchState() {
setChecked(mAccessibilityServiceItem, AccessibilityServiceTool.isAccessibilityServiceEnabled(getActivity()));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
setChecked(mNotificationPermissionItem, NotificationListenerService.getInstance() != null);
setChecked(mNotificationPermissionItem, NotificationListenerService.Companion.getInstance() != null);
}
}