Browse Source

[fix]键盘插件,键盘选择和登录页的icon,增加圆角

hezihao 7 months ago
parent
commit
13b68ed71e

+ 2 - 2
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/component/item/KeyboardSelectViewBinder.kt

@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.atmob.keyboard_android.R
 import com.atmob.keyboard_android.enums.KeyboardType
 import com.atmob.keyboard_android.ext.click
-import com.atmob.keyboard_android.ext.loadUrlImage
+import com.atmob.keyboard_android.ext.loadUrlImageToCorner
 import com.atmob.keyboard_android.model.KeyboardSelectModel
 import me.drakeet.multitype.ItemViewBinder
 
@@ -41,7 +41,7 @@ class KeyboardSelectViewBinder(
             R.mipmap.ic_keyboard_default_icon
         }
 
-        holder.vIcon.loadUrlImage(item.imageUrl, iconDefaultResId)
+        holder.vIcon.loadUrlImageToCorner(item.imageUrl, 24f, iconDefaultResId)
         holder.vName.text = item.name
 
         // 选中

+ 7 - 0
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/component/page/impl/LoginPageComponent.kt

@@ -3,6 +3,7 @@ package com.atmob.keyboard_android.component.page.impl
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
+import android.widget.ImageView
 import com.atmob.keyboard_android.R
 import com.atmob.keyboard_android.component.ComponentConstant
 import com.atmob.keyboard_android.component.annotation.Component
@@ -12,6 +13,7 @@ import com.atmob.keyboard_android.component.base.animator.impl.TransitionAnimato
 import com.atmob.keyboard_android.component.page.ILoginPageComponent
 import com.atmob.keyboard_android.constant.Constants
 import com.atmob.keyboard_android.ext.click
+import com.atmob.keyboard_android.ext.loadResDrawableToCorner
 import com.atmob.keyboard_android.util.KeyboardHolder
 import com.atmob.keyboard_android.util.bridge.FlutterBridgeManager
 
@@ -23,6 +25,7 @@ class LoginPageComponent @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : BaseUIComponent<ILoginPageComponent>(context, attrs, defStyleAttr), ILoginPageComponent {
     private lateinit var vBackBtn: View
+    private lateinit var vAppIcon: ImageView
     private lateinit var vLoginBtn: View
 
     override fun onInflateViewId(): Int {
@@ -31,6 +34,7 @@ class LoginPageComponent @JvmOverloads constructor(
 
     override fun findView(view: View) {
         vBackBtn = view.findViewById(R.id.back_btn)
+        vAppIcon = view.findViewById(R.id.app_icon)
         vLoginBtn = view.findViewById(R.id.login_btn)
     }
 
@@ -39,6 +43,9 @@ class LoginPageComponent @JvmOverloads constructor(
             // 关闭
             hide()
         }
+        vAppIcon.apply {
+            loadResDrawableToCorner(R.mipmap.ic_app_icon, 46f, 0)
+        }
         vLoginBtn.click {
             // 跳转到登录页,并关闭自身
             FlutterBridgeManager.jump2LoginPage()

+ 20 - 1
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/ext/ViewExt.kt

@@ -340,6 +340,7 @@ fun ImageView.loadUrlImageToRound(
  */
 fun ImageView.loadUrlImageToCorner(
     url: String?,
+    radius: Float,
     defaultImgResId: Int
 ) {
     ImageLoader.get(context).loader.load(
@@ -347,7 +348,25 @@ fun ImageView.loadUrlImageToCorner(
             LoadOption.Builder()
                 .setUrl(url)
                 .setDefaultImgResId(defaultImgResId)
-                .setRadius(8f)
+                .setRadius(radius)
+        ), this
+    )
+}
+
+/**
+ * 加载图片带圆角
+ */
+fun ImageView.loadResDrawableToCorner(
+    resId: Int,
+    radius: Float,
+    defaultImgResId: Int
+) {
+    ImageLoader.get(context).loader.load(
+        context, LoadOption(
+            LoadOption.Builder()
+                .setDrawableResId(resId)
+                .setDefaultImgResId(defaultImgResId)
+                .setRadius(radius)
         ), this
     )
 }