refactor(fragment): 重构部分代码并优化结构

AndroidCoderPeng · AndroidCoderPeng · commit 10616ecb838c · 2025-01-19T22:47:59.000+08:00
- 修改 AdapterPackageFragment 中的适配器名称和对应 Fragment
- 删除 ExtensionsPackageFragment 中的 View 扩展相关代码
- 移除 FileExtensionFragment 中的文件读取功能
- 重命名 ReadOnlyImageAdapterFragment为 GridViewImageAdapterFragment
- 删除未使用的布局文件和资源文件- 优化部分代码结构，提高可读性和维护性
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/AdapterPackageFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/AdapterPackageFragment.kt
@@ -8,25 +8,25 @@ import com.pengxh.kt.lib.R
 import com.pengxh.kt.lib.adapter.SlideAdapter
 import com.pengxh.kt.lib.databinding.FragmentAdapterPackageBinding
 import com.pengxh.kt.lib.fragments.adapter.EditableImageAdapterFragment
+import com.pengxh.kt.lib.fragments.adapter.GridViewImageAdapterFragment
 import com.pengxh.kt.lib.fragments.adapter.MultipleChoiceAdapterFragment
 import com.pengxh.kt.lib.fragments.adapter.NormalRecyclerAdapterFragment
-import com.pengxh.kt.lib.fragments.adapter.ReadOnlyImageAdapterFragment
 import com.pengxh.kt.lib.fragments.adapter.SingleChoiceAdapterFragment
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 
 class AdapterPackageFragment : KotlinBaseFragment<FragmentAdapterPackageBinding>() {
 
     private lateinit var slideAdapter: SlideAdapter
     private val itemTitles = arrayOf(
-        "可变适配器", "多选适配器", "普通适配器", "只读适配器", "单选适配器"
+        "可变适配器", "多选适配器", "普通适配器", "宫格适配器", "单选适配器"
     )
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     init {
         fragmentPages.add(EditableImageAdapterFragment())
         fragmentPages.add(MultipleChoiceAdapterFragment())
         fragmentPages.add(NormalRecyclerAdapterFragment())
-        fragmentPages.add(ReadOnlyImageAdapterFragment())
+        fragmentPages.add(GridViewImageAdapterFragment())
         fragmentPages.add(SingleChoiceAdapterFragment())
     }
 
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/ExtensionsPackageFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/ExtensionsPackageFragment.kt
@@ -25,7 +25,6 @@ import com.pengxh.kt.lib.fragments.extensions.StringExtensionFragment
 import com.pengxh.kt.lib.fragments.extensions.TextSwitcherExtensionFragment
 import com.pengxh.kt.lib.fragments.extensions.UriExtensionFragment
 import com.pengxh.kt.lib.fragments.extensions.ViewBindingExtensionFragment
-import com.pengxh.kt.lib.fragments.extensions.ViewExtensionFragment
 import com.pengxh.kt.lib.fragments.extensions.ViewModelExtensionFragment
 import com.pengxh.kt.lib.fragments.extensions.WindowExtensionFragment
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -51,7 +50,6 @@ class ExtensionsPackageFragment : KotlinBaseFragment<FragmentExtensionsPackageBi
         "String",
         "TextSwitcher",
         "Uri",
-        "View",
         "ViewBinding",
         "ViewModel",
         "Window"
@@ -76,7 +74,6 @@ class ExtensionsPackageFragment : KotlinBaseFragment<FragmentExtensionsPackageBi
         fragmentPages.add(StringExtensionFragment())
         fragmentPages.add(TextSwitcherExtensionFragment())
         fragmentPages.add(UriExtensionFragment())
-        fragmentPages.add(ViewExtensionFragment())
         fragmentPages.add(ViewBindingExtensionFragment())
         fragmentPages.add(ViewModelExtensionFragment())
         fragmentPages.add(WindowExtensionFragment())
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/adapter/GridViewImageAdapterFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/adapter/GridViewImageAdapterFragment.kt
@@ -3,12 +3,11 @@ package com.pengxh.kt.lib.fragments.adapter
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.AdapterView
-import com.pengxh.kt.lib.databinding.FragmentAdapterReadonlyImageBinding
+import com.pengxh.kt.lib.databinding.FragmentAdapterGridviewImageBinding
 import com.pengxh.kt.lite.adapter.GridViewImageAdapter
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 
-class ReadOnlyImageAdapterFragment : KotlinBaseFragment<FragmentAdapterReadonlyImageBinding>() {
+class GridViewImageAdapterFragment : KotlinBaseFragment<FragmentAdapterGridviewImageBinding>() {
 
     private val images = mutableListOf(
         "https://img.zcool.cn/community/010d5c5b9d17c9a8012099c8781b7e.jpg@1280w_1l_2o_100sh.jpg",
@@ -24,21 +23,16 @@ class ReadOnlyImageAdapterFragment : KotlinBaseFragment<FragmentAdapterReadonlyI
     override fun initViewBinding(
         inflater: LayoutInflater,
         container: ViewGroup?
-    ): FragmentAdapterReadonlyImageBinding {
-        return FragmentAdapterReadonlyImageBinding.inflate(inflater, container, false)
+    ): FragmentAdapterGridviewImageBinding {
+        return FragmentAdapterGridviewImageBinding.inflate(inflater, container, false)
     }
 
     override fun setupTopBarLayout() {
 
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val imageAdapter = GridViewImageAdapter(requireContext(), images)
-        binding.gridView.adapter = imageAdapter
-        binding.gridView.onItemClickListener =
-            AdapterView.OnItemClickListener { adapterView, view, position, l ->
-
-            }
+        binding.gridView.adapter = GridViewImageAdapter(requireContext(), images)
     }
 
     override fun observeRequestState() {
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/adapter/NormalRecyclerAdapterFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/adapter/NormalRecyclerAdapterFragment.kt
@@ -46,8 +46,8 @@ class NormalRecyclerAdapterFragment : KotlinBaseFragment<FragmentAdapterNormalRe
         binding.recyclerView.adapter = normalAdapter
         normalAdapter.setOnItemClickedListener(object :
             NormalRecyclerAdapter.OnItemClickedListener<String> {
-            override fun onItemClicked(position: Int, t: String) {
-                t.show(requireContext())
+            override fun onItemClicked(position: Int, item: String) {
+                item.show(requireContext())
             }
         })
     }
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/adapter/SingleChoiceAdapterFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/adapter/SingleChoiceAdapterFragment.kt
@@ -48,8 +48,8 @@ class SingleChoiceAdapterFragment : KotlinBaseFragment<FragmentAdapterSingleChoi
         binding.recyclerView.adapter = selectedAdapter
         selectedAdapter.setOnItemCheckedListener(object :
             SingleChoiceAdapter.OnItemCheckedListener<String> {
-            override fun onItemChecked(position: Int, t: String) {
-                Log.d(kTag, "onItemChecked => $t")
+            override fun onItemChecked(position: Int, item: String) {
+                Log.d(kTag, "onItemChecked => $item")
             }
         })
     }
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/divider/RecyclerStickDecorationFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/divider/RecyclerStickDecorationFragment.kt
@@ -92,8 +92,8 @@ class RecyclerStickDecorationFragment : KotlinBaseFragment<FragmentRvStickDecora
         binding.recyclerView.adapter = cityAdapter
         cityAdapter.setOnItemClickedListener(object :
             NormalRecyclerAdapter.OnItemClickedListener<CityModel> {
-            override fun onItemClicked(position: Int, t: CityModel) {
-                t.city.show(requireContext())
+            override fun onItemClicked(position: Int, item: CityModel) {
+                item.city.show(requireContext())
             }
         })
     }
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/divider/RecyclerViewItemOffsetsFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/divider/RecyclerViewItemOffsetsFragment.kt
@@ -37,8 +37,8 @@ class RecyclerViewItemOffsetsFragment : KotlinBaseFragment<FragmentRvItemOffsets
         binding.recyclerView.adapter = cityAdapter
         cityAdapter.setOnItemClickedListener(object :
             NormalRecyclerAdapter.OnItemClickedListener<String> {
-            override fun onItemClicked(position: Int, t: String) {
-                t.show(requireContext())
+            override fun onItemClicked(position: Int, item: String) {
+                item.show(requireContext())
             }
         })
     }
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/extensions/FileExtensionFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/extensions/FileExtensionFragment.kt
@@ -10,7 +10,6 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.extensions.calculateSize
 import com.pengxh.kt.lite.extensions.deleteFile
 import com.pengxh.kt.lite.extensions.formatFileSize
-import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.extensions.toBase64
 import com.pengxh.kt.lite.extensions.writeToFile
 import java.io.File
@@ -41,7 +40,6 @@ class FileExtensionFragment : KotlinBaseFragment<FragmentExtensionFileBinding>()
         documentDir = File(
             requireContext().getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS), ""
         )
-        binding.filePathView.text = "$documentDir${File.separator}协议模拟数据.txt"
 
         val imageDir = File(
             requireContext().getExternalFilesDir(Environment.DIRECTORY_PICTURES), ""
@@ -65,10 +63,6 @@ class FileExtensionFragment : KotlinBaseFragment<FragmentExtensionFileBinding>()
     }
 
     override fun initEvent() {
-        binding.readFileButton.setOnClickListener {
-            binding.fileContentView.text = File(binding.filePathView.text.toString()).read()
-        }
-
         binding.base64Button.setOnClickListener {
             val imageFile = File(imageFilePath).toBase64()
             imageFile.writeToFile(base64File)
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/extensions/ViewExtensionFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/extensions/ViewExtensionFragment.kt
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/widget/SlideBarViewFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/widget/SlideBarViewFragment.kt
@@ -92,8 +92,8 @@ class SlideBarViewFragment : KotlinBaseFragment<FragmentWidgetSlideBarViewBindin
         binding.cityRecyclerView.adapter = cityAdapter
         cityAdapter.setOnItemClickedListener(object :
             NormalRecyclerAdapter.OnItemClickedListener<CityModel> {
-            override fun onItemClicked(position: Int, t: CityModel) {
-                t.city.show(requireContext())
+            override fun onItemClicked(position: Int, item: CityModel) {
+                item.city.show(requireContext())
             }
         })
     }
diff --git a/app/src/main/res/drawable/bg_solid_text_blue_radius_top_5.xml b/app/src/main/res/drawable/bg_solid_text_blue_radius_top_5.xml
diff --git a/app/src/main/res/layout/fragment_adapter_gridview_image.xml b/app/src/main/res/layout/fragment_adapter_gridview_image.xml
diff --git a/app/src/main/res/layout/fragment_extension_file.xml b/app/src/main/res/layout/fragment_extension_file.xml
@@ -9,34 +9,6 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/filePathView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_10" />
-
-            <Button
-                android:id="@+id/readFileButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:text="读取文件"
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:id="@+id/fileContentView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_10" />
-        </LinearLayout>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_extension_view.xml b/app/src/main/res/layout/fragment_extension_view.xml
diff --git a/app/src/main/res/layout/map_info_window.xml b/app/src/main/res/layout/map_info_window.xml
diff --git a/lite/src/main/java/com/pengxh/kt/lite/extensions/Bitmap.kt b/lite/src/main/java/com/pengxh/kt/lite/extensions/Bitmap.kt
@@ -67,9 +67,8 @@ fun Bitmap.toBase64(): String {
 /**
  * 圆形图片
  *
- * 用[com.google.android.material.imageview.ShapeableImageView]代替
+ * 也可以用[com.google.android.material.imageview.ShapeableImageView]代替
  * */
-@Deprecated("用ShapeableImageView代替")
 fun Bitmap.createRoundDrawable(context: Context, borderStroke: Float, color: Int): Bitmap {
     //转换为正方形后的宽高。以最短边为正方形边长，也是圆形图像的直径
     val squareBitmapBorderLength = min(this.width, this.height)
diff --git a/lite/src/main/java/com/pengxh/kt/lite/extensions/File.kt b/lite/src/main/java/com/pengxh/kt/lite/extensions/File.kt
@@ -1,35 +1,9 @@
 package com.pengxh.kt.lite.extensions
 
 import android.util.Base64
-import java.io.BufferedReader
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileInputStream
-import java.io.FileReader
-import java.io.IOException
-
-/**
- * 用[java.io.File.readText]代替
- * */
-@Deprecated("请使用：File.readText(Charsets.UTF_8)")
-fun File.read(): String {
-    val builder: StringBuilder
-    try {
-        val bufferedReader = BufferedReader(FileReader(this))
-        var line = bufferedReader.readLine()
-        builder = StringBuilder()
-        while (line != null) {
-            builder.append(line)
-            builder.append("\n")
-            line = bufferedReader.readLine()
-        }
-        bufferedReader.close()
-        return builder.toString()
-    } catch (e: IOException) {
-        e.printStackTrace()
-    }
-    return ""
-}
 
 /**
  * 获取图片文件base64编码
diff --git a/lite/src/main/java/com/pengxh/kt/lite/extensions/Fragment.kt b/lite/src/main/java/com/pengxh/kt/lite/extensions/Fragment.kt
@@ -22,6 +22,7 @@ class FragmentBindingDelegate<VB : ViewBinding>(private val clazz: Class<VB>) :
         }
     }
 
+    @Suppress("UNCHECKED_CAST")
     override fun getValue(thisRef: Fragment, property: KProperty<*>): VB {
         if (binding == null) {
             try {
diff --git a/lite/src/main/java/com/pengxh/kt/lite/extensions/String.kt b/lite/src/main/java/com/pengxh/kt/lite/extensions/String.kt
@@ -106,7 +106,7 @@ fun String.diffCurrentTime(): Int {
         return 0
     }
     val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
-    val date = simpleDateFormat.parse(this)
+    val date = simpleDateFormat.parse(this) ?: return 0
     val diff = abs(System.currentTimeMillis() - date.time)
     return (diff / (3600000)).toInt()
 }
@@ -119,7 +119,7 @@ fun String.formatToYearMonthDay(): String {
         return this
     }
     val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
-    val date = simpleDateFormat.parse(this)
+    val date = simpleDateFormat.parse(this)!!
 
     val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA)
     return dateFormat.format(date)
diff --git a/lite/src/main/java/com/pengxh/kt/lite/extensions/View.kt b/lite/src/main/java/com/pengxh/kt/lite/extensions/View.kt

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ class NormalRecyclerAdapterFragment : KotlinBaseFragment<FragmentAdapterNormalRe`
`46`	`46`	`binding.recyclerView.adapter = normalAdapter`
`47`	`47`	`normalAdapter.setOnItemClickedListener(object :`
`48`	`48`	`NormalRecyclerAdapter.OnItemClickedListener<String> {`
`49`		`- override fun onItemClicked(position: Int, t: String) {`
`50`		`- t.show(requireContext())`
	`49`	`+ override fun onItemClicked(position: Int, item: String) {`
	`50`	`+ item.show(requireContext())`
`51`	`51`	`}`
`52`	`52`	`})`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ class SingleChoiceAdapterFragment : KotlinBaseFragment<FragmentAdapterSingleChoi`
`48`	`48`	`binding.recyclerView.adapter = selectedAdapter`
`49`	`49`	`selectedAdapter.setOnItemCheckedListener(object :`
`50`	`50`	`SingleChoiceAdapter.OnItemCheckedListener<String> {`
`51`		`- override fun onItemChecked(position: Int, t: String) {`
`52`		`- Log.d(kTag, "onItemChecked => $t")`
	`51`	`+ override fun onItemChecked(position: Int, item: String) {`
	`52`	`+ Log.d(kTag, "onItemChecked => $item")`
`53`	`53`	`}`
`54`	`54`	`})`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,8 @@ class RecyclerStickDecorationFragment : KotlinBaseFragment<FragmentRvStickDecora`
`92`	`92`	`binding.recyclerView.adapter = cityAdapter`
`93`	`93`	`cityAdapter.setOnItemClickedListener(object :`
`94`	`94`	`NormalRecyclerAdapter.OnItemClickedListener<CityModel> {`
`95`		`- override fun onItemClicked(position: Int, t: CityModel) {`
`96`		`- t.city.show(requireContext())`
	`95`	`+ override fun onItemClicked(position: Int, item: CityModel) {`
	`96`	`+ item.city.show(requireContext())`
`97`	`97`	`}`
`98`	`98`	`})`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ class RecyclerViewItemOffsetsFragment : KotlinBaseFragment<FragmentRvItemOffsets`
`37`	`37`	`binding.recyclerView.adapter = cityAdapter`
`38`	`38`	`cityAdapter.setOnItemClickedListener(object :`
`39`	`39`	`NormalRecyclerAdapter.OnItemClickedListener<String> {`
`40`		`- override fun onItemClicked(position: Int, t: String) {`
`41`		`- t.show(requireContext())`
	`40`	`+ override fun onItemClicked(position: Int, item: String) {`
	`41`	`+ item.show(requireContext())`
`42`	`42`	`}`
`43`	`43`	`})`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,8 @@ class SlideBarViewFragment : KotlinBaseFragment<FragmentWidgetSlideBarViewBindin`
`92`	`92`	`binding.cityRecyclerView.adapter = cityAdapter`
`93`	`93`	`cityAdapter.setOnItemClickedListener(object :`
`94`	`94`	`NormalRecyclerAdapter.OnItemClickedListener<CityModel> {`
`95`		`- override fun onItemClicked(position: Int, t: CityModel) {`
`96`		`- t.city.show(requireContext())`
	`95`	`+ override fun onItemClicked(position: Int, item: CityModel) {`
	`96`	`+ item.city.show(requireContext())`
`97`	`97`	`}`
`98`	`98`	`})`
`99`	`99`	`}`