From e7cdff8188e7e1a5ab07253a3e67489942776c7c Mon Sep 17 00:00:00 2001
From: itgaojian163 <itgaojian@163.com>
Date: Wed, 30 Oct 2024 19:34:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aimz_k/page/activity/ChatActivity.kt      | 26 -------------------
 .../aimz_k/page/activity/MainActivity.kt      |  2 ++
 .../tenlionsoft/aimz_k/widget/BindingUtils.kt |  6 ++---
 app/src/main/res/layout/fragment_msg.xml      |  2 +-
 app/src/main/res/layout/item_category.xml     |  3 +--
 baselib/build.gradle.kts                      |  2 +-
 .../tenlionsoft/baselib/utils/DensityUtils.kt | 16 +++++++-----
 gradle/libs.versions.toml                     |  5 ++--
 8 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/page/activity/ChatActivity.kt b/app/src/main/java/com/tenlionsoft/aimz_k/page/activity/ChatActivity.kt
index c67254d..4a30c78 100644
--- a/app/src/main/java/com/tenlionsoft/aimz_k/page/activity/ChatActivity.kt
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/page/activity/ChatActivity.kt
@@ -23,25 +23,7 @@ class ChatActivity : BaseActivity() {
     private val chatPageViewModel: ChatPageViewModel by lazy {
         ViewModelProvider(this)[ChatPageViewModel::class.java]
     }
-    private val launcher =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            if (it.resultCode == Activity.RESULT_OK) {
-                // Use the uri to load the image
-//                val uri = it.data?.data!!
-                // Use the file path to set image or upload
-//                val filePath= it.data?.getStringExtra(Const.BundleExtras.FILE_PATH)
-                //...
 
-                // for Multiple picks
-                // first item
-//                val first = it.data?.data!!
-                // other items
-//                val  clipData = it.data?.clipData
-                // Multiple file paths list
-//                val filePaths = result.data?.getStringArrayListExtra(Const.BundleExtras.FILE_PATH_LIST)
-                //...
-            }
-        }
     private val filePicker = FilePicker.getInstance(this)
     override fun bindView() {
         mBinding = DataBindingUtil.setContentView(this, R.layout.activity_chat);
@@ -175,11 +157,3 @@ class ChatActivity : BaseActivity() {
 //        }
 //    }
 //})
-
-//FilePicker.Builder(this)
-//                            .setPopUpConfig()
-//                            .addPickDocumentFile()
-//                            .addImageCapture()
-//                            .addVideoCapture()
-//                            .addPickMedia()
-//                            .build()
\ No newline at end of file
diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/page/activity/MainActivity.kt b/app/src/main/java/com/tenlionsoft/aimz_k/page/activity/MainActivity.kt
index f838373..57764b8 100644
--- a/app/src/main/java/com/tenlionsoft/aimz_k/page/activity/MainActivity.kt
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/page/activity/MainActivity.kt
@@ -1,5 +1,6 @@
 package com.tenlionsoft.aimz_k.page.activity
 
+import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -136,6 +137,7 @@ class MainActivity : BaseActivity() {
         unregisterReceiver(mLocalReceiver)
     }
 
+    @SuppressLint("UnspecifiedRegisterReceiverFlag")
     private fun registerLocalReceiver() {
         mLocalReceiver = MainBroadcastReceiver()
         val filter = IntentFilter()
diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/widget/BindingUtils.kt b/app/src/main/java/com/tenlionsoft/aimz_k/widget/BindingUtils.kt
index 4c5237d..a580b23 100644
--- a/app/src/main/java/com/tenlionsoft/aimz_k/widget/BindingUtils.kt
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/widget/BindingUtils.kt
@@ -13,16 +13,14 @@ import com.tenlionsoft.aimz_k.R
 
 object BindingUtils {
 
-    @BindingAdapter("app:setAdapter")
+    @BindingAdapter("setAdapter")
     @JvmStatic
     fun bindAdapterToRecyclerView(recyclerView: RecyclerView, adapter: Adapter<*>) {
-//        adapter.setHasStableIds(true)
-//        recyclerView.setHasFixedSize(true)
         recyclerView.layoutManager = LinearLayoutManager(recyclerView.context)
         recyclerView.adapter = adapter
     }
 
-    @BindingAdapter("app:imageUrl")
+    @BindingAdapter("imageUrl")
     @JvmStatic
     fun bindImgUrl(imageView: ImageView, url: String?) {
         if (url.isNullOrEmpty()) {
diff --git a/app/src/main/res/layout/fragment_msg.xml b/app/src/main/res/layout/fragment_msg.xml
index 47b4bc6..92d2541 100644
--- a/app/src/main/res/layout/fragment_msg.xml
+++ b/app/src/main/res/layout/fragment_msg.xml
@@ -27,7 +27,7 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rlv_msgs"
                 android:layout_width="match_parent"
-                app:setAdapter="@{msgViewModel.adapter}"
+                setAdapter="@{msgViewModel.adapter}"
                 android:layout_height="match_parent"
                 tools:listitem="@layout/item_category" />
 
diff --git a/app/src/main/res/layout/item_category.xml b/app/src/main/res/layout/item_category.xml
index 559b391..1917338 100644
--- a/app/src/main/res/layout/item_category.xml
+++ b/app/src/main/res/layout/item_category.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
@@ -28,11 +27,11 @@
             android:layout_margin="10dp">
 
             <ImageView
+                imageUrl="@{item.avatar}"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_centerInParent="true"
                 android:scaleType="fitXY"
-                app:imageUrl="@{item.avatar}"
                 tools:src="@drawable/app_logo_small" />
 
             <ImageView
diff --git a/baselib/build.gradle.kts b/baselib/build.gradle.kts
index 8cc10e4..b02b89a 100644
--- a/baselib/build.gradle.kts
+++ b/baselib/build.gradle.kts
@@ -65,5 +65,5 @@ dependencies {
     api(libs.jjwt)
     api(libs.emojipicker)
     api(libs.xxpermissions)
-    api(libs.filepicker2)
+    api(libs.filepicker)
 }
\ No newline at end of file
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/utils/DensityUtils.kt b/baselib/src/main/java/com/tenlionsoft/baselib/utils/DensityUtils.kt
index db28e26..2729b81 100644
--- a/baselib/src/main/java/com/tenlionsoft/baselib/utils/DensityUtils.kt
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/utils/DensityUtils.kt
@@ -2,6 +2,7 @@ package com.tenlionsoft.baselib.utils
 
 import android.content.Context
 import android.util.DisplayMetrics
+import android.util.TypedValue
 import android.view.WindowManager
 
 
@@ -25,9 +26,12 @@ class DensityUtils {
          * @return value of px
          */
         @JvmStatic
-        fun sp2px(context: Context,spValue: Float): Int {
-            val fontScale: Float =context.resources.displayMetrics.scaledDensity
-            return (spValue * fontScale + 0.5f).toInt()
+        fun sp2px(context: Context, spValue: Float): Int {
+            return TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_SP,
+                spValue,
+                context.resources.displayMetrics
+            ).toInt()
         }
 
 
@@ -38,9 +42,9 @@ class DensityUtils {
          * @return value of sp
          */
         @JvmStatic
-        fun px2sp(context: Context,pxValue: Float): Int {
-            val fontScale: Float = context.resources.displayMetrics.scaledDensity
-            return (pxValue / fontScale + 0.5f).toInt()
+        fun px2sp(context: Context, pxValue: Float): Int {
+            val scaledDensity = context.resources.displayMetrics.scaledDensity
+            return (pxValue / scaledDensity).toInt()
         }
 
         @JvmStatic
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 579b53b..576bd39 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,7 +35,7 @@ smartRefreshLayout = "2.1.0"
 jjwt = "3.10.3"
 emoji2Emojipicker = "1.0.0-alpha03"
 xxpermissions = "20.0"
-filepicker2="2.0.0"
+filepicker="2.0.0"
 
 
 [libraries]
@@ -84,7 +84,8 @@ refreshMaterial = { group = "io.github.scwang90", name = "refresh-header-materia
 jjwt = { group = "com.auth0", name = "java-jwt", version.ref = "jjwt" }
 emojipicker = { group = "androidx.emoji2", name = "emoji2-emojipicker", version.ref = "emoji2Emojipicker" }
 xxpermissions = { group = "com.github.getActivity", name = "XXPermissions", version.ref = "xxpermissions" }
-filepicker2={group="com.github.atwa",name="filepicker",version.ref="filepicker2"}
+filepicker={group="com.github.atwa",name="filepicker",version.ref="filepicker"}
+
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }