diff --git a/app/build.gradle b/app/build.gradle index b39100ec..a9404786 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -100,7 +100,7 @@ dependencies { compile 'com.wang.avi:library:2.1.3' compile 'org.apache.commons:commons-lang3:3.6' compile 'com.thoughtbot:expandablerecyclerview:1.3' - compile 'com.github.hyb1996:FloatingCircularActionMenu:0.0.2' + compile('com.github.hyb1996:FloatingCircularActionMenu:0.0.4') compile(name: 'apkbuilder-release', ext: 'aar') // RxJava diff --git a/app/src/main/assets/sample/HTTP网络请求/文件下载.js b/app/src/main/assets/sample/HTTP网络请求/文件下载.js new file mode 100644 index 00000000..e41bd1ef --- /dev/null +++ b/app/src/main/assets/sample/HTTP网络请求/文件下载.js @@ -0,0 +1,8 @@ +var url = "http://www.autojs.org/assets/uploads/profile/3-profileavatar.png"; +var res = http.get(url); +if(res.statusCode != 200){ + toast("请求失败"); +} +files.writeBytes("/sdcard/1.png", res.body.bytes()); +toast("下载成功"); +app.viewFile("/sdcard/1.png"); \ No newline at end of file diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java b/app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java index e018f624..ab1f8e60 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java @@ -64,6 +64,8 @@ public class CircularMenu implements Recorder.OnStateChangedListener { public static final int STATE_NORMAL = 0; public static final int STATE_RECORDING = 1; + private static final int IC_ACTION_VIEW = R.drawable.ic_circular_menu; + CircularActionMenuFloatingWindow mWindow; private int mState; private ImageView mActionViewIcon; @@ -110,7 +112,7 @@ public class CircularMenu implements Recorder.OnStateChangedListener { return menu; } }); - mWindow.setKeepToSideHiddenWidthRadio(0.2f); + mWindow.setKeepToSideHiddenWidthRadio(0.3f); FloatyService.addWindow(mWindow); } @@ -142,7 +144,7 @@ public class CircularMenu implements Recorder.OnStateChangedListener { int previousState = mState; mState = state; mActionViewIcon.setImageResource(mState == STATE_RECORDING ? R.drawable.ic_ali_record : - R.drawable.autojs_logo); + IC_ACTION_VIEW); mActionViewIcon.setBackgroundResource(mState == STATE_RECORDING ? R.drawable.circle_red : 0); if (state == STATE_RECORDING) { diff --git a/app/src/main/res/drawable-xhdpi/ic_circular_menu.png b/app/src/main/res/drawable-xhdpi/ic_circular_menu.png new file mode 100644 index 00000000..9af9e5b5 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_circular_menu.png differ diff --git a/app/src/main/res/drawable/autojs_logo.png b/app/src/main/res/drawable/autojs_logo.png deleted file mode 100644 index e95d6565..00000000 Binary files a/app/src/main/res/drawable/autojs_logo.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 afb6d118..00f7bf03 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/autojs_logo"/> + android:src="@drawable/autojs_material"/> - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_console.xml b/app/src/main/res/layout/activity_console.xml deleted file mode 100644 index ac013ad0..00000000 --- a/app/src/main/res/layout/activity_console.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/circular_action_view.xml b/app/src/main/res/layout/circular_action_view.xml index f7d9b816..3e6b86e4 100644 --- a/app/src/main/res/layout/circular_action_view.xml +++ b/app/src/main/res/layout/circular_action_view.xml @@ -8,5 +8,5 @@ android:id="@+id/icon" android:layout_width="48dp" android:layout_height="48dp" - android:src="@drawable/autojs_logo"/> + android:src="@drawable/ic_circular_menu"/> \ No newline at end of file diff --git a/app/src/main/res/menu/context_menu_editor.xml b/app/src/main/res/menu/context_menu_editor.xml deleted file mode 100644 index 42eba5e6..00000000 --- a/app/src/main/res/menu/context_menu_editor.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/menu_manager.xml b/app/src/main/res/menu/menu_manager.xml deleted file mode 100644 index 568d0d91..00000000 --- a/app/src/main/res/menu/menu_manager.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 2ccf1890..ba5129b2 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -113,7 +113,6 @@ Release Notes Update - Tasks Processing Pre-execute script Check for updates diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index cf96cf61..5b345d13 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -1,12 +1,5 @@ - - - - - - - diff --git a/autojs/build.gradle b/autojs/build.gradle index 863837a6..163cf976 100644 --- a/autojs/build.gradle +++ b/autojs/build.gradle @@ -48,7 +48,7 @@ dependencies { }) compile 'com.android.support:design:25.4.0' compile 'com.android.support:appcompat-v7:25.4.0' - compile 'com.github.hyb1996:EnhancedFloaty:0.17' + compile 'com.github.hyb1996:EnhancedFloaty:0.21' compile 'com.github.hyb1996:OpenCvLib:2.4.13.4-imgproc' compile 'com.makeramen:roundedimageview:2.3.0' // OkHttp diff --git a/autojs/src/main/assets/modules/__console__.js b/autojs/src/main/assets/modules/__console__.js index 66e8987c..17ada9c4 100644 --- a/autojs/src/main/assets/modules/__console__.js +++ b/autojs/src/main/assets/modules/__console__.js @@ -39,7 +39,7 @@ module.exports = function(__runtime__, scope){ } console.show = rtConsole.show.bind(rtConsole); - console.hide = rtConsole.show.bind(rtConsole); + console.hide = rtConsole.hide.bind(rtConsole); console.clear = rtConsole.clear.bind(rtConsole); console.setTitle = rtConsole.setTitle.bind(rtConsole); diff --git a/autojs/src/main/assets/modules/__http__.js b/autojs/src/main/assets/modules/__http__.js index c7afac9e..54230538 100644 --- a/autojs/src/main/assets/modules/__http__.js +++ b/autojs/src/main/assets/modules/__http__.js @@ -163,6 +163,7 @@ module.exports = function(runtime, scope){ r.body = {}; var body = res.body(); r.body.string = body.string.bind(body); + r.body.bytes = body.bytes.bind(body); r.body.json = function(){ return JSON.parse(r.body.string()); } diff --git a/autojs/src/test/java/com/stardust/autojs/ExampleUnitTest.java b/autojs/src/test/java/com/stardust/autojs/ExampleUnitTest.java index 4cca63a9..7a4e3be7 100644 --- a/autojs/src/test/java/com/stardust/autojs/ExampleUnitTest.java +++ b/autojs/src/test/java/com/stardust/autojs/ExampleUnitTest.java @@ -26,7 +26,6 @@ public class ExampleUnitTest { @Test public void test() throws IOException { - MimeTypeMap.getSingleton().getMimeTypeFromExtension(); File file = new File("C:\\Users\\Stardust\\Desktop\\1.txt"); System.out.println(PFiles.read(file)); String url = "http://posttestserver.com/post.php?dir=example";