滑动冲突

README.md

@@ -1,38 +1,113 @@
 # XRefreshView
 
-###Usage
+### Usage
 ----
 
 #### Gradle
 
 ```groovy
 dependencies {
-   compile 'com.huxq17.xrefreshview:xrefreshview:3.0.0'
+   compile 'com.huxq17.xrefreshview:xrefreshview:3.6.9'
    //依赖下面的库
-   compile 'com.android.support:recyclerview-v7:23.0.1'
-   compile 'com.android.support:support-v4:23.0.1'
+   implementation 'androidx.recyclerview:recyclerview:1.1.0'
 }
 ```
 
-##最新的使用说明请移步[我的博客](http://blog.csdn.net/footballclub/article/details/46982115 "description")
-##效果图
-###带Banner的Recyclerview
-![带Banner的Recyclerview](http://img.my.csdn.net/uploads/201602/15/1455502311_5774.gif)
-###LinearLayout样式的Recyclerview
-![LinearLayout样式的Recyclerview](http://img.my.csdn.net/uploads/201602/03/1454495499_9614.gif) 
-###GridLayout样式的Recyclerview
-![GridLayout样式的Recyclerview](http://img.my.csdn.net/uploads/201602/03/1454495517_6621.gif) 
-###Staggered样式的Recyclerview
-![Staggered样式的Recyclerview](http://img.my.csdn.net/uploads/201602/03/1454495499_9854.gif)
-###GridView
-![自带的头部](http://img.my.csdn.net/uploads/201508/25/1440465457_8215.gif)
-###自定义View
-![自定义头部](http://img.my.csdn.net/uploads/201508/25/1440465306_9400.gif) 
-
-还有listview,scrollview，webview等其他的view就不一一截图了。
+## 最新的使用说明请移步[我的博客](http://blog.csdn.net/footballclub/article/details/46982115 "description")
+
+## 效果图
+
+|松开加载更多的Recyclerview|带Banner的Recyclerview| LinearLayout样式的Recyclerview|
+|:-----|:-----|:-----|
+| <img src="gif/xrefresh_releasetoloadmore.gif" width="280" height="475" /> | <img src="gif/xrefresh_banner.gif" width="280" height="475" /> | <img src="gif/xrefresh_linearlayout.gif" width="280" height="475" /> |
+
+|GridLayout样式的Recyclerview|Staggered样式的Recyclerview|
+|:-----|:-----|
+| <img src="gif/xrefresh_gridlayout.gif" width="280" height="475" />| <img src="gif/xrefresh_staggeredlayout.gif" width="280" height="475" />|
+
+|GridView|自定义View|笑脸刷新|
+|:-----|:-----|:-----|
+| <img src="gif/xrefresh_gridview.gif" width="280" height="475" />| <img src="gif/xrefresh_customview.gif" width="280" height="475" />|<img src="gif/xrefresh_smile.gif" width="280" height="475" />|
+
+|自定义刷新|仿京东刷新|自定义刷新|
+|:-----|:-----|:-----|
+| <img src="gif/wine_refresh.gif" width="280" height="475" />| <img src="gif/jd_refresh.gif" width="280" height="475" />| <img src="gif/car_refresh.gif" width="280" height="475" />|
+
+
+还有listview,scrollview，webview等其他的view就不一一截图了。**建议把此项目下载下来，然后跑到手机上看效果，例子都在app module里。**
+
+### 更新日志：<br/>
+
+    2020-6-13：
+    1.更新android平台到androidx
+
+
+    2017-5-4：
+    1.解决已无更多数据显示不出来的问题，fix issue[#78](https://github.com/huxq17/XRefreshView/issues/78)
+    2.升级到3.6.9版本
+
+    2017-5-3：
+    1.解决xrefreshview不满屏的时候footerview正常状态下出现在屏幕上的问题，fix issue[#75](https://github.com/huxq17/XRefreshView/issues/75)
+    2.升级到3.6.8版本
+
+    2017-4-25：
+    1.通过使用XWebView，解决在三星c5、小米5等机型在webview上加XRefreshView,会出现加载更多没有效果的现象，详见issue[#72](https://github.com/huxq17/XRefreshView/issues/72)
+    2.升级到3.6.7版本
+
+    2017-4-14：
+    1.解决Recyclerview频繁上拉加载时会出现footerview位置异常的问题
+    2.给setSilenceLoadMore方法添加boolean参数，可以启用和禁用静默加载模式  
+    3.升级到3.6.6版本
+
+    2017-3-28：
+    1.不再强制Recyclerview使用BaseRecyclerAdapter,当不使用BaseRecyclerAdapter时，RecyclerView会被当成普通view
+    上拉加载等操作和普通view相同，空布局等功能的使用方式也和普通view相同
+    2.解决ListView的子项目不足一屏时，上拉时再下拉会出现布局突然缩回的问题
+    3.升级到3.6.5版本
+
+    2017-3-27：
+    1.解决事先setPullRefreshEnable(false),再setPullRefreshEnable(true)和startRefresh()时，headerview无法显示的问题
+    2.升级到3.6.3版本
+
+    2017-2-17：
+    1.添加下拉刷新时的回调onRefresh(boolean isPullDown)，其中isPullDown用来判断此次下拉刷新是不是由下拉手势触发的，true则代表是，
+    反之则是自动刷新或者是调用XRefreshView#startRefresh()}触发的刷新
+    2.升级到3.6.2版本
+
+    2017-2-16：
+    1.解决issue[#58](https://github.com/huxq17/XRefreshView/issues/58)
+
+    2017-1-13：
+    1.解决Recyclerview使用StaggeredGridLayoutManager时，添加的headerview不能使用全部宽度的问题(headview layout won't use all span area)
+
+    2017-1-6：
+    1.解决issue[#49](https://github.com/huxq17/XRefreshView/issues/49)
+
+    2017-1-4：
+    1.解决AbsListview数据不满一屏的时候，会重复加载更多的问题
+
+    2016-12-15：
+    1.优化非RecyclerView上拉加载回弹的效果，同时支持AbsListView(ListView、GridView)加载更多数据完成之后露出新加载的数据
+
+    2016-9-28：
+    1.添加xscrollview的滑动监听
+
+    2016-9-6：
+    1.解决issue[#36](https://github.com/huxq17/XRefreshView/issues/36)
+
+    2016-8-19：
+    1.添加没有数据时显示空布局的支持
+    2.解决6.0以下的手机，在调用startRefresh()方法后，刷新时headerview有时会不显示的问题
+    3.其他一些优化
+
+    2016-8-8：
+    1.添加下拉刷新，数据接收失败的ui处理
+    2.解决下拉刷新，在刷新状态下把headerview完全隐藏掉，在刷新结束以后下拉和上拉都不可用的问题
+
 
 ### 关于我
-QQ：1491359569 邮箱：huxq17@163.com
+    邮箱：huxq17@163.com   fanyafeng@live.cn
+    ps:有问题联系我的话请不要问我在不在，直接说问题，谢谢。
 
 ### License
 

app/build.gradle

@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "com.andview.example"
-        minSdkVersion 11
-        targetSdkVersion 23
+        minSdkVersion 19
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -21,13 +22,17 @@ android {
         abortOnError false
     }
 }
-
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':library')
-//    compile 'com.huxq17.xrefreshview:xrefreshview:3.2.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':library')
+//    compile 'com.huxq17.xrefreshview:xrefreshview:3.6.9'
     //依赖下面的库
-    compile 'com.android.support:recyclerview-v7:23.0.1'
-    compile 'com.android.support:support-v4:23.0.1'
-    compile 'com.android.support:cardview-v7:23.1.1'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "androidx.core:core-ktx:+"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
 }

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     package="com.andview.example">
 
     <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -21,17 +22,35 @@
         <activity android:name=".activity.GridViewActivity" />
         <activity android:name=".activity.ListViewActivity" />
         <activity android:name=".activity.WebViewActivity" />
-        <activity android:name=".activity.LinearRecyclerViewActivity" />
-        <activity android:name=".activity.BannerRecyclerViewActivity" />
+        <activity android:name=".activity.recyclerview.LinearRecyclerViewActivity" />
+        <activity android:name=".activity.recyclerview.BannerRecyclerViewActivity" />
         <activity android:name=".activity.ScrollViewActivity" />
         <activity android:name=".activity.HeadAdActivity" />
         <activity android:name=".activity.RainDropActivity" />
         <activity android:name=".activity.RecyclerViewsActivity" />
-        <activity android:name=".activity.GridRecyclerViewActivity" />
-        <activity android:name=".activity.StaggeredRecyclerViewActivity" />
-        <activity android:name=".activity.SilenceRecyclerViewActivity" />
+        <activity android:name=".activity.recyclerview.GridRecyclerViewActivity" />
+        <activity android:name=".activity.recyclerview.StaggeredRecyclerViewActivity" />
+        <activity android:name=".activity.recyclerview.SilenceRecyclerViewActivity" />
         <activity android:name=".activity.NotFullScreenActivity" />
-        <activity android:name=".activity.MultiItemRecyclerViewActivity" />
+        <activity android:name=".activity.EmptyViewActivity" />
+        <activity android:name=".activity.recyclerview.MultiItemRecyclerViewActivity" />
+        <activity android:name=".activity.recyclerview.ShowFooterWhenNoMoreDataRecyclerViewActivity" />
+        <activity android:name=".activity.NotFullScreenWithoutFooterActivity" />
+        <activity android:name=".activity.SmileViewActivity" />
+        <activity android:name=".activity.recyclerview.WithoutBaseAdapterRecyclerViewActivity" />
+        <activity
+            android:name=".activity.WineActivity"
+            android:label="@string/title_activity_wine" />
+        <activity
+            android:name=".activity.JDActivity"
+            android:label="@string/title_activity_jd" />
+        <activity
+            android:name=".activity.TaoBaoActivity"
+            android:label="@string/title_activity_tao_bao" />
+        <activity
+            android:name=".activity.PluseActivity"
+            android:label="@string/title_activity_pluse" />
+        <activity android:name=".activity.CarCrmActivity"></activity>
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/com/andview/example/IndexPageAdapter.java

@@ -2,14 +2,14 @@
 
 import android.content.Context;
 import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ImageView.ScaleType;
 
+import androidx.viewpager.widget.PagerAdapter;
+
 public class IndexPageAdapter extends PagerAdapter {
 
     private int[] images;
@@ -24,7 +24,7 @@ public IndexPageAdapter(Context context, int[] images) {
 
     @Override
     public void destroyItem(ViewGroup container, int position, Object object) {
-        ((ViewPager) container).removeView((View) object);
+        container.removeView((View) object);
     }
 
     @Override
@@ -45,7 +45,7 @@ public Object instantiateItem(ViewGroup view, int position) {
         final int index = position % images.length;
         imageView.setBackgroundResource(images[index]);
 
-        ((ViewPager) view).addView(imageLayout, 0);
+        view.addView(imageLayout, 0);
 
         return imageLayout;
     }

app/src/main/java/com/andview/example/ScrollAdapter.java

@@ -0,0 +1,114 @@
+package com.andview.example;
+
+import android.content.Context;
+import android.os.Parcelable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import androidx.viewpager.widget.PagerAdapter;
+
+import com.andview.example.ui.raindrop.CustomerFooter;
+import com.andview.refreshview.XRefreshView;
+import com.andview.refreshview.XScrollView;
+
+public class ScrollAdapter extends PagerAdapter {
+
+    private int[] images;
+    private Context mContext;
+    private LayoutInflater mInflater;
+
+    public ScrollAdapter(Context context) {
+        this.mContext = context;
+        mInflater = LayoutInflater.from(mContext);
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {
+        container.removeView((View) object);
+    }
+
+    @Override
+    public void finishUpdate(View container) {
+    }
+
+    @Override
+    public int getCount() {
+        return Integer.MAX_VALUE;
+    }
+
+    @Override
+    public Object instantiateItem(ViewGroup view, int position) {
+        final View imageLayout = mInflater.inflate(R.layout.adapter_scrollview, view, false);
+        final XRefreshView outView = (XRefreshView) imageLayout.findViewById(R.id.custom_view);
+        final XScrollView scrollView = (XScrollView) imageLayout.findViewById(R.id.xscrollview);
+        scrollView.setOnScrollListener(new XScrollView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(ScrollView view, int scrollState, boolean arriveBottom) {
+            }
+
+            @Override
+            public void onScroll(int l, int t, int oldl, int oldt) {
+            }
+        });
+        outView.setAutoRefresh(false);
+        outView.setPullLoadEnable(true);
+        outView.setPinnedTime(1000);
+        outView.setAutoLoadMore(false);
+//		outView.setSilenceLoadMore();
+        outView.setXRefreshViewListener(new XRefreshView.SimpleXRefreshListener() {
+            @Override
+            public void onLoadMore(boolean isSilence) {
+                imageLayout.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        outView.stopLoadMore();
+                    }
+                }, 2000);
+            }
+
+            @Override
+            public void onRefresh(boolean isPullDown) {
+                imageLayout.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        outView.stopRefresh();
+                    }
+                }, 2000);
+            }
+        });
+        outView.setCustomFooterView(new CustomerFooter(mContext));
+        LinearLayout ll = (LinearLayout) imageLayout.findViewById(R.id.ll);
+        for (int i = 0; i < 50; i++) {
+            TextView tv = new TextView(mContext);
+            tv.setTextIsSelectable(true);
+            tv.setText("数据" + i);
+            ll.addView(tv);
+        }
+        view.addView(imageLayout, 0);
+
+        return imageLayout;
+    }
+
+    @Override
+    public boolean isViewFromObject(View view, Object object) {
+        return view.equals(object);
+    }
+
+    @Override
+    public void restoreState(Parcelable state, ClassLoader loader) {
+    }
+
+    @Override
+    public Parcelable saveState() {
+        return null;
+    }
+
+    @Override
+    public void startUpdate(View container) {
+    }
+
+}