..

alguojian · Jul 13, 2020 · 2ba9d04 · 2ba9d04
1 parent b5fe011
commit 2ba9d04
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/alguojian/example/MainActivity.kt b/app/src/main/java/com/alguojian/example/MainActivity.kt
@@ -14,7 +14,7 @@ class MainActivity : AppCompatActivity() {
         seekBar.progress = 50
         seekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                heightColorImageView.setProgress(progress / 100.toFloat())
+                heightColorImageView.setProgress(progress / 100.toDouble())
             }
 
             override fun onStartTrackingTouch(seekBar: SeekBar?) {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -58,7 +58,7 @@
                 android:layout_height="300dp"
                 android:layout_marginTop="30dp"
                 android:src="@mipmap/aaa"
-                percentage="@{0.8f}"/>
+                percentage="@{0.83}"/>
 
             <com.alguojian.view.HeightColorImageView
                 android:layout_width="200dp"

diff --git a/round-imageview/build.gradle b/round-imageview/build.gradle
@@ -11,8 +11,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 122
-        versionName "1.2.2"
+        versionCode 123
+        versionName "1.2.3"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/round-imageview/src/main/java/com/alguojian/view/HeightColorImageView.kt b/round-imageview/src/main/java/com/alguojian/view/HeightColorImageView.kt
@@ -20,7 +20,7 @@ class HeightColorImageView @JvmOverloads constructor(context: Context, attrs: At
     private lateinit var mBitmapPaint: Paint
     private var mContext: Context? = null
     private lateinit var mMatrix: Matrix
-    private var percentage = 0.5f
+    private var percentage = 0.00
 
     private lateinit var paint: Paint
 
@@ -57,7 +57,7 @@ class HeightColorImageView @JvmOverloads constructor(context: Context, attrs: At
 
         if (bb != 0) {
             val createBitmap2 = Bitmap.createBitmap(bmp, 0, aa, bmp.width, bb, mMatrix, false)
-            canvas.drawBitmap(createBitmap2, 0f, height * (1.0f - percentage), paint)
+            canvas.drawBitmap(createBitmap2, 0f, height * (1.00 - percentage).toFloat(), paint)
             createBitmap2.recycle()
         }
         createBitmap.recycle()
@@ -87,7 +87,7 @@ class HeightColorImageView @JvmOverloads constructor(context: Context, attrs: At
     /**
      * 设置高度灰色的占比，百分比
      */
-    fun setProgress(percentage: Float) {
+    fun setProgress(percentage: Double) {
         this.percentage = percentage
         invalidate()
     }
@@ -101,7 +101,7 @@ class HeightColorImageView @JvmOverloads constructor(context: Context, attrs: At
 
         @JvmStatic
         @BindingAdapter(value = ["percentage"])
-        fun HeightColorImageView.setFloat(float: Float = 0.0f) {
+        fun HeightColorImageView.setFloat(float: Double = 0.00) {
             this.percentage = float
         }
     }