[new] 去除部分无效代码

app/src/main/res/layout/activity_tip.xml

@@ -3,6 +3,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
+        android:background="#E9DFE0"
         android:layout_height="match_parent"
         tools:context=".TipActivity">
 

widgetlib/src/main/java/com/qimai/android/widgetlib/popup/QmTipOverlayDrawable.kt

@@ -4,6 +4,7 @@ import android.graphics.*
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.view.Gravity
+import androidx.core.content.ContextCompat
 import com.qimai.android.tools.dpTopx
 import com.qimai.android.widgetlib.R
 
@@ -12,6 +13,7 @@ import com.qimai.android.widgetlib.R
  *   @version 1.1.1
  *   @Description
  **/
+@Suppress("unused")
 internal class QmTipOverlayDrawable(builder: QmToolTip.Builder) : Drawable() {
 
     private val outlineRect = Rect()
@@ -26,8 +28,7 @@ internal class QmTipOverlayDrawable(builder: QmToolTip.Builder) : Drawable() {
     private var padding = 0
     private var gravity = builder.gravity
     private val rectF: RectF
-
-    private val arrowHeight = 20f
+    private val arrowHeight = 15f
 
 
     /**
@@ -50,7 +51,7 @@ internal class QmTipOverlayDrawable(builder: QmToolTip.Builder) : Drawable() {
             ).toFloat()
         this.bgColor = theme.getColor(
             R.styleable.QmToolTipOverlay_overlay_bgColor,
-            context.resources.getColor(R.color.QmTopBar_color_FFFFFFF)
+            ContextCompat.getColor(context, R.color.QmTopBar_color_FFFFFFF)
         )
         this.borderWidth =
             theme.getDimensionPixelOffset(
@@ -59,7 +60,7 @@ internal class QmTipOverlayDrawable(builder: QmToolTip.Builder) : Drawable() {
             )
         this.borderColor = theme.getColor(
             R.styleable.QmToolTipOverlay_overlay_borderColor,
-            context.resources.getColor(R.color.QmTopBar_color_FFFFFFF)
+            ContextCompat.getColor(context, R.color.QmTopBar_color_FFFFFFF)
         )
 
         theme.recycle()
@@ -84,16 +85,13 @@ internal class QmTipOverlayDrawable(builder: QmToolTip.Builder) : Drawable() {
 
     override fun draw(canvas: Canvas) {
         path.op(arrowPath, Path.Op.XOR)
+
+        bgPaint?.let {
+            canvas.drawPath(path, it)
+        }
         borderPaint?.let {
             canvas.drawPath(path, it)
         }
-//      borderPaint?.let {
-//          canvas.drawPath(arrowPath,it)
-//      }
-//        borderPaint?.let {
-//            canvas.drawPath(path, it)
-//        }
-
     }
 
     override fun setAlpha(alpha: Int) {
@@ -118,7 +116,7 @@ internal class QmTipOverlayDrawable(builder: QmToolTip.Builder) : Drawable() {
         } else {
             // 5.0以下
 
-
+            // todo nothing
         }
 
     }
@@ -135,85 +133,85 @@ internal class QmTipOverlayDrawable(builder: QmToolTip.Builder) : Drawable() {
             val right = outBounds.right - padding
             val bottom = outBounds.bottom - padding
 
-            val maxY = bottom - radius
-            val maxX = right - radius
-            val minY = top + radius
-            val minX = left + radius
-
             if (gravity != Gravity.NO_GRAVITY) {
                 calculatePathWithGravity(
-                    outBounds = outBounds,
                     left = left,
                     top = top,
                     right = right,
-                    bottom = bottom,
-                    maxY = maxY,
-                    maxX = maxX,
-                    minY = minY,
-                    minX = minX
+                    bottom = bottom
                 )
             } else {
                 rectF.set(left.toFloat(), top.toFloat(), right.toFloat(), bottom.toFloat())
                 path.addRoundRect(rectF, radius, radius, Path.Direction.CW)
             }
-
         }
     }
 
     private fun calculatePathWithGravity(
-        outBounds: Rect,
         left: Int,
         top: Int,
         right: Int,
-        bottom: Int,
-        maxY: Float,
-        maxX: Float,
-        minY: Float,
-        minX: Float
+        bottom: Int
     ) {
 
         when (gravity) {
             Gravity.TOP -> {
-                drawArrowTopWithRect(left, top, right, bottom)
+                drawArrowBottomWithRect(left, top, right, bottom)
             }
 
             Gravity.BOTTOM -> {
-                drawArrowBottomWithRect(left, top, right, bottom)
+                drawArrowTopWithRect(left, top, right, bottom)
             }
         }
     }
 
     /**
-     * 箭头朝上
+     * 箭头朝下
+     *
+     * * --------------
+     * * |            |
+     * * |            |
+     * * |-----\/-----|
      */
-    private fun drawArrowTopWithRect(
+
+    private fun drawArrowBottomWithRect(
         left: Int,
         top: Int,
         right: Int,
         bottom: Int
     ) {
 
+        val radioHeight = (right - left) * arrowWeight
+
         rectF.set(
             left.toFloat() + borderWidth,
             top.toFloat() + borderWidth,
             right.toFloat() - borderWidth,
-            bottom.toFloat() - arrowHeight-borderWidth
+            bottom.toFloat() - arrowHeight - borderWidth
         )
         path.addRoundRect(rectF, radius, radius, Path.Direction.CW)
 
-        val radioHeight = (right - left) * arrowWeight
-        arrowPath.moveTo(left + radioHeight+borderWidth -arrowHeight, bottom - arrowHeight-borderWidth)
+        arrowPath.moveTo(
+            left + radioHeight + borderWidth - arrowHeight,
+            bottom - arrowHeight - borderWidth
+        )
         arrowPath.lineTo(
-            left.toFloat() + radioHeight+borderWidth,
+            left.toFloat() + radioHeight + borderWidth,
             (bottom - borderWidth).toFloat()
         )
-        arrowPath.lineTo(left + radioHeight + arrowHeight+borderWidth, bottom - arrowHeight-borderWidth)
+        arrowPath.lineTo(
+            left + radioHeight + arrowHeight + borderWidth,
+            bottom - arrowHeight - borderWidth
+        )
         arrowPath.close()
 
 
     }
 
-    private fun drawArrowBottomWithRect(
+    /**
+     * 箭头朝上
+     */
+    private fun drawArrowTopWithRect(
         left: Int,
         top: Int,
         right: Int,
@@ -237,70 +235,5 @@ internal class QmTipOverlayDrawable(builder: QmToolTip.Builder) : Drawable() {
             top + arrowHeight + borderWidth
         )
         arrowPath.close()
-
-
     }
-
-    private fun drawLeftArrayWithRect(
-        left: Int,
-        top: Int,
-        right: Int,
-        bottom: Int
-    ) {
-
-        rectF.set(
-            left.toFloat() + arrowHeight + borderWidth,
-            top.toFloat() + borderWidth,
-            right.toFloat() - borderWidth,
-            bottom.toFloat() - borderWidth
-        )
-        path.addRoundRect(rectF, radius, radius, Path.Direction.CW)
-        val radioHeight = (bottom - top) * arrowWeight
-        arrowPath.moveTo(left + arrowHeight + borderWidth, top + radioHeight + arrowHeight)
-        arrowPath.lineTo(left.toFloat() + borderWidth, top + radioHeight)
-        arrowPath.lineTo(left + arrowHeight + borderWidth, top + radioHeight - arrowHeight)
-        arrowPath.close()
-//        path.moveTo(left + arrowHeight, bottom - radius)
-//        val radioHeight = (bottom - top) * arrowWeight
-//        path.lineTo(left + arrowHeight, top + radioHeight + arrowHeight)
-//        path.lineTo(left.toFloat(), top + radioHeight)
-//        path.lineTo(left + arrowHeight, top + radioHeight - arrowHeight)
-//        path.lineTo(left + arrowHeight, top + radius)
-////        // 话 左上的 圆弧
-//        path.addArc(
-//            RectF(
-//                left + arrowHeight,
-//                top.toFloat(),
-//                left + arrowHeight + 2 * radius,
-//                top + 2 * radius
-//            ),
-//            180F,
-//            90f
-//        )
-//        path.lineTo(right - radius, top.toFloat())
-//        path.addArc(
-//            RectF(right - 2 * radius, top.toFloat(), right.toFloat(), top + 2 * radius),
-//            270F,
-//            90f)
-//        path.lineTo(right.toFloat(), bottom - radius)
-//        path.addArc(
-//            RectF(
-//                right - 2 * radius,
-//                bottom - 2 * radius,
-//                right.toFloat(),
-//                bottom.toFloat()
-//            ), 0f, 90f
-//        )
-//        path.lineTo(left + arrowHeight + radius, bottom.toFloat())
-//        path.addArc(
-//            RectF(
-//                left + arrowHeight,
-//                bottom - radius,
-//                left + arrowHeight + 2 * radius,
-//                bottom.toFloat()
-//            ), 90f, 90f
-//        )
-//        path.close()
-    }
-
 }
\ No newline at end of file

widgetlib/src/main/java/com/qimai/android/widgetlib/popup/QmToolTip.kt

@@ -19,6 +19,7 @@ import com.qimai.android.widgetlib.R
  *   @version 1.1.1
  *   @Description
  **/
+@Suppress("unused")
 class QmToolTip private constructor(
     var attachedView: View?,
     var defaultOverlayStyle: Int,
@@ -41,8 +42,8 @@ class QmToolTip private constructor(
     private val containerPaddingBig = 30
 
     private val containerPaddingSmall = 10
-    var containerMeasureWidth = 0
-    var containerMeasureHeight = 0
+    private var containerMeasureWidth = 0
+    private var containerMeasureHeight = 0
 
     private constructor(builder: Builder) : this(
         builder.attachedView,
@@ -126,10 +127,9 @@ class QmToolTip private constructor(
         })
 
         mWindow.setOnDismissListener {
-            //            this@QMBasePopup.onDismiss()
-//            if (mDismissListener != null) {
-//                mDismissListener!!.onDismiss()
-//            }
+            if (builder.dismissListener != null) {
+                builder.dismissListener?.invoke(mWindow)
+            }
         }
 
         builder.attachedView?.addOnAttachStateChangeListener(object :
@@ -145,6 +145,10 @@ class QmToolTip private constructor(
             }
         })
 
+        if (builder.animationStyle != -1) {
+            mWindow.animationStyle = builder.animationStyle
+        }
+
     }
 
     fun hasShowing(): Boolean {
@@ -177,7 +181,7 @@ class QmToolTip private constructor(
     }
 
     private fun calculateLocation(anchorView: View): Point {
-        anchorView?.getLocationOnScreen(attachedViewLocation)
+        anchorView.getLocationOnScreen(attachedViewLocation)
         var point = Point()
         when (gravity) {
 
@@ -189,7 +193,6 @@ class QmToolTip private constructor(
             }
         }
         return point
-
     }
 
     private fun calculateTopOffset(anchorView: View): Point {
@@ -197,7 +200,7 @@ class QmToolTip private constructor(
         val point = Point()
         point.x =
             (attachedViewLocation[0] + anchorView.measuredWidth / 2) - containerMeasureWidth / 2
-        point.y = attachedViewLocation[1] - arrowOffsetOfAnchor - anchorView.measuredHeight / 2
+        point.y = attachedViewLocation[1] - anchorView.measuredHeight
 
         return point
     }
@@ -206,21 +209,18 @@ class QmToolTip private constructor(
     private fun calculateBottomOffset(anchorView: View): Point {
 
         val point = Point()
-        val anchorViewHeight = anchorView.measuredWidth
         point.x = attachedViewLocation[0] + containerMeasureWidth / 2
-        point.y = attachedViewLocation[1] +anchorView.measuredHeight
-
-
+        point.y = attachedViewLocation[1] + anchorView.measuredHeight
         return point
     }
 
+
     class Builder {
 
         @IntDef(Gravity.TOP, Gravity.BOTTOM, Gravity.NO_GRAVITY)
         @Retention(AnnotationRetention.SOURCE)
         internal annotation class GravityRange
 
-
         internal var attachedView: View? = null
         internal var defaultOverlayStyle: Int = R.style.QmToolTipOverlayDefault
 
@@ -229,17 +229,29 @@ class QmToolTip private constructor(
 
         internal var contentView: View? = null
 
+        internal var animationStyle: Int = -1
+
+        internal var dismissListener: ((window: PopupWindow) -> Unit)? = null
+
 
         fun withAttachedView(attachedView: View?) = apply {
 
             this.attachedView = attachedView
         }
 
+        fun withDismissListener(listener: (window: PopupWindow) -> Unit) = apply {
+            this.dismissListener = listener
+        }
+
 
         fun withGravity(@GravityRange gravity: Int) = apply {
             this.gravity = gravity
         }
 
+        fun withAnimationStyle(animationStyle: Int) = apply {
+
+            this.animationStyle = animationStyle
+        }
 
         fun withDefaultOverlayStyle(defaultOverlayStyle: Int) = apply {