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

chore: add ensureAccessibilityServiceEnabled() to currentPackage(), currentActivity(), events.observeKey()

Browse Source
This commit is contained in:
hyb1996
2017-12-09 10:45:14 +08:00
parent 87c7cc73c3
commit 6128aa28a6
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autojs/src/main/assets/modules/__general__.js
View File

@@ -38,10 +38,12 @@ module.exports = function(__runtime__, scope){
} }
scope.currentPackage = function(){ scope.currentPackage = function(){
scope.auto();
return __runtime__.info.getLatestPackage(); return __runtime__.info.getLatestPackage();
} }
scope.currentActivity = function(){ scope.currentActivity = function(){
scope.auto();
return __runtime__.info.getLatestActivity(); return __runtime__.info.getLatestActivity();
} }

10
autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java
View File

@@ -11,6 +11,7 @@ import android.view.accessibility.AccessibilityEvent;
import com.stardust.autojs.R; import com.stardust.autojs.R;
import com.stardust.autojs.core.accessibility.AccessibilityBridge; import com.stardust.autojs.core.accessibility.AccessibilityBridge;
import com.stardust.autojs.core.eventloop.EventEmitter; import com.stardust.autojs.core.eventloop.EventEmitter;
import com.stardust.autojs.runtime.ScriptRuntime;
import com.stardust.notification.Notification; import com.stardust.notification.Notification;
import com.stardust.notification.NotificationListenerService; import com.stardust.notification.NotificationListenerService;
import com.stardust.autojs.runtime.ScriptBridges; import com.stardust.autojs.runtime.ScriptBridges;
@@ -40,12 +41,14 @@ public class Events extends EventEmitter implements OnKeyListener, TouchObserver
private Loopers mLoopers; private Loopers mLoopers;
private Handler mHandler; private Handler mHandler;
private boolean mListeningNotification = false; private boolean mListeningNotification = false;
private ScriptRuntime mScriptRuntime;
public Events(Context context, AccessibilityBridge accessibilityBridge, ScriptBridges bridges, Loopers loopers) { public Events(Context context, AccessibilityBridge accessibilityBridge, ScriptRuntime runtime) {
super(bridges); super(runtime.bridges);
mAccessibilityBridge = accessibilityBridge; mAccessibilityBridge = accessibilityBridge;
mContext = context; mContext = context;
mLoopers = loopers; mLoopers = runtime.loopers;
mScriptRuntime = runtime;
} }
public EventEmitter emitter() { public EventEmitter emitter() {
@@ -55,6 +58,7 @@ public class Events extends EventEmitter implements OnKeyListener, TouchObserver
public void observeKey() { public void observeKey() {
if (mListeningKey) if (mListeningKey)
return; return;
mScriptRuntime.ensureAccessibilityServiceEnabled();
AccessibilityService service = mAccessibilityBridge.getService(); AccessibilityService service = mAccessibilityBridge.getService();
if (service == null) if (service == null)
throw new ScriptException("AccessibilityService = null"); throw new ScriptException("AccessibilityService = null");