修复键盘绘制bug

KeyBoardView/build.gradle

@@ -37,7 +37,7 @@ repositories {
 }
 
 group 'com.qmai.android.widget'
-version '1.1.35-SNAPSHOT'
+version '1.1.39-SNAPSHOT'
 
 gradlePublish {
 

KeyBoardView/src/main/java/com/qmai/android/keyboard/MoneyNumberKeyBoardKeyBoard.kt

@@ -7,6 +7,7 @@ import android.graphics.Paint
 import android.inputmethodservice.Keyboard
 import android.inputmethodservice.KeyboardView
 import android.util.AttributeSet
+import android.util.Log
 import android.util.TypedValue
 import android.widget.EditText
 import com.qmai.android.keyboardview.R
@@ -17,11 +18,12 @@ import com.qmai.android.keyboardview.R
  **/
 @Suppress("DEPRECATION")
 class MoneyNumberKeyBoardKeyBoard : KeyboardView {
-
+private lateinit var keys: List<Keyboard.Key>
     private var editWidget: EditText? = null
     private lateinit var mtextPaint: Paint
     public var btnText = "结账"
-
+    //获取drawable资源
+    val drawable = context.resources.getDrawable(R.drawable.savestock)
 
     private var defaultActionListener: DefaultKeyBoardActionListener? =
         DefaultKeyBoardActionListener()
@@ -56,13 +58,15 @@ class MoneyNumberKeyBoardKeyBoard : KeyboardView {
 
     override fun onDraw(canvas: Canvas?) {
         super.onDraw(canvas)
+        if (!::keys.isInitialized){
+            keys = getKeyboard().keys
+        }
         canvas?.let { c ->
             val keys: List<Keyboard.Key> = keyboard.keys
             keys.forEach { key ->
                 if (key.codes[0] == -11) {
 
-                    //获取drawable资源
-                    val drawable = context.resources.getDrawable(R.drawable.savestock)
+
                     //把真正的状态设置给上层绘制的key键
                     drawable.state = key.currentDrawableState
                     //rawable将在被绘制在canvas的哪个矩形区域内（这个矩形区域的坐标是以canvas左上角为坐标原点的）
@@ -187,7 +191,7 @@ class MoneyNumberKeyBoardKeyBoard : KeyboardView {
         mtextPaint.textAlign = Paint.Align.CENTER
         mtextPaint.textSize = sp2px(20f)
         mtextPaint.color = Color.parseColor("#333333")
-
+        keys = getKeyboard().keys
     }
 
     private fun sp2px(spValue: Float): Float {
@@ -198,4 +202,9 @@ class MoneyNumberKeyBoardKeyBoard : KeyboardView {
         )
     }
 
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        mHandler
+        Log.d("TAG", "onDetachedFromWindow: ")
+    }
 }
\ No newline at end of file

tools/build.gradle

@@ -42,7 +42,7 @@ repositories {
 
 
 group 'com.qmai.android.tools'
-version '1.1.9-SNAPSHOT'
+version '1.1.11-SNAPSHOT'
 
 gradlePublish {
 

tools/src/main/java/com/qimai/android/tools/TimeFormat.kt

@@ -13,7 +13,7 @@ import java.util.*
 
 fun formatCurrentDate(pattern: String) = getTimeFormatStr(pattern)
 
-private fun getTimeFormatStr(pattern: String, original: Any = Date()) =
+ fun getTimeFormatStr(pattern: String, original: Any = Date()) =
     SimpleDateFormat(pattern, Locale.getDefault()).format(original)
         ?: ""
 

tools/src/main/java/com/qimai/android/tools/ViewExtension.kt

+package com.qimai.android.tools
+
+import android.graphics.Color
+import android.graphics.drawable.GradientDrawable
+import android.view.View
+
+/**
+ * 设置背景
+ */
+fun View.setRoundRectBg(color: Int = Color.WHITE, cornerRadius: Float = 15f.dp) {
+    background = GradientDrawable().apply {
+        setColor(color)
+        setCornerRadius(cornerRadius)
+    }
+}
+