搜索优化

app/src/main/java/com/itant/shibei/ui/MainActivity.java

@@ -15,7 +15,6 @@ import com.itant.shibei.R;
 import com.itant.shibei.adapter.FragmentPagerItemAdapter;
 import com.itant.shibei.base.BaseBeiActivity;
 import com.itant.shibei.ui.function.FunctionFragment;
-import com.itant.shibei.ui.mine.MineFragment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -50,7 +49,7 @@ public class MainActivity extends BaseBeiActivity implements View.OnClickListene
         fragmentList = new ArrayList<>();
         fragmentList.add(new HomeFragment());
         fragmentList.add(new FunctionFragment());
-        fragmentList.add(new MineFragment());
+        //fragmentList.add(new MineFragment());
         vp_main = findViewById(R.id.vp_main);
         vp_main.setOffscreenPageLimit(fragmentList.size());
 

app/src/main/java/com/itant/shibei/ui/home/search/SearchActivity.java

@@ -172,27 +172,16 @@ public class SearchActivity extends BaseBeiActivity implements View.OnClickListe
             return;
         }
 
-        if (mCurrentPage == PAGE_START) {
+        if (mIsRefresh) {
             mGoodsList.clear();
-            if (goodsList != null) {
-                mGoodsList.addAll(goodsList);
-            }
-
-            // 本地写死的数据
-            mAdapter.notifyDataSetChanged();
-            // 如果是下拉刷新获取的第0页数据，item不要自动滚动一段距离
-            // 或者用这个mLayoutManager.scrollToPositionWithOffset(0, 0);
-            if (mIsRefresh) {
-                rv_search_result.smoothScrollToPosition(0);
-            }
-        } else {
-            if (goodsList != null) {
-                mGoodsList.addAll(goodsList);
-            }
+        }
 
-            mAdapter.notifyDataSetChanged();
+        if (goodsList != null) {
+            mGoodsList.addAll(goodsList);
         }
 
+        mAdapter.notifyDataSetChanged();
+
         // 请求到数据了，页数自增
         if (goodsList != null && goodsList.size() > 0) {
             mCurrentPage++;
@@ -232,11 +221,11 @@ public class SearchActivity extends BaseBeiActivity implements View.OnClickListe
     public void onFocusChange(View v, boolean hasFocus) {
         if (v.getId() == R.id.et_search) {
             if (hasFocus) {
-                rv_search_result.setVisibility(View.GONE);
+                rv_search_result.setVisibility(View.INVISIBLE);
                 btn_search.setVisibility(View.VISIBLE);
             } else {
                 rv_search_result.setVisibility(View.VISIBLE);
-                btn_search.setVisibility(View.GONE);
+                btn_search.setVisibility(View.INVISIBLE);
             }
         }
     }

app/src/main/java/com/itant/shibei/ui/mine/MineActivity.java

@@ -8,7 +8,6 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.Switch;
-import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -19,7 +18,6 @@ import com.itant.shibei.bean.BeiUser;
 import com.itant.shibei.bean.SystemBean;
 import com.itant.shibei.constant.ConstantString;
 import com.itant.shibei.manager.UserInfoManager;
-import com.itant.shibei.tool.StringTool;
 import com.itant.shibei.tool.TimeTool;
 import com.itant.shibei.ui.home.tool.ISystemView;
 import com.itant.shibei.ui.home.tool.SystemPresenter;
@@ -34,9 +32,6 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
     SystemPresenter mSystemPresenter;
 
     // 当前金额
-    private TextView tv_amount_rest;
-    // 提现支付宝
-    private TextView tv_cash_account;
     private Switch switch_api;
 
     private BeiUser mUser;
@@ -51,7 +46,7 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
         mUser = UserInfoManager.getInstance().getBeiUser();
         setTitle(String.format(ConstantString.WELCOME_HELLO, TimeTool.getCurrentTimePeriod(), mUser.nickName));
         ViewTool.setOnClickListener(this, this,
-                new int[]{R.id.ll_favorite, R.id.btn_exit_login, R.id.tv_add_photo, R.id.tv_deal_vip});
+                new int[]{R.id.tv_my_fav, R.id.btn_exit_login, R.id.tv_add_photo, R.id.tv_deal_vip});
 
         // 只有我才能管理后台
         View ll_admin = findViewById(R.id.ll_admin);
@@ -63,11 +58,6 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
 
         switch_api = findViewById(R.id.switch_api);
         switch_api.setOnCheckedChangeListener(this);
-
-        tv_amount_rest = findViewById(R.id.tv_amount_rest);
-        tv_cash_account = findViewById(R.id.tv_cash_account);
-        tv_amount_rest.setText(String.format(ConstantString.MONEY_RMB, StringTool.longCent2Yuan(mUser.currentMoney)));
-        tv_cash_account.setText("提现支付宝：" + mUser.cashAccount);
     }
 
     @Override
