Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/peek #4132

Merged
merged 3 commits into from
Nov 26, 2024
Merged

Fix/peek #4132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37c0fc5
fix(android): avoid peek EmptyStackException
siguangli2018 Nov 26, 2024
637aef5
fix(android): update custom createVirtualNode arguments
siguangli2018 Nov 26, 2024
5af395d
Merge branch 'main' into fix/peek
siguangli Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.tencent.mtt.hippy.HippyGlobalConfigs;
import com.tencent.mtt.hippy.utils.LogUtils;
import com.tencent.mtt.hippy.utils.UIThreadUtils;
import java.util.EmptyStackException;
import java.util.HashMap;
import java.util.Stack;

Expand Down Expand Up @@ -214,7 +215,7 @@ public void run() {
if (mExceptionDialog != null && mExceptionDialog.isShowing()) {
return;
}
DevFloatButton button = mDevButtonStack.peek();
DevFloatButton button = (mDevButtonStack.size() > 0) ? mDevButtonStack.peek() : null;
if (button != null) {
mExceptionDialog = new DevExceptionDialog(button.getContext());
mExceptionDialog.handleException(throwable);
Expand Down
5 changes: 3 additions & 2 deletions renderer/native/android/src/main/java/com/tencent/mtt/hippy/uimanager/ControllerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,9 @@ public VirtualNode createVirtualNode(int rootId, int id, int pid, int index,
@NonNull String className,
@Nullable Map<String, Object> props) {
HippyViewController<?> controller = mControllerRegistry.getViewController(className);
if (controller != null) {
return controller.createVirtualNode(rootId, id, pid, index, props);
Renderer renderer = mRendererWeakRef.get();
if (controller != null && renderer instanceof NativeRender) {
return controller.createVirtualNode(rootId, id, pid, index, props, (NativeRender) renderer);
}
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion ...rer/native/android/src/main/java/com/tencent/mtt/hippy/uimanager/HippyViewController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ protected RenderNode createRenderNode(int rootId, int id, @Nullable Map<String,
@SuppressWarnings("unused")
@Nullable
public VirtualNode createVirtualNode(int rootId, int id, int pid, int index,
@Nullable Map<String, Object> props) {
@Nullable Map<String, Object> props, @NonNull NativeRender nativeRender) {
// The host can create customize virtual node in a derived class.
return null;
}
Expand Down
Loading