tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Script file chooser. Fixed the issue that background image setting not working

Browse Source
This commit is contained in:
hyb1996
2017-04-03 16:28:07 +08:00
parent bfabef6a0e
commit 59811a4a5d
53 changed files with 1465 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/stardust/scriptdroid/external/CommonUtils.java vendored
View File

@@ -1,5 +1,7 @@
package com.stardust.scriptdroid.external;
import android.os.Bundle;
/**
* Created by Stardust on 2017/4/1.
*/
@@ -10,5 +12,8 @@ public class CommonUtils {
public static final String EXTRA_KEY_PREPARE_SCRIPT = "script";
public static boolean isTaskerBundleValid(Bundle bundle) {
return bundle.containsKey(CommonUtils.EXTRA_KEY_PATH);
}
}

5
app/src/main/java/com/stardust/scriptdroid/external/tasker/FireSettingReceiver.java vendored
View File

@@ -23,19 +23,16 @@ public class FireSettingReceiver extends AbstractPluginSettingReceiver {
@Override
protected boolean isBundleValid(@NonNull Bundle bundle) {
Log.v(TAG, "isBundleValid: " + bundle);
return bundle.containsKey(CommonUtils.EXTRA_KEY_PATH);
return CommonUtils.isTaskerBundleValid(bundle);
}
@Override
protected boolean isAsync() {
Log.v(TAG, "isAsync");
return true;
}
@Override
protected void firePluginSetting(@NonNull Context context, @NonNull Bundle bundle) {
Log.v(TAG, "firePluginSetting：" + bundle);
context.startActivity(new Intent(App.getApp(), RunIntentActivity.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra(CommonUtils.EXTRA_KEY_PATH, bundle.getString(CommonUtils.EXTRA_KEY_PATH))

18
app/src/main/java/com/stardust/scriptdroid/external/tasker/TaskPrefEditActivity.java vendored
View File

@@ -9,7 +9,8 @@ import android.util.Log;
import com.stardust.scriptdroid.scripts.ScriptFile;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.external.CommonUtils;
import com.stardust.scriptdroid.ui.main.my_script_list.ScriptAndFolderListRecyclerView;
import com.stardust.scriptdroid.ui.main.script_list.ScriptAndFolderListRecyclerView;
import com.stardust.scriptdroid.ui.main.script_list.ScriptListWithProgressBarView;
import com.twofortyfouram.locale.sdk.client.ui.activity.AbstractPluginActivity;
/**
@@ -18,20 +19,19 @@ import com.twofortyfouram.locale.sdk.client.ui.activity.AbstractPluginActivity;
public class TaskPrefEditActivity extends AbstractPluginActivity {
private static final String TAG = "TaskPrefEditActivity";
private String mSelectedScriptFilePath;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Log.v(TAG, "onCreate");
setContentView(R.layout.activity_tasker_edit);
initScriptListRecyclerView();
}
private void initScriptListRecyclerView() {
ScriptAndFolderListRecyclerView scriptListRecyclerView = (ScriptAndFolderListRecyclerView) findViewById(R.id.script_list);
scriptListRecyclerView.setOnItemClickListener(new ScriptAndFolderListRecyclerView.OnScriptFileClickListener() {
ScriptListWithProgressBarView scriptListWithProgressBarView = (ScriptListWithProgressBarView) findViewById(R.id.script_list);
scriptListWithProgressBarView.setScriptFileOperationEnabled(false);
scriptListWithProgressBarView.setOnItemClickListener(new ScriptAndFolderListRecyclerView.OnScriptFileClickListener() {
@Override
public void onClick(ScriptFile file) {
mSelectedScriptFilePath = file.getPath();
@@ -43,22 +43,17 @@ public class TaskPrefEditActivity extends AbstractPluginActivity {
@Override
public boolean isBundleValid(@NonNull Bundle bundle) {
boolean valid = bundle.getString(CommonUtils.EXTRA_KEY_PATH) != null;
Log.v(TAG, "isBundleValid: " + valid);
Context context;
return valid;
return CommonUtils.isTaskerBundleValid(bundle);
}
@Override
public void onPostCreateWithPreviousResult(@NonNull Bundle bundle, @NonNull String s) {
Log.v(TAG, "onPostCreateWithPreviousResult: bundle=" + bundle + " str=" + s);
mSelectedScriptFilePath = bundle.getString(CommonUtils.EXTRA_KEY_PATH);
}
@Nullable
@Override
public Bundle getResultBundle() {
Log.v(TAG, "getResultBundle");
Bundle bundle = new Bundle();
bundle.putString(CommonUtils.EXTRA_KEY_PATH, mSelectedScriptFilePath);
return bundle;
@@ -67,7 +62,6 @@ public class TaskPrefEditActivity extends AbstractPluginActivity {
@NonNull
@Override
public String getResultBlurb(@NonNull Bundle bundle) {
Log.v(TAG, "getResultBlurb");
return bundle.getString(CommonUtils.EXTRA_KEY_PATH, getString(R.string.text_path_is_empty));
}
}