diff --git a/.idea/misc.xml b/.idea/misc.xml index 497cbeb5..157352a8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -42,7 +42,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 3b2c8b90..bf8037ff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.stardust.scriptdroid" minSdkVersion 19 targetSdkVersion 23 - versionCode 1 - versionName "1.0" + versionCode 10 + versionName "0.17.02050预览版" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c07c65bc..814361a2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/ScriptFileOperation.java b/app/src/main/java/com/stardust/scriptdroid/ui/ScriptFileOperation.java index 87c9bc2e..6b8aa56d 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/ScriptFileOperation.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/ScriptFileOperation.java @@ -134,7 +134,7 @@ public abstract class ScriptFileOperation { ScriptFile scriptFile = scriptFileList.get(position); new Shortcut(context).name(scriptFile.name) .targetClass(ShortcutActivity.class) - .icon(R.drawable.script_droid) + .icon(R.drawable.ic_robot_green) .extras(new Intent().putExtra("path", scriptFile.path)) .send(); Snackbar.make(recyclerView, R.string.text_already_create, Snackbar.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/stardust/util/StateObserver.java b/app/src/main/java/com/stardust/util/StateObserver.java index 30b4558a..eb60f56b 100644 --- a/app/src/main/java/com/stardust/util/StateObserver.java +++ b/app/src/main/java/com/stardust/util/StateObserver.java @@ -4,10 +4,10 @@ import android.content.SharedPreferences; import android.support.v7.widget.SwitchCompat; import java.lang.ref.WeakReference; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.CopyOnWriteArrayList; /** * Created by Stardust on 2017/2/3. @@ -71,9 +71,7 @@ public class StateObserver { listener.initState(initialState); synchronized (mKeyStateListenersMap) { List listeners = getListenerListOrCreateIfNotExists(key); - synchronized (listener) { - listeners.add(listener); - } + listeners.add(listener); } } @@ -84,25 +82,18 @@ public class StateObserver { if (listeners == null) { return; } - synchronized (listeners) { - listeners.remove(stateChangedListener); - } + listeners.remove(stateChangedListener); } } public void setState(String key, T state) { synchronized (mKeyStateListenersMap) { List listeners = mKeyStateListenersMap.get(key); - if (listeners == null) + if (listeners == null || listeners.isEmpty()) return; - synchronized (listeners) { - if (listeners.isEmpty()) { - return; - } - if (listeners.get(0) instanceof OnBooleanStateChangedListener) { - mSharedPreferences.edit().putBoolean(key, (Boolean) state).apply(); - notifyBooleanStateChanged(listeners, (Boolean) state); - } + if (listeners.get(0) instanceof OnBooleanStateChangedListener) { + mSharedPreferences.edit().putBoolean(key, (Boolean) state).apply(); + notifyBooleanStateChanged(listeners, (Boolean) state); } } } @@ -124,7 +115,7 @@ public class StateObserver { private List getListenerListOrCreateIfNotExists(String key) { List listeners = mKeyStateListenersMap.get(key); if (listeners == null) { - listeners = new ArrayList<>(); + listeners = new CopyOnWriteArrayList<>(); mKeyStateListenersMap.put(key, listeners); } return listeners; diff --git a/app/src/main/res/drawable/ic_accessibility_service.png b/app/src/main/res/drawable/ic_accessibility_service.png deleted file mode 100644 index 21e8d3a1..00000000 Binary files a/app/src/main/res/drawable/ic_accessibility_service.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_add_black_24dp.png b/app/src/main/res/drawable/ic_add_black_24dp.png deleted file mode 100644 index 3cb10924..00000000 Binary files a/app/src/main/res/drawable/ic_add_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_android_eat_js.png b/app/src/main/res/drawable/ic_android_eat_js.png new file mode 100644 index 00000000..1b1bc029 Binary files /dev/null and b/app/src/main/res/drawable/ic_android_eat_js.png differ diff --git a/app/src/main/res/drawable/ic_create_new_folder_black_48dp.png b/app/src/main/res/drawable/ic_create_new_folder_black_48dp.png deleted file mode 100644 index d28b3b21..00000000 Binary files a/app/src/main/res/drawable/ic_create_new_folder_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_play_arrow_green_48dp.png b/app/src/main/res/drawable/ic_play_arrow_green_48dp.png deleted file mode 100644 index 8c018dcc..00000000 Binary files a/app/src/main/res/drawable/ic_play_arrow_green_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_play_circle_filled_black_48dp.png b/app/src/main/res/drawable/ic_play_circle_filled_black_48dp.png deleted file mode 100644 index 00e83114..00000000 Binary files a/app/src/main/res/drawable/ic_play_circle_filled_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_qq.png b/app/src/main/res/drawable/ic_qq.png deleted file mode 100644 index 67597fce..00000000 Binary files a/app/src/main/res/drawable/ic_qq.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_script_droid_40.png b/app/src/main/res/drawable/ic_script_droid_40.png deleted file mode 100644 index c8de8c42..00000000 Binary files a/app/src/main/res/drawable/ic_script_droid_40.png and /dev/null differ diff --git a/app/src/main/res/drawable/script_droid.png b/app/src/main/res/drawable/script_droid.png deleted file mode 100644 index c8507872..00000000 Binary files a/app/src/main/res/drawable/script_droid.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 394f24d7..00dc7b9e 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -47,7 +47,7 @@ android:layout_width="90dp" android:layout_height="90dp" android:layout_centerInParent="true" - android:src="@drawable/script_droid"/> + android:src="@drawable/ic_android_eat_js"/> 免Root脚本机器人 - Version 1.17.0202 + Version 0.17.0205 设置 关闭服务 使脚本自动操作(点击、长按、滑动等)所需，若关闭则只能执行不涉及自动操作的脚本。 diff --git a/app20170205.apk b/app0.17.0205.apk similarity index 65% rename from app20170205.apk rename to app0.17.0205.apk index 10da8c37..aa2198d8 100644 Binary files a/app20170205.apk and b/app0.17.0205.apk differ