From 99ad92cc90791217dfd4ca19e0fb0aac0138db22 Mon Sep 17 00:00:00 2001
From: itgaojian163 <itgaojian@163.com>
Date: Wed, 22 Jul 2020 10:05:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=9B=BE=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |  3 +--
 .../core/widget/base/BannerHolder.java        |  6 ++++++
 .../widget/base/BaseBannerImageAdapter.java   | 21 +++++++++++--------
 .../main/res/layout/item_banner_layout.xml    | 12 +++++++++++
 .../activitys/LegacyDetailActivity.java       |  5 -----
 5 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 cm_utils/src/main/res/layout/item_banner_layout.xml

diff --git a/build.gradle b/build.gradle
index 9e5c145..6c496ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,8 +75,6 @@ ext {
     //Rxjava
     gRxJavaVersion = '2.2.7'
     gRxAndroid = '2.1.1'
-    //Glide
-    gGlideVersion = '4.11.0'
     //Okhttp
     gOkHttp3Version = '4.5.0'
     //EventBus
@@ -112,6 +110,7 @@ ext {
     supportGson = '2.8.5'
     //Glide
     supportGlide = '4.11.0'
+
     gSmartRefreshLayoutVersion = '1.1.2'
     leonidslibVersion = '1.3.2'
     ijkPlayer = '0.8.8'
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerHolder.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerHolder.java
index 73d4fc3..a5f4c5d 100644
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerHolder.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerHolder.java
@@ -1,6 +1,9 @@
 package com.sucstepsoft.cm_utils.core.widget.base;
 
 import android.view.View;
+import android.widget.ImageView;
+
+import com.sucstepsoft.cm_utils.R;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
@@ -12,7 +15,10 @@ import androidx.recyclerview.widget.RecyclerView;
  * 描述:
  */
 public class BannerHolder extends RecyclerView.ViewHolder {
+    public ImageView mIvContent;
+
     public BannerHolder(@NonNull View itemView) {
         super(itemView);
+        mIvContent = itemView.findViewById(R.id.iv_content);
     }
 }
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseBannerImageAdapter.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseBannerImageAdapter.java
index 2fc3116..0fcf8ba 100644
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseBannerImageAdapter.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseBannerImageAdapter.java
@@ -1,5 +1,7 @@
 package com.sucstepsoft.cm_utils.core.widget.base;
 
+import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
@@ -11,6 +13,7 @@ import com.sucstepsoft.cm_utils.core.beans.BaseImageBean;
 import com.sucstepsoft.cm_utils.utils.ConvertUtils;
 import com.youth.banner.adapter.BannerAdapter;
 
+import java.lang.reflect.Parameter;
 import java.util.List;
 
 /**
@@ -27,13 +30,14 @@ public class BaseBannerImageAdapter extends BannerAdapter<BaseImageBean, BannerH
 
     @Override
     public BannerHolder onCreateHolder(ViewGroup parent, int viewType) {
-        ImageView imageView = new ImageView(parent.getContext());
-        //注意，必须设置为match_parent，这个是viewpager2强制要求的
-        imageView.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-        imageView.setScaleType(ImageView.ScaleType.FIT_XY);
-        return new BannerHolder(imageView);
+//        ImageView imageView = new ImageView(parent.getContext());
+//        //注意，必须设置为match_parent，这个是viewpager2强制要求的
+//        imageView.setLayoutParams(new ViewGroup.LayoutParams(
+//                ViewGroup.LayoutParams.MATCH_PARENT,
+//                ViewGroup.LayoutParams.WRAP_CONTENT));
+//        imageView.setScaleType(ImageView.ScaleType.FIT_XY);
+        View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_banner_layout, parent, false);
+        return new BannerHolder(itemView);
     }
 
     @Override
@@ -46,11 +50,10 @@ public class BaseBannerImageAdapter extends BannerAdapter<BaseImageBean, BannerH
                 .placeholder(R.drawable.ic_img_default_banner)
                 .transform(roundedCornersTransform)
                 .diskCacheStrategy(DiskCacheStrategy.RESOURCE);
-        ImageView image = (ImageView) holder.itemView;
         Glide.with(holder.itemView.getContext())
                 .asBitmap()
                 .load(data.getImgUrl())
                 .apply(options)
-                .into(image);
+                .into(holder.mIvContent);
     }
 }
diff --git a/cm_utils/src/main/res/layout/item_banner_layout.xml b/cm_utils/src/main/res/layout/item_banner_layout.xml
new file mode 100644
index 0000000..2092535
--- /dev/null
+++ b/cm_utils/src/main/res/layout/item_banner_layout.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/iv_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY" />
+</LinearLayout>
\ No newline at end of file
diff --git a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LegacyDetailActivity.java b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LegacyDetailActivity.java
index 614e69a..bdf2f02 100644
--- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LegacyDetailActivity.java
+++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LegacyDetailActivity.java
@@ -213,11 +213,6 @@ public class LegacyDetailActivity extends BaseActivity {
             adapter.notifyDataSetChanged();
             mIvCover.setDelayTime(3000);
             mIvCover.start();
-//            Glide.with(mActivity)
-//                    .asBitmap()
-//                    .load(BaseUrlApi.BASE_LEGACY_IMG_URL + bean.getLibraryCover())
-//                    .apply(mOptions)
-//                    .into(mIvCover);
         }
 
         mTvTitle.setText(bean.getLibraryTitle());