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

Revert "opt(ui): use new js beautifier"

Browse Source 
This reverts commit a69152f719.
This commit is contained in:
hyb1996
2018-09-13 09:10:37 +08:00
parent a69152f719
commit 23f817f4e3
28 changed files with 108 additions and 3284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/autojs/autojs/tool/ImageSelector.java
View File

@@ -4,14 +4,17 @@ import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import com.stardust.app.OnActivityResultListener;
import com.stardust.app.OnActivityResultDelegate;
import org.autojs.autojs.R;
import java.io.FileNotFoundException;
import java.io.InputStream;
/**
* Created by Stardust on 2017/3/5.
*/
public class ImageSelector implements OnActivityResultListener {
public class ImageSelector implements OnActivityResultDelegate {
public interface ImageSelectorCallback {
void onImageSelected(ImageSelector selector, Uri uri);
@@ -23,13 +26,13 @@ public class ImageSelector implements OnActivityResultListener {
private Activity mActivity;
private ImageSelectorCallback mCallback;
private boolean mDisposable;
private ActivityResultObserver mActivityResultObserver;
private Mediator mMediator;
public ImageSelector(Activity activity, ActivityResultObserver activityResultObserver, ImageSelectorCallback callback) {
activityResultObserver.addListener(REQUEST_CODE, this);
public ImageSelector(Activity activity, OnActivityResultDelegate.Mediator mediator, ImageSelectorCallback callback) {
mediator.addDelegate(REQUEST_CODE, this);
mActivity = activity;
mCallback = callback;
mActivityResultObserver = activityResultObserver;
mMediator = mediator;
}
public void select() {
@@ -46,7 +49,7 @@ public class ImageSelector implements OnActivityResultListener {
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (mDisposable) {
mActivityResultObserver.removeListener(this);
mMediator.removeDelegate(this);
}
if (data == null) {
mCallback.onImageSelected(this, null);

12
app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java
View File

@@ -8,7 +8,7 @@ import android.view.ActionMode;
import android.view.Menu;
import android.view.MenuItem;
import com.stardust.app.OnActivityResultListener;
import com.stardust.app.OnActivityResultDelegate;
import com.stardust.autojs.core.permission.OnRequestPermissionsResultCallback;
import com.stardust.autojs.core.permission.PermissionRequestProxyActivity;
import com.stardust.autojs.core.permission.RequestPermissionCallbacks;
@@ -40,9 +40,9 @@ import static org.autojs.autojs.ui.edit.EditorView.EXTRA_READ_ONLY;
* Created by Stardust on 2017/1/29.
*/
@EActivity(R.layout.activity_edit)
public class EditActivity extends BaseActivity implements OnActivityResultListener.ObservableActivity, PermissionRequestProxyActivity {
public class EditActivity extends BaseActivity implements OnActivityResultDelegate.DelegateHost, PermissionRequestProxyActivity {
private OnActivityResultListener.ActivityResultObserver mActivityResultObserver = new OnActivityResultListener.ActivityResultObserver();
private OnActivityResultDelegate.Mediator mMediator = new OnActivityResultDelegate.Mediator();
@ViewById(R.id.editor_view)
EditorView mEditorView;
@@ -147,13 +147,13 @@ public class EditActivity extends BaseActivity implements OnActivityResultListen
@NonNull
@Override
public OnActivityResultListener.ActivityResultObserver getActivityResultObserver() {
return mActivityResultObserver;
public OnActivityResultDelegate.Mediator getOnActivityResultDelegateMediator() {
return mMediator;
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
mActivityResultObserver.onActivityResult(requestCode, resultCode, data);
mMediator.onActivityResult(requestCode, resultCode, data);
}
@Override

13
app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java
View File

@@ -12,7 +12,7 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import com.stardust.app.OnActivityResultListener;
import com.stardust.app.OnActivityResultDelegate;
import com.stardust.autojs.engine.JavaScriptEngine;
import com.stardust.autojs.execution.ScriptExecution;
import org.autojs.autojs.R;
@@ -21,6 +21,7 @@ import org.autojs.autojs.model.sample.SampleFile;
import org.autojs.autojs.ui.BaseActivity;
import org.autojs.autojs.ui.common.ScriptOperations;
import com.stardust.theme.ThemeColorManager;
import com.stardust.util.AssetsCache;
import com.stardust.util.SparseArrayEntries;
import org.autojs.autojs.ui.widget.ToolbarMenuItem;
@@ -37,7 +38,7 @@ import static org.autojs.autojs.model.script.Scripts.EXTRA_EXCEPTION_MESSAGE;
/**
* Created by Stardust on 2017/4/29.
*/
public class ViewSampleActivity extends AppCompatActivity implements OnActivityResultListener.ObservableActivity {
public class ViewSampleActivity extends AppCompatActivity implements OnActivityResultDelegate.DelegateHost {
public static void view(Context context, SampleFile sample) {
@@ -50,7 +51,7 @@ public class ViewSampleActivity extends AppCompatActivity implements OnActivityR
private SampleFile mSample;
private ScriptExecution mScriptExecution;
private SparseArray<ToolbarMenuItem> mMenuMap;
private OnActivityResultListener.ActivityResultObserver mActivityResultObserver = new OnActivityResultListener.ActivityResultObserver();
private OnActivityResultDelegate.Mediator mMediator = new OnActivityResultDelegate.Mediator();
private BroadcastReceiver mOnRunFinishedReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
@@ -181,12 +182,12 @@ public class ViewSampleActivity extends AppCompatActivity implements OnActivityR
}
@Override
public OnActivityResultListener.ActivityResultObserver getActivityResultObserver() {
return mActivityResultObserver;
public OnActivityResultDelegate.Mediator getOnActivityResultDelegateMediator() {
return mMediator;
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
mActivityResultObserver.onActivityResult(requestCode, resultCode, data);
mMediator.onActivityResult(requestCode, resultCode, data);
}
}

2
app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java
View File

@@ -80,7 +80,7 @@ public class CodeEditor extends HVScrollView {
mTextViewRedoUndo = new TextViewUndoRedo(mCodeEditText);
mJavaScriptHighlighter = new JavaScriptHighlighter(mTheme, mCodeEditText);
setTheme(Theme.getDefault(getContext()));
mJsBeautifier = new JsBeautifier(this, "js/js-beautify");
mJsBeautifier = new JsBeautifier(this, "js/beautify.js");
}

19
app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java
View File

@@ -3,10 +3,12 @@ package org.autojs.autojs.ui.main;
import android.Manifest;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.TabLayout;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager;
import android.support.v4.widget.DrawerLayout;
@@ -18,7 +20,8 @@ import android.view.MenuItem;
import android.view.View;
import com.stardust.app.FragmentPagerAdapterBuilder;
import com.stardust.app.OnActivityResultListener;
import com.stardust.app.OnActivityResultDelegate;
import com.stardust.autojs.core.image.OpenCVHelper;
import com.stardust.autojs.core.permission.OnRequestPermissionsResultCallback;
import com.stardust.autojs.core.permission.PermissionRequestProxyActivity;
import com.stardust.autojs.core.permission.RequestPermissionCallbacks;
@@ -30,6 +33,7 @@ import org.autojs.autojs.Pref;
import org.autojs.autojs.R;
import org.autojs.autojs.autojs.AutoJs;
import org.autojs.autojs.storage.file.StorageFileProvider;
import org.autojs.autojs.timing.TimedTaskManager;
import org.autojs.autojs.tool.AccessibilityServiceTool;
import org.autojs.autojs.ui.BaseActivity;
import org.autojs.autojs.ui.common.NotAskAgainDialog;
@@ -48,6 +52,8 @@ import org.autojs.autojs.ui.widget.SearchViewItem;
import com.stardust.theme.ThemeColorManager;
import org.autojs.autojs.theme.dialog.ThemeColorMaterialDialogBuilder;
import com.stardust.util.BackPressedHandler;
import com.stardust.util.DeveloperUtils;
import com.stardust.util.DrawerAutoClose;
@@ -58,11 +64,12 @@ import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.ViewById;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.opencv.core.Core;
import java.util.Arrays;
@EActivity(R.layout.activity_main)
public class MainActivity extends BaseActivity implements OnActivityResultListener.ObservableActivity, BackPressedHandler.HostActivity, PermissionRequestProxyActivity {
public class MainActivity extends BaseActivity implements OnActivityResultDelegate.DelegateHost, BackPressedHandler.HostActivity, PermissionRequestProxyActivity {
public static class DrawerOpenEvent {
@@ -81,7 +88,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultListen
FloatingActionButton mFab;
private FragmentPagerAdapterBuilder.StoredFragmentPagerAdapter mPagerAdapter;
private OnActivityResultListener.ActivityResultObserver mActivityResultActivityResultObserver = new OnActivityResultListener.ActivityResultObserver();
private OnActivityResultDelegate.Mediator mActivityResultMediator = new OnActivityResultDelegate.Mediator();
private RequestPermissionCallbacks mRequestPermissionCallbacks = new RequestPermissionCallbacks();
private VersionGuard mVersionGuard;
private BackPressedHandler.Observer mBackPressObserver = new BackPressedHandler.Observer();
@@ -228,7 +235,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultListen
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
mActivityResultActivityResultObserver.onActivityResult(requestCode, resultCode, data);
mActivityResultMediator.onActivityResult(requestCode, resultCode, data);
}
@Override
@@ -261,8 +268,8 @@ public class MainActivity extends BaseActivity implements OnActivityResultListen
@NonNull
@Override
public OnActivityResultListener.ActivityResultObserver getActivityResultObserver() {
return mActivityResultActivityResultObserver;
public OnActivityResultDelegate.Mediator getOnActivityResultDelegateMediator() {
return mActivityResultMediator;
}
@Override

12
app/src/main/java/org/autojs/autojs/ui/user/WebActivity.java
View File

@@ -3,7 +3,7 @@ package org.autojs.autojs.ui.user;
import android.content.Intent;
import android.support.annotation.NonNull;
import com.stardust.app.OnActivityResultListener;
import com.stardust.app.OnActivityResultDelegate;
import org.autojs.autojs.R;
import org.autojs.autojs.ui.BaseActivity;
import org.autojs.autojs.ui.widget.EWebView;
@@ -16,11 +16,11 @@ import org.androidannotations.annotations.ViewById;
* Created by Stardust on 2017/10/26.
*/
@EActivity(R.layout.activity_web)
public class WebActivity extends BaseActivity implements OnActivityResultListener.ObservableActivity {
public class WebActivity extends BaseActivity implements OnActivityResultDelegate.DelegateHost {
public static final String EXTRA_URL = "url";
private OnActivityResultListener.ActivityResultObserver mActivityResultObserver = new OnActivityResultListener.ActivityResultObserver();
private OnActivityResultDelegate.Mediator mMediator = new OnActivityResultDelegate.Mediator();
@ViewById(R.id.eweb_view)
EWebView mEWebView;
@@ -33,12 +33,12 @@ public class WebActivity extends BaseActivity implements OnActivityResultListene
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
mActivityResultObserver.onActivityResult(requestCode, resultCode, data);
mMediator.onActivityResult(requestCode, resultCode, data);
}
@NonNull
@Override
public OnActivityResultListener.ActivityResultObserver getActivityResultObserver() {
return mActivityResultObserver;
public OnActivityResultDelegate.Mediator getOnActivityResultDelegateMediator() {
return mMediator;
}
}

18
app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java
View File

@@ -20,10 +20,16 @@ import android.webkit.WebViewClient;
import android.widget.FrameLayout;
import android.widget.ProgressBar;
import com.stardust.app.OnActivityResultListener;
import com.stardust.app.OnActivityResultDelegate;
import org.autojs.autojs.R;
import org.autojs.autojs.tool.ImageSelector;
import com.stardust.util.IntentUtil;
import org.androidannotations.annotations.OnActivityResult;
import org.androidannotations.annotations.ViewById;
import java.io.File;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -35,7 +41,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
* Created by Stardust on 2017/8/22.
*/
public class EWebView extends FrameLayout implements SwipeRefreshLayout.OnRefreshListener, OnActivityResultListener {
public class EWebView extends FrameLayout implements SwipeRefreshLayout.OnRefreshListener, OnActivityResultDelegate {
private static final List<String> IMAGE_TYPES = Arrays.asList("png", "jpg", "bmp");
private static final int CHOOSE_IMAGE = 42222;
@@ -127,7 +133,7 @@ public class EWebView extends FrameLayout implements SwipeRefreshLayout.OnRefres
public boolean openFileChooser(ValueCallback<Uri> valueCallback,
String[] acceptType) {
if (getContext() instanceof ObservableActivity &&
if (getContext() instanceof OnActivityResultDelegate.DelegateHost &&
getContext() instanceof Activity && isImageType(acceptType)) {
chooseImage(valueCallback);
return true;
@@ -155,10 +161,10 @@ public class EWebView extends FrameLayout implements SwipeRefreshLayout.OnRefres
}
private void chooseImage(ValueCallback<Uri> valueCallback) {
ObservableActivity observableActivity = ((ObservableActivity) getContext());
ActivityResultObserver activityResultObserver = observableActivity.getActivityResultObserver();
DelegateHost delegateHost = ((OnActivityResultDelegate.DelegateHost) getContext());
Mediator mediator = delegateHost.getOnActivityResultDelegateMediator();
Activity activity = (Activity) getContext();
new ImageSelector(activity, activityResultObserver, (selector, uri) -> valueCallback.onReceiveValue(uri))
new ImageSelector(activity, mediator, (selector, uri) -> valueCallback.onReceiveValue(uri))
.disposable()
.select();
}