From e5ca87e89fef96c827ec37d1d91082f626cbb17d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 11 五月 2021 18:50:09 +0800
Subject: [PATCH] 特价新版UI改造

---
 app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchActivity.java |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchActivity.java
index 19a576d..06fd903 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchActivity.java
@@ -4,10 +4,12 @@
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.provider.Settings;
+
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
+
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -72,6 +74,10 @@
 
         findViewById(R.id.tv_net_setting).setOnClickListener(this);
         findViewById(R.id.tv_refresh).setOnClickListener(this);
+        findViewById(R.id.tv_search_result_back).setOnClickListener(this);
+        findViewById(R.id.tv_search_result).setOnClickListener(this);
+
+
         tv_search.setOnClickListener(this);
 
 //        setHotData();
@@ -202,19 +208,35 @@
             public boolean onEditorAction(TextView arg0, int arg1, KeyEvent arg2) {
                 //鐐瑰嚮鎼滅储 鎴栬�� 瀹屾垚 骞朵笖鍊间笉涓虹┖
                 if ((arg1 == EditorInfo.IME_ACTION_SEARCH || arg1 == EditorInfo.IME_ACTION_DONE) && !StringUtils.isEmpty(et_search.getText().toString())) {
-                    mPresenter.addSearchHistory(et_search.getText().toString(), page);//娣诲姞鎼滅储璁板綍
-                    mPresenter.addSearchResultActivity(et_search.getText().toString(), page);//璺宠浆鎼滅储缁撴灉椤�
+                    startSearch(et_search.getText().toString());
                     return true;
                 }
                 // //鐐瑰嚮鎼滅储 鎴栬�� 瀹屾垚 骞朵笖鍊间负绌� 鎻愮ず璇笉涓虹┖
                 else if (et_search != null && et_search.getHint() != null && (arg1 == EditorInfo.IME_ACTION_SEARCH || arg1 == EditorInfo.IME_ACTION_DONE) && !StringUtils.isEmpty(et_search.getHint().toString())) {
-                    mPresenter.addSearchHistory(et_search.getHint().toString(), page);//娣诲姞鎼滅储璁板綍
-                    mPresenter.addSearchResultActivity(et_search.getHint().toString(), page);//璺宠浆鎼滅储缁撴灉椤�
+                    startSearch(et_search.getHint().toString());
                     return true;
                 }
                 return false;
             }
         });
+    }
+
+
+    private void startSearch(String text) {
+        if (text == null) {
+            if (et_search.getText() != null && !StringUtils.isNullOrEmpty(et_search.getText().toString())) {
+                text = et_search.getText().toString().trim();
+            }
+
+            if (text == null) {
+                if (et_search.getHint() != null && !StringUtils.isNullOrEmpty(et_search.getHint().toString())) {
+                    text = et_search.getHint().toString().trim();
+                }
+            }
+        }
+
+        mPresenter.addSearchHistory(text, page);//娣诲姞鎼滅储璁板綍
+        mPresenter.addSearchResultActivity(text, page);//璺宠浆鎼滅储缁撴灉椤�
     }
 
     /**
@@ -273,8 +295,14 @@
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.tv_search://鍙栨秷
-                finish();
+            case R.id.tv_search_result_back://鍙栨秷
+                if (search_tv_list.getVisibility() == View.VISIBLE) {
+                    search_tv_list.setVisibility(View.GONE);
+                } else
+                    finish();
+                break;
+            case R.id.tv_search_result://寮�濮嬫悳绱�
+                startSearch(null);
                 break;
             case R.id.tv_net_setting:
                 startActivity(new Intent(Settings.ACTION_SETTINGS));

--
Gitblit v1.8.0