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

i don't know what i did

Browse Source
This commit is contained in:
hyb1996
2017-09-20 14:02:03 +08:00
parent d227d76d87
commit 43b7132280
30 changed files with 817 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/misc.xml generated
View File

@@ -2,7 +2,7 @@
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
<list size="9">
<list size="10">
<item index="0" class="java.lang.String" itemvalue="android.support.annotation.Keep" />
<item index="1" class="java.lang.String" itemvalue="android.webkit.JavascriptInterface" />
<item index="2" class="java.lang.String" itemvalue="butterknife.OnClick" />
@@ -11,7 +11,8 @@
<item index="5" class="java.lang.String" itemvalue="com.stardust.view.ViewBind.Click" />
<item index="6" class="java.lang.String" itemvalue="com.stardust.view.ViewBinding.Check" />
<item index="7" class="java.lang.String" itemvalue="com.stardust.view.ViewBinding.Click" />
<item index="8" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
<item index="8" class="java.lang.String" itemvalue="org.androidannotations.annotations.Click" />
<item index="9" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
</list>
</component>
<component name="NullableNotNullManager">

12
app/build.gradle
View File

@@ -9,8 +9,8 @@ android {
applicationId "com.stardust.scriptdroid"
minSdkVersion 17
targetSdkVersion 23
versionCode 163
versionName "2.0.16 Beta2.1"
versionCode 200
versionName "3.0.0 Alpha1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
ndk {
@@ -124,12 +124,16 @@ dependencies {
compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
compile 'com.yqritc:recyclerview-flexibledivider:1.4.0'
compile 'com.wang.avi:library:2.1.3'
// RxJava
compile "io.reactivex.rxjava2:rxjava:2.1.0"
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
// Retrofit
compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
// Tasker Plugin
compile 'com.twofortyfouram:android-plugin-client-sdk-for-locale:[4.0.2, 5.0['
compile 'com.android.volley:volley:1.0.0'
compile 'com.flurry.android:analytics:7.0.0@aar'
compile 'com.pushtorefresh.storio:sqlite:1.12.3'
// 920 Text Editors

8
app/src/main/java/com/stardust/scriptdroid/network/Apis.java Normal file
View File

@@ -0,0 +1,8 @@
package com.stardust.scriptdroid.network;
/**
* Created by Stardust on 2017/9/20.
*/
public class Apis {
}

17
app/src/main/java/com/stardust/scriptdroid/network/UpdateCheckApi.java Normal file
View File

@@ -0,0 +1,17 @@
package com.stardust.scriptdroid.network;
import com.stardust.scriptdroid.network.entity.VersionInfo;
import io.reactivex.Observable;
import retrofit2.http.GET;
/**
* Created by Stardust on 2017/9/20.
*/
public interface UpdateCheckApi {
@GET("/hyb1996/NoRootScriptDroid/master/version.json")
Observable<VersionInfo> checkForUpdates();
}

150
app/src/main/java/com/stardust/scriptdroid/network/VersionService.java Normal file
View File

@@ -0,0 +1,150 @@
package com.stardust.scriptdroid.network;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.widget.Toast;
import com.google.gson.GsonBuilder;
import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
import com.stardust.scriptdroid.App;
import com.stardust.scriptdroid.BuildConfig;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.network.entity.VersionInfo;
import com.stardust.scriptdroid.tool.SimpleObserver;
import com.stardust.scriptdroid.ui.update.UpdateInfoDialogBuilder;
import com.stardust.util.NetworkUtils;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull;
import io.reactivex.schedulers.Schedulers;
import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory;
/**
* Created by Stardust on 2017/9/20.
*/
public class VersionService {
private static final String KEY_DEPRECATED = "Still loving you...Can we go back...";
private static final String KEY_DEPRECATED_VERSION_CODE = "I miss you so much tonight...Baby don't let me cry...";
private static VersionService sInstance = new VersionService();
private boolean mDeprecated = false;
private VersionInfo mVersionInfo;
private SharedPreferences mSharedPreferences;
private Retrofit mRetrofit;
public VersionService() {
mRetrofit = new Retrofit.Builder()
.baseUrl("https://raw.githubusercontent.com/")
.addConverterFactory(GsonConverterFactory.create(new GsonBuilder()
.setLenient()
.create()))
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.build();
}
public static VersionService getInstance() {
return sInstance;
}
public Observable<VersionInfo> checkForUpdates() {
return mRetrofit.create(UpdateCheckApi.class)
.checkForUpdates()
.subscribeOn(Schedulers.io());
}
public void checkForUpdatesAndShow(final Context context) {
checkForUpdates().observeOn(AndroidSchedulers.mainThread())
.subscribe(new SimpleObserver<VersionInfo>() {
@Override
public void onNext(@io.reactivex.annotations.NonNull VersionInfo versionInfo) {
new UpdateInfoDialogBuilder(context, versionInfo)
.show();
}
@Override
public void onError(@io.reactivex.annotations.NonNull Throwable e) {
Toast.makeText(App.getApp(), R.string.text_check_update_error, Toast.LENGTH_SHORT).show();
}
});
}
private void readDeprecatedFromPref(Context context) {
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
if (mSharedPreferences.getInt(KEY_DEPRECATED_VERSION_CODE, 0) < BuildConfig.VERSION_CODE) {
mSharedPreferences.edit().remove(KEY_DEPRECATED_VERSION_CODE)
.putBoolean(KEY_DEPRECATED, false)
.apply();
}
mDeprecated = mSharedPreferences.getBoolean(KEY_DEPRECATED, false);
}
public void readDeprecatedFromPrefIfNeeded(Context context) {
if (mSharedPreferences == null) {
readDeprecatedFromPref(context);
}
}
public boolean isCurrentVersionDeprecated() {
return mDeprecated;
}
public VersionInfo getVersionInfo() {
return mVersionInfo;
}
public String getCurrentVersionIssues() {
if (mVersionInfo == null)
return null;
VersionInfo.OldVersion oldVersion = mVersionInfo.getOldVersion(BuildConfig.VERSION_CODE);
if (oldVersion == null)
return null;
return oldVersion.issues;
}
public Observable<VersionInfo> checkForUpdatesIfNeededAndUsingWifi(Context context) {
if (mVersionInfo == null) {
return checkUpdateIfUsingWifi(context);
}
return Observable.just(mVersionInfo);
}
private Observable<VersionInfo> checkUpdateIfUsingWifi(Context context) {
if (!NetworkUtils.isWifiAvailable(context)) {
return Observable.empty();
}
Observable<VersionInfo> observable = checkForUpdates();
observable.subscribe(new SimpleObserver<VersionInfo>() {
@Override
public void onNext(@NonNull VersionInfo versionInfo) {
if (versionInfo.isValid()) {
setVersionInfo(versionInfo);
}
}
@Override
public void onError(@NonNull Throwable e) {
e.printStackTrace();
}
});
return observable;
}
private void setVersionInfo(VersionInfo result) {
mDeprecated = BuildConfig.VERSION_CODE <= result.deprecated;
mVersionInfo = result;
if (mDeprecated) {
mSharedPreferences.edit().putBoolean(KEY_DEPRECATED, mDeprecated)
.putInt(KEY_DEPRECATED_VERSION_CODE, BuildConfig.VERSION_CODE)
.apply();
}
}
}

78
app/src/main/java/com/stardust/scriptdroid/network/entity/VersionInfo.java Normal file
View File

@@ -0,0 +1,78 @@
package com.stardust.scriptdroid.network.entity;
import android.text.TextUtils;
import org.json.JSONObject;
import java.util.List;
/**
* Created by Stardust on 2017/9/20.
*/
public class VersionInfo {
public int versionCode;
public String releaseNotes;
public String versionName;
public List<Download> downloads;
public List<OldVersion> oldVersions;
public int deprecated;
public String downloadUrl;
public boolean isValid() {
return downloads != null && !downloads.isEmpty() && versionCode > 0
&& !TextUtils.isEmpty(versionName) && !TextUtils.isEmpty(releaseNotes);
}
public OldVersion getOldVersion(int versionCode) {
for (OldVersion oldVersion : oldVersions) {
if (oldVersion.versionCode == versionCode) {
return oldVersion;
}
}
return null;
}
@Override
public String toString() {
return "UpdateInfo{" +
"versionCode=" + versionCode +
", releaseNotes='" + releaseNotes + '\'' +
", versionName='" + versionName + '\'' +
", downloads=" + downloads +
", oldVersions=" + oldVersions +
", deprecated=" + deprecated +
", downloadUrl='" + downloadUrl + '\'' +
'}';
}
public static class OldVersion extends JSONObject {
public int versionCode;
public String issues;
@Override
public String toString() {
return "OldVersion{" +
"versionCode=" + versionCode +
", issues='" + issues + '\'' +
'}';
}
}
public static class Download extends JSONObject {
public String name;
public String url;
@Override
public String toString() {
return "Download{" +
"name='" + name + '\'' +
", url='" + url + '\'' +
'}';
}
}
}

83
app/src/main/java/com/stardust/scriptdroid/sublime/SublimePluginClient.java
View File

@@ -5,6 +5,8 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import org.greenrobot.eventbus.EventBus;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscriber;
import java.io.BufferedReader;
import java.io.IOException;
@@ -12,9 +14,10 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Callable;
import io.reactivex.Observable;
import io.reactivex.subjects.PublishSubject;
/**
* Created by Stardust on 2017/5/10.
@@ -22,50 +25,56 @@ import java.util.concurrent.Executors;
public class SublimePluginClient {
public static class ConnectionStateChangeEvent {
private boolean mConnected;
public ConnectionStateChangeEvent(boolean connected) {
mConnected = connected;
}
public boolean isConnected() {
return mConnected;
}
}
private volatile Socket mSocket;
private Handler mResponseHandler;
private String host;
private int port;
private OutputStream mOutputStream;
private ExecutorService mExecutor;
private final PublishSubject<Boolean> mConnectionState;
public SublimePluginClient(String host, int port) {
public SublimePluginClient(String host, int port, PublishSubject<Boolean> connectionState) {
this.host = host;
this.port = port;
mConnectionState = connectionState;
}
public void setResponseHandler(Handler handler) {
mResponseHandler = handler;
}
public void listen() {
public Observable<Void> listen() {
if (mSocket != null) {
throw new IllegalStateException("Socket listening ");
}
return Observable.fromPublisher(new Publisher<Void>() {
@Override
public void subscribe(Subscriber<? super Void> s) {
if (mSocket != null) {
s.onError(new IllegalStateException("Socket listening "));
return;
}
listenInternal(s);
}
});
}
private void listenInternal(final Subscriber<? super Void> s) {
new Thread(new Runnable() {
@Override
public void run() {
try {
mSocket = new Socket(host, port);
EventBus.getDefault().post(new ConnectionStateChangeEvent(true));
mConnectionState.onNext(true);
mSocket.setTcpNoDelay(true);
mOutputStream = mSocket.getOutputStream();
startReadLoop(mSocket.getInputStream());
s.onComplete();
readLoop(mSocket.getInputStream());
} catch (IOException e) {
e.printStackTrace();
s.onError(e);
} finally {
tryClose();
}
@@ -73,6 +82,10 @@ public class SublimePluginClient {
}).start();
}
public PublishSubject<Boolean> getConnectionState() {
return mConnectionState;
}
public boolean isListening() {
return mSocket != null;
}
@@ -85,24 +98,17 @@ public class SublimePluginClient {
}
}
public void send(final JsonObject object) {
public Observable<Void> send(final JsonObject object) {
if (mSocket == null) {
throw new IllegalStateException("Socket is not listening ");
}
if (mExecutor == null) {
mExecutor = Executors.newSingleThreadExecutor();
}
mExecutor.execute(new Runnable() {
return Observable.fromCallable(new Callable<Void>() {
@Override
public void run() {
try {
mOutputStream.write(object.toString().getBytes());
mOutputStream.write("\n".getBytes());
mOutputStream.flush();
} catch (IOException e) {
e.printStackTrace();
tryClose();
}
public Void call() throws Exception {
mOutputStream.write(object.toString().getBytes());
mOutputStream.write("\n".getBytes());
mOutputStream.flush();
return null;
}
});
}
@@ -110,23 +116,22 @@ public class SublimePluginClient {
public void close() throws IOException {
if (mSocket != null) {
mSocket.close();
mExecutor.shutdownNow();
mSocket = null;
mOutputStream = null;
mExecutor = null;
EventBus.getDefault().post(new ConnectionStateChangeEvent(false));
mConnectionState.onNext(false);
}
}
private void startReadLoop(InputStream stream) throws IOException {
private void readLoop(InputStream stream) throws IOException {
BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
JsonParser parser = new JsonParser();
while (!Thread.currentThread().isInterrupted()) {
String line = reader.readLine();
if (line == null) {
return;
}
if (mResponseHandler != null) {
JsonElement jsonElement = new JsonParser().parse(line);
JsonElement jsonElement = parser.parse(line);
JsonObject jsonObject = jsonElement.getAsJsonObject();
mResponseHandler.handle(jsonObject);
}

19
app/src/main/java/com/stardust/scriptdroid/sublime/SublimePluginService.java
View File

@@ -2,7 +2,8 @@ package com.stardust.scriptdroid.sublime;
import com.google.gson.JsonObject;
import java.io.IOException;
import io.reactivex.Observable;
import io.reactivex.subjects.PublishSubject;
/**
* Created by Stardust on 2017/5/11.
@@ -11,6 +12,7 @@ import java.io.IOException;
public class SublimePluginService {
private static SublimePluginClient client;
private static final PublishSubject<Boolean> CONNECTION_STATE = PublishSubject.create();
public static boolean isConnected() {
return client != null && client.isListening();
@@ -25,17 +27,21 @@ public class SublimePluginService {
public static void disconnect() {
try {
client.close();
} catch (IOException e) {
} catch (Exception e) {
e.printStackTrace();
} finally {
client = null;
}
}
public static void connect(String host) {
client = new SublimePluginClient(host, 1209);
public static PublishSubject<Boolean> getConnectionState() {
return CONNECTION_STATE;
}
public static Observable<Void> connect(String host) {
client = new SublimePluginClient(host, 1209, CONNECTION_STATE);
client.setResponseHandler(new SublimeResponseHandler());
client.listen();
return client.listen();
}
public static void log(String log) {
@@ -46,8 +52,9 @@ public class SublimePluginService {
object.addProperty("log", log);
try {
client.send(object);
} catch (IllegalStateException e) {
} catch (Exception e) {
e.printStackTrace();
disconnect();
}
}
}

169
app/src/main/java/com/stardust/scriptdroid/tool/UpdateChecker.java
View File

@@ -1,169 +0,0 @@
package com.stardust.scriptdroid.tool;
import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
import com.android.volley.DefaultRetryPolicy;
import com.android.volley.Request;
import com.android.volley.RequestQueue;
import com.android.volley.Response;
import com.android.volley.VolleyError;
import com.android.volley.toolbox.StringRequest;
import com.android.volley.toolbox.Volley;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.stardust.scriptdroid.BuildConfig;
import org.json.JSONObject;
import java.lang.reflect.Type;
import java.util.List;
/**
* Created by Stardust on 2017/4/9.
*/
public class UpdateChecker implements Response.Listener<String>, Response.ErrorListener {
private static final String LOG_TAG = UpdateChecker.class.getName();
private RequestQueue mRequestQueue;
private static final String UPDATE_URL = "https://raw.githubusercontent.com/hyb1996/NoRootScriptDroid/master/version.json";
public interface Callback {
void onSuccess(UpdateInfo result);
void onError(Exception exception);
}
public static UpdateInfo savedResult;
private final int mTimeOut = 3000;
private Callback mCallback;
public UpdateChecker(Context context) {
mRequestQueue = Volley.newRequestQueue(context);
}
private UpdateInfo parse(String json) {
Gson gson = new Gson();
Type type = new TypeToken<UpdateInfo>() {
}.getType();
UpdateInfo result = gson.fromJson(json, type);
Log.i(LOG_TAG, result.toString());
return result;
}
public void check(final Callback callback) {
mCallback = callback;
StringRequest request = new StringRequest(Request.Method.GET, UPDATE_URL, this, this);
request.setRetryPolicy(new DefaultRetryPolicy(mTimeOut, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT));
request.setTag("update-check");
request.setShouldCache(false);
mRequestQueue.add(request);
}
@Override
public void onErrorResponse(VolleyError error) {
error.printStackTrace();
mCallback.onError(error);
mCallback = null;
}
@Override
public void onResponse(String response) {
try {
UpdateInfo result = parse(response);
savedResult = result;
if (mCallback == null)
return;
if (result.isValid()) {
mCallback.onSuccess(result);
} else {
mCallback.onError(new UpdateDataInvalidException());
}
} catch (Exception e) {
e.printStackTrace();
mCallback.onError(e);
}
mCallback = null;
}
public void cancel() {
mRequestQueue.cancelAll("update-check");
}
public static class UpdateInfo extends JSONObject {
public int versionCode;
public String releaseNotes;
public String versionName;
public List<Download> downloads;
public List<OldVersion> oldVersions;
public int deprecated;
public String downloadUrl;
public boolean isValid() {
return downloads != null && !downloads.isEmpty() && versionCode > 0
&& !TextUtils.isEmpty(versionName) && !TextUtils.isEmpty(releaseNotes);
}
public OldVersion getOldVersion(int versionCode) {
for (OldVersion oldVersion : oldVersions) {
if (oldVersion.versionCode == versionCode) {
return oldVersion;
}
}
return null;
}
@Override
public String toString() {
return "UpdateInfo{" +
"versionCode=" + versionCode +
", releaseNotes='" + releaseNotes + '\'' +
", versionName='" + versionName + '\'' +
", downloads=" + downloads +
", oldVersions=" + oldVersions +
", deprecated=" + deprecated +
", downloadUrl='" + downloadUrl + '\'' +
'}';
}
}
public static class OldVersion extends JSONObject {
public int versionCode;
public String issues;
@Override
public String toString() {
return "OldVersion{" +
"versionCode=" + versionCode +
", issues='" + issues + '\'' +
'}';
}
}
public static class Download extends JSONObject {
public String name;
public String url;
@Override
public String toString() {
return "Download{" +
"name='" + name + '\'' +
", url='" + url + '\'' +
'}';
}
}
public static class UpdateDataInvalidException extends RuntimeException {
}
}

121
app/src/main/java/com/stardust/scriptdroid/tool/VersionInfo.java
View File

@@ -1,121 +0,0 @@
package com.stardust.scriptdroid.tool;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import com.stardust.scriptdroid.BuildConfig;
import com.stardust.util.NetworkUtils;
/**
* Created by Stardust on 2017/4/9.
*/
public class VersionInfo {
private static final String KEY_DEPRECATED = "Still loving you...Can we go back...";
private static final String KEY_DEPRECATED_VERSION_CODE = "I miss you so much tonight...Baby don't let me cry...";
public interface OnReceiveUpdateResultCallback {
void onReceive(UpdateChecker.UpdateInfo info, boolean isCurrentVersionDeprecated);
}
private static VersionInfo instance = new VersionInfo();
public static VersionInfo getInstance() {
return instance;
}
private boolean mDeprecated = false;
private UpdateChecker.UpdateInfo mUpdateInfo;
private OnReceiveUpdateResultCallback mOnReceiveUpdateResultCallback;
private SharedPreferences mSharedPreferences;
public void readDeprecatedFromPref(Context context) {
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
if (mSharedPreferences.getInt(KEY_DEPRECATED_VERSION_CODE, 0) < BuildConfig.VERSION_CODE) {
mSharedPreferences.edit().remove(KEY_DEPRECATED_VERSION_CODE)
.putBoolean(KEY_DEPRECATED, false)
.apply();
}
mDeprecated = mSharedPreferences.getBoolean(KEY_DEPRECATED, false);
}
public void readDeprecatedFromPrefIfNeeded(Context context) {
if (mSharedPreferences == null) {
readDeprecatedFromPref(context);
}
}
public boolean isCurrentVersionDeprecated() {
return mDeprecated;
}
public UpdateChecker.UpdateInfo getUpdateInfo() {
return mUpdateInfo;
}
public String getCurrentVersionIssues() {
if (mUpdateInfo == null)
return null;
UpdateChecker.OldVersion oldVersion = mUpdateInfo.getOldVersion(BuildConfig.VERSION_CODE);
if (oldVersion == null)
return null;
return oldVersion.issues;
}
public void checkUpdateIfNeeded(Context context) {
if (mUpdateInfo == null) {
checkUpdateIfUsingWifi(context);
}
}
public void setOnReceiveUpdateResultCallback(OnReceiveUpdateResultCallback onReceiveUpdateResultCallback) {
mOnReceiveUpdateResultCallback = onReceiveUpdateResultCallback;
}
private void checkUpdateIfUsingWifi(Context context) {
if (NetworkUtils.isWifiAvailable(context)) {
checkUpdate(context);
}
}
public void checkUpdate(Context context) {
checkUpdateInner(context);
}
private void checkUpdateInner(final Context context) {
new UpdateChecker(context).check(new UpdateChecker.Callback() {
@Override
public void onSuccess(UpdateChecker.UpdateInfo result) {
if (result.isValid()) {
setUpdateInfo(result);
}
}
@Override
public void onError(Exception exception) {
exception.printStackTrace();
}
});
}
private void setUpdateInfo(UpdateChecker.UpdateInfo result) {
mDeprecated = BuildConfig.VERSION_CODE <= result.deprecated;
mUpdateInfo = result;
if (mDeprecated) {
mSharedPreferences.edit().putBoolean(KEY_DEPRECATED, mDeprecated)
.putInt(KEY_DEPRECATED_VERSION_CODE, BuildConfig.VERSION_CODE)
.apply();
}
if (mOnReceiveUpdateResultCallback != null) {
mOnReceiveUpdateResultCallback.onReceive(result, mDeprecated);
}
}
}

14
app/src/main/java/com/stardust/scriptdroid/ui/BaseActivity.java
View File

@@ -11,7 +11,7 @@ import android.support.v7.widget.Toolbar;
import android.view.View;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.tool.VersionInfo;
import com.stardust.scriptdroid.network.VersionService;
import com.stardust.theme.ThemeColorManager;
import com.stardust.util.BackPressedHandler;
@@ -46,18 +46,6 @@ public abstract class BaseActivity extends AppCompatActivity implements BackPres
}
@Override
protected void onResume() {
super.onResume();
}
@Override
protected void onPause() {
super.onPause();
VersionInfo.getInstance().setOnReceiveUpdateResultCallback(null);
}
@SuppressWarnings("unchecked")
public <T extends View> T $(int resId) {
return (T) findViewById(resId);

3
app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java
View File

@@ -28,7 +28,6 @@ import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.autojs.AutoJs;
import com.stardust.scriptdroid.external.floatingwindow.HoverMenuManger;
import com.stardust.scriptdroid.script.StorageFileProvider;
import com.stardust.scriptdroid.ui.main.community.CommunityFragment;
import com.stardust.scriptdroid.ui.main.community.CommunityFragment_;
import com.stardust.scriptdroid.ui.main.doc.OnlineDocsFragment_;
import com.stardust.scriptdroid.ui.main.scripts.MyScriptListFragment_;
@@ -194,7 +193,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
@Override
protected void onResume() {
super.onResume();
mVersionGuard.checkDeprecateAndUpdate();
mVersionGuard.checkForDeprecatesAndUpdates();
}
@Override

2
app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityFragment.java
View File

@@ -44,7 +44,7 @@ public class CommunityFragment extends ViewPagerFragment implements BackPressedH
@AfterViews
void setUpViews() {
mWebView = mEWebView.getWebView();
mWebView.loadUrl("http://39.108.231.37/");
mWebView.loadUrl("http://www.autojs.org/");
}
@Override

298
app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerFragment.java
View File

@@ -1,13 +1,10 @@
package com.stardust.scriptdroid.ui.main.drawer;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.SwitchCompat;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.Toast;
import com.afollestad.materialdialogs.DialogAction;
@@ -17,10 +14,15 @@ import com.stardust.scriptdroid.Pref;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.external.floatingwindow.HoverMenuManger;
import com.stardust.scriptdroid.external.floatingwindow.menu.HoverMenuService;
import com.stardust.scriptdroid.network.UpdateCheckApi;
import com.stardust.scriptdroid.network.VersionService;
import com.stardust.scriptdroid.network.entity.VersionInfo;
import com.stardust.scriptdroid.tool.SimpleObserver;
import com.stardust.scriptdroid.ui.common.ProgressDialog;
import com.stardust.scriptdroid.ui.settings.SettingsActivity;
import com.stardust.scriptdroid.ui.update.UpdateInfoDialogBuilder;
import com.stardust.theme.ThemeColorManager;
import com.stardust.view.accessibility.AccessibilityService;
import com.stardust.scriptdroid.sublime.SublimePluginClient;
import com.stardust.scriptdroid.sublime.SublimePluginService;
import com.stardust.scriptdroid.tool.AccessibilityServiceTool;
import com.stardust.scriptdroid.tool.WifiTool;
@@ -28,15 +30,18 @@ import com.stardust.util.IntentUtil;
import com.stardust.util.UnderuseExecutors;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.CheckedChange;
import org.androidannotations.annotations.Click;
import org.androidannotations.annotations.EFragment;
import org.androidannotations.annotations.ViewById;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.concurrent.Executor;
import java.util.concurrent.Callable;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
/**
@@ -45,153 +50,234 @@ import java.util.concurrent.Executor;
@EFragment(R.layout.fragment_drawer)
public class DrawerFragment extends android.support.v4.app.Fragment {
SwitchCompat mAccessibilityServiceSwitch;
SwitchCompat mFloatingWindowSwitch;
SwitchCompat mDebugSwitch;
private static final String URL_SUBLIME_PLUGIN_HELP = "https://github.com/hyb1996/AutoJs-Sublime-Plugin/blob/master/Readme.md";
@ViewById(R.id.debug)
DrawerMenuItem mConnectionItem;
@ViewById(R.id.accessibility_service)
DrawerMenuItem mAccessibilityServiceItem;
@ViewById(R.id.floating_window)
DrawerMenuItem mFloatingWindowItem;
@ViewById(R.id.check_for_updates)
DrawerMenuItem mCheckForUpdatesItem;
@ViewById(R.id.header)
View mHeaderView;
private Executor mExecutor = UnderuseExecutors.getExecutor();
private Disposable mConnectionStateDisposable;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
EventBus.getDefault().register(this);
mConnectionStateDisposable = SublimePluginService.getConnectionState()
.observeOn(AndroidSchedulers.mainThread())
.doOnNext(new Consumer<Boolean>() {
@Override
public void accept(@io.reactivex.annotations.NonNull Boolean connected) throws Exception {
mConnectionItem.getSwitchCompat().setChecked(connected);
}
})
.subscribe();
}
@Override
public void onStart() {
super.onStart();
//syncSwitchState();
syncSwitchState();
}
@AfterViews
void setUpViews(){
void setUpViews() {
ThemeColorManager.addViewBackground(mHeaderView);
}
private void syncSwitchState() {
mAccessibilityServiceSwitch.postDelayed(new Runnable() {
@Override
public void run() {
mExecutor.execute(new Runnable() {
@Override
public void run() {
if (mAccessibilityServiceSwitch == null) {
return;
}
final boolean checked = AccessibilityServiceTool.isAccessibilityServiceEnabled(App.getApp());
mAccessibilityServiceSwitch.post(new Runnable() {
@Override
public void run() {
if (mAccessibilityServiceSwitch == null) {
return;
}
mAccessibilityServiceSwitch.setChecked(checked);
}
});
}
});
}
}, 450);
mFloatingWindowSwitch.setChecked(HoverMenuManger.isHoverMenuShowing());
}
void setAutoOperateServiceEnable(CompoundButton button, boolean enable) {
boolean isAccessibilityServiceEnabled = AccessibilityServiceTool.isAccessibilityServiceEnabled(App.getApp());
if (enable && !isAccessibilityServiceEnabled) {
@Click(R.id.accessibility_service)
void enableOrDisableAccessibilityService() {
boolean isAccessibilityServiceEnabled = isAccessibilityServiceEnabled();
boolean checked = mAccessibilityServiceItem.getSwitchCompat().isChecked();
if (checked && !isAccessibilityServiceEnabled) {
enableAccessibilityService();
} else if (!enable && isAccessibilityServiceEnabled) {
} else if (!checked && isAccessibilityServiceEnabled) {
if (!AccessibilityService.disable()) {
AccessibilityServiceTool.goToAccessibilitySetting();
}
}
}
private boolean isAccessibilityServiceEnabled() {
return AccessibilityServiceTool.isAccessibilityServiceEnabled(getActivity());
}
@Click(R.id.floating_window)
void showOrDismissFloatingWindow() {
boolean isFloatingWindowShowing = HoverMenuManger.isHoverMenuShowing();
boolean checked = mFloatingWindowItem.getSwitchCompat().isChecked();
if (checked && !isFloatingWindowShowing) {
HoverMenuManger.showHoverMenu();
enableAccessibilityServiceByRootIfNeeded();
} else if (!checked && isFloatingWindowShowing) {
HoverMenuManger.hideHoverMenu();
}
}
@Click(R.id.theme_color)
void openThemeColorSettings() {
SettingsActivity.selectThemeColor(getActivity());
}
private void enableAccessibilityServiceByRootIfNeeded() {
Observable.fromCallable(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
return Pref.enableAccessibilityServiceByRoot() && !isAccessibilityServiceEnabled();
}
})
.subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<Boolean>() {
@Override
public void accept(@io.reactivex.annotations.NonNull Boolean needed) throws Exception {
if (needed) {
enableAccessibilityServiceByRoot();
}
}
});
}
@Click(R.id.debug)
void connectOrDisconnectToRemote() {
boolean checked = mConnectionItem.getSwitchCompat().isChecked();
boolean connected = SublimePluginService.isConnected();
if (checked && !connected) {
inputRemoteHost();
} else if (!checked && connected) {
SublimePluginService.disconnectIfNeeded();
}
}
private void inputRemoteHost() {
String host = Pref.getServerAddressOrDefault(WifiTool.getWifiAddress(getActivity()));
new MaterialDialog.Builder(getActivity())
.title(R.string.text_server_address)
.input("", host, new MaterialDialog.InputCallback() {
@Override
public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
Pref.saveServerAddress(input.toString());
connectToRemote(input.toString());
}
})
.neutralText(R.string.text_help)
.onNeutral(new MaterialDialog.SingleButtonCallback() {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
IntentUtil.browse(getActivity(), URL_SUBLIME_PLUGIN_HELP);
}
})
.cancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
mConnectionItem.getSwitchCompat().toggle(false);
}
})
.show();
}
private void connectToRemote(String host) {
mConnectionItem.setProgress(true);
Toast.makeText(App.getApp(), R.string.text_connecting, Toast.LENGTH_SHORT).show();
SublimePluginService.connect(host)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new SimpleObserver<Void>() {
@Override
public void onError(@io.reactivex.annotations.NonNull Throwable e) {
Toast.makeText(App.getApp(), e.getMessage(), Toast.LENGTH_SHORT).show();
mConnectionItem.getSwitchCompat().setChecked(false, false);
mConnectionItem.setProgress(false);
}
@Override
public void onComplete() {
mConnectionItem.setProgress(false);
}
});
}
@Click(R.id.check_for_updates)
void checkForUpdates() {
mCheckForUpdatesItem.setProgress(true);
VersionService.getInstance().checkForUpdates()
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new SimpleObserver<VersionInfo>() {
@Override
public void onNext(@io.reactivex.annotations.NonNull VersionInfo versionInfo) {
new UpdateInfoDialogBuilder(getActivity(), versionInfo)
.show();
mCheckForUpdatesItem.setProgress(false);
}
@Override
public void onError(@io.reactivex.annotations.NonNull Throwable e) {
e.printStackTrace();
Toast.makeText(App.getApp(), R.string.text_check_update_error, Toast.LENGTH_SHORT).show();
mCheckForUpdatesItem.setProgress(false);
}
});
}
private void syncSwitchState() {
mAccessibilityServiceItem.getSwitchCompat().setChecked(
AccessibilityServiceTool.isAccessibilityServiceEnabled(getActivity()));
mFloatingWindowItem.getSwitchCompat().setChecked(HoverMenuManger.isHoverMenuShowing());
}
private void enableAccessibilityService() {
if (!Pref.enableAccessibilityServiceByRoot()) {
AccessibilityServiceTool.goToAccessibilitySetting();
return;
}
enableAccessibilityServiceByRoot();
}
private void enableAccessibilityServiceByRoot() {
final ProgressDialog progress = new ProgressDialog(getContext(), R.string.text_enable_accessibility_service_by_root_ing);
UnderuseExecutors.execute(new Runnable() {
mAccessibilityServiceItem.setProgress(true);
Observable.fromCallable(new Callable<Boolean>() {
@Override
public void run() {
final boolean succeed = AccessibilityServiceTool.enableAccessibilityServiceByRootAndWaitFor(4000);
getActivity().runOnUiThread(new Runnable() {
public Boolean call() throws Exception {
return AccessibilityServiceTool.enableAccessibilityServiceByRootAndWaitFor(4000);
}
})
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<Boolean>() {
@Override
public void run() {
public void accept(@io.reactivex.annotations.NonNull Boolean succeed) throws Exception {
if (!succeed) {
Toast.makeText(getContext(), R.string.text_enable_accessibitliy_service_by_root_failed, Toast.LENGTH_SHORT).show();
AccessibilityServiceTool.goToAccessibilitySetting();
}
progress.dismiss();
mAccessibilityServiceItem.setProgress(false);
}
});
}
});
}
void setFloatingWindowEnable(CompoundButton button, boolean enable) {
if (enable && !HoverMenuManger.isHoverMenuShowing()) {
HoverMenuManger.showHoverMenu();
if (Pref.enableAccessibilityServiceByRoot()) {
enableAccessibilityServiceByRoot();
}
} else if (!enable && HoverMenuManger.isHoverMenuShowing()) {
HoverMenuManger.hideHoverMenu();
}
}
void setDebugEnabled(CompoundButton button, boolean enabled) {
if (enabled && !SublimePluginService.isConnected()) {
new MaterialDialog.Builder(getActivity())
.title(R.string.text_server_address)
.input("", getServerAddress(), new MaterialDialog.InputCallback() {
@Override
public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
Pref.saveServerAddress(input.toString());
SublimePluginService.connect(input.toString());
}
})
.neutralText(R.string.text_help)
.onNeutral(new MaterialDialog.SingleButtonCallback() {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
IntentUtil.browse(getActivity(), "https://github.com/hyb1996/AutoJs-Sublime-Plugin/blob/master/Readme.md");
}
})
.show();
} else if (!enabled) {
SublimePluginService.disconnectIfNeeded();
}
}
private CharSequence getServerAddress() {
return Pref.getServerAddressOrDefault(WifiTool.getWifiAddress(getActivity()));
}
@Override
public void onDestroy() {
super.onDestroy();
EventBus.getDefault().unregister(this);
mConnectionStateDisposable.dispose();
}
@Subscribe
public void onHoverMenuServiceStateChanged(HoverMenuService.ServiceStateChangedEvent event) {
mFloatingWindowSwitch.setChecked(event.state);
mAccessibilityServiceItem.getSwitchCompat().setChecked(event.state);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onSublimeClientStateChange(SublimePluginClient.ConnectionStateChangeEvent event) {
mDebugSwitch.setChecked(event.isConnected());
App.getApp().getUiHandler().toast(event.isConnected() ? R.string.text_connected : R.string.text_disconnected);
}
}

95
app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerMenuItem.java
View File

@@ -2,26 +2,49 @@ package com.stardust.scriptdroid.ui.main.drawer;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import android.support.v7.widget.SwitchCompat;
import android.util.AttributeSet;
import android.view.View;
import android.widget.AutoCompleteTextView;
import android.widget.CompoundButton;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.stardust.scriptdroid.R;
import com.stardust.widget.PrefSwitch;
import com.stardust.widget.SwitchCompat;
import butterknife.BindView;
import butterknife.ButterKnife;
import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
/**
* Created by Stardust on 2017/8/25.
*/
public class DrawerMenuItem extends FrameLayout {
private SwitchCompat mSwitchCompat;
private static final long CLICK_TIMEOUT = 1000;
@BindView(R.id.sw)
PrefSwitch mSwitchCompat;
@BindView(R.id.progress_bar)
MaterialProgressBar mProgressBar;
@BindView(R.id.icon)
ImageView mIcon;
@BindView(R.id.title)
TextView mTitle;
private OnClickListener mOnClickListener;
private boolean mAntiShake = false;
private long mLastClickMillis;
public DrawerMenuItem(Context context) {
super(context);
@@ -46,28 +69,68 @@ public class DrawerMenuItem extends FrameLayout {
private void init(AttributeSet attrs) {
inflate(getContext(), R.layout.drawer_menu_item, this);
ImageView icon = (ImageView) findViewById(R.id.icon);
TextView title = (TextView) findViewById(R.id.title);
mSwitchCompat = (SwitchCompat) findViewById(R.id.sw);
ButterKnife.bind(this, this);
if (attrs == null)
return;
TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.DrawerMenuItem);
icon.setImageResource(a.getResourceId(R.styleable.DrawerMenuItem_icon, 0));
title.setText(a.getString(R.styleable.DrawerMenuItem_title));
mIcon.setImageResource(a.getResourceId(R.styleable.DrawerMenuItem_icon, 0));
mTitle.setText(a.getString(R.styleable.DrawerMenuItem_title));
mAntiShake = a.getBoolean(R.styleable.DrawerMenuItem_anti_shake, false);
if (a.getBoolean(R.styleable.DrawerMenuItem_with_switch, false)) {
mSwitchCompat.setVisibility(VISIBLE);
setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
mSwitchCompat.toggle();
}
});
enableSwitch(a.getString(R.styleable.DrawerMenuItem_pref_key));
}
a.recycle();
}
private void enableSwitch(String prefKey) {
mSwitchCompat.setVisibility(VISIBLE);
if (prefKey != null) {
mSwitchCompat.setPrefKey(prefKey);
}
mSwitchCompat.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
onClick();
}
});
super.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
mSwitchCompat.toggle();
}
});
}
private void onClick() {
if (mAntiShake && (System.currentTimeMillis() - mLastClickMillis < CLICK_TIMEOUT)) {
Toast.makeText(getContext(), R.string.text_click_too_frequently, Toast.LENGTH_SHORT).show();
mSwitchCompat.setChecked(!mSwitchCompat.isChecked(), false);
return;
}
mLastClickMillis = System.currentTimeMillis();
if (mOnClickListener != null) {
mOnClickListener.onClick(DrawerMenuItem.this);
}
}
public void setProgress(boolean onProgress) {
mProgressBar.setVisibility(onProgress ? VISIBLE : GONE);
mIcon.setVisibility(onProgress ? GONE : VISIBLE);
mSwitchCompat.setEnabled(!onProgress);
setEnabled(!onProgress);
}
public SwitchCompat getSwitchCompat() {
return mSwitchCompat;
}
@Override
public void setOnClickListener(OnClickListener onClickListener) {
if (mSwitchCompat.getVisibility() == VISIBLE) {
mOnClickListener = onClickListener;
} else {
super.setOnClickListener(onClickListener);
}
}
}

