diff --git a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java index 5e4d2060..0c97f6c9 100644 --- a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java +++ b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java @@ -131,8 +131,6 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR loadItemList(); } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { mOnItemClickListener = onItemClickListener; } diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java b/app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java index c9109f79..96852a0b 100644 --- a/app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java +++ b/app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java @@ -214,8 +214,10 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp } private void inspectLayout(Func1 windowCreator) { - mLayoutInspectDialog.dismiss(); - mLayoutInspectDialog = null; + if(mLayoutInspectDialog != null){ + mLayoutInspectDialog.dismiss(); + mLayoutInspectDialog = null; + } if (AccessibilityService.getInstance() == null) { Toast.makeText(mContext, R.string.text_no_accessibility_permission_to_capture, Toast.LENGTH_SHORT).show(); AccessibilityServiceTool.goToAccessibilitySetting(); diff --git a/autojs/src/main/assets/modules/__app__.js b/autojs/src/main/assets/modules/__app__.js index c4175048..a1efcdd4 100644 --- a/autojs/src/main/assets/modules/__app__.js +++ b/autojs/src/main/assets/modules/__app__.js @@ -82,7 +82,7 @@ module.exports = function(runtime, global){ i.putExtra(Intent.EXTRA_TEXT, options.text); } if(options.attachment){ - i.putExtra(Intent.EXTRA_STREAM, android.content.Uri.parse("file://" + options.attachment)); + i.putExtra(Intent.EXTRA_STREAM, app.parseUri(options.attachment)); } i.setType("message/rfc822"); context.startActivity(Intent.createChooser(i, "发送邮件").addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); @@ -99,7 +99,17 @@ module.exports = function(runtime, global){ return arr; } + app.parseUri = function(uri){ + if(uri.startsWith("file://")){ + return app.getUriForFile(uri); + } + return android.net.Uri.parse(uri); + } + app.getUriForFile = function(path){ + if(path.startsWith("file://")){ + path = path.substring(7); + } return android.support.v4.content.FileProvider.getUriForFile(context, "org.autojs.autojs.fileprovider", new java.io.File(files.path(path))); };