@@ -84,8 +74,8 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
     public void onClick(View v) {
         switch (v.getId()) {
 
-            case R.id.ll_favorite:
-                // todo 我的收藏条数
+            case R.id.tv_my_fav:
+                // todo 我的收藏列表
                 break;
 
             case R.id.tv_deal_vip:

app/src/main/java/com/itant/shibei/ui/mine/MineFragment.java

@@ -1,45 +0,0 @@
-package com.itant.shibei.ui.mine;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-
-import com.itant.shibei.R;
-import com.itant.shibei.manager.UserInfoManager;
-import com.itant.shibei.ui.mine.login.LoginActivity;
-
-public class MineFragment extends Fragment implements View.OnClickListener {
-
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             ViewGroup container, Bundle savedInstanceState) {
-        View root = inflater.inflate(R.layout.activity_mine, container, false);
-        root.findViewById(R.id.ll_favorite).setOnClickListener(this);
-        //root.findViewById(R.id.ll_feedback).setOnClickListener(this);
-        return root;
-
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.ll_favorite:
-                if (!UserInfoManager.getInstance().isLogin()) {
-                    // 未登录，跳转登录
-                    startActivity(new Intent(getActivity(), LoginActivity.class));
-                } else {
-                    // 退出登录对话框
-                }
-                break;
-
-            default:
-                break;
-        }
-    }
-}

app/src/main/res/layout/activity_mine.xml

@@ -9,55 +9,16 @@
 
     <include layout="@layout/view_toolbar"/>
 
-    <LinearLayout
-        android:id="@+id/ll_favorite"
+    <TextView
+        android:id="@+id/tv_my_fav"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/size_image_big"
+        android:layout_height="@dimen/height_tab_bar"
+        android:background="?attr/selectableItemBackground"
         android:gravity="center_vertical"
-        android:orientation="horizontal"
         android:paddingStart="@dimen/activity_horizontal_margin"
         android:paddingEnd="@dimen/activity_horizontal_margin"
-        android:background="?attr/selectableItemBackground">
-
-        <RelativeLayout
-            android:layout_width="@dimen/size_icon_big"
-            android:layout_height="@dimen/size_icon_big"
-            android:visibility="gone">
-
-            <ImageView
-                android:layout_width="@dimen/size_image_s"
-                android:layout_height="@dimen/size_image_s"
-                android:layout_centerInParent="true"
-                android:scaleType="fitXY"
-                android:src="@mipmap/logo_gray"
-                android:tint="@color/black_theme" />
-        </RelativeLayout>
-
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingTop="@dimen/margin_ss"
-            android:paddingBottom="@dimen/margin_ss">
-
-            <TextView
-                android:id="@+id/tv_amount_rest"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/size_hello"
-                android:textColor="@color/black_theme"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/tv_cash_account"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_ss"
-                android:textSize="@dimen/text_normal_s"
-                android:textColor="@color/black_text_hint" />
-        </LinearLayout>
-    </LinearLayout>
+        android:text="我的收藏"
+        android:textColor="@color/black_text" />
 
     <include layout="@layout/view_divider_common" />
 

app/src/main/res/navigation/mobile_navigation.xml

@@ -17,8 +17,8 @@
         android:label="@string/title_function"
         tools:layout="@layout/fragment_function_template" />
 
-    <fragment
+    <!--<fragment
         android:id="@+id/nav_mine"
         android:name="com.itant.shibei.ui.mine.MineFragment"
-        android:label="@string/title_mine" />
+        android:label="@string/title_mine" />-->
 </navigation>