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) {