From 797c614241567a7e05cd14b397ec1b3f3c46ae39 Mon Sep 17 00:00:00 2001
From: lgr <344760694@qq.com>
Date: Fri, 27 Jul 2018 09:51:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E9=98=B4=E5=BD=B1=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加修改上下阴影比例
---
 app/src/main/res/layout/activity_main.xml     |  4 +++
 .../wmzx/cardviewlibrary/library/CardView.kt  |  9 ++++--
 .../library/CardViewApi17Impl.kt              |  4 +--
 .../library/CardViewApi21Impl.kt              | 12 +++++---
 .../library/CardViewBaseImpl.java             | 16 +++++-----
 .../cardviewlibrary/library/CardViewImpl.kt   |  5 ++--
 .../library/RoundRectDrawableWithShadow.kt    | 30 ++++++++++++++-----
 cardviewlibrary/src/main/res/values/attrs.xml | 10 +++++--
 8 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index be69e16..e9925c3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:background="@color/white"
     >
 
     <com.bigman.wmzx.customcardview.library.CardView
@@ -16,6 +17,7 @@
         app:endColor="@color/cardview_shadow_end_color"
         app:cardCornerRadius="4dp"
         app:cardElevation="10dp"
+        app:topDelta="-1"
         >
 
         <LinearLayout
@@ -125,6 +127,7 @@
         app:endColor="@color/cardview_shadow_end_color"
         app:cardCornerRadius="4dp"
         app:cardElevation="10dp"
+        app:topDelta="0"
         >
 
         <LinearLayout
@@ -234,6 +237,7 @@
         app:endColor="@color/cardview_shadow_end_color"
         app:cardCornerRadius="4dp"
         app:cardElevation="10dp"
+        app:topDelta="1"
         >
 
         <LinearLayout
diff --git a/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardView.kt b/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardView.kt
index 0c4f12e..7093c86 100644
--- a/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardView.kt
+++ b/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardView.kt
@@ -380,6 +380,8 @@ class CardView : FrameLayout {
         }
     }
 