61
app/src/main/java/com/stardust/scriptdroid/ui/settings/SettingsActivity.java
View File

@@ -5,15 +5,16 @@ import android.content.Intent;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceScreen;
import android.support.v4.util.Pair;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.widget.Toast;
import com.stardust.scriptdroid.network.VersionService;
import com.stardust.scriptdroid.ui.BaseActivity;
import com.stardust.scriptdroid.ui.error.IssueReporterActivity;
import com.stardust.scriptdroid.ui.splash.SplashActivity;
import com.stardust.scriptdroid.ui.splash.SplashActivity_;
import com.stardust.scriptdroid.ui.update.UpdateCheckDialog;
import com.stardust.theme.preference.ThemeColorPreferenceFragment;
import com.stardust.util.IntentUtil;
import com.stardust.util.MapEntries;
@@ -24,6 +25,7 @@ import com.stardust.theme.util.ListBuilder;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EActivity;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -37,30 +39,35 @@ import de.psdev.licensesdialog.licenses.License;
@EActivity(R.layout.activity_settings)
public class SettingsActivity extends BaseActivity {
private static final List<ColorSelectActivity.ColorItem> COLOR_ITEMS;
private static final List<Pair<Integer, Integer>> COLOR_ITEMS = new ListBuilder<Pair<Integer, Integer>>()
.add(new Pair<>(R.color.theme_color_red, R.string.theme_color_red))
.add(new Pair<>(R.color.theme_color_pink, R.string.theme_color_pink))
.add(new Pair<>(R.color.theme_color_purple, R.string.theme_color_purple))
.add(new Pair<>(R.color.theme_color_dark_purple, R.string.theme_color_dark_purple))
.add(new Pair<>(R.color.theme_color_indigo, R.string.theme_color_indigo))
.add(new Pair<>(R.color.theme_color_blue, R.string.theme_color_blue))
.add(new Pair<>(R.color.theme_color_light_blue, R.string.theme_color_light_blue))
.add(new Pair<>(R.color.theme_color_blue_green, R.string.theme_color_blue_green))
.add(new Pair<>(R.color.theme_color_cyan, R.string.theme_color_cyan))
.add(new Pair<>(R.color.theme_color_green, R.string.theme_color_green))
.add(new Pair<>(R.color.theme_color_light_green, R.string.theme_color_light_green))
.add(new Pair<>(R.color.theme_color_yellow_green, R.string.theme_color_yellow_green))
.add(new Pair<>(R.color.theme_color_yellow, R.string.theme_color_yellow))
.add(new Pair<>(R.color.theme_color_amber, R.string.theme_color_amber))
.add(new Pair<>(R.color.theme_color_orange, R.string.theme_color_orange))
.add(new Pair<>(R.color.theme_color_dark_orange, R.string.theme_color_dark_orange))
.add(new Pair<>(R.color.theme_color_brown, R.string.theme_color_brown))
.add(new Pair<>(R.color.theme_color_gray, R.string.theme_color_gray))
.add(new Pair<>(R.color.theme_color_blue_gray, R.string.theme_color_blue_gray))
.list();
static {
COLOR_ITEMS = new ListBuilder<ColorSelectActivity.ColorItem>()
.add(new ColorSelectActivity.ColorItem("基佬红", 0xFFF44336))
.add(new ColorSelectActivity.ColorItem("基佬粉", 0xFFE91E63))
.add(new ColorSelectActivity.ColorItem("基佬紫", 0xFF9C27B0))
.add(new ColorSelectActivity.ColorItem("基深紫", 0xFF673AB7))
.add(new ColorSelectActivity.ColorItem("基靛蓝", 0xFF3F51B5))
.add(new ColorSelectActivity.ColorItem("基佬蓝", 0xFF2196F3))
.add(new ColorSelectActivity.ColorItem("基亮蓝", 0xFF03A9F4))
.add(new ColorSelectActivity.ColorItem("基蓝绿", 0xFF00BCD4))
.add(new ColorSelectActivity.ColorItem("基佬青", 0xFF009688))
.add(new ColorSelectActivity.ColorItem("基佬绿", 0xFF4CAF50))
.add(new ColorSelectActivity.ColorItem("基亮绿", 0xFF8BC34A))
.add(new ColorSelectActivity.ColorItem("基黄绿", 0xFFCDDC39))
.add(new ColorSelectActivity.ColorItem("基佬黄", 0xFFFFEB3B))
.add(new ColorSelectActivity.ColorItem("基琥珀", 0xFFFFC107))
.add(new ColorSelectActivity.ColorItem("基佬橙", 0xFFFF9800))
.add(new ColorSelectActivity.ColorItem("基深橙", 0xFFFF5722))
.add(new ColorSelectActivity.ColorItem("基佬棕", 0xFF795548))
.add(new ColorSelectActivity.ColorItem("基佬灰", 0xFF9E9E9E))
.add(new ColorSelectActivity.ColorItem("基南灰", 0xFF607D8B))
.list();
public static void selectThemeColor(Context context) {
List<ColorSelectActivity.ColorItem> colorItems = new ArrayList<>(COLOR_ITEMS.size());
for (Pair<Integer, Integer> item : COLOR_ITEMS) {
colorItems.add(new ColorSelectActivity.ColorItem(context.getString(item.second),
context.getResources().getColor(item.first)));
}
ColorSelectActivity.startColorSelect(context, context.getString(R.string.mt_color_picker_title), colorItems);
}
@AfterViews
@@ -101,13 +108,13 @@ public class SettingsActivity extends BaseActivity {
.entry(getString(R.string.text_theme_color), new Runnable() {
@Override
public void run() {
ColorSelectActivity.startColorSelect(getActivity(), getString(R.string.mt_color_picker_title), COLOR_ITEMS);
selectThemeColor(getActivity());
}
})
.entry(getString(R.string.text_reset_background), new Runnable() {
@Override
public void run() {
// EventBus.getDefault().post(new MessageEvent(MainActivity.MESSAGE_CLEAR_BACKGROUND_SETTINGS));
// EventBus.getDefault().post(new MessageEvent(MainActivity.MESSAGE_CLEAR_BACKGROUND_SETTINGS));
Toast.makeText(getActivity(), R.string.text_already_reset, Toast.LENGTH_SHORT).show();
}
})
@@ -123,7 +130,7 @@ public class SettingsActivity extends BaseActivity {
.entry(getString(R.string.text_check_for_updates), new Runnable() {
@Override
public void run() {
new UpdateCheckDialog(getActivity()).show();
VersionService.getInstance().checkForUpdatesAndShow(getActivity());
}
})
.entry(getString(R.string.text_issue_report), new Runnable() {

67
app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateCheckDialog.java
View File

@@ -1,67 +0,0 @@
package com.stardust.scriptdroid.ui.update;
import android.content.Context;
import android.support.annotation.NonNull;
import android.widget.Toast;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import com.stardust.scriptdroid.BuildConfig;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.tool.UpdateChecker;
import com.stardust.util.IntentUtil;
import java.util.LinkedList;
/**
* Created by Stardust on 2017/4/9.
*/
public class UpdateCheckDialog implements UpdateChecker.Callback {
private MaterialDialog mProgressDialog;
private Context mContext;
private UpdateChecker mUpdateChecker;
public UpdateCheckDialog(Context context) {
mContext = context;
mUpdateChecker = new UpdateChecker(context);
}
public void show() {
if (mProgressDialog != null)
throw new IllegalStateException();
mProgressDialog = new MaterialDialog.Builder(mContext)
.content(mContext.getString(R.string.text_checking_update))
.progress(true, 0)
.cancelable(false)
.show();
mUpdateChecker.check(this);
}
@Override
public void onSuccess(UpdateChecker.UpdateInfo result) {
mProgressDialog.dismiss();
if (BuildConfig.VERSION_CODE >= result.versionCode) {
Toast.makeText(mContext, R.string.text_is_latest_version, Toast.LENGTH_SHORT).show();
return;
}
new UpdateInfoDialogBuilder(mContext, result)
.show();
clear();
}
@Override
public void onError(Exception exception) {
mProgressDialog.dismiss();
Toast.makeText(mContext, R.string.text_check_update_error, Toast.LENGTH_SHORT).show();
clear();
}
private void clear() {
mProgressDialog = null;
mContext = null;
}
}

26
app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateInfoDialogBuilder.java
View File

@@ -16,9 +16,9 @@ import android.widget.Toast;
import com.afollestad.materialdialogs.MaterialDialog;
import com.stardust.scriptdroid.BuildConfig;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.network.entity.VersionInfo;
import com.stardust.scriptdroid.script.StorageFileProvider;
import com.stardust.scriptdroid.tool.IntentTool;
import com.stardust.scriptdroid.tool.UpdateChecker;
import com.stardust.util.DownloadTask;
import com.stardust.util.IntentUtil;
import com.stardust.widget.CommonMarkdownView;
@@ -32,16 +32,16 @@ public class UpdateInfoDialogBuilder extends MaterialDialog.Builder {
private static final String KEY_DO_NOT_ASK_AGAIN_FOR_VERSION = "I cannot forget you...cannot help missing you...";
private View mView;
private SharedPreferences mSharedPreferences;
private UpdateChecker.UpdateInfo mUpdateInfo;
private VersionInfo mVersionInfo;
public UpdateInfoDialogBuilder(@NonNull Context context, UpdateChecker.UpdateInfo info) {
public UpdateInfoDialogBuilder(@NonNull Context context, VersionInfo info) {
super(context);
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
updateInfo(info);
}
public UpdateInfoDialogBuilder updateInfo(UpdateChecker.UpdateInfo info) {
mUpdateInfo = info;
public UpdateInfoDialogBuilder updateInfo(VersionInfo info) {
mVersionInfo = info;
mView = View.inflate(context, R.layout.dialog_update_info, null);
setReleaseNotes(mView, info);
setCurrentVersionIssues(mView, info);
@@ -57,7 +57,7 @@ public class UpdateInfoDialogBuilder extends MaterialDialog.Builder {
checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mSharedPreferences.edit().putBoolean(KEY_DO_NOT_ASK_AGAIN_FOR_VERSION + mUpdateInfo.versionCode, isChecked).apply();
mSharedPreferences.edit().putBoolean(KEY_DO_NOT_ASK_AGAIN_FOR_VERSION + mVersionInfo.versionCode, isChecked).apply();
}
});
return this;
@@ -65,15 +65,15 @@ public class UpdateInfoDialogBuilder extends MaterialDialog.Builder {
@Override
public MaterialDialog show() {
if (mSharedPreferences.getBoolean(KEY_DO_NOT_ASK_AGAIN_FOR_VERSION + mUpdateInfo.versionCode, false)) {
if (mSharedPreferences.getBoolean(KEY_DO_NOT_ASK_AGAIN_FOR_VERSION + mVersionInfo.versionCode, false)) {
return null;
}
return super.show();
}
private void setCurrentVersionIssues(View view, UpdateChecker.UpdateInfo info) {
private void setCurrentVersionIssues(View view, VersionInfo info) {
TextView issues = (TextView) view.findViewById(R.id.issues);
UpdateChecker.OldVersion currentVersion = info.getOldVersion(BuildConfig.VERSION_CODE);
VersionInfo.OldVersion currentVersion = info.getOldVersion(BuildConfig.VERSION_CODE);
if (currentVersion == null) {
issues.setVisibility(View.GONE);
} else {
@@ -81,10 +81,10 @@ public class UpdateInfoDialogBuilder extends MaterialDialog.Builder {
}
}
private void setUpdateDownloadButtons(View view, UpdateChecker.UpdateInfo info) {
private void setUpdateDownloadButtons(View view, VersionInfo info) {
LinearLayout downloads = (LinearLayout) view.findViewById(R.id.downloads);
setDirectlyDownloadButton(downloads, info);
for (final UpdateChecker.Download download : info.downloads) {
for (final VersionInfo.Download download : info.downloads) {
Button button = (Button) View.inflate(getContext(), R.layout.dialog_update_info_btn, null);
button.setText(download.name);
downloads.addView(button);
@@ -97,7 +97,7 @@ public class UpdateInfoDialogBuilder extends MaterialDialog.Builder {
}
}
private void setDirectlyDownloadButton(LinearLayout container, final UpdateChecker.UpdateInfo info) {
private void setDirectlyDownloadButton(LinearLayout container, final VersionInfo info) {
if (TextUtils.isEmpty(info.downloadUrl)) {
return;
}
@@ -139,7 +139,7 @@ public class UpdateInfoDialogBuilder extends MaterialDialog.Builder {
task.execute(downloadUrl, path);
}
private void setReleaseNotes(View view, UpdateChecker.UpdateInfo info) {
private void setReleaseNotes(View view, VersionInfo info) {
CommonMarkdownView markdownView = (CommonMarkdownView) view.findViewById(R.id.release_notes);
markdownView.loadMarkdown(info.releaseNotes);
}

52
app/src/main/java/com/stardust/scriptdroid/ui/update/VersionGuard.java
View File

@@ -8,8 +8,11 @@ import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import com.stardust.scriptdroid.BuildConfig;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.tool.UpdateChecker;
import com.stardust.scriptdroid.tool.VersionInfo;
import com.stardust.scriptdroid.network.VersionService;
import com.stardust.scriptdroid.network.entity.VersionInfo;
import com.stardust.scriptdroid.tool.SimpleObserver;
import io.reactivex.functions.Consumer;
/**
* Created by Stardust on 2017/4/12.
@@ -17,42 +20,40 @@ import com.stardust.scriptdroid.tool.VersionInfo;
public class VersionGuard {
private Activity mActivity;
private MaterialDialog mDeprecatedDialog;
private VersionInfo mVersionInfo = VersionInfo.getInstance();
private VersionService mVersionService = VersionService.getInstance();
public VersionGuard(Activity activity) {
mActivity = activity;
}
public void checkDeprecateAndUpdate() {
mVersionInfo.readDeprecatedFromPrefIfNeeded(mActivity);
if (mVersionInfo.isCurrentVersionDeprecated()) {
public void checkForDeprecatesAndUpdates() {
mVersionService.readDeprecatedFromPrefIfNeeded(mActivity);
if (mVersionService.isCurrentVersionDeprecated()) {
showDeprecatedDialogIfNeeded();
} else {
checkUpdateIfNeeded();
checkForUpdatesIfNeeded();
}
}
private void checkUpdateIfNeeded() {
if (mVersionInfo.getUpdateInfo() == null) {
mVersionInfo.setOnReceiveUpdateResultCallback(new VersionInfo.OnReceiveUpdateResultCallback() {
@Override
public void onReceive(UpdateChecker.UpdateInfo info, boolean isCurrentVersionDeprecated) {
mVersionInfo.setOnReceiveUpdateResultCallback(null);
if (isCurrentVersionDeprecated) {
showDeprecatedDialogIfNeeded();
} else {
showUpdateInfoIfNeeded(info);
private void checkForUpdatesIfNeeded() {
mVersionService.checkForUpdatesIfNeededAndUsingWifi(mActivity)
.subscribe(new SimpleObserver<VersionInfo>() {
@Override
public void onNext(@io.reactivex.annotations.NonNull VersionInfo versionInfo) {
if (mVersionService.isCurrentVersionDeprecated()) {
showDeprecatedDialogIfNeeded();
} else {
showUpdateInfoIfNeeded(versionInfo);
}
}
}
});
mVersionInfo.checkUpdateIfNeeded(mActivity);
}
});
}
private void showUpdateInfoIfNeeded(UpdateChecker.UpdateInfo info) {
private void showUpdateInfoIfNeeded(com.stardust.scriptdroid.network.entity.VersionInfo info) {
if (BuildConfig.VERSION_CODE < info.versionCode) {
new UpdateInfoDialogBuilder(mActivity, info)
.showDoNotAskAgain()
@@ -64,7 +65,7 @@ public class VersionGuard {
if (mDeprecatedDialog != null && mDeprecatedDialog.isShowing())
return;
String content = mActivity.getString(R.string.warning_version_too_old);
String issues = mVersionInfo.getCurrentVersionIssues();
String issues = mVersionService.getCurrentVersionIssues();
if (issues != null) {
content += "\n" + issues;
}
@@ -79,8 +80,7 @@ public class VersionGuard {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
if (which == DialogAction.POSITIVE) {
new UpdateCheckDialog(mActivity)
.show();
VersionService.getInstance().checkForUpdatesAndShow(mActivity);
} else {
mActivity.finish();
}

3
app/src/main/java/com/stardust/widget/EWebView.java
View File

@@ -1,5 +1,6 @@
package com.stardust.widget;
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Bitmap;
import android.os.Build;
@@ -53,7 +54,7 @@ public class EWebView extends FrameLayout implements SwipeRefreshLayout.OnRefres
settings.setUseWideViewPort(true);
settings.setBuiltInZoomControls(true);
settings.setLoadWithOverviewMode(true);
//settings.setJavaScriptEnabled(true);
settings.setJavaScriptEnabled(true);
mWebView.setWebViewClient(new MyWebViewClient());
mWebView.setWebChromeClient(new MyWebChromeClient());
}

36
app/src/main/java/com/stardust/widget/PrefSwitch.java
View File

@@ -3,16 +3,11 @@ package com.stardust.widget;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.res.TypedArray;
import android.graphics.Paint;
import android.preference.PreferenceManager;
import android.support.v7.widget.SwitchCompat;
import android.util.AttributeSet;
import android.widget.CompoundButton;
import com.stardust.scriptdroid.R;
import java.util.Objects;
/**
* Created by Stardust on 2017/8/6.
*/
@@ -38,21 +33,21 @@ public class PrefSwitch extends SwitchCompat implements SharedPreferences.OnShar
}
private void init(AttributeSet attrs) {
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
if (attrs != null) {
TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.PrefSwitch);
mPrefKey = a.getString(R.styleable.PrefSwitch_key);
boolean defaultValue = a.getBoolean(R.styleable.PrefSwitch_defaultValue, false);
if (mPrefKey != null)
setChecked(mSharedPreferences.getBoolean(mPrefKey, defaultValue), false);
else
setChecked(defaultValue, false);
a.recycle();
if (attrs == null)
return;
TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.PrefSwitch);
mPrefKey = a.getString(R.styleable.PrefSwitch_key);
boolean defaultValue = a.getBoolean(R.styleable.PrefSwitch_defaultValue, false);
if (mPrefKey != null) {
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
mSharedPreferences.registerOnSharedPreferenceChangeListener(this);
setChecked(mSharedPreferences.getBoolean(mPrefKey, defaultValue), false);
} else {
setChecked(defaultValue, false);
}
mSharedPreferences.registerOnSharedPreferenceChangeListener(this);
a.recycle();
}
private void notifyPrefChanged(boolean isChecked) {
if (mPrefKey == null)
return;
@@ -61,6 +56,13 @@ public class PrefSwitch extends SwitchCompat implements SharedPreferences.OnShar
.apply();
}
public void setPrefKey(String prefKey) {
mPrefKey = prefKey;
if (mSharedPreferences == null) {
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
mSharedPreferences.registerOnSharedPreferenceChangeListener(this);
}
}
@Override
public void setChecked(boolean checked) {

50
app/src/main/java/com/stardust/widget/SwitchCompat.java Normal file
View File

@@ -0,0 +1,50 @@
package com.stardust.widget;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.CompoundButton;
/**
* Created by Stardust on 2017/9/18.
*/
public class SwitchCompat extends android.support.v7.widget.SwitchCompat {
private boolean mIgnoreCheckedChange = false;
public SwitchCompat(Context context) {
super(context);
}
public SwitchCompat(Context context, AttributeSet attrs) {
super(context, attrs);
}
public SwitchCompat(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
@Override
public void setOnCheckedChangeListener(final OnCheckedChangeListener listener) {
super.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (mIgnoreCheckedChange) {
return;
}
listener.onCheckedChanged(buttonView, isChecked);
}
});
}
public void setChecked(boolean checked, boolean notify) {
mIgnoreCheckedChange = !notify;
setChecked(checked);
mIgnoreCheckedChange = false;
}
public void toggle(boolean notify) {
setChecked(!isChecked(), notify);
}
}

1
app/src/main/res/layout/activity_main.xml
View File

@@ -49,6 +49,7 @@
android:layout_margin="16dp"
android:clickable="true"
android:src="@drawable/ic_add_white_48dp"
app:backgroundTint="@color/colorPrimary"
app:layout_anchor="@id/viewpager"
app:layout_anchorGravity="bottom|right|end"
app:layout_behavior="com.stardust.widget.ScrollAwareFABBehavior"/>

5
app/src/main/res/layout/drawer_menu.xml
View File

@@ -21,6 +21,7 @@
android:id="@+id/accessibility_service"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:anti_shake="true"
app:icon="@drawable/ic_service_green"
app:title="@string/text_accessibility_service"
app:with_switch="true"/>
@@ -30,6 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_stable"
app:pref_key="@string/key_stable_mode"
app:title="@string/text_stable_mode"
app:with_switch="true"/>
@@ -46,6 +48,7 @@
android:id="@+id/floating_window"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:anti_shake="true"
app:icon="@drawable/ic_robot_64"
app:title="@string/text_floating_window"
app:with_switch="true"/>
@@ -55,6 +58,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_volume"
app:pref_key="@string/key_use_volume_control_record"
app:title="@string/text_volume_down_control"
app:with_switch="true"/>
@@ -71,6 +75,7 @@
android:id="@+id/debug"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:anti_shake="true"
app:icon="@drawable/ic_debug"
app:title="@string/debug"
app:with_switch="true"/>

27
app/src/main/res/layout/drawer_menu_item.xml
View File

@@ -1,18 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="?selectableItemBackground"
android:orientation="horizontal">
<ImageView
android:id="@+id/icon"
<FrameLayout
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_margin="16dp"
android:tint="#999999"
tools:src="@drawable/ic_service_green"/>
android:layout_margin="16dp">
<ImageView
android:id="@+id/icon"
android:layout_width="16dp"
android:layout_height="16dp"
android:tint="#999999"
tools:src="@drawable/ic_service_green"/>
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/progress_bar"
android:layout_width="16dp"
android:layout_height="16dp"
android:backgroundTint="#999999"
android:visibility="gone"/>
</FrameLayout>
<TextView
android:id="@+id/title"
@@ -24,7 +39,7 @@
android:textSize="14sp"
tools:text="@string/text_auto_operate_service"/>
<com.stardust.theme.widget.ThemeColorSwitch
<com.stardust.widget.PrefSwitch
android:id="@+id/sw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
app/src/main/res/layout/fragment_drawer.xml
View File

@@ -45,11 +45,11 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="118dp"
android:layout_alignParentBottom="true"
android:layout_marginLeft="-12dp"
android:layout_toRightOf="@+id/avatar"
android:layout_alignParentBottom="true"
android:src="@drawable/android_eating_half"
android:alpha="0.08"
android:src="@drawable/android_eating_half"
android:tint="#000000"/>

2
app/src/main/res/values/attrs.xml
View File

@@ -19,6 +19,8 @@
<attr name="title"/>
<attr name="icon"/>
<attr name="with_switch" format="boolean"/>
<attr name="pref_key" format="string|reference"/>
<attr name="anti_shake" format="boolean"/>
</declare-styleable>
<declare-styleable name="DrawerMenuGroup">

4
app/src/main/res/values/strings.xml
View File

@@ -236,11 +236,13 @@
<string name="not_login">未登录</string>
<string name="text_volume_down_control">音量下键控制</string>
<string name="text_others">其他</string>
<string name="text_import">导入...</string>
<string name="text_import">导入…</string>
<string name="text_auto_mode">auto模式</string>
<string name="text_ui_mode">ui模式</string>
<string name="text_new">新建</string>
<string name="text_choose_file">选择文件</string>
<string name="text_click_too_frequently">您的操作太快啦ヽ(#`Д´)ﾉ</string>
<string name="text_connecting">连接中…</string>
<string-array name="record_control_keys">

43
app/src/main/res/values/theme_colors.xml Normal file
View File

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="theme_color_red">基佬红</string>
<string name="theme_color_pink">基佬粉</string>
<string name="theme_color_purple">基佬紫</string>
<string name="theme_color_dark_purple">基深紫</string>
<string name="theme_color_indigo">基靛蓝</string>
<string name="theme_color_blue">基佬蓝</string>
<string name="theme_color_light_blue">基亮蓝</string>
<string name="theme_color_blue_green">基蓝绿</string>
<string name="theme_color_cyan">基佬青</string>
<string name="theme_color_green">基佬绿</string>
<string name="theme_color_light_green">基亮绿</string>
<string name="theme_color_yellow_green">基黄绿</string>
<string name="theme_color_yellow">基佬黄</string>
<string name="theme_color_amber">基琥珀</string>
<string name="theme_color_orange">基佬橙</string>
<string name="theme_color_dark_orange">基深橙</string>
<string name="theme_color_brown">基佬棕</string>
<string name="theme_color_gray">基佬灰</string>
<string name="theme_color_blue_gray">基蓝灰</string>
<color name="theme_color_red">#F44336</color>
<color name="theme_color_pink">#E91E63</color>
<color name="theme_color_purple">#9C27B0</color>
<color name="theme_color_dark_purple">#673AB7</color>
<color name="theme_color_indigo">#3F51B5</color>
<color name="theme_color_blue">#2196F3</color>
<color name="theme_color_light_blue">#03A9F4</color>
<color name="theme_color_blue_green">#00BCD4</color>
<color name="theme_color_cyan">#009688</color>
<color name="theme_color_green">#4CAF50</color>
<color name="theme_color_light_green">#8BC34A</color>
<color name="theme_color_yellow_green">#CDDC39</color>
<color name="theme_color_yellow">#FFEB3B</color>
<color name="theme_color_amber">#FFC107</color>
<color name="theme_color_orange">#FF9800</color>
<color name="theme_color_dark_orange">#FF5722</color>
<color name="theme_color_brown">#795548</color>
<color name="theme_color_gray">#9E9E9E</color>
<color name="theme_color_blue_gray">#607D8B</color>
</resources>

2
version.json
View File

@@ -10,7 +10,7 @@
{
"name": "百度手机助手",
"url": "http://shouji.baidu.com/software/22060055.html"
},
}
],
"oldVersions": [
{