From 9d1fdf3fe94f6ff773eb33a485f9909b404eaad5 Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Fri, 28 Sep 2018 14:20:21 +0800 Subject: [PATCH] feat: intent task --- .../receiver/BaseBroadcastReceiver.java | 1 - .../autojs/autojs/model/explorer/Explorer.java | 4 ++++ ...erSamleItem.java => ExplorerSampleItem.java} | 8 ++++---- .../model/explorer/WorkspaceFileProvider.java | 7 ++++++- .../autojs/autojs/ui/explorer/ExplorerView.java | 9 +++++++++ .../ui/timing/TimedTaskSettingActivity.java | 4 ++++ .../res/layout/activity_timed_task_setting.xml | 17 +++++++++++++++++ app/src/main/res/values/strings.xml | 2 ++ 8 files changed, 46 insertions(+), 6 deletions(-) rename app/src/main/java/org/autojs/autojs/model/explorer/{ExplorerSamleItem.java => ExplorerSampleItem.java} (58%) diff --git a/app/src/main/java/org/autojs/autojs/external/receiver/BaseBroadcastReceiver.java b/app/src/main/java/org/autojs/autojs/external/receiver/BaseBroadcastReceiver.java index 5cad9f4f..791fcbb4 100644 --- a/app/src/main/java/org/autojs/autojs/external/receiver/BaseBroadcastReceiver.java +++ b/app/src/main/java/org/autojs/autojs/external/receiver/BaseBroadcastReceiver.java @@ -4,7 +4,6 @@ import android.annotation.SuppressLint; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.os.Bundle; import android.util.Log; import android.widget.Toast; diff --git a/app/src/main/java/org/autojs/autojs/model/explorer/Explorer.java b/app/src/main/java/org/autojs/autojs/model/explorer/Explorer.java index ade9ea3f..cb8a5e39 100644 --- a/app/src/main/java/org/autojs/autojs/model/explorer/Explorer.java +++ b/app/src/main/java/org/autojs/autojs/model/explorer/Explorer.java @@ -30,6 +30,10 @@ public class Explorer { this(explorerProvider, cacheSize, EventBus.getDefault()); } + public ExplorerProvider getProvider() { + return mExplorerProvider; + } + public void notifyChildrenChanged(ExplorerPage page) { clearCache(page); mEventBus.post(new ExplorerChangeEvent(page, CHILDREN_CHANGE, null)); diff --git a/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerSamleItem.java b/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerSampleItem.java similarity index 58% rename from app/src/main/java/org/autojs/autojs/model/explorer/ExplorerSamleItem.java rename to app/src/main/java/org/autojs/autojs/model/explorer/ExplorerSampleItem.java index f469acd9..48170710 100644 --- a/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerSamleItem.java +++ b/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerSampleItem.java @@ -4,16 +4,16 @@ import com.stardust.pio.PFile; import java.io.File; -public class ExplorerSamleItem extends ExplorerFileItem { - public ExplorerSamleItem(PFile file, ExplorerPage parent) { +public class ExplorerSampleItem extends ExplorerFileItem { + public ExplorerSampleItem(PFile file, ExplorerPage parent) { super(file, parent); } - public ExplorerSamleItem(String path, ExplorerPage parent) { + public ExplorerSampleItem(String path, ExplorerPage parent) { super(path, parent); } - public ExplorerSamleItem(File file, ExplorerPage parent) { + public ExplorerSampleItem(File file, ExplorerPage parent) { super(file, parent); } diff --git a/app/src/main/java/org/autojs/autojs/model/explorer/WorkspaceFileProvider.java b/app/src/main/java/org/autojs/autojs/model/explorer/WorkspaceFileProvider.java index 403cad93..e9a147d2 100644 --- a/app/src/main/java/org/autojs/autojs/model/explorer/WorkspaceFileProvider.java +++ b/app/src/main/java/org/autojs/autojs/model/explorer/WorkspaceFileProvider.java @@ -8,6 +8,7 @@ import com.stardust.pio.PFile; import com.stardust.pio.PFiles; import org.autojs.autojs.Pref; +import org.autojs.autojs.model.sample.SampleFile; import java.io.File; import java.io.FileFilter; @@ -52,7 +53,7 @@ public class WorkspaceFileProvider extends ExplorerFileProvider { } } else { if (file.getPath().startsWith(mSampleDir.getPath())) { - p.addChild(new ExplorerSamleItem(file, p)); + p.addChild(new ExplorerSampleItem(file, p)); } else { p.addChild(new ExplorerFileItem(file, p)); } @@ -98,6 +99,10 @@ public class WorkspaceFileProvider extends ExplorerFileProvider { }); } + public static void resetSample(SampleFile sampleFile){ + + } + @Override protected ExplorerDirPage createExplorerPage(String path, ExplorerPage parent) { ExplorerDirPage page = super.createExplorerPage(path, parent); 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 e250921c..a91384ff 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 @@ -27,7 +27,11 @@ import org.autojs.autojs.model.explorer.ExplorerFileItem; import org.autojs.autojs.model.explorer.ExplorerItem; import org.autojs.autojs.model.explorer.ExplorerPage; import org.autojs.autojs.model.explorer.ExplorerProjectPage; +import org.autojs.autojs.model.explorer.ExplorerSampleItem; import org.autojs.autojs.model.explorer.ExplorerSamplePage; +import org.autojs.autojs.model.explorer.Explorers; +import org.autojs.autojs.model.explorer.WorkspaceFileProvider; +import org.autojs.autojs.model.sample.SampleFile; import org.autojs.autojs.model.script.ScriptFile; import org.autojs.autojs.model.script.Scripts; import org.autojs.autojs.ui.project.BuildActivity; @@ -306,6 +310,8 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR case R.id.action_sort_by_size: sort(ExplorerItemList.SORT_TYPE_SIZE, mDirSortMenuShowing); break; + case R.id.reset: + // WorkspaceFileProvider.resetSample(mSelectedItem.toScriptFile()); default: return false; } @@ -487,6 +493,9 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR } if (!mExplorerItem.canRename()) { menu.removeItem(R.id.rename); + } + if(mExplorerItem instanceof ExplorerSampleItem){ + } popupMenu.setOnMenuItemClickListener(ExplorerView.this); popupMenu.show(); diff --git a/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java b/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java index 0997e7c3..a4d4ce31 100644 --- a/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java @@ -86,6 +86,8 @@ public class TimedTaskSettingActivity extends BaseActivity { .put(Intent.ACTION_PACKAGE_REMOVED, R.string.text_run_on_package_uninstall) .put(Intent.ACTION_PACKAGE_REPLACED, R.string.text_run_on_package_update) .put(Intent.ACTION_HEADSET_PLUG, R.string.text_run_on_headset_plug) + .put(Intent.ACTION_CONFIGURATION_CHANGED, R.string.text_run_on_config_change) + .put(Intent.ACTION_TIME_TICK, R.string.text_run_on_time_tick) .build(); private static final BiMap ACTIONS = BiMaps.newBuilder() @@ -101,6 +103,8 @@ public class TimedTaskSettingActivity extends BaseActivity { .put(R.id.run_on_package_uninstall, Intent.ACTION_PACKAGE_REMOVED) .put(R.id.run_on_package_update, Intent.ACTION_PACKAGE_REPLACED) .put(R.id.run_on_headset_plug, Intent.ACTION_HEADSET_PLUG) + .put(R.id.run_on_config_change, Intent.ACTION_CONFIGURATION_CHANGED) + .put(R.id.run_on_time_tick, Intent.ACTION_TIME_TICK) .build(); diff --git a/app/src/main/res/layout/activity_timed_task_setting.xml b/app/src/main/res/layout/activity_timed_task_setting.xml index ee7e0c11..fc19525c 100644 --- a/app/src/main/res/layout/activity_timed_task_setting.xml +++ b/app/src/main/res/layout/activity_timed_task_setting.xml @@ -375,6 +375,22 @@ android:paddingLeft="8dp" android:text="@string/text_run_on_headset_plug"/> + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 31637940..ec195a39 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -419,4 +419,6 @@ 应用卸载时 应用更新时 耳机插拔时 + 每分钟一次 + 某些设置(屏幕方向,地区等)更改时