update version name

This commit is contained in:
hyb1996
2017-10-25 21:22:30 +08:00
parent f3ea2cd897
commit 70383a97df
4 changed files with 39 additions and 4 deletions

View File

@@ -10,8 +10,8 @@ android {
applicationId "com.stardust.scriptdroid" applicationId "com.stardust.scriptdroid"
minSdkVersion 17 minSdkVersion 17
targetSdkVersion 23 targetSdkVersion 23
versionCode 212 versionCode 213
versionName "3.0.0 Alpha13" versionName "3.0.0 Alpha14"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
ndk { ndk {

View File

@@ -139,6 +139,9 @@
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.EDIT"/> <action android:name="android.intent.action.EDIT"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="file"/> <data android:scheme="file"/>
<data android:scheme="content"/> <data android:scheme="content"/>
<data android:mimeType="application/x-javascript"/> <data android:mimeType="application/x-javascript"/>
@@ -157,6 +160,9 @@
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.EDIT"/> <action android:name="android.intent.action.EDIT"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="file"/> <data android:scheme="file"/>
<data android:scheme="content"/> <data android:scheme="content"/>
<data android:mimeType="application/x-javascript"/> <data android:mimeType="application/x-javascript"/>
@@ -176,6 +182,10 @@
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.EDIT"/> <action android:name="android.intent.action.EDIT"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="file"/> <data android:scheme="file"/>
<data android:scheme="content"/> <data android:scheme="content"/>
<data android:mimeType="application/x-javascript"/> <data android:mimeType="application/x-javascript"/>

View File

@@ -1,12 +1,24 @@
package com.stardust.scriptdroid.external.open; package com.stardust.scriptdroid.external.open;
import android.app.Activity; import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.widget.Toast; import android.widget.Toast;
import com.stardust.autojs.script.StringScriptSource;
import com.stardust.pio.PFile;
import com.stardust.pio.PFiles;
import com.stardust.scriptdroid.external.CommonUtils; import com.stardust.scriptdroid.external.CommonUtils;
import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.model.script.ScriptFile;
import com.stardust.scriptdroid.model.script.Scripts;
import com.stardust.scriptdroid.ui.common.ScriptOperations;
import java.io.FileNotFoundException;
import java.io.InputStream;
/** /**
* Created by Stardust on 2017/2/22. * Created by Stardust on 2017/2/22.
@@ -18,11 +30,24 @@ public class RunIntentActivity extends Activity {
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
try { try {
CommonUtils.handleIntent(this, getIntent()); handleIntent(getIntent());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
Toast.makeText(this, R.string.edit_and_run_handle_intent_error, Toast.LENGTH_LONG).show(); Toast.makeText(this, R.string.edit_and_run_handle_intent_error, Toast.LENGTH_LONG).show();
} }
finish(); finish();
} }
private void handleIntent(Intent intent) throws FileNotFoundException {
Uri uri = intent.getData();
if (uri != null && "content".equals(uri.getScheme())) {
InputStream stream = getContentResolver().openInputStream(uri);
Scripts.run(new StringScriptSource(PFiles.read(stream)));
} else {
final String path = intent.getData().getPath();
if (!TextUtils.isEmpty(path)) {
Scripts.run(new ScriptFile(path));
}
}
}
} }

View File

@@ -93,7 +93,7 @@ public class BuildActivity extends BaseActivity implements AutoJsApkBuilder.Prog
String initialDir = new File(mOutputPath.getText().toString()).exists() ? String initialDir = new File(mOutputPath.getText().toString()).exists() ?
mOutputPath.getText().toString() : StorageFileProvider.DEFAULT_DIRECTORY_PATH; mOutputPath.getText().toString() : StorageFileProvider.DEFAULT_DIRECTORY_PATH;
new FileChooserDialogBuilder(this) new FileChooserDialogBuilder(this)
.title(R.string.text_source_file_path) .title(R.string.text_output_apk_path)
.dir(initialDir) .dir(initialDir)
.chooseDir() .chooseDir()
.singleChoice(dir -> mOutputPath.setText(dir.getPath())) .singleChoice(dir -> mOutputPath.setText(dir.getPath()))