update libs version

sunfusheng · Nov 29, 2017 · 65a6700 · 65a6700
1 parent b52b09b
commit 65a6700
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 295 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.jakewharton.butterknife'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         applicationId "com.sunfusheng.StickyHeaderListView"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 8
         versionName "1.7"
     }
@@ -23,13 +23,13 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile 'com.android.support:design:26.1.0'
 
     // ButterKnife
-    compile 'com.jakewharton:butterknife:8.5.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile 'com.jakewharton:butterknife:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 
-    // Glide
-    compile 'com.github.bumptech.glide:glide:3.7.0'
+    // GlideImageView
+    compile 'com.sunfusheng:glideimageview:1.2.0'
 }
diff --git a/app/src/main/java/com/sunfusheng/StickyHeaderListView/adapter/HeaderChannelAdapter.java b/app/src/main/java/com/sunfusheng/StickyHeaderListView/adapter/HeaderChannelAdapter.java
@@ -8,7 +8,7 @@
 
 import com.sunfusheng.StickyHeaderListView.R;
 import com.sunfusheng.StickyHeaderListView.model.ChannelEntity;
-import com.sunfusheng.StickyHeaderListView.view.GildeImageView.GlideImageView;
+import com.sunfusheng.glideimageview.GlideImageView;
 
 import java.util.List;
 
@@ -38,7 +38,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         ChannelEntity entity = getItem(position);
 
         holder.tvTitle.setText(entity.getTitle());
-        holder.givImage.loadNetCircleImage(entity.getImage_url(), R.color.font_black_6);
+        holder.givImage.loadImage(entity.getImage_url(), R.color.font_black_6);
 
         if (TextUtils.isEmpty(entity.getTips())) {
             holder.tvTips.setVisibility(View.INVISIBLE);

diff --git a/app/src/main/java/com/sunfusheng/StickyHeaderListView/adapter/HeaderOperationAdapter.java b/app/src/main/java/com/sunfusheng/StickyHeaderListView/adapter/HeaderOperationAdapter.java
@@ -8,7 +8,7 @@
 
 import com.sunfusheng.StickyHeaderListView.R;
 import com.sunfusheng.StickyHeaderListView.model.OperationEntity;
-import com.sunfusheng.StickyHeaderListView.view.GildeImageView.GlideImageView;
+import com.sunfusheng.glideimageview.GlideImageView;
 
 import java.util.List;
 
@@ -42,7 +42,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         OperationEntity entity = getItem(position);
 
         holder.tvTitle.setText(entity.getTitle());
-        holder.givImage.loadNetImage(entity.getImage_url(), R.color.font_black_6);
+        holder.givImage.loadImage(entity.getImage_url(), R.color.font_black_6);
 
         if (TextUtils.isEmpty(entity.getSubtitle())) {
             holder.tvSubtitle.setVisibility(View.INVISIBLE);

diff --git a/app/src/main/java/com/sunfusheng/StickyHeaderListView/adapter/TravelingAdapter.java b/app/src/main/java/com/sunfusheng/StickyHeaderListView/adapter/TravelingAdapter.java
@@ -12,7 +12,7 @@
 import com.sunfusheng.StickyHeaderListView.R;
 import com.sunfusheng.StickyHeaderListView.model.TravelingEntity;
 import com.sunfusheng.StickyHeaderListView.util.ToastUtil;
-import com.sunfusheng.StickyHeaderListView.view.GildeImageView.GlideImageView;
+import com.sunfusheng.glideimageview.GlideImageView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -99,7 +99,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         final String title = entity.getFrom() + entity.getTitle() + entity.getType();
         holder.tvTitle.setText(title);
         holder.tvRank.setText("排名：" + entity.getRank());
-        holder.givImage.loadNetImage(entity.getImage_url(), R.color.font_black_6);
+        holder.givImage.loadImage(entity.getImage_url(), R.color.font_black_6);
 
         convertView.setOnClickListener(new View.OnClickListener() {
             @Override

diff --git a/...in/java/com/sunfusheng/StickyHeaderListView/view/GildeImageView/GlideCircleTransform.java b/...in/java/com/sunfusheng/StickyHeaderListView/view/GildeImageView/GlideCircleTransform.java
diff --git a/...c/main/java/com/sunfusheng/StickyHeaderListView/view/GildeImageView/GlideImageLoader.java b/...c/main/java/com/sunfusheng/StickyHeaderListView/view/GildeImageView/GlideImageLoader.java
diff --git a/...src/main/java/com/sunfusheng/StickyHeaderListView/view/GildeImageView/GlideImageView.java b/...src/main/java/com/sunfusheng/StickyHeaderListView/view/GildeImageView/GlideImageView.java
diff --git a/app/src/main/java/com/sunfusheng/StickyHeaderListView/view/GildeImageView/GlideManager.java b/app/src/main/java/com/sunfusheng/StickyHeaderListView/view/GildeImageView/GlideManager.java
diff --git a/app/src/main/java/com/sunfusheng/StickyHeaderListView/view/HeaderBannerView.java b/app/src/main/java/com/sunfusheng/StickyHeaderListView/view/HeaderBannerView.java
@@ -16,7 +16,7 @@
 import com.sunfusheng.StickyHeaderListView.R;
 import com.sunfusheng.StickyHeaderListView.adapter.HeaderBannerAdapter;
 import com.sunfusheng.StickyHeaderListView.util.DensityUtil;
-import com.sunfusheng.StickyHeaderListView.view.GildeImageView.GlideImageView;
+import com.sunfusheng.glideimageview.GlideImageView;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -94,7 +94,7 @@ private void createImageViews(List<String> list) {
             GlideImageView imageView = new GlideImageView(mActivity);
             AbsListView.LayoutParams params = new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
             imageView.setLayoutParams(params);
-            imageView.loadNetImage(list.get(i), R.color.font_black_6);
+            imageView.loadImage(list.get(i), R.color.font_black_6);
             imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
             ivList.add(imageView);
         }