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

move LOG from tab TASK to action menu

Browse Source
This commit is contained in:
hyb1996
2017-11-02 00:39:31 +08:00
parent d9b3a4ac27
commit e8110c76a2
17 changed files with 144 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorMenu.java
View File

@@ -11,6 +11,7 @@ import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.autojs.AutoJs;
import com.stardust.scriptdroid.ui.build.BuildActivity;
import com.stardust.scriptdroid.ui.build.BuildActivity_;
import com.stardust.scriptdroid.ui.log.LogActivity_;
import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder;
import com.stardust.util.ClipboardUtil;
@@ -258,7 +259,7 @@ public class EditorMenu {
private void showLog() {
AutoJs.getInstance().getScriptEngineService().getGlobalConsole().show();
LogActivity_.intent(mContext).start();
}
private void showConsole() {

40
app/src/main/java/com/stardust/scriptdroid/ui/log/LogActivity.java Normal file
View File

@@ -0,0 +1,40 @@
package com.stardust.scriptdroid.ui.log;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.View;
import com.stardust.autojs.core.console.ConsoleView;
import com.stardust.autojs.core.console.StardustConsole;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.autojs.AutoJs;
import com.stardust.scriptdroid.ui.BaseActivity;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.Click;
import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.ViewById;
@EActivity(R.layout.activity_log)
public class LogActivity extends BaseActivity {
@ViewById(R.id.console)
ConsoleView mConsoleView;
private StardustConsole mStardustConsole;
@AfterViews
void setupViews() {
setToolbarAsBack(getString(R.string.text_log));
mStardustConsole = (StardustConsole) AutoJs.getInstance().getGlobalConsole();
mConsoleView.setConsole(mStardustConsole);
}
@Click(R.id.fab)
void clearConsole() {
mStardustConsole.clear();
}
}

10
app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java
View File

@@ -32,6 +32,7 @@ import com.stardust.scriptdroid.ui.floating.FloatyWindowManger;
import com.stardust.scriptdroid.io.StorageFileProvider;
import com.stardust.scriptdroid.ui.main.community.CommunityFragment_;
import com.stardust.scriptdroid.ui.main.sample.SampleListFragment;
import com.stardust.scriptdroid.ui.log.LogActivity_;
import com.stardust.scriptdroid.ui.main.sample.SampleListFragment_;
import com.stardust.scriptdroid.ui.main.scripts.MyScriptListFragment_;
import com.stardust.scriptdroid.ui.main.task.TaskManagerFragment_;
@@ -259,6 +260,15 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if(item.getItemId() == R.id.action_log){
LogActivity_.intent(this).start();
return true;
}
return super.onOptionsItemSelected(item);
}
private void setUpSearchMenuItem(MenuItem searchMenuItem) {
mSearchViewItem = new SearchViewItem(this, searchMenuItem);
mSearchViewItem.setQueryCallback(this::submitQuery);

65
app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java
View File

@@ -24,7 +24,7 @@ import org.androidannotations.annotations.ViewById;
* Created by Stardust on 2017/3/24.
*/
@EFragment(R.layout.fragment_task_manager)
public class TaskManagerFragment extends ViewPagerFragment implements PopupMenu.OnMenuItemClickListener {
public class TaskManagerFragment extends ViewPagerFragment {
@ViewById(R.id.task_list)
TaskListRecyclerView mTaskListRecyclerView;
@@ -35,36 +35,17 @@ public class TaskManagerFragment extends ViewPagerFragment implements PopupMenu.
@ViewById(R.id.swipe_refresh_layout)
SwipeRefreshLayout mSwipeRefreshLayout;
@ViewById(R.id.task_manager_view)
View mTaskManagerView;
@ViewById(R.id.spinner)
View mSpinner;
@ViewById(R.id.spinner_current_item)
TextView mSpinnerCurrentItem;
@ViewById(R.id.console)
ConsoleView mConsoleView;
private StardustConsole mStardustConsole;
public TaskManagerFragment() {
super(45);
setArguments(new Bundle());
}
@AfterViews
void setUpViews() {
init();
final boolean noRunningScript = mTaskListRecyclerView.getAdapter().getItemCount() == 0;
mNoRunningScriptNotice.setVisibility(noRunningScript ? View.VISIBLE : View.GONE);
mStardustConsole = (StardustConsole) AutoJs.getInstance().getGlobalConsole();
mConsoleView.setConsole(mStardustConsole);
if (getArguments().getBoolean("console_shown", false)) {
showLog();
}
}
private void init() {
@@ -90,51 +71,9 @@ public class TaskManagerFragment extends ViewPagerFragment implements PopupMenu.
});
}
@Click(R.id.spinner)
void showPopupMenu() {
PopupMenu popupMenu = new PopupMenu(getContext(), mSpinner);
popupMenu.inflate(R.menu.menu_manager);
popupMenu.show();
popupMenu.setOnMenuItemClickListener(this);
}
@Override
public boolean onMenuItemClick(MenuItem item) {
int id = item.getItemId();
if (id == R.id.task_manage) {
showTaskManager();
} else {
showLog();
}
return true;
}
private void showLog() {
mTaskManagerView.setVisibility(View.GONE);
mConsoleView.setVisibility(View.VISIBLE);
mSpinnerCurrentItem.setText(R.string.text_log);
}
private void showTaskManager() {
mConsoleView.setVisibility(View.GONE);
mTaskManagerView.setVisibility(View.VISIBLE);
mSpinnerCurrentItem.setText(R.string.text_task_manage);
}
@Override
protected void onFabClick(FloatingActionButton fab) {
if (mConsoleView.getVisibility() == View.VISIBLE) {
mStardustConsole.clear();
} else {
AutoJs.getInstance().getScriptEngineService().stopAll();
}
AutoJs.getInstance().getScriptEngineService().stopAll();
}
@Override
public void onPause() {
super.onPause();
getArguments().putBoolean("console_shown", mConsoleView.getVisibility() == View.VISIBLE);
}
}