From ad1bbecc7ea19af29e6babcdb6e0d2a2e14a8284 Mon Sep 17 00:00:00 2001 From: TonyJiangWJ Date: Sat, 15 Jan 2022 21:45:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 1 - .../autojs/ui/edit/ViewSampleActivity.java | 188 ------------------ .../autojs/ui/main/drawer/DrawerFragment.java | 84 +------- .../autojs/ui/settings/SettingsActivity.java | 2 - .../main/res/layout/activity_view_sample.xml | 97 --------- app/src/main/res/layout/fragment_drawer.xml | 30 +-- 6 files changed, 19 insertions(+), 383 deletions(-) delete mode 100644 app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java delete mode 100644 app/src/main/res/layout/activity_view_sample.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 222b024a..c04cd3f7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,6 @@ android:name=".external.tasker.TaskerScriptEditActivity_" android:configChanges="orientation|screenSize" android:exported="false" /> - diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java b/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java deleted file mode 100644 index 48f49fed..00000000 --- a/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java +++ /dev/null @@ -1,188 +0,0 @@ -package org.autojs.autojs.ui.edit; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.os.Bundle; - -import com.google.android.material.snackbar.Snackbar; - -import androidx.appcompat.app.AppCompatActivity; - -import android.util.SparseArray; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; - -import com.stardust.app.OnActivityResultDelegate; -import com.stardust.autojs.engine.JavaScriptEngine; -import com.stardust.autojs.execution.ScriptExecution; - -import org.autojs.autojs.R; -import org.autojs.autojs.autojs.AutoJs; -import org.autojs.autojs.model.sample.SampleFile; -import org.autojs.autojs.ui.BaseActivity; -import org.autojs.autojs.ui.common.ScriptOperations; - -import com.stardust.theme.ThemeColorManager; -import com.stardust.util.SparseArrayEntries; - -import org.autojs.autojs.ui.widget.ToolbarMenuItem; - -import butterknife.ButterKnife; -import butterknife.OnClick; -import io.reactivex.android.schedulers.AndroidSchedulers; - -import static org.autojs.autojs.model.script.Scripts.ACTION_ON_EXECUTION_FINISHED; -import static org.autojs.autojs.model.script.Scripts.EXTRA_EXCEPTION_MESSAGE; - - -/** - * Created by Stardust on 2017/4/29. - */ -public class ViewSampleActivity extends AppCompatActivity implements OnActivityResultDelegate.DelegateHost { - - - public static void view(Context context, SampleFile sample) { - context.startActivity(new Intent(context, ViewSampleActivity.class) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - .putExtra("sample_path", sample.getPath())); - } - - private View mView; - private SampleFile mSample; - private ScriptExecution mScriptExecution; - private SparseArray mMenuMap; - private OnActivityResultDelegate.Mediator mMediator = new OnActivityResultDelegate.Mediator(); - private BroadcastReceiver mOnRunFinishedReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals(ACTION_ON_EXECUTION_FINISHED)) { - mScriptExecution = null; - String msg = intent.getStringExtra(EXTRA_EXCEPTION_MESSAGE); - if (msg != null) { - Snackbar.make(mView, getString(R.string.text_error) + ": " + msg, Snackbar.LENGTH_LONG).show(); - } - } - } - }; - - public void onCreate(Bundle b) { - super.onCreate(b); - mView = View.inflate(this, R.layout.activity_view_sample, null); - setContentView(mView); - handleIntent(getIntent()); - setUpUI(); - registerReceiver(mOnRunFinishedReceiver, new IntentFilter(ACTION_ON_EXECUTION_FINISHED)); - } - - private void handleIntent(Intent intent) { - mSample = new SampleFile(intent.getStringExtra("sample_path"), getAssets()); - } - - private void setUpUI() { - ThemeColorManager.addActivityStatusBar(this); - setUpToolbar(); - initMenuItem(); - ButterKnife.bind(this); - } - - private void setUpToolbar() { - BaseActivity.setToolbarAsBack(this, R.id.toolbar, mSample.getSimplifiedName()); - } - - @OnClick(R.id.run) - void run() { - Snackbar.make(mView, R.string.text_start_running, Snackbar.LENGTH_SHORT).show(); - //mScriptExecution = Scripts.runWithBroadcastSender(new StringScriptSource(mSample.name, mEditorDelegate.getText())); - } - - @OnClick(R.id.edit) - void edit() { - new ScriptOperations(this, mView) - .importSample(mSample) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(path -> { - EditActivity.editFile(ViewSampleActivity.this, path, false); - finish(); - }); - } - - private void initMenuItem() { - mMenuMap = new SparseArrayEntries() - .entry(R.id.run, (ToolbarMenuItem) findViewById(R.id.run)) - .sparseArray(); - } - - public void setMenuStatus(int menuResId, int status) { - ToolbarMenuItem menuItem = mMenuMap.get(menuResId); - if (menuItem == null) - return; - } - - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_view_sample, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.action_console: - showConsole(); - return true; - case R.id.action_log: - showLog(); - return true; - case R.id.action_help: - - return true; - case R.id.action_import: - new ScriptOperations(this, mView) - .importSample(mSample) - .subscribe(); - return true; - } - return super.onOptionsItemSelected(item); - } - - - private void showLog() { - AutoJs.getInstance().getScriptEngineService().getGlobalConsole().show(); - } - - private void showConsole() { - if (mScriptExecution != null) { - ((JavaScriptEngine) mScriptExecution.getEngine()).getRuntime().console.show(); - } - } - - @Override - protected void onDestroy() { - super.onDestroy(); - unregisterReceiver(mOnRunFinishedReceiver); - } - - @Override - protected void onRestoreInstanceState(Bundle savedInstanceState) { - try { - super.onRestoreInstanceState(savedInstanceState); - } catch (RuntimeException e) { - // FIXME: 2017/3/20 - e.printStackTrace(); - } - } - - @Override - public OnActivityResultDelegate.Mediator getOnActivityResultDelegateMediator() { - return mMediator; - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - mMediator.onActivityResult(requestCode, resultCode, data); - } -} diff --git a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java index aa534f72..3fa1baa6 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java @@ -96,13 +96,13 @@ public class DrawerFragment extends androidx.fragment.app.Fragment { @ViewById(R.id.header) View mHeaderView; - @ViewById(R.id.username) +// @ViewById(R.id.username) TextView mUserName; - @ViewById(R.id.avatar) +// @ViewById(R.id.avatar) AvatarView mAvatar; @ViewById(R.id.shadow) View mShadow; - @ViewById(R.id.default_cover) +// @ViewById(R.id.default_cover) View mDefaultCover; @ViewById(R.id.drawer_menu) RecyclerView mDrawerMenu; @@ -189,31 +189,6 @@ public class DrawerFragment extends androidx.fragment.app.Fragment { mDrawerMenu.setLayoutManager(new LinearLayoutManager(getContext())); } - - @SuppressLint("CheckResult") - @Click(R.id.avatar) - void loginOrShowUserInfo() { - UserService.getInstance() - .me() - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(user -> { - if (getActivity() == null) - return; - WebActivity_.intent(this) - .extra(WebActivity.EXTRA_URL, NodeBB.url("user/" + user.getUserslug())) - .extra(Intent.EXTRA_TITLE, user.getUsername()) - .start(); - }, - error -> { - if (getActivity() == null) - return; - LoginActivity_.intent(getActivity()).start(); - } - ); - } - - void enableOrDisableAccessibilityService(DrawerMenuItemViewHolder holder) { boolean isAccessibilityServiceEnabled = isAccessibilityServiceEnabled(); boolean checked = holder.getSwitchCompat().isChecked(); @@ -398,51 +373,6 @@ public class DrawerFragment extends androidx.fragment.app.Fragment { public void onResume() { super.onResume(); syncSwitchState(); -// syncUserInfo(); - } - - private void syncUserInfo() { - NodeBB.getInstance().getRetrofit() - .create(UserApi.class) - .me() - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(this::setUpUserInfo, error -> { - error.printStackTrace(); - setUpUserInfo(null); - }); - } - - private void setUpUserInfo(@Nullable User user) { - if (mUserName == null || mAvatar == null) - return; - if (user == null) { - mUserName.setText(R.string.not_login); - mAvatar.setIcon(R.drawable.profile_avatar_placeholder); - } else { - mUserName.setText(user.getUsername()); - mAvatar.setUser(user); - } - setCoverImage(user); - } - - private void setCoverImage(User user) { - if (mDefaultCover == null || mShadow == null || mHeaderView == null) - return; - if (user == null || TextUtils.isEmpty(user.getCoverUrl()) || user.getCoverUrl().equals("/assets/images/cover-default.png")) { - mDefaultCover.setVisibility(View.VISIBLE); - mShadow.setVisibility(View.GONE); - mHeaderView.setBackgroundColor(ThemeColorManagerCompat.getColorPrimary()); - } else { - mDefaultCover.setVisibility(View.GONE); - mShadow.setVisibility(View.VISIBLE); - Glide.with(this) - .load(NodeBB.BASE_URL + user.getCoverUrl()) - .apply(new RequestOptions() - .diskCacheStrategy(DiskCacheStrategy.NONE) - ) - .into(new BackgroundTarget(mHeaderView)); - } } private void syncSwitchState() { @@ -493,14 +423,6 @@ public class DrawerFragment extends androidx.fragment.app.Fragment { mDrawerMenu.scrollToPosition(0); } - @Subscribe(threadMode = ThreadMode.MAIN) - public void onLoginStateChange(UserService.LoginStateChange change) { - syncUserInfo(); - if (mCommunityDrawerMenu.isShown()) { - mCommunityDrawerMenu.setUserOnlineStatus(mDrawerMenuAdapter, change.isOnline()); - } - } - @Subscribe(threadMode = ThreadMode.MAIN) public void onDrawerOpen(MainActivity.DrawerOpenEvent event) { diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/SettingsActivity.java b/app/src/main/java/org/autojs/autojs/ui/settings/SettingsActivity.java index 177805de..1d12d2ff 100644 --- a/app/src/main/java/org/autojs/autojs/ui/settings/SettingsActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/settings/SettingsActivity.java @@ -102,8 +102,6 @@ public class SettingsActivity extends BaseActivity { super.onStart(); ACTION_MAP = new MapBuilder() .put(getString(R.string.text_theme_color), () -> selectThemeColor(getActivity())) - .put(getString(R.string.text_check_for_updates), () -> new UpdateCheckDialog(getActivity()) - .show()) .put(getString(R.string.text_issue_report), () -> startActivity(new Intent(getActivity(), IssueReporterActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))) .put(getString(R.string.text_about_me_and_repo), () -> startActivity(new Intent(getActivity(), AboutActivity_.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))) .put(getString(R.string.text_licenses), () -> showLicenseDialog()) diff --git a/app/src/main/res/layout/activity_view_sample.xml b/app/src/main/res/layout/activity_view_sample.xml deleted file mode 100644 index 20c0ed90..00000000 --- a/app/src/main/res/layout/activity_view_sample.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_drawer.xml b/app/src/main/res/layout/fragment_drawer.xml index b86cb8e6..a2bd57b8 100644 --- a/app/src/main/res/layout/fragment_drawer.xml +++ b/app/src/main/res/layout/fragment_drawer.xml @@ -13,7 +13,8 @@ android:id="@+id/header" android:layout_width="match_parent" android:layout_height="170dp" - android:layout_marginBottom="5dp"> + android:layout_marginBottom="5dp" + android:visibility="gone"> - + + + + + + + + + @@ -93,9 +95,9 @@ android:layout_width="20dp" android:layout_height="20dp" android:layout_gravity="center_vertical" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:src="@drawable/ic_ali_settings" - android:tint="#666666"/> + app:tint="#666666" /> + app:tint="#666666" />