From 82a60413e156eb968f5148be9fa22abcf3ef92c8 Mon Sep 17 00:00:00 2001 From: leafwai Date: Mon, 1 Nov 2021 09:32:15 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5?= =?UTF-8?q?.4.0=E3=80=91=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=86=85=E9=83=A8?= =?UTF-8?q?=E9=9C=80=E6=B1=82=EF=BC=88Toolbar=E6=A0=B7=E5=BC=8F=E8=A1=A5?= =?UTF-8?q?=E5=85=853=EF=BC=89https://git.ghzs.com/pm/halo-app-issues/-/is?= =?UTF-8?q?sues/1567?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/base/ToolBarActivity.java | 1 + app/src/main/java/com/gh/base/fragment/BaseFragment.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/base/ToolBarActivity.java b/app/src/main/java/com/gh/base/ToolBarActivity.java index 65fb7b59c8..bd1199b84e 100644 --- a/app/src/main/java/com/gh/base/ToolBarActivity.java +++ b/app/src/main/java/com/gh/base/ToolBarActivity.java @@ -126,6 +126,7 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon // mToolbar.setNavigationIcon(provideNavigationIcon()); // mToolbar.setNavigationOnClickListener(provideNavigationItemClickListener()); if (mBackBtn != null) mBackBtn.setOnClickListener(provideNavigationItemClickListener()); + if (mBackContainer != null) mBackContainer.setOnClickListener(provideNavigationItemClickListener()); if (mTitleTv != null) { mTitleTv.setOnClickListener(view -> { final List fragmentList = getSupportFragmentManager().getFragments(); diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment.java b/app/src/main/java/com/gh/base/fragment/BaseFragment.java index a542a31de8..c511328685 100644 --- a/app/src/main/java/com/gh/base/fragment/BaseFragment.java +++ b/app/src/main/java/com/gh/base/fragment/BaseFragment.java @@ -112,7 +112,11 @@ public abstract class BaseFragment extends Fragment implements OnRequestCallB protected void initView(View view) { View mBackBtn = view.findViewById(R.id.backBtn); - if (mBackBtn != null) mBackBtn.setOnClickListener(v -> requireActivity().onBackPressed()); + View mBackContainer = view.findViewById(R.id.backContainer); + if (mBackBtn != null && mBackContainer != null) { + mBackBtn.setOnClickListener(v -> requireActivity().onBackPressed()); + mBackContainer.setOnClickListener(v -> requireActivity().onBackPressed()); + } } protected void postRunnable(Runnable runnable) {