tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

android:add protection for DoricPanel is null

Browse Source
This commit is contained in:
pengfei.zhou 2020-05-20 10:31:14 +08:00 committed by osborn
parent 6080717940
commit 3a9b6c2a85
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doric-android/doric/src/main/java/pub/doric/DoricPanelFragment.java
View File

@ -98,7 +98,7 @@ public class DoricPanelFragment extends Fragment implements IDoricNavigator {
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
if (!(getActivity() instanceof LifecycleOwner)) { if (!(getActivity() instanceof LifecycleOwner && doricPanel != null)) {
doricPanel.onActivityResume(); doricPanel.onActivityResume();
} }
} }
@ -106,7 +106,7 @@ public class DoricPanelFragment extends Fragment implements IDoricNavigator {
@Override @Override
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
if (!(getActivity() instanceof LifecycleOwner)) { if (!(getActivity() instanceof LifecycleOwner) && doricPanel != null) {
doricPanel.onActivityPause(); doricPanel.onActivityPause();
} }
} }
@ -114,7 +114,8 @@ public class DoricPanelFragment extends Fragment implements IDoricNavigator {
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
if (getActivity() == null || !getActivity().isFinishing() || !(getActivity() instanceof LifecycleOwner)) { if ((getActivity() == null || !getActivity().isFinishing() || !(getActivity() instanceof LifecycleOwner))
&& doricPanel != null) {
doricPanel.onActivityDestroy(); doricPanel.onActivityDestroy();
} }
} }