Commit bb7eda9a authored by wanglei's avatar wanglei

...

parent c6d8a2b4
...@@ -38,6 +38,7 @@ import com.base.browserwhite.utils.BarUtils.setStatusBarLightMode ...@@ -38,6 +38,7 @@ import com.base.browserwhite.utils.BarUtils.setStatusBarLightMode
import com.base.browserwhite.utils.LinkSearchUtils import com.base.browserwhite.utils.LinkSearchUtils
import com.base.browserwhite.utils.LogEx import com.base.browserwhite.utils.LogEx
import com.base.browserwhite.utils.SpBeanUtils import com.base.browserwhite.utils.SpBeanUtils
import com.base.browserwhite.utils.SpBeanUtils.HISTORY_SP_KEY
import com.base.browserwhite.utils.SpBeanUtils.SEARCH_RECORD_SP_KEY import com.base.browserwhite.utils.SpBeanUtils.SEARCH_RECORD_SP_KEY
import com.base.browserwhite.utils.Utils import com.base.browserwhite.utils.Utils
import com.base.browserwhite.utils.Utils.dpToPx import com.base.browserwhite.utils.Utils.dpToPx
...@@ -66,6 +67,11 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -66,6 +67,11 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
}, performSearch = { }, performSearch = {
link = LinkSearchUtils.getSpSearchAction(content) link = LinkSearchUtils.getSpSearchAction(content)
}) })
val list = SpBeanUtils.getSpBeanList(SEARCH_RECORD_SP_KEY).map { Gson().fromJson(it, SearchRecordBean::class.java) }
val old = list.find { it.content == content }
if (old != null) {
SpBeanUtils.deleteSpBeanCondition(SEARCH_RECORD_SP_KEY, old.id)
}
SpBeanUtils.addSpBean(SEARCH_RECORD_SP_KEY, SearchRecordBean(content)) SpBeanUtils.addSpBean(SEARCH_RECORD_SP_KEY, SearchRecordBean(content))
LogEx.logDebug(TAG, "isHomeSearch=$isHomeSearch") LogEx.logDebug(TAG, "isHomeSearch=$isHomeSearch")
...@@ -238,7 +244,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -238,7 +244,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
var searchContent: String = "" var searchContent: String = ""
fun startActivityWithButtonAnimation(currentActivity: Activity, button: View, verticalOffset: Int) { fun startActivityWithButtonAnimation(currentActivity: Activity, button: View, verticalOffset: Int) {
val finalPosition =MyApplication.context.dpToPx(16f) val finalPosition = MyApplication.context.dpToPx(16f)
val buttonTop = button.top - finalPosition val buttonTop = button.top - finalPosition
val distanceToTop = -buttonTop - verticalOffset val distanceToTop = -buttonTop - verticalOffset
val animator = ObjectAnimator.ofFloat(button, "translationY", button.translationY, distanceToTop.toFloat()) val animator = ObjectAnimator.ofFloat(button, "translationY", button.translationY, distanceToTop.toFloat())
...@@ -267,7 +273,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -267,7 +273,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
verticalOffset: Int verticalOffset: Int
) { ) {
val marginEnd = MyApplication.context.dpToPx(30f) val marginEnd = MyApplication.context.dpToPx(30f)
val screenWidth =Utils.getScreenWidth(MyApplication.context) - marginEnd val screenWidth = Utils.getScreenWidth(MyApplication.context) - marginEnd
val x = screenWidth.toFloat() / button.width.toFloat() val x = screenWidth.toFloat() / button.width.toFloat()
val scaleXAnimator = ObjectAnimator.ofFloat(button, "scaleX", 1f, x) val scaleXAnimator = ObjectAnimator.ofFloat(button, "scaleX", 1f, x)
val scaleYAnimator = ObjectAnimator.ofFloat(button, "scaleY", 1f, 50f / 44f) val scaleYAnimator = ObjectAnimator.ofFloat(button, "scaleY", 1f, 50f / 44f)
......
...@@ -159,7 +159,7 @@ class FileFragment : BaseFragment<FragmentFileBinding>() { ...@@ -159,7 +159,7 @@ class FileFragment : BaseFragment<FragmentFileBinding>() {
} }
fun mediaPermission(jump: () -> Unit) { private fun mediaPermission(jump: () -> Unit) {
if (requireContext().checkStorePermission()) { if (requireContext().checkStorePermission()) {
jump.invoke() jump.invoke()
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment