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

fix DoricPanelFragment back to recreate view,recreate context error

Browse Source
This commit is contained in:
pengfei.zhou 2019-12-23 19:29:19 +08:00 committed by osborn
parent 59eaf42b00
commit b88e3605b0
2 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doric-android/doric/src/main/java/pub/doric/DoricPanel.java
View File

@ -62,7 +62,7 @@ public class DoricPanel extends FrameLayout implements LifecycleObserver {
public void config(DoricContext doricContext) { public void config(DoricContext doricContext) {
mDoricContext = doricContext; mDoricContext = doricContext;
mDoricContext.getRootNode().setRootView(this); mDoricContext.getRootNode().setRootView(this);
if (getMeasuredState() != 0) { if (getMeasuredWidth() != 0 && getMeasuredHeight() != 0) {
mDoricContext.init(DoricUtils.px2dp(getMeasuredWidth()), DoricUtils.px2dp(getMeasuredHeight())); mDoricContext.init(DoricUtils.px2dp(getMeasuredWidth()), DoricUtils.px2dp(getMeasuredHeight()));
} }
if (getContext() instanceof LifecycleOwner if (getContext() instanceof LifecycleOwner

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

@ -49,40 +49,48 @@ public class DoricPanelFragment extends Fragment implements IDoricNavigator {
@Override @Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
doricPanel = view.findViewById(R.id.doric_panel); if (doricPanel == null) {
Bundle argument = getArguments(); doricPanel = view.findViewById(R.id.doric_panel);
if (argument == null) { Bundle argument = getArguments();
if (getActivity() != null && getActivity().getIntent() != null) { if (argument == null) {
argument = getActivity().getIntent().getExtras(); if (getActivity() != null && getActivity().getIntent() != null) {
argument = getActivity().getIntent().getExtras();
}
} }
} if (argument == null) {
if (argument == null) { DoricLog.e("DoricPanelFragment argument is null");
DoricLog.e("DoricPanelFragment argument is null"); return;
return; }
} final String alias = argument.getString("alias");
final String alias = argument.getString("alias"); String scheme = argument.getString("scheme");
String scheme = argument.getString("scheme"); final String extra = argument.getString("extra");
final String extra = argument.getString("extra"); DoricJSLoaderManager.getInstance().loadJSBundle(scheme).setCallback(new AsyncResult.Callback<String>() {
DoricJSLoaderManager.getInstance().loadJSBundle(scheme).setCallback(new AsyncResult.Callback<String>() { @Override
@Override public void onResult(String result) {
public void onResult(String result) { doricPanel.config(result, alias, extra);
doricPanel.config(result, alias, extra); DoricContext context = doricPanel.getDoricContext();
context.setDoricNavigator(DoricPanelFragment.this);
BaseDoricNavBar navBar = requireActivity().getWindow().getDecorView().findViewById(R.id.doric_nav_bar);
context.setDoricNavBar(navBar);
}
@Override
public void onError(Throwable t) {
DoricLog.e("DoricPanelFragment load JS error:" + t.getLocalizedMessage());
}
@Override
public void onFinish() {
}
});
} else {
DoricPanel panel = view.findViewById(R.id.doric_panel);
if (doricPanel != view.findViewById(R.id.doric_panel)) {
DoricContext context = doricPanel.getDoricContext(); DoricContext context = doricPanel.getDoricContext();
context.setDoricNavigator(DoricPanelFragment.this); panel.config(context);
BaseDoricNavBar navBar = requireActivity().getWindow().getDecorView().findViewById(R.id.doric_nav_bar);
context.setDoricNavBar(navBar);
} }
}
@Override
public void onError(Throwable t) {
DoricLog.e("DoricPanelFragment load JS error:" + t.getLocalizedMessage());
}
@Override
public void onFinish() {
}
});
} }
@Override @Override