kotlinOptions remove

Author: fengpeng

app/build.gradle

@@ -27,9 +27,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
 }
 
 dependencies {
@@ -38,7 +35,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.+'
+    testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation project(":lib")

lib/build.gradle

@@ -27,17 +27,14 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.+'
+    testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

lib/src/main/java/com/pizzk/overlay/OverlayLayout.kt

@@ -68,7 +68,6 @@ class OverlayLayout : ConstraintLayout {
         val vXY = IntArray(2)
         getLocationOnScreen(vXY)
         val vAnchorXY = IntArray(2)
-        //
         overlay.anchors.forEach { e: Anchor ->
             val vAnchor: View = e.find.onFind(viewGroup, e) ?: return@forEach
             //计算宽度及位置
@@ -82,23 +81,24 @@ class OverlayLayout : ConstraintLayout {
             rect.inset(-outset, -outset)
             //锚点生产及绘制
             e.draw.onDraw(canvas, paint, e, rect)
-            val anchor = onFakeAnchor(e.id, rect.toRect())
+            val anchor = onFakeAnchor(e.id, rect)
             //标记层布局
             val markers = overlay.markers.filter { it.anchor == e.id }
             markers.forEach { onLayoutMarker(viewGroup.context, it, anchor) }
         }
     }
 
-    private fun onFakeAnchor(id: Int, rc: Rect): View {
+    private fun onFakeAnchor(id: Int, rc: RectF): View {
         val v: View? = getViewById(id)
         if (null != v) return v
         val view = View(context)
         view.id = id
-        addView(view, rc.width(), rc.height())
+        addView(view, rc.width().toInt(), rc.height().toInt())
         val cs = ConstraintSet()
         cs.clone(this)
-        cs.connect(id, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START, rc.left)
-        cs.connect(id, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP, rc.top)
+        val iid = ConstraintSet.PARENT_ID
+        cs.connect(id, ConstraintSet.START, iid, ConstraintSet.START, rc.left.toInt())
+        cs.connect(id, ConstraintSet.TOP, iid, ConstraintSet.TOP, rc.top.toInt())
         cs.applyTo(this)
         return view
     }