fix(android): revised naming of onInterceptTouchEvent

iPel · Sep 26, 2022 · 905a82d · 905a82d
1 parent 76da43c
commit 905a82d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/renderer/native/android/src/main/java/com/tencent/mtt/hippy/dom/node/NodeProps.java b/renderer/native/android/src/main/java/com/tencent/mtt/hippy/dom/node/NodeProps.java
@@ -124,10 +124,10 @@ public class NodeProps {
   public static final String ON_TOUCH_MOVE = "touchmove";
   public static final String ON_TOUCH_END = "touchend";
   public static final String ON_TOUCH_CANCEL = "touchcancel";
-  public static final String ON_INTERCEPT_TOUCH_EVENT = "intercepttouchevent";
-  public static final String ON_INTERCEPT_PULL_UP_EVENT = "interceptpullupevent";
-  public static final String ON_ATTACHED_TO_WINDOW = "attachedtowindow";
-  public static final String ON_DETACHED_FROM_WINDOW = "detachedfromwindow";
+  public static final String ON_INTERCEPT_TOUCH_EVENT = "onInterceptTouchEvent";
+  public static final String ON_INTERCEPT_PULL_UP_EVENT = "onInterceptPullUpEvent";
+  public static final String ON_ATTACHED_TO_WINDOW = "attachedToWindow";
+  public static final String ON_DETACHED_FROM_WINDOW = "detachedFromWindow";
 
   public static final String BORDER_RADIUS = "borderRadius";
   public static final String BORDER_TOP_LEFT_RADIUS = "borderTopLeftRadius";

diff --git a/renderer/native/android/src/main/java/com/tencent/renderer/NativeRenderer.java b/renderer/native/android/src/main/java/com/tencent/renderer/NativeRenderer.java
@@ -73,6 +73,7 @@ public class NativeRenderer extends Renderer implements NativeRender, NativeRend
     private static final String LAYOUT_TOP = "top";
     private static final String LAYOUT_WIDTH = "width";
     private static final String LAYOUT_HEIGHT = "height";
+    private static final String EVENT_PREFIX = "on";
     private static final int MAX_UI_TASK_QUEUE_CAPACITY = 1000;
     @Nullable
     private FrameworkProxy mFrameworkProxy;
@@ -282,6 +283,10 @@ public void dispatchEvent(int rootId, int nodeId, @NonNull String eventName,
             @Nullable Object params, boolean useCapture, boolean useBubble, EventType eventType) {
         // Because the native(C++) DOM use lowercase names, convert to lowercase here before call JNI.
         String lowerCaseEventName = eventName.toLowerCase();
+        // Compatible with events prefixed with on in old version
+        if (lowerCaseEventName.startsWith(EVENT_PREFIX)) {
+            lowerCaseEventName = lowerCaseEventName.substring(EVENT_PREFIX.length());
+        }
         if (eventType != EventType.EVENT_TYPE_GESTURE && !mRenderManager.checkRegisteredEvent(
                 rootId, nodeId, lowerCaseEventName)) {
             return;