diff --git a/app/build.gradle b/app/build.gradle index dcc9a3d8..5cc8be47 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.stardust.scriptdroid" minSdkVersion 17 targetSdkVersion 23 - versionCode 242 - versionName "3.0.0 Alpha42" + versionCode 243 + versionName "3.0.0 Alpha43" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true ndk { diff --git a/app/release/output.json b/app/release/output.json index fb70653f..aaa06e73 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":242},"path":"release-3.0.0 Alpha42.apk","properties":{"packageId":"com.stardust.scriptdroid","split":"","minSdkVersion":"17"}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":34},"path":"inrt-release.apk","properties":{"packageId":"com.stardust.auojs.inrt","split":"","minSdkVersion":"17"}}] \ No newline at end of file diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/RootTool.java b/app/src/main/java/com/stardust/scriptdroid/tool/RootTool.java new file mode 100644 index 00000000..4ee2b8ea --- /dev/null +++ b/app/src/main/java/com/stardust/scriptdroid/tool/RootTool.java @@ -0,0 +1,19 @@ +package com.stardust.scriptdroid.tool; + +import com.stericson.RootShell.RootShell; + +/** + * Created by Stardust on 2018/1/26. + */ + +public class RootTool { + + public static boolean isRootAvailable() { + try { + return RootShell.isRootAvailable(); + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } +} 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 407cfcff..fb6ac6d0 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 @@ -12,6 +12,7 @@ import com.afollestad.materialdialogs.MaterialDialog; import com.stardust.app.DialogUtils; import com.stardust.app.OperationDialogBuilder; import com.stardust.autojs.core.record.Recorder; +import com.stardust.autojs.runtime.api.Dialogs; import com.stardust.enhancedfloaty.FloatyService; import com.stardust.floatingcircularactionmenu.CircularActionMenu; import com.stardust.floatingcircularactionmenu.CircularActionMenuFloatingWindow; @@ -23,6 +24,7 @@ import com.stardust.scriptdroid.autojs.record.GlobalActionRecorder; import com.stardust.scriptdroid.model.script.Scripts; import com.stardust.scriptdroid.storage.file.StorageFileProvider; import com.stardust.scriptdroid.tool.AccessibilityServiceTool; +import com.stardust.scriptdroid.tool.RootTool; import com.stardust.scriptdroid.ui.common.NotAskAgainDialog; import com.stardust.scriptdroid.ui.floating.layoutinspector.LayoutBoundsFloatyWindow; import com.stardust.scriptdroid.ui.floating.layoutinspector.LayoutHierarchyFloatyWindow; @@ -148,14 +150,14 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp @OnClick(R.id.record) void startRecord() { mWindow.collapse(); - if (!RootShell.isRootAvailable()) { - new NotAskAgainDialog.Builder(mContext, "CircularMenu.root") + if (!RootTool.isRootAvailable()) { + DialogUtils.showDialog(new NotAskAgainDialog.Builder(mContext, "CircularMenu.root") .title(R.string.text_device_not_rooted) .content(R.string.prompt_device_not_rooted) .neutralText(R.string.text_device_rooted) .positiveText(R.string.ok) .onNeutral(((dialog, which) -> mRecorder.start())) - .show(); + .build()); } else { mRecorder.start(); diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityWebView.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityWebView.java index 35aac2c4..886c09d5 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityWebView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityWebView.java @@ -10,6 +10,7 @@ import android.webkit.ValueCallback; import android.webkit.WebView; import com.stardust.scriptdroid.R; +import com.stardust.scriptdroid.network.NodeBB; import com.stardust.scriptdroid.storage.file.StorageFileProvider; import com.stardust.scriptdroid.model.script.Scripts; import com.stardust.scriptdroid.network.download.DownloadManager; @@ -99,7 +100,7 @@ public class CommunityWebView extends EWebView { private class MyWebViewClient extends EWebView.MyWebViewClient { - private final Pattern UPLOAD_FILE_PATTERN = Pattern.compile("http://www.autojs.org/assets/uploads/files/.+(\\.js|\\.auto)"); + private final Pattern UPLOAD_FILE_PATTERN = Pattern.compile(NodeBB.url("assets/uploads/files/.+(\\.js|\\.auto)")); @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerMenuItemViewHolder.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerMenuItemViewHolder.java index 70cbd587..3207a1ee 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerMenuItemViewHolder.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerMenuItemViewHolder.java @@ -72,7 +72,7 @@ public class DrawerMenuItemViewHolder extends BindableViewHolder mSwitchCompat.setVisibility(VISIBLE); int prefKey = item.getPrefKey(); if (prefKey == 0) { - mSwitchCompat.setChecked(item.isChecked()); + mSwitchCompat.setChecked(item.isChecked(), false); mSwitchCompat.setPrefKey(null); } else { mSwitchCompat.setPrefKey(itemView.getResources().getString(prefKey)); diff --git a/autojs/src/main/assets/modules/__io__.js b/autojs/src/main/assets/modules/__io__.js index 5e826c3d..72c995eb 100644 --- a/autojs/src/main/assets/modules/__io__.js +++ b/autojs/src/main/assets/modules/__io__.js @@ -3,7 +3,7 @@ module.exports = function(__runtime__, scope){ var fs = __runtime__.files; var files = Object.create(fs); files.join = function(base){ - var paths = Array.prototype.slice.call(arguments, 0); + var paths = Array.prototype.slice.call(arguments, 1); return fs.join(base, paths); } scope.files = files; diff --git a/inrt/src/main/assets/project/main.js b/inrt/src/main/assets/project/main.js index 988f41e7..a0ef982a 100644 --- a/inrt/src/main/assets/project/main.js +++ b/inrt/src/main/assets/project/main.js @@ -1,32 +1 @@ -"ui"; - -ui.layout( - - - - - - - - - - - - - - - - -