+    private var mTopDelta: Float=1f
+
     private fun initialize(context: Context, attrs: AttributeSet?, defStyleAttr: Int) {
         val a = context.obtainStyledAttributes(attrs, R.styleable.CardView, defStyleAttr,
                 R.style.CardView)
@@ -425,6 +427,9 @@ class CardView : FrameLayout {
 
         val a2 = context.obtainStyledAttributes(attrs, R.styleable.CardViewShadow)
         val n = a2.indexCount
+        if(a2.hasValue(R.styleable.CardViewShadow_topDelta)){
+            mTopDelta=a2.getFloat(R.styleable.CardViewShadow_topDelta,0f)
+        }
         if (a2.hasValue(R.styleable.CardViewShadow_endColor) && a2.hasValue(R.styleable.CardViewShadow_startColor)) {
             for (i in 0 until n) {
                 val attr = a.getIndex(i)
@@ -435,10 +440,10 @@ class CardView : FrameLayout {
 
             }
             IMPL.initialize(mCardViewDelegate, context, backgroundColor, radius,
-                    elevation, maxElevation, mStartColor, mEndColor)
+                    elevation, maxElevation, mStartColor, mEndColor,mTopDelta)
         } else {
             IMPL.initialize(mCardViewDelegate, context, backgroundColor, radius,
-                    elevation, maxElevation)
+                    elevation, maxElevation,mTopDelta)
         }
 
 
diff --git a/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewApi17Impl.kt b/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewApi17Impl.kt
index f4907c3..77b3514 100644
--- a/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewApi17Impl.kt
+++ b/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewApi17Impl.kt
@@ -15,9 +15,7 @@ import com.bigman.wmzx.cardviewlibrary.library.CardViewDelegate
  * create time == 15:48
  */
 internal class CardViewApi17Impl : CardViewBaseImpl() {
-    override fun initialize(cardView: CardViewDelegate, context: Context, backgroundColor: ColorStateList, radius: Float, elevation: Float, maxElevation: Float) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
+
 
     override fun initStatic() {
         RoundRectDrawableWithShadow.sRoundRectHelper = object : RoundRectDrawableWithShadow.RoundRectHelper {
diff --git a/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewApi21Impl.kt b/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewApi21Impl.kt
index fda1c3f..0f81e2e 100644
--- a/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewApi21Impl.kt
+++ b/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewApi21Impl.kt
@@ -14,9 +14,13 @@ import com.bigman.wmzx.customcardview.library.RoundRectDrawableWithShadow
 
 @RequiresApi(21)
 internal class CardViewApi21Impl : CardViewImpl {
+    override fun initialize(cardViewDelegate: CardViewDelegate, context: Context, backgroundColor: ColorStateList,
+                            radius: Float, elevation: Float, maxElevation: Float, startColor: Int, endColor: Int, topDelta: Float) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
 
-    override fun initialize(cardView: CardViewDelegate, context: Context,
-                            backgroundColor: ColorStateList, radius: Float, elevation: Float, maxElevation: Float) {
+    override fun initialize(cardView: CardViewDelegate, context: Context, backgroundColor: ColorStateList, radius: Float
+                            , elevation: Float, maxElevation: Float, topDelta: Float) {
         val background = RoundRectDrawable(backgroundColor, radius)
         cardView.cardBackground = background
 
@@ -26,6 +30,8 @@ internal class CardViewApi21Impl : CardViewImpl {
         setMaxElevation(cardView, maxElevation)
     }
 
+
+
     override fun setRadius(cardView: CardViewDelegate, radius: Float) {
         getCardBackground(cardView).radius = radius
     }
@@ -92,9 +98,7 @@ internal class CardViewApi21Impl : CardViewImpl {
         return getCardBackground(cardView).color
     }
 
-    override fun initialize(cardViewDelegate: CardViewDelegate, context: Context, backgroundColor: ColorStateList, radius: Float, elevation: Float, maxElevation: Float, startColor: Int, endColor: Int) {
 
-    }
 
     private fun getCardBackground(cardView: CardViewDelegate): RoundRectDrawable {
         return cardView.cardBackground as RoundRectDrawable
diff --git a/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewBaseImpl.java b/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewBaseImpl.java
index 6dcd89b..51b847d 100644
--- a/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewBaseImpl.java
+++ b/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewBaseImpl.java
@@ -59,9 +59,9 @@ public void initStatic() {
 
     @Override
     public void initialize(CardViewDelegate cardView, Context context,
-                           ColorStateList backgroundColor, float radius, float elevation, float maxElevation) {
+                           ColorStateList backgroundColor, float radius, float elevation, float maxElevation,float topDelta) {
         RoundRectDrawableWithShadow background = createBackground(context, backgroundColor, radius,
-                elevation, maxElevation);
+                elevation, maxElevation,topDelta);
         background.setAddPaddingForCorners(cardView.getPreventCornerOverlap());
         cardView.setCardBackground(background);
         updatePadding(cardView);
@@ -69,9 +69,9 @@ public void initialize(CardViewDelegate cardView, Context context,
 
     private RoundRectDrawableWithShadow createBackground(Context context,
                                                          ColorStateList backgroundColor, float radius, float elevation,
-                                                         float maxElevation) {
+                                                         float maxElevation,float topDelta) {
         return new RoundRectDrawableWithShadow(context.getResources(), backgroundColor, radius,
-                elevation, maxElevation);
+                elevation, maxElevation,topDelta);
     }
 
     @Override
@@ -108,9 +108,9 @@ public ColorStateList getBackgroundColor(CardViewDelegate cardView) {
     @Override
     public void initialize(CardViewDelegate cardView, Context context,
                            ColorStateList backgroundColor, float radius, float elevation,
-                           float maxElevation, int startColor, int endColor) {
+                           float maxElevation, int startColor, int endColor,float topDelta) {
         RoundRectDrawableWithShadow background = createBackground(context, backgroundColor, radius,
-                elevation, maxElevation,startColor,endColor);
+                elevation, maxElevation,startColor,endColor,topDelta);
         background.setAddPaddingForCorners(cardView.getPreventCornerOverlap());
         cardView.setCardBackground(background);
         updatePadding(cardView);
@@ -118,9 +118,9 @@ public void initialize(CardViewDelegate cardView, Context context,
 
     private RoundRectDrawableWithShadow createBackground(Context context, ColorStateList backgroundColor,
                                                          float radius, float elevation, float maxElevation,
-                                                         int startColor, int endColor) {
+                                                         int startColor, int endColor,float topDelta) {
         return new RoundRectDrawableWithShadow(context.getResources(), backgroundColor, radius,
-                elevation, maxElevation,startColor,endColor);
+                elevation, maxElevation,startColor,endColor,topDelta);
     }
 
     @Override
diff --git a/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewImpl.kt b/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewImpl.kt
index b28181d..6a9e0dc 100644
--- a/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewImpl.kt
+++ b/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/CardViewImpl.kt
@@ -7,7 +7,7 @@ import com.bigman.wmzx.cardviewlibrary.library.CardViewDelegate
 
 internal interface CardViewImpl {
     fun initialize(cardView: CardViewDelegate, context: Context, backgroundColor: ColorStateList,
-                   radius: Float, elevation: Float, maxElevation: Float)
+                   radius: Float, elevation: Float, maxElevation: Float, topDelta: Float)
 
     fun setRadius(cardView: CardViewDelegate, radius: Float)
 
@@ -38,5 +38,6 @@ internal interface CardViewImpl {
     fun getBackgroundColor(cardView: CardViewDelegate): ColorStateList
 
     fun initialize(cardViewDelegate: CardViewDelegate, context: Context,
-                   backgroundColor: ColorStateList, radius: Float, elevation: Float, maxElevation: Float, startColor: Int, endColor: Int)
+                   backgroundColor: ColorStateList, radius: Float, elevation: Float
+                   , maxElevation: Float, startColor: Int, endColor: Int, topDelta: Float)
 }
diff --git a/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/RoundRectDrawableWithShadow.kt b/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/RoundRectDrawableWithShadow.kt
index e4ea825..0abbe78 100644
--- a/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/RoundRectDrawableWithShadow.kt
+++ b/cardviewlibrary/src/main/java/com/bigman/wmzx/cardviewlibrary/library/RoundRectDrawableWithShadow.kt
@@ -42,6 +42,7 @@ internal class RoundRectDrawableWithShadow : Drawable {
     private val mShadowStartColor: Int
 
     private val mShadowEndColor: Int
+    private var mTopDelta: Float
 
     private var mAddPaddingForCorners = true
 
@@ -95,9 +96,10 @@ internal class RoundRectDrawableWithShadow : Drawable {
         }
 
     constructor(resources: Resources, backgroundColor: ColorStateList, radius: Float,
-                shadowSize: Float, maxShadowSize: Float) {
+                shadowSize: Float, maxShadowSize: Float,topDelta:Float) {
         mShadowStartColor = resources.getColor(R.color.cardview_shadow_start_color)
         mShadowEndColor = resources.getColor(R.color.cardview_shadow_end_color)
+        mTopDelta =topDelta
         mInsetShadow = resources.getDimensionPixelSize(R.dimen.cardview_compat_inset_shadow)
         mPaint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.DITHER_FLAG)
         setBackground(backgroundColor)
@@ -112,9 +114,10 @@ internal class RoundRectDrawableWithShadow : Drawable {
 
     constructor(resources: Resources, backgroundColor: ColorStateList,
                 radius: Float, shadowSize: Float, maxShadowSize: Float,
-                startColor: Int, endColor: Int) {
+                startColor: Int, endColor: Int,topDelta:Float) {
         mShadowStartColor = startColor
         mShadowEndColor = endColor
+        mTopDelta = topDelta
         mInsetShadow = resources.getDimensionPixelSize(R.dimen.cardview_compat_inset_shadow)
         mPaint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.DITHER_FLAG)
         setBackground(backgroundColor)
@@ -219,23 +222,34 @@ internal class RoundRectDrawableWithShadow : Drawable {
         return PixelFormat.TRANSLUCENT
     }
 
+    /**
+     * 绘制主要工作
+     */
     override fun draw(canvas: Canvas) {
         if (mDirty) {
             buildComponents(bounds)
             mDirty = false
         }
-        canvas.translate(0f, mRawShadowSize / 2)
+        if(mTopDelta>1f){
+            mTopDelta=1f
+        }else if(mTopDelta>-1f&&mTopDelta<0f){
+            mTopDelta=-1f
+        }
+        canvas.translate(0f, mRawShadowSize / 2*mTopDelta)
         drawShadow(canvas)
-        canvas.translate(0f, -mRawShadowSize / 2)
+        canvas.translate(0f, -mRawShadowSize / 2*mTopDelta)
         sRoundRectHelper!!.drawRoundRect(canvas, mCardBounds, mCornerRadius, mPaint)
     }
 
+    /**
+     * 绘制四个角阴影
+     */
     private fun drawShadow(canvas: Canvas) {
         val edgeShadowTop = -mCornerRadius - mShadowSize
         val inset = mCornerRadius + mInsetShadow.toFloat() + mRawShadowSize / 2
         val drawHorizontalEdges = mCardBounds.width() - 2 * inset > 0
         val drawVerticalEdges = mCardBounds.height() - 2 * inset > 0
-        // LT
+        // LT 左上
         var saved = canvas.save()
         canvas.translate(mCardBounds.left + inset, mCardBounds.top + inset)
         canvas.drawPath(mCornerShadowPath!!, mCornerShadowPaint!!)
@@ -245,7 +259,7 @@ internal class RoundRectDrawableWithShadow : Drawable {
                     mEdgeShadowPaint!!)
         }
         canvas.restoreToCount(saved)
-        // RB
+        // RB 右下
         saved = canvas.save()
         canvas.translate(mCardBounds.right - inset, mCardBounds.bottom - inset)
         canvas.rotate(180f)
@@ -256,7 +270,7 @@ internal class RoundRectDrawableWithShadow : Drawable {
                     mEdgeShadowPaint!!)
         }
         canvas.restoreToCount(saved)
-        // LB
+        // LB 左下
         saved = canvas.save()
         canvas.translate(mCardBounds.left + inset, mCardBounds.bottom - inset)
         canvas.rotate(270f)
@@ -266,7 +280,7 @@ internal class RoundRectDrawableWithShadow : Drawable {
                     mCardBounds.height() - 2 * inset, -mCornerRadius, mEdgeShadowPaint!!)
         }
         canvas.restoreToCount(saved)
-        // RT
+        // RT 右上
         saved = canvas.save()
         canvas.translate(mCardBounds.right - inset, mCardBounds.top + inset)
         canvas.rotate(90f)
diff --git a/cardviewlibrary/src/main/res/values/attrs.xml b/cardviewlibrary/src/main/res/values/attrs.xml
index d66192e..9321474 100644
--- a/cardviewlibrary/src/main/res/values/attrs.xml
+++ b/cardviewlibrary/src/main/res/values/attrs.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-
+    <attr name="startColor" format="reference|color"/>
+    <attr name="topDelta" format="float"/>
+    <!-- Selected Paint Color (color). -->
+    <attr name="endColor" format="reference|color"/>
     <declare-styleable name="CardViewShadow">
         <!-- Default Paint Color (color). -->
-        <attr name="startColor" format="reference|color"/>
+        <attr name="startColor" />
         <!-- Selected Paint Color (color). -->
-        <attr name="endColor" format="reference|color"/>
+        <attr name="endColor" />
+        <attr name="topDelta" />
     </declare-styleable>