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

refactor: use GlobalAppContext to replace App.getApp()

Browse Source 
add: Canvas
This commit is contained in:
hyb1996
2018-03-23 14:45:48 +08:00
parent d098c77827
commit a009eb02b0
33 changed files with 666 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inrt/src/main/java/com/stardust/auojs/inrt/App.java
View File

@@ -10,6 +10,7 @@ import android.widget.ImageView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.transition.Transition;
import com.stardust.app.GlobalAppContext;
import com.stardust.auojs.inrt.autojs.AutoJs;
import com.stardust.auojs.inrt.autojs.GlobalKeyObserver;
import com.stardust.autojs.core.ui.inflater.ImageLoader;
@@ -21,16 +22,11 @@ import com.stardust.autojs.core.ui.inflater.util.Drawables;
public class App extends Application {
private static App sApp;
public static App getApp() {
return sApp;
}
@Override
public void onCreate() {
super.onCreate();
sApp = this;
GlobalAppContext.set(this);
AutoJs.initInstance(this);
GlobalKeyObserver.init();
Drawables.setDefaultImageLoader(new ImageLoader() {

6
inrt/src/main/java/com/stardust/auojs/inrt/Pref.java
View File

@@ -3,6 +3,8 @@ package com.stardust.auojs.inrt;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import com.stardust.app.GlobalAppContext;
/**
* Created by Stardust on 2017/12/8.
*/
@@ -14,7 +16,7 @@ public class Pref {
public static SharedPreferences getPreferences() {
if (sPreferences == null)
sPreferences = PreferenceManager.getDefaultSharedPreferences(App.getApp());
sPreferences = PreferenceManager.getDefaultSharedPreferences(GlobalAppContext.get());
return sPreferences;
}
@@ -23,7 +25,7 @@ public class Pref {
}
private static String getString(int res) {
return App.getApp().getString(res);
return GlobalAppContext.getString(res);
}
public static boolean shouldEnableAccessibilityServiceByRoot() {

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

@@ -6,6 +6,7 @@ import android.content.Intent;
import android.provider.Settings;
import android.text.TextUtils;
import com.stardust.app.GlobalAppContext;
import com.stardust.auojs.inrt.App;
import com.stardust.autojs.core.util.ProcessShell;
@@ -45,7 +46,7 @@ public class AccessibilityServiceTool {
}
public static void goToAccessibilitySetting() {
App.getApp().startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
GlobalAppContext.get().startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}
}

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

@@ -3,6 +3,7 @@ package com.stardust.auojs.inrt.autojs;
import android.app.Application;
import android.content.Context;
import com.stardust.app.GlobalAppContext;
import com.stardust.auojs.inrt.App;
import com.stardust.auojs.inrt.LogActivity;
import com.stardust.auojs.inrt.Pref;
@@ -27,12 +28,12 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
return instance;
}
public static void initInstance(Context context) {
instance = new AutoJs(context);
public static void initInstance(Application application) {
instance = new AutoJs(application);
}
private AutoJs(Context context) {
super(context);
private AutoJs(Application application) {
super(application);
}
@@ -43,14 +44,14 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
}
String errorMessage = null;
if (AccessibilityServiceUtils.isAccessibilityServiceEnabled(getApplication(), AccessibilityService.class)) {
errorMessage = App.getApp().getString(R.string.text_auto_operate_service_enabled_but_not_running);
errorMessage = GlobalAppContext.getString(R.string.text_auto_operate_service_enabled_but_not_running);
} else {
if (Pref.shouldEnableAccessibilityServiceByRoot()) {
if (!AccessibilityServiceTool.enableAccessibilityServiceByRootAndWaitFor(getApplication(), 2000)) {
errorMessage = App.getApp().getString(R.string.text_enable_accessibility_service_by_root_timeout);
errorMessage = GlobalAppContext.getString(R.string.text_enable_accessibility_service_by_root_timeout);
}
} else {
errorMessage = App.getApp().getString(R.string.text_no_accessibility_permission);
errorMessage = GlobalAppContext.getString(R.string.text_no_accessibility_permission);
}
}
if (errorMessage != null) {
@@ -66,14 +67,14 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
}
String errorMessage = null;
if (AccessibilityServiceUtils.isAccessibilityServiceEnabled(getApplication(), AccessibilityService.class)) {
errorMessage = App.getApp().getString(R.string.text_auto_operate_service_enabled_but_not_running);
errorMessage = GlobalAppContext.getString(R.string.text_auto_operate_service_enabled_but_not_running);
} else {
if (Pref.shouldEnableAccessibilityServiceByRoot()) {
if (!AccessibilityServiceTool.enableAccessibilityServiceByRootAndWaitFor(getApplication(), 2000)) {
errorMessage = App.getApp().getString(R.string.text_enable_accessibility_service_by_root_timeout);
errorMessage = GlobalAppContext.getString(R.string.text_enable_accessibility_service_by_root_timeout);
}
} else {
errorMessage = App.getApp().getString(R.string.text_no_accessibility_permission);
errorMessage = GlobalAppContext.getString(R.string.text_no_accessibility_permission);
}
}
if (errorMessage != null) {
@@ -84,11 +85,6 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
}
}
@Override
protected Application getApplication() {
return App.getApp();
}
@Override
protected ScriptRuntime createRuntime() {
ScriptRuntime runtime = super.createRuntime();

3
inrt/src/main/java/com/stardust/auojs/inrt/launch/GlobalProjectLauncher.java
View File

@@ -3,6 +3,7 @@ package com.stardust.auojs.inrt.launch;
import android.app.Activity;
import android.content.Context;
import com.stardust.app.GlobalAppContext;
import com.stardust.auojs.inrt.App;
/**
@@ -15,7 +16,7 @@ public class GlobalProjectLauncher extends AssetsProjectLauncher {
public static GlobalProjectLauncher getInstance() {
if (sInstance == null)
sInstance = new GlobalProjectLauncher(App.getApp());
sInstance = new GlobalProjectLauncher(GlobalAppContext.get());
return sInstance;
}