Merge branch '0.12-dev' into dev

Author: sospartan

android/sdk/libs/armeabi/libweexjsc.so

@@ -954,7 +954,7 @@ private void initFramework(String framework){
   private void invokeCallJSBatch(Message message) {
     if (mNextTickTasks.isEmpty() || !isJSFrameworkInit()) {
       if (!isJSFrameworkInit()) {
-        WXLogUtils.e("[WXBridgeManager] invokeCallJSBatch: framework.js uninitialized.");
+        WXLogUtils.e("[WXBridgeManager] invokeCallJSBatch: framework.js uninitialized!!  message:"+message.toString());
       }
       return;
     }
@@ -1116,7 +1116,7 @@ private boolean isJSThread() {
   private void invokeRegisterModules(Map<String, Object> modules, List<Map<String, Object>> failReceiver) {
     if (modules == null || !isJSFrameworkInit()) {
       if (!isJSFrameworkInit()) {
-        WXLogUtils.e("[WXBridgeManager] invokeCallJSBatch: framework.js uninitialized.");
+        WXLogUtils.e("[WXBridgeManager] invokeRegisterModules: framework.js uninitialized.");
       }
       failReceiver.add(modules);
       return;
@@ -1137,7 +1137,7 @@ private void invokeRegisterComponents(List<Map<String, Object>> components, List
       throw new RuntimeException("Fail receiver should not use source.");
     }
     if (!isJSFrameworkInit()) {
-      WXLogUtils.e("[WXBridgeManager] invokeCallJSBatch: framework.js uninitialized.");
+      WXLogUtils.e("[WXBridgeManager] invokeRegisterComponents: framework.js uninitialized.");
 
       for (Map<String,Object> comp:components){
         failReceiver.add(comp);

android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java

@@ -315,7 +315,7 @@ WXComponent findDirectListChild(WXComponent comp) {
       return null;
     }
 
-    if (parent instanceof WXListComponent) {
+    if (parent instanceof BasicListComponent) {
       return comp;
     }
 
@@ -551,7 +551,7 @@ public int getScrollX() {
   }
 
   /**
-   * Append a child component to the end of WXListComponent. This will not refresh the underlying
+   * Append a child component to the end of list. This will not refresh the underlying
    * view immediately. The message of index of the inserted child is given to the adapter, and the
    * adapter will determine when to refresh. The default implementation of adapter will push the
    * message into a message and refresh the view in a period of time.
@@ -661,7 +661,7 @@ protected void addSubView(View child, int index) {
   }
 
   /**
-   * Remove the child from WXListComponent. This method will use {@link
+   * Remove the child from list. This method will use {@link
    * java.util.List#indexOf(Object)} to retrieve the component to be deleted. Like {@link
    * #addChild(WXComponent)}, this method will not refresh the view immediately, the adapter will
    * decide when to refresh.
@@ -743,7 +743,7 @@ public void onViewRecycled(ListBaseViewHolder holder) {
    * Bind the component of the position to the holder. Then flush the view.
    *
    * @param holder   viewHolder, which holds reference to the view
-   * @param position position of component in WXListComponent
+   * @param position position of component in list
    */
   @Override
   public void onBindViewHolder(ListBaseViewHolder holder, int position) {

android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java

@@ -87,19 +87,19 @@ private void showSticky() {
       final float translationX = headerView.getTranslationX();
       final float translationY = headerView.getTranslationY();
       headComponent.removeSticky();
-      mParent.post(WXThread.secure(new Runnable() {
-        @Override
-        public void run() {
-          ViewGroup existedParent;
-          if ((existedParent = (ViewGroup) headerView.getParent()) != null) {
-            existedParent.removeView(headerView);
-          }
-          mParent.addView(headerView);
-          //recover translation, sometimes it will be changed on fling
-          headerView.setTranslationX(translationX);
-          headerView.setTranslationY(translationY);
-        }
-      }));
+
+      ViewGroup existedParent;
+      if ((existedParent = (ViewGroup) headerView.getParent()) != null) {
+        existedParent.removeView(headerView);
+      }
+      mParent.addView(headerView);
+      //recover translation, sometimes it will be changed on fling
+      headerView.setTranslationX(translationX);
+      headerView.setTranslationY(translationY);
+
+    }
+    if (headComponent.getDomObject().getEvents().contains("sticky")) {
+      headComponent.fireEvent("sticky");
     }
   }
 
@@ -124,6 +124,9 @@ public void run() {
         component.recoverySticky();
       }
     }));
+    if (component.getDomObject().getEvents().contains("unsticky")) {
+      component.fireEvent("unsticky");
+    }
   }
 
 

android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java

@@ -0,0 +1,31 @@
+package com.taobao.weex.ui.view.listview;
+
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.StaggeredGridLayoutManager;
+
+import com.taobao.weex.WXEnvironment;
+import com.taobao.weex.utils.WXLogUtils;
+
+/**
+ * Created by zhengshihan on 2017/5/5.
+ */
+
+public class ExtendedStaggeredGridLayoutManager extends StaggeredGridLayoutManager{
+
+  public ExtendedStaggeredGridLayoutManager(int spanCount, int orientation) {
+    super(spanCount, orientation);
+  }
+
+  @Override
+  public void onItemsRemoved(RecyclerView recyclerView, int positionStart, int itemCount) {
+    if(positionStart ==-1){
+      WXLogUtils.e("ExtendedStaggeredGridLayoutManager: onItemsRemoved  Error Invalid Index : positionStart :"+positionStart +"  itemCount:"+ itemCount);
+      return ;
+    }else {
+      if(WXEnvironment.isApkDebugable()){
+        WXLogUtils.e("ExtendedStaggeredGridLayoutManager: onItemsRemoved  positionStart :"+positionStart+"  itemCount:"+ itemCount);
+      }
+    }
+    super.onItemsRemoved(recyclerView, positionStart, itemCount);
+  }
+}

android/sdk/src/main/java/com/taobao/weex/ui/view/listview/ExtendedStaggeredGridLayoutManager.java

@@ -73,7 +73,7 @@ public void initView(Context context, int type, int columnCount, float columnGap
     if (type == TYPE_GRID_LAYOUT) {
       setLayoutManager(new GridLayoutManager(context, columnCount,orientation,false));
     } else if (type == TYPE_STAGGERED_GRID_LAYOUT) {
-      setLayoutManager(new StaggeredGridLayoutManager(columnCount, orientation));
+      setLayoutManager(new ExtendedStaggeredGridLayoutManager(columnCount, orientation));
     } else if (type == TYPE_LINEAR_LAYOUT) {
       setLayoutManager(new ExtendedLinearLayoutManager(context,orientation,false));
     }