Commit 494d2053 authored by wanglei's avatar wanglei

...

parent 65e4b25b
...@@ -39,8 +39,6 @@ class SearchRecordAdapter : BaseQuickAdapter<SearchRecordBean, SearchRecordAdapt ...@@ -39,8 +39,6 @@ class SearchRecordAdapter : BaseQuickAdapter<SearchRecordBean, SearchRecordAdapt
} }
if (!item.isDelete) { if (!item.isDelete) {
showItemAnimation(binding.root) showItemAnimation(binding.root)
} else {
binding.root.background = null
} }
} }
......
...@@ -116,11 +116,12 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() { ...@@ -116,11 +116,12 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
mChangeSearchUrl = RxBus.get().register(Constants.CHANGE_SEARCH_URL, String::class.java) mChangeSearchUrl = RxBus.get().register(Constants.CHANGE_SEARCH_URL, String::class.java)
mChangeSearchUrl?.observeOn(AndroidSchedulers.mainThread())?.subscribe { t -> mChangeSearchUrl?.observeOn(AndroidSchedulers.mainThread())?.subscribe { t ->
currentFragment?.loadWebView(t) currentFragment?.loadWebView(t)
binding.editWeb.setText(t)
} }
addNewWebSite(url) addNewWebSite(url)
val action = intent.getStringExtra("action")?:"" val action = intent.getStringExtra("action") ?: ""
if(TextUtils.equals(action,"search")){ if (TextUtils.equals(action, "search")) {
binding.clSearch.post { binding.clSearch.post {
resetSearchLayout() resetSearchLayout()
} }
...@@ -129,17 +130,18 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() { ...@@ -129,17 +130,18 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data) super.onActivityResult(requestCode, resultCode, data)
if(requestCode==10087){ if (requestCode == 10087) {
resetSearchLayout() resetSearchLayout()
} }
} }
private fun resetSearchLayout(){ private fun resetSearchLayout() {
val screenWidth = Utils.getScreenWidth(MyApplication.context) -MyApplication.context.dpToPx(30f) val screenWidth = Utils.getScreenWidth(MyApplication.context) - MyApplication.context.dpToPx(30f)
val reverseScaleXAnimator = ObjectAnimator.ofFloat(binding.clSearch, "scaleX", screenWidth / binding.clSearch.width.toFloat(), 1f) val reverseScaleXAnimator =
ObjectAnimator.ofFloat(binding.clSearch, "scaleX", screenWidth / binding.clSearch.width.toFloat(), 1f)
val reverseScaleYAnimator = ObjectAnimator.ofFloat(binding.clSearch, "scaleY", 50f / 44f, 1f) val reverseScaleYAnimator = ObjectAnimator.ofFloat(binding.clSearch, "scaleY", 50f / 44f, 1f)
binding.clSearch.pivotX=0f binding.clSearch.pivotX = 0f
binding.clSearch.pivotY=0f binding.clSearch.pivotY = 0f
reverseScaleXAnimator.setDuration(500) reverseScaleXAnimator.setDuration(500)
reverseScaleYAnimator.setDuration(500) reverseScaleYAnimator.setDuration(500)
val reverseAnimatorSet = AnimatorSet().apply { val reverseAnimatorSet = AnimatorSet().apply {
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="100dp" />
<solid android:color="#EEF1F6" />
</shape>
\ No newline at end of file
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="40dp"
android:layout_marginHorizontal="10dp" android:layout_marginHorizontal="10dp"
android:layout_marginVertical="5.5dp" android:layout_marginVertical="5.5dp"
android:background="@drawable/bg_eef1f6_20"> android:background="@drawable/bg_eef1f6_100">
<TextView <TextView
android:id="@+id/tv_content" android:id="@+id/tv_content"
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:ellipsize="end" android:ellipsize="end"
android:includeFontPadding="false"
android:paddingHorizontal="15dp" android:paddingHorizontal="15dp"
android:paddingVertical="12.5dp"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/black" android:textColor="@color/black"
android:visibility="gone" android:visibility="gone"
...@@ -22,10 +22,11 @@ ...@@ -22,10 +22,11 @@
<ImageView <ImageView
android:id="@+id/iv_delete" android:id="@+id/iv_delete"
android:layout_width="42dp" android:layout_width="wrap_content"
android:layout_height="42dp" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@mipmap/del_searchrecord" android:minWidth="40dp"
android:src="@mipmap/del_chip"
android:visibility="gone" android:visibility="gone"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
......
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