...

app/src/main/java/com/base/scanqr/ui/main/HistoryFragment.kt

@@ -3,11 +3,13 @@ package com.base.scanqr.ui.main
 import android.content.Intent
 import android.graphics.Color
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.lifecycle.ViewModelProvider
 import com.base.scanqr.R
 import com.base.scanqr.base.BaseFragment
 import com.base.scanqr.bean.FunctionUIBean
+import com.base.scanqr.bean.ScanBean
 import com.base.scanqr.databinding.FragmentHistoryBinding
 import com.base.scanqr.ui.email.EmailCodeActivity
 import com.base.scanqr.ui.text.TextCodeActivity
@@ -38,7 +40,9 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
         adapter = HistoryAdapter()
         binding.rv.adapter = adapter
         adapter?.moreAction = { view, bean ->
-            requireContext().showHistoryMoreDialog(view, detailAction = {}, removeAction = {
+            requireContext().showHistoryMoreDialog(view, detailAction = {
+                jumpByScanBean(bean)
+            }, removeAction = {
                 viewModel.removeBean(bean)
 
                 if (tab == 0) {
@@ -49,26 +53,30 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
             })
         }
         adapter?.itemClick = { item ->
-            val activity = requireActivity() as MainActivity?
+            jumpByScanBean(item)
+        }
+    }
 
-            when (item.scanType) {
-                FunctionUIBean.KEY_WIFI -> {
-                    activity?.startActivity(Intent(activity, WifiCodeActivity::class.java).apply {
-                        putExtra("data", Gson().toJson(item))
-                    })
-                }
+    private fun jumpByScanBean(item: ScanBean) {
+        val activity = requireActivity() as MainActivity?
 
-                FunctionUIBean.KEY_TEXT -> {
-                    activity?.startActivity(Intent(activity, TextCodeActivity::class.java).apply {
-                        putExtra("data", Gson().toJson(item))
-                    })
-                }
+        when (item.scanType) {
+            FunctionUIBean.KEY_WIFI -> {
+                activity?.startActivity(Intent(activity, WifiCodeActivity::class.java).apply {
+                    putExtra("data", Gson().toJson(item))
+                })
+            }
 
-                FunctionUIBean.KEY_EMAIL -> {
-                    activity?.startActivity(Intent(activity, EmailCodeActivity::class.java).apply {
-                        putExtra("data", Gson().toJson(item))
-                    })
-                }
+            FunctionUIBean.KEY_TEXT -> {
+                activity?.startActivity(Intent(activity, TextCodeActivity::class.java).apply {
+                    putExtra("data", Gson().toJson(item))
+                })
+            }
+
+            FunctionUIBean.KEY_EMAIL -> {
+                activity?.startActivity(Intent(activity, EmailCodeActivity::class.java).apply {
+                    putExtra("data", Gson().toJson(item))
+                })
             }
         }
     }
@@ -128,6 +136,7 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
     private fun changeRvData(isCreateOrScan: Boolean) {
         val uiRefresh = {
             val createList = viewModel.historyList.filter { it.isCreateOrScan == isCreateOrScan }
+            binding.tvEmpty.isVisible = createList.isEmpty()
             adapter?.submitList(createList)
         }
         if (viewModel.dataRefreshFinish.get()) {

app/src/main/java/com/base/scanqr/ui/main/MainActivity.kt

@@ -28,7 +28,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             HomeTabUIBean(R.drawable.bg_selector_create, getString(R.string.create)),
             HomeTabUIBean(R.drawable.bg_selector_scan, getString(R.string.scan)),
             HomeTabUIBean(R.drawable.bg_selector_history, getString(R.string.history)),
-            HomeTabUIBean(R.drawable.bg_selector_settings, getString(R.string.settings)),
+//            HomeTabUIBean(R.drawable.bg_selector_settings, getString(R.string.settings)),
         )
     }
 

app/src/main/res/layout/fragment_history.xml

@@ -158,13 +158,29 @@
 
     </LinearLayout>
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv"
+
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        tools:listitem="@layout/item_history"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+        android:layout_height="match_parent"
+        android:layout_marginTop="12dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/item_history" />
+
+        <TextView
+            android:id="@+id/tv_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="NO QRCode"
+            android:textColor="#999999"
+            android:textSize="20sp"
+            android:visibility="gone" />
+    </FrameLayout>
 
 
 </LinearLayout>
\ No newline at end of file