...

app/src/main/java/com/base/browserwhite/ui/activity/bookmark/BookmarkActivity.kt

@@ -10,9 +10,15 @@ import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
+import com.base.browserwhite.bean.BookmarkBean
 import com.base.browserwhite.databinding.ActivityBookmarkBinding
 import com.base.browserwhite.ui.activity.BaseActivity
+import com.base.browserwhite.ui.activity.bookmark.BookmarkFolderActivity.Companion.selectFolder
 import com.base.browserwhite.utils.BarUtils
+import com.base.browserwhite.utils.SpBeanUtils
+import com.base.browserwhite.utils.SpBeanUtils.BOOKMARK_SP_KEY
+import com.base.browserwhite.utils.ToastUtils.toast
+import com.google.gson.Gson
 
 class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
 
@@ -100,27 +106,32 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
         }
         binding.tvCancel.setOnClickListener { noSelectUI() }
         binding.llRemoveFolder.setOnClickListener {
-//            val selectList = bookmarkAdapter.items.filter { it.isSelect }
-//            if (selectList.isEmpty()) {
-//                toast("Please select a bookmark to move")
-//                return@setOnClickListener
-//            }
-//            if (selectList.any { it.isFolder }) {
-//                toast("Folder cannot be moved")
-//                return@setOnClickListener
-//            }
-//            selectFolder = selectList.first().folder
-//            launcher.launch(Intent(this, BookmarkFolderActivity::class.java)) {
-//                val json = it.data?.extras?.getString("Folder")
-//                val folder = Gson().fromJson(json, BookmarkBean::class.java)
-//                selectList.forEach { bookmarkBean ->
-//                    bookmarkBean.folderId = folder.id
-//                    bookmarkBean.folder = folder.name
-//                    SpBeanUtils.editSpBean(BOOKMARK_SP_KEY, bookmarkBean)
-//                }
-////                initBookmarkData()
-//                noSelectUI()
-//            }
+
+            if (currentTab == BOOKMARK_TAB) {
+                val selectList = bookmarkFragment.bookmarkAdapter.items.filter { it.isSelect }
+                if (selectList.isEmpty()) {
+                    toast("Please select a bookmark to move")
+                    return@setOnClickListener
+                }
+                if (selectList.any { it.isFolder }) {
+                    toast("Folder cannot be moved")
+                    return@setOnClickListener
+                }
+                selectFolder = selectList.first().folder
+                launcher.launch(Intent(this, BookmarkFolderActivity::class.java)) {
+                    val json = it.data?.extras?.getString("Folder")
+                    val folder = Gson().fromJson(json, BookmarkBean::class.java)
+                    selectList.forEach { bookmarkBean ->
+                        bookmarkBean.folderId = folder.id
+                        bookmarkBean.folder = folder.name
+                        SpBeanUtils.editSpBean(BOOKMARK_SP_KEY, bookmarkBean)
+                    }
+                    bookmarkFragment.initData()
+                    noSelectUI()
+                }
+            }
+
+
         }
     }
 
@@ -143,6 +154,11 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
 
     override fun onResume() {
         super.onResume()
+        if (currentTab == BOOKMARK_TAB) {
+            bookmarkFragment.initData()
+        } else {
+            historyFragment.initData()
+        }
     }
 
 
@@ -173,93 +189,4 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
         private val BOOKMARK_TAB = "bookmark_tab"
         private val HISTORY_TAB = "history_tab"
     }
-
-
-//        bookmarkAdapter = BookmarkAdapter()
-//        bookmarkAdapter.changeFolderAction = { folderId ->
-//            val list = bookmarkList.filter { it.folderId == folderId }
-//            binding.llEmpty.isVisible = list.isEmpty()
-//            bookmarkAdapter.submitList(list)
-//        }
-//        bookmarkAdapter.moreAction = { view, bean ->
-//            showBookmarkMoreDialog(
-//                view,
-//                bean.isFolder,
-//                //新开
-//                openNewTab = {
-//                    startActivity(Intent(this, WebBrowserActivity::class.java).apply {
-//                        putExtra("url", bean.url)
-//                    })
-//                },
-//                //删除
-//                deleteAction = {
-//                    if (bean.isFolder) {//书签目录
-//                        val desc = "Delete folder [${bean.name}] and the bookmarks in the folder?"
-//                        showDeleteTipDialog(desc) {
-//                            //删除书签目录
-//                            SpBeanUtils.deleteSpBeanCondition(BOOKMARK_SP_KEY, bean.id)
-//                            bookmarkList.remove(bean)
-//                            bookmarkAdapter.remove(bean)
-//
-//                            //删除目录下书签
-//                            val subBeanList = bookmarkList.filter { it.folder == bean.name }
-//                            subBeanList.forEach { subBean ->
-//                                SpBeanUtils.deleteSpBeanCondition(BOOKMARK_SP_KEY, subBean.id)
-//                                bookmarkList.remove(subBean)
-//                                //删除书签导航
-//                                SpBeanUtils.deleteSpBeanCondition(BOOKMARK_NAV_SP_KEY, bean.id)
-//                            }
-//                        }
-//                    } else {//书签直接删除
-//                        SpBeanUtils.deleteSpBeanCondition(BOOKMARK_SP_KEY, bean.id)
-//                        bookmarkList.remove(bean)
-//                        bookmarkAdapter.remove(bean)
-//                        //删除书签导航
-//                        SpBeanUtils.deleteSpBeanCondition(BOOKMARK_NAV_SP_KEY, bean.id)
-//                    }
-//                },
-//                //编辑
-//                editAction = {
-//                    BookmarkFolderEditActivity.editFolder = bean
-//                    launcher.launch(Intent(Intent(this, BookmarkFolderEditActivity::class.java)))
-//                },
-//                //添加导航
-//                addNavAction = {
-//                    SpBeanUtils.addSpBean(BOOKMARK_NAV_SP_KEY, bean)
-//                },
-//                //选择
-//                selectAction = {
-//                    selectUI()
-//                }
-//            )
-//        }
-
-
-//    private fun initHistoryData() {
-//        historyList.clear()
-//        val list = SpBeanUtils.getSpBeanList(HISTORY_SP_KEY)
-//        val gson = Gson()
-//        val item = list.map { gson.fromJson(it, HistoryBean::class.java) }
-//
-//        val time = ""
-//        item.sortedBy { it.time }.forEach {
-//            if (time != it.time.toFormatTime()) {
-//                it.showTime = true
-//            }
-//            historyList.add(it)
-//        }
-//    }
-
-//    private fun initBookmarkData() {
-//        bookmarkList.clear()
-//        val list = SpBeanUtils.getSpBeanList(BOOKMARK_SP_KEY)
-//        val gson = Gson()
-//        val items = list.map { gson.fromJson(it, BookmarkBean::class.java) }
-//
-//        bookmarkList.addAll(items)
-//        bookmarkAdapter.currentFolderId = 0
-//        bookmarkAdapter.submitList(bookmarkList.filter { it.folderId == bookmarkAdapter.currentFolderId })
-//        binding.llEmpty.isVisible = items.isEmpty()
-//    }
-
 }
\ No newline at end of file

app/src/main/java/com/base/browserwhite/ui/activity/bookmark/BookmarkFolderActivity.kt

@@ -62,8 +62,7 @@ class BookmarkFolderActivity : BaseActivity<ActivityBookmarkFolderBinding>() {
 
 
     companion object {
-
-        var selectFolder: String = "Root Directory"
+        var selectFolder: String = BookmarkBean.folderRoot
     }
 
 }
\ No newline at end of file

app/src/main/java/com/base/browserwhite/ui/activity/bookmark/BookmarkFragment.kt

@@ -22,6 +22,7 @@ class BookmarkFragment : BaseFragment<FragmentBookmarkBinding>() {
     lateinit var bookmarkAdapter: BookmarkAdapter
 
     private val bookmarkList = arrayListOf<BookmarkBean>()
+    private var viewInit: Boolean = false
 
     @SuppressLint("NotifyDataSetChanged")
     override fun setView() {
@@ -87,11 +88,13 @@ class BookmarkFragment : BaseFragment<FragmentBookmarkBinding>() {
                 }
             )
         }
-
+        viewInit = true
         initData()
     }
 
-    private fun initData() {
+    fun initData() {
+        if (!viewInit) return
+
         bookmarkList.clear()
         val list = SpBeanUtils.getSpBeanList(SpBeanUtils.BOOKMARK_SP_KEY)
         val gson = Gson()

app/src/main/java/com/base/browserwhite/ui/activity/bookmark/HistoryFragment.kt

@@ -18,16 +18,19 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>() {
         FragmentHistoryBinding.inflate(layoutInflater)
     }
 
+    private var viewInit: Boolean = false
 
     override fun setView() {
 
         historyAdapter = HistoryAdapter()
         binding.rv.adapter = historyAdapter
 
+        viewInit = true
         initData()
     }
 
-    private fun initData() {
+    fun initData() {
+        if (!viewInit) return
         historyList.clear()
         val list = SpBeanUtils.getSpBeanList(SpBeanUtils.HISTORY_SP_KEY)
         val gson = Gson()
@@ -40,6 +43,9 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>() {
             }
             historyList.add(it)
         }
+        runCatching {
+            historyAdapter.submitList(historyList)
+        }
     }
 
 }
\ No newline at end of file

app/src/main/java/com/base/browserwhite/ui/activity/scanqrc/ScanQRCActivity.kt

@@ -16,7 +16,6 @@ import androidx.camera.core.Preview
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
-import androidx.core.view.updatePadding
 import com.base.browserwhite.databinding.ActivityScanQrcBinding
 import com.base.browserwhite.ui.activity.BaseActivity
 import com.base.browserwhite.ui.views.PermissionDialog.showCameraAuthorize