[
https://issues.apache.org/jira/browse/WEEX-586?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16589953#comment-16589953
]
ASF GitHub Bot commented on WEEX-586:
-------------------------------------
zshshr closed pull request #1466: [WEEX-586][Android]WXEmbed Support Listen
scroll scrollEnd scrollStart Event
URL: https://github.com/apache/incubator-weex/pull/1466
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 1c43a331bc..8e8c21d626 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -64,6 +64,7 @@
import com.taobao.weex.common.WXResponse;
import com.taobao.weex.dom.WXEvent;
import com.taobao.weex.http.WXHttpUtil;
+import com.taobao.weex.instance.InstanceOnFireEventInterceptor;
import com.taobao.weex.layout.ContentBoxMeasurement;
import com.taobao.weex.performance.WXAnalyzerDataTransfer;
import com.taobao.weex.performance.WXInstanceApm;
@@ -71,9 +72,7 @@
import com.taobao.weex.tracing.WXTracing;
import com.taobao.weex.ui.action.GraphicActionAddElement;
import com.taobao.weex.ui.component.NestedContainer;
-import com.taobao.weex.ui.component.WXBasicComponentType;
import com.taobao.weex.ui.component.WXComponent;
-import com.taobao.weex.ui.component.WXComponentFactory;
import com.taobao.weex.ui.component.WXEmbed;
import com.taobao.weex.ui.flat.FlatGUIContext;
import com.taobao.weex.ui.view.WXScrollView;
@@ -93,7 +92,6 @@
import java.util.List;
import java.util.Map;
import java.util.PriorityQueue;
-import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import static com.taobao.weex.http.WXHttpUtil.KEY_USER_AGENT;
@@ -208,6 +206,9 @@ public void removeLayerOverFlowListener(String ref) {
private Map<Long, ContentBoxMeasurement> mContentBoxMeasurements = new
ArrayMap<>();
+ private List<InstanceOnFireEventInterceptor>
mInstanceOnFireEventInterceptorList;
+
+
/**
* set make weexCore run in single process mode
* @param flag true means weexCore run in single process mode or multi
process mode
@@ -1436,7 +1437,7 @@ public synchronized void destroy() {
getFlatUIContext().destroy();
mFlatGUIContext = null;
-
+ mInstanceOnFireEventInterceptorList = null;
mWXScrollListeners = null;
mRenderContainer = null;
mNestedInstanceInterceptor = null;
@@ -1614,12 +1615,15 @@ public void fireEvent(String elementRef,final String
type, final Map<String, Obj
}
public void fireEvent(String elementRef,final String type, final Map<String,
Object> data,final Map<String, Object> domChanges, List<Object> eventArgs,
EventResult callback) {
+ onInterceptInstanceEvent(getInstanceId(), elementRef, type, data,
domChanges);
if (null != mWXPerformance &&
mWXPerformance.fsCallEventTotalNum<Integer.MAX_VALUE){
mWXPerformance.fsCallEventTotalNum++;
}
mApmForInstance.updateFSDiffStats(WXInstanceApm.KEY_PAGE_STATS_FS_CALL_EVENT_NUM,1);
WXBridgeManager.getInstance().fireEventOnNode(getInstanceId(),elementRef,type,data,domChanges,
eventArgs, callback);
}
+
+
/**
* Fire event callback on a element.
* @param elementRef
@@ -2055,4 +2059,31 @@ public void addContentBoxMeasurement(long
renderObjectPtr, ContentBoxMeasurement
public ContentBoxMeasurement getContentBoxMeasurement(long renderObjectPtr) {
return mContentBoxMeasurements.get(renderObjectPtr);
}
+
+
+ private void onInterceptInstanceEvent(String instanceId, String elementRef,
String type, Map<String, Object> data, Map<String, Object> domChanges) {
+ if(this.mInstanceOnFireEventInterceptorList == null){
+ return;
+ }
+ for(InstanceOnFireEventInterceptor instanceOnFireEventInterceptor :
this.mInstanceOnFireEventInterceptorList){
+ instanceOnFireEventInterceptor.onInterceptFireEvent(instanceId,
elementRef, type, data, domChanges);
+ }
+ }
+
+ public List<InstanceOnFireEventInterceptor>
getInstanceOnFireEventInterceptorList(){
+ if(this.mInstanceOnFireEventInterceptorList == null){
+ this.mInstanceOnFireEventInterceptorList = new ArrayList<>();
+ }
+ return mInstanceOnFireEventInterceptorList;
+ }
+
+
+ public void addInstanceOnFireEventInterceptor(InstanceOnFireEventInterceptor
instanceOnFireEventInterceptor) {
+ if(instanceOnFireEventInterceptor == null){
+ return;
+ }
+
if(!getInstanceOnFireEventInterceptorList().contains(instanceOnFireEventInterceptor)){
+
getInstanceOnFireEventInterceptorList().add(instanceOnFireEventInterceptor);
+ }
+ }
}
diff --git
a/android/sdk/src/main/java/com/taobao/weex/instance/InstanceOnFireEventInterceptor.java
b/android/sdk/src/main/java/com/taobao/weex/instance/InstanceOnFireEventInterceptor.java
new file mode 100644
index 0000000000..3b142f7857
--- /dev/null
+++
b/android/sdk/src/main/java/com/taobao/weex/instance/InstanceOnFireEventInterceptor.java
@@ -0,0 +1,61 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.taobao.weex.instance;
+
+import com.taobao.weex.WXSDKManager;
+import com.taobao.weex.bridge.WXBridgeManager;
+import com.taobao.weex.ui.WXRenderManager;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by furture on 2018/8/23.
+ */
+
+public abstract class InstanceOnFireEventInterceptor {
+
+ private List<String> listenEvents;
+
+ public InstanceOnFireEventInterceptor() {
+ this.listenEvents = new ArrayList<>();
+ }
+
+ public void addInterceptEvent(String event){
+ if(!listenEvents.contains(event)){
+ this.listenEvents.add(event);
+ }
+ }
+
+ public List<String> getListenEvents() {
+ return listenEvents;
+ }
+
+ public void onInterceptFireEvent(String instanceId, String elementRef,
String type, Map<String, Object> params, Map<String, Object> domChanges){
+ if(params == null){
+ return;
+ }
+ if(this.listenEvents.contains(type)){
+ onFireEvent(instanceId, elementRef, type, params, domChanges);
+ }
+ }
+
+ public abstract void onFireEvent(String instanceId, String
elementRef,String type, Map<String, Object> params, Map<String, Object>
domChanges);
+}
\ No newline at end of file
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index b9a414fd6d..37351670ed 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -2174,15 +2174,15 @@ public void setWaste(boolean waste) {
}
- /** component key id in native,
- * differ with ref, ref + position
+ /** component uniquie key id in native for recycle-list,
+ * should be unique for every native component differ with ref
* */
public String getViewTreeKey(){
if(mViewTreeKey == null){
if(getParent() == null){
- mViewTreeKey = getRef();
+ mViewTreeKey = hashCode() + "_" + getRef();
}else{
- mViewTreeKey = getRef() + "_" + getParent().indexOf(this);
+ mViewTreeKey = hashCode() + "_" + getRef() + "_" +
getParent().indexOf(this);
}
}
return mViewTreeKey;
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
index 2970d1e992..f187d49ad9 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
@@ -33,19 +33,21 @@
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.annotation.Component;
import com.taobao.weex.common.Constants;
+import com.taobao.weex.common.OnWXScrollListener;
import com.taobao.weex.common.WXErrorCode;
-import com.taobao.weex.common.WXPerformance;
-import com.taobao.weex.common.WXPerformance.Dimension;
import com.taobao.weex.common.WXRenderStrategy;
+import com.taobao.weex.instance.InstanceOnFireEventInterceptor;
import com.taobao.weex.performance.WXInstanceApm;
-import com.taobao.weex.ui.IFComponentHolder;
import com.taobao.weex.ui.action.BasicComponentData;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXUtils;
import com.taobao.weex.utils.WXViewUtils;
+import java.util.ArrayDeque;
import java.util.Comparator;
+import java.util.Map;
import java.util.PriorityQueue;
+import java.util.Queue;
@Component(lazyload = false)
public class WXEmbed extends WXDiv implements
WXSDKInstance.OnInstanceVisibleListener,NestedContainer {
@@ -68,6 +70,7 @@
private boolean mIsVisible = true;
private EmbedRenderListener mListener;
+ private EmbedInstanceOnScrollFireEventInterceptor
mInstanceOnScrollFireEventInterceptor;
private String priority = PRIORITY_NORMAL;
@@ -76,6 +79,8 @@
private long hiddenTime;
+
+
public interface EmbedManager {
WXEmbed getEmbed(String itemId);
void putEmbed(String itemId,WXEmbed comp);
@@ -197,6 +202,7 @@ public WXEmbed(WXSDKInstance instance, WXVContainer parent,
String instanceId, b
public WXEmbed(WXSDKInstance instance, WXVContainer parent,
BasicComponentData basicComponentData) {
super(instance, parent, basicComponentData);
mListener = new EmbedRenderListener(this);
+ mInstanceOnScrollFireEventInterceptor = new
EmbedInstanceOnScrollFireEventInterceptor(this);
ERROR_IMG_WIDTH = (int) WXViewUtils.getRealPxByWidth(270,
instance.getInstanceViewPortWidth());
ERROR_IMG_HEIGHT = (int) WXViewUtils.getRealPxByWidth(260,
instance.getInstanceViewPortWidth());
@@ -262,6 +268,19 @@ public void setOriginUrl(String originUrl) {
private String originUrl;
+
+ @Override
+ public void addEvent(String type) {
+ super.addEvent(type);
+ if(Constants.Event.SCROLL_START.equals(type)){
+ mInstanceOnScrollFireEventInterceptor.addInterceptEvent(type);
+ }else if(Constants.Event.SCROLL_END.equals(type)){
+ mInstanceOnScrollFireEventInterceptor.addInterceptEvent(type);
+ }else if(Constants.Event.SCROLL.equals(type)){
+ mInstanceOnScrollFireEventInterceptor.addInterceptEvent(type);
+ }
+ }
+
@WXComponentProp(name = Constants.Name.SRC)
public void setSrc(String src) {
originUrl=src;
@@ -318,6 +337,9 @@ private WXSDKInstance createInstance() {
WXSDKInstance sdkInstance = getInstance().createNestedInstance(this);
getInstance().addOnInstanceVisibleListener(this);
sdkInstance.registerRenderListener(mListener);
+ mInstanceOnScrollFireEventInterceptor.resetFirstLaterScroller();;
+
sdkInstance.addInstanceOnFireEventInterceptor(mInstanceOnScrollFireEventInterceptor);
+
sdkInstance.registerOnWXScrollListener(mInstanceOnScrollFireEventInterceptor);
String url=src;
if(mListener != null && mListener.mEventListener != null){
@@ -337,7 +359,6 @@ private WXSDKInstance createInstance() {
}
sdkInstance.setContainerInfo(WXInstanceApm.KEY_PAGE_PROPERTIES_INSTANCE_TYPE,"embed");
sdkInstance.setContainerInfo(WXInstanceApm.KEY_PAGE_PROPERTIES_PARENT_PAGE,getInstance().getWXPerformance().pageName);
-
sdkInstance.renderByUrl(url,
url,
null, null,
@@ -518,4 +539,99 @@ public void removeLayerOverFlowListener(String ref) {
if (mNestedInstance != null)
mNestedInstance.removeLayerOverFlowListener(ref);
}
+
+ static class EmbedInstanceOnScrollFireEventInterceptor extends
InstanceOnFireEventInterceptor implements OnWXScrollListener{
+
+ private WXEmbed mEmbed;
+ private WXComponent firstLayerScroller;
+
+ public EmbedInstanceOnScrollFireEventInterceptor(WXEmbed embed) {
+ this.mEmbed = embed;
+ }
+
+ public void resetFirstLaterScroller(){
+ firstLayerScroller = null;
+ }
+
+ @Override
+ public void onFireEvent(String instanceId, String elementRef, String type,
Map<String, Object> params, Map<String, Object> domChanges) {
+ if(mEmbed == null
+ || mEmbed.mNestedInstance == null
+ || !mEmbed.mNestedInstance.getInstanceId().equals(instanceId)){
+ return;
+ }
+ if(firstLayerScroller == null){
+ initFirstLayerScroller();
+ }
+ if(firstLayerScroller == null){
+ return;
+ }
+ if(firstLayerScroller.getRef().equals(elementRef)){
+ mEmbed.getInstance().fireEvent(mEmbed.getRef(), type, params,
domChanges);
+ }
+ }
+
+
+ private void initFirstLayerScroller(){
+ if(firstLayerScroller == null){
+ firstLayerScroller = findFirstLayerScroller();
+ if(firstLayerScroller != null){
+ for(String event : getListenEvents()){
+ if(!firstLayerScroller.containsEvent(event)){
+ firstLayerScroller.getEvents().add(event);
+ firstLayerScroller.addEvent(event);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * get first layer scroller ref
+ * */
+ private WXComponent findFirstLayerScroller(){
+ if(mEmbed.mNestedInstance == null){
+ return null;
+ }
+ WXComponent rootComponent = mEmbed.mNestedInstance.getRootComponent();
+ if(rootComponent instanceof Scrollable){
+ return rootComponent;
+ }
+ Queue<WXComponent> queues = new ArrayDeque<>();
+ queues.offer(rootComponent);
+ while (!queues.isEmpty()){
+ WXComponent component = queues.poll();
+ if(component == null){
+ break;
+ }
+ if(component instanceof Scrollable){
+ return component;
+ }
+ if(component instanceof WXVContainer){
+ WXVContainer container = (WXVContainer) component;
+ for(int i=0; i<container.getChildCount(); i++){
+ queues.offer(container.getChild(i));
+ }
+ }
+ }
+ return null;
+ }
+
+
+ @Override
+ public void onScrolled(View view, int x, int y) {
+ if(firstLayerScroller != null){
+ return;
+ }
+ if(getListenEvents().size() > 0){
+ initFirstLayerScroller();
+ }
+ }
+
+ @Override
+ public void onScrollStateChanged(View view, int x, int y, int newState) {
+
+ }
+ }
+
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> WXEmbed Support Listen scroll scrollEnd scrollStart Event
> ---------------------------------------------------------
>
> Key: WEEX-586
> URL: https://issues.apache.org/jira/browse/WEEX-586
> Project: Weex
> Issue Type: Bug
> Reporter: codefurture
> Assignee: codefurture
> Priority: Major
>
> WXEmbed Support Listen scroll scrollEnd scrollStart Event
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
