change commit

yanyiqun001 · Nov 21, 2017 · 94e117d · 94e117d
1 parent 7ea2f05
commit 94e117d
Show file tree

Hide file tree

Showing 32 changed files with 24 additions and 2,022 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     compile 'com.android.support:cardview-v7:26.1.0'
     compile 'de.hdodenhof:circleimageview:2.2.0'
 
-
     compile project(':refreshlayout')
+    compile project(':refreshlayout_lottie')
 
 }
diff --git a/app/src/main/java/com/refreshDemo/LottieActivity.java b/app/src/main/java/com/refreshDemo/LottieActivity.java
@@ -17,10 +17,9 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.GoRefesh_core.LottieView;
 import com.GoRefresh.GoRefreshLayout;
 import com.GoRefresh.LoadmoreListener;
-import com.GoRefresh.LottieView;
-
 import com.GoRefresh.RefreshListener;
 import com.airbnb.lottie.LottieAnimationView;
 import com.bumptech.glide.Glide;

diff --git a/app/src/main/java/com/refreshDemo/MyLottileView.java b/app/src/main/java/com/refreshDemo/MyLottileView.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.widget.TextView;
 
-import com.GoRefresh.LottieView;
+import com.GoRefesh_core.LottieView;
 
 /**
  * Created by Administrator on 2017/10/23 0023.

diff --git a/app/src/main/java/com/refreshDemo/RecyclerViewActivity.java b/app/src/main/java/com/refreshDemo/RecyclerViewActivity.java
@@ -11,9 +11,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.GoRefesh_core.LottieView;
 import com.GoRefresh.GoRefreshLayout;
 import com.GoRefresh.LoadmoreListener;
-import com.GoRefresh.LottieView;
 import com.GoRefresh.RefreshListener;
 import com.bumptech.glide.Glide;
 

diff --git a/refreshlayout/build.gradle b/refreshlayout/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'com.github.dcendents.android-maven'
 
 group='com.github.yanyiqun001'
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
 
@@ -28,8 +28,6 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.android.support:recyclerview-v7:26.1.0'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
     testCompile 'junit:junit:4.12'
-    compile 'com.airbnb.android:lottie:2.2.5'
 }
diff --git a/refreshlayout/src/main/java/com/GoRefresh/DefaultHeaderLayout.java b/refreshlayout/src/main/java/com/GoRefresh/DefaultHeaderLayout.java
@@ -27,9 +27,9 @@ public DefaultHeaderLayout(@NonNull Context context) {
 
     private void initView() {
         mHeaderView=LayoutInflater.from(context).inflate(R.layout.headerview,null);
-        icon=mHeaderView.findViewById(R.id.arrow);
-        text=mHeaderView.findViewById(R.id.text);
-        progressBar=mHeaderView.findViewById(R.id.progressbar);
+        icon= (ImageView) mHeaderView.findViewById(R.id.arrow);
+        text= (TextView) mHeaderView.findViewById(R.id.text);
+        progressBar= (RingProgressBar) mHeaderView.findViewById(R.id.progressbar);
         icon.setVisibility(View.VISIBLE);
         icon.setImageResource(R.drawable.arrow);
     }
@@ -97,7 +97,4 @@ private void reset() {
         progressBar.stopAnimation();
     }
 
-
-
-
 }
diff --git a/refreshlayout_core/src/main/java/com/GoRefesh_core/DefaultFooterView.java b/refreshlayout_core/src/main/java/com/GoRefesh_core/DefaultFooterView.java
diff --git a/refreshlayout_core/src/main/java/com/GoRefesh_core/DefaultHeaderLayout.java b/refreshlayout_core/src/main/java/com/GoRefesh_core/DefaultHeaderLayout.java