Commit 99a5edf3 authored by wanglei's avatar wanglei

...

parent 52758720
...@@ -73,11 +73,11 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -73,11 +73,11 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
}) })
} else { } else {
RxBus.get().post(CHANGE_SEARCH_URL, link) RxBus.get().post(CHANGE_SEARCH_URL, link)
overridePendingTransition(0, 0)
} }
RxBus.get().post(Constants.RESET_SEARCH_VIEW,1) RxBus.get().post(Constants.RESET_SEARCH_VIEW, 1)
setResult(10087) setResult(10087)
finish() finish()
overridePendingTransition(0, 0)
} }
override fun initView() { override fun initView() {
...@@ -289,7 +289,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -289,7 +289,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
Log.d("glc", "button.width.toFloat():" + button.width.toFloat()) Log.d("glc", "button.width.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)
button.pivotX = 0f button.pivotX = 0f
button.pivotY = 0f button.pivotY = 0f
......
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