2024-1-29 代码备份

首页基本完成，秒杀数据未调试
登录接口已调试，邀请人绑定逻辑未做
首页搜索已完成
消息页面UI已做，数据有问题

.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="192.168.56.103:5555" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2024-01-29T06:30:08.135441500Z" />
+  </component>
+</project>

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.yihucha.hbyhc"
         minSdk 21
         targetSdk 33
-        versionCode 2364
-        versionName "3.3.2"
+        versionCode 1
+        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //必须要保证所有的flavor 都属于同一个维度

app/src/main/AndroidManifest.xml

@@ -9,8 +9,12 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- 网络权限 -->
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> <!-- <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/> -->
     <!-- <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/> -->
@@ -49,9 +53,12 @@
     <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" /> <!-- 穿山甲3400版本新增：建议添加“query_all_package”权限，穿山甲将通过此权限在Android R系统上判定广告对应的应用是否在用户的app上安装，避免投放错误的广告，以此提高用户的广告体验。若添加此权限，需要在您的用户隐私文档中声明！ -->
-    <!--<uses-permission
+    <!--
+<uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
-        tools:ignore="QueryAllPackagesPermission" /> --> <!--处理android 11 验证微信是否安装  一直返回false问题-->
+        tools:ignore="QueryAllPackagesPermission" />
+    -->
+    <!-- 处理android 11 验证微信是否安装  一直返回false问题 -->
     <queries>
         <package android:name="com.tencent.mm" />
     </queries>
@@ -70,16 +77,20 @@
         android:usesCleartextTraffic="true"
         tools:replace="android:theme"
         tools:targetApi="31">
-        <activity android:name=".utils.explainpermissions.ExplainPermissionsUtil"
+        <activity
+            android:name=".presentation.home.YHCHomeSearchActivity"
             android:exported="false"
-            android:theme="@style/Transparent"
             android:screenOrientation="portrait"
             />
         <activity
-            android:name=".presentation.order.SelectMailCompanyActivity"
+            android:name=".utils.explainpermissions.ExplainPermissionsUtil"
             android:exported="false"
             android:screenOrientation="portrait"
-            />
+            android:theme="@style/Transparent" />
+        <activity
+            android:name=".presentation.order.SelectMailCompanyActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.order.CustomCaptureActivity"
             android:exported="false"

app/src/main/java/com/yihucha/hbyhc/config/Constants.java

@@ -68,7 +68,8 @@ public class Constants {
     /**
      * 友盟
      */
-    public static final String UM_KEY = "624559086adb343c47e9e623";
+//    public static final String UM_KEY = "624559086adb343c47e9e623";
+    public static final String UM_KEY = "65b31bcaa7208a5af1a39ae5";
     /**
      * token
      */

app/src/main/java/com/yihucha/hbyhc/network/service/ProductService.java

@@ -5,6 +5,7 @@ import com.yihucha.hbyhc.network.DataResponse;
 import com.yihucha.hbyhc.network.request_bean.IdRequest;
 import com.yihucha.hbyhc.network.request_bean.TaobaoGoodsListRequest;
 import com.yihucha.hbyhc.network.request_bean.TaobaoLinkRequest;
+import com.yihucha.hbyhc.presentation.home.model.HomeProductBean;
 import com.yihucha.hbyhc.presentation.home.model.HomeProductListBean;
 import com.yihucha.hbyhc.presentation.home.model.ProductListBean;
 import com.yihucha.hbyhc.presentation.home.model.SearchGoodsListBean;
@@ -52,6 +53,15 @@ public interface ProductService {
     Observable<DataResponse<List<HomeProductListBean>>> homeProductList(@QueryMap Map<String, Object> request);
 
     /**
+     * 一壶茶首页商品列表、搜索接口
+     * @param request
+     * @return
+     */
+    @GET("gateway/wares_service/waresService/selectProductList")
+    Observable<DataResponse<HomeProductBean>> homeProductListYHC(@QueryMap Map<String, Object> request);
+
+
+    /**
      * 商品搜索
      *
      * @param

app/src/main/java/com/yihucha/hbyhc/network/service/StoreService.java

@@ -29,22 +29,25 @@ public interface StoreService {
      */
 
     @GET("api/store/merchant/product/type_lst")
-    Call<VipAreaBean> getGongchangAreanList(@Query("page") int page,
+    Observable<DataJavaResponse<VipAreaBean>> getGongchangAreanList(@Query("page") int page,
                                             @Query("limit") int limit,
                                             @Query("type") String type,
                                             @Query("keyword") String keyword);
 
     /**
      * 会员专区
+     *
      * @param page
      * @param limit
      * @param keyword
      * @return
      */
-    @GET("api/store/merchant/product/lst/324")
-    Call<VipAreaBean> getVipAreanList(@Query("page") int page,@Query("limit") int limit,@Query("keyword") String keyword);
+    @GET("api/store/merchant/product/lst/496")
+    Observable<DataJavaResponse<VipAreaBean>> getVipAreanList(@Query("page") int page, @Query("limit") int limit, @Query("keyword") String keyword);
+
     /**
      * 店铺搜索
+     *
      * @param
      * @return
      */
@@ -53,6 +56,7 @@ public interface StoreService {
 
     /**
      * 附近分类
+     *
      * @param
      * @return
      */
@@ -60,12 +64,11 @@ public interface StoreService {
     Observable<DataJavaResponse<ClassifyBean>> getClassify();
 
 
-
     /**
      * 店铺信息
      */
     @GET("api/store/merchant/detail/{id}")
-    Observable<DataResponse<ShopInfoBean>> getShopInfo(@Path("id") String id,@QueryMap Map<String, Object> request);
+    Observable<DataResponse<ShopInfoBean>> getShopInfo(@Path("id") String id, @QueryMap Map<String, Object> request);
 
     /**
      * 店铺分类

app/src/main/java/com/yihucha/hbyhc/presentation/MainActivityViewModel.java

@@ -38,7 +38,7 @@ public class MainActivityViewModel extends BaseViewModel {
         UserRepository.getCheckupdates(map, new NormalListener<CheckUpdatesBean>() {
             @Override
             public void success(CheckUpdatesBean checkUpdatesBean) {
-                mCheckUpdatesData.postValue(checkUpdatesBean);
+//                mCheckUpdatesData.postValue(checkUpdatesBean);
             }
 
             @Override

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/HomeMSAdapter.kt

@@ -28,9 +28,7 @@ class HomeMSAdapter(private var dataList: List<DcSeckillBean.Product_data>?,var
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MsViewHolder {
-        return MsViewHolder(
-            LayoutInflater.from(context).inflate(R.layout.item_home_miaosha, parent, false)
-        )
+        return MsViewHolder(LayoutInflater.from(context).inflate(R.layout.item_home_miaosha, parent, false))
     }
 
     override fun getItemCount(): Int {
@@ -41,7 +39,9 @@ class HomeMSAdapter(private var dataList: List<DcSeckillBean.Product_data>?,var
         var pBean = dataList!![position]
         holder.binding?.apply {
             tvNameItem.text = pBean.store_name
+            priceLayout.visibility =View.VISIBLE
             tvPriceItem.text = "${pBean.seckill_price}"
+
             tvYanglaojin.text = "养老金 ${pBean.yanglao}"
             Glide.with(context).load(pBean.image).into(imgvItem)
             layoutParent.setOnClickListener{

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/HomeVipAdapter.kt

@@ -0,0 +1,68 @@
+package com.yihucha.hbyhc.presentation.big_storehouse.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.bumptech.glide.Glide
+import com.yihucha.hbyhc.R
+import com.yihucha.hbyhc.databinding.ItemHomeMiaoshaBinding
+import com.yihucha.hbyhc.databinding.ItemHomeVipBinding
+import com.yihucha.hbyhc.presentation.big_storehouse.model.DcSeckillBean
+import com.yihucha.hbyhc.presentation.product.ProductDetailsActivity
+import com.yihucha.hbyhc.presentation.shop.model.VipAreaBean
+import com.yihucha.hbyhc.utils.DensityUtils
+
+/**
+ *  author : zhangbing
+ *  time   : 2023/10/29 15:19
+ *  com.laolaixiang.bjtdba.presentation.big_storehouse.adapter
+ */
+class HomeVipAdapter(private var dataList: List<VipAreaBean.ListDTO>?, var context: Context) :
+    Adapter<HomeVipAdapter.VipViewHolder>() {
+
+    fun setDatas(dataList: List<VipAreaBean.ListDTO>){
+        this.dataList = dataList
+        notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VipViewHolder {
+        return VipViewHolder(LayoutInflater.from(context).inflate(R.layout.item_home_vip, parent, false))
+    }
+
+    override fun getItemCount(): Int {
+        return if (dataList == null) 0 else dataList!!.size
+    }
+
+    override fun onBindViewHolder(holder: VipViewHolder, position: Int) {
+        var pBean = dataList!![position]
+        holder.binding?.apply {
+            tvNameItem.text = pBean.store_name
+            tvPriceItemVip.text = "${pBean.price}"
+
+            tvYanglaojin.text = "养老金 ${pBean.yanglao}"
+            Glide.with(context).load(pBean.image).into(imgvItem)
+            layoutParent.setOnClickListener{
+                ProductDetailsActivity.launch(context, pBean.product_id)
+            }
+        }
+    }
+
+    class VipViewHolder(val itemView: View) : ViewHolder(itemView) {
+
+        var binding:ItemHomeVipBinding?=null
+        init {
+            binding = ItemHomeVipBinding.bind(itemView)
+            val windowManager = itemView.context
+                .getSystemService(Context.WINDOW_SERVICE) as WindowManager
+            val display = windowManager.defaultDisplay
+            val layoutParams = itemView.layoutParams
+            layoutParams.width = (display.width
+                    - DensityUtils.dip2px(19f) * 2) / 3
+            itemView.layoutParams = layoutParams
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/model/DcSeckillBean.java

@@ -59,6 +59,7 @@ public class DcSeckillBean {
     }
 
     public class Product_data {
+        private String mer_id;
         private String product_id;//商品id
 
         private String store_name;
@@ -66,7 +67,6 @@ public class DcSeckillBean {
         private String ot_price;
         private String seckill_price;
         private String yanglao;
-        private String img;
         private String img_text;
         private String status;//1-抢购中。2-即将开始。3-已结速
 
@@ -134,12 +134,12 @@ public class DcSeckillBean {
             this.yanglao = yanglao;
         }
 
-        public String getImg() {
-            return img == null ? "" : img;
+        public String getMer_id() {
+            return mer_id;
         }
 
-        public void setImg(String img) {
-            this.img = img;
+        public void setMer_id(String mer_id) {
+            this.mer_id = mer_id;
         }
     }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/home/HomeFragment.java

@@ -12,7 +12,6 @@ import android.view.GestureDetector;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -21,6 +20,7 @@ import androidx.core.content.ContextCompat;
 import androidx.core.widget.NestedScrollView;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -35,25 +35,25 @@ import com.yihucha.hbyhc.presentation.MainActivity;
 import com.yihucha.hbyhc.presentation.annuity.AnnuityActivity;
 import com.yihucha.hbyhc.presentation.big_storehouse.DacangSeckillActivity;
 import com.yihucha.hbyhc.presentation.big_storehouse.adapter.HomeMSAdapter;
+import com.yihucha.hbyhc.presentation.big_storehouse.adapter.HomeVipAdapter;
 import com.yihucha.hbyhc.presentation.big_storehouse.model.DcSeckillBean;
 import com.yihucha.hbyhc.presentation.big_storehouse.view_model.BigWarehouseViewModel;
 import com.yihucha.hbyhc.presentation.home.adapter.HomeImageAdapter;
 import com.yihucha.hbyhc.presentation.home.adapter.HomeProductListAdapter;
 import com.yihucha.hbyhc.presentation.home.model.BannerDataBean;
+import com.yihucha.hbyhc.presentation.home.model.HomeProductBean;
 import com.yihucha.hbyhc.presentation.home.model.HomeProductListBean;
-import com.yihucha.hbyhc.presentation.home.model.HomeQuickLink;
 import com.yihucha.hbyhc.presentation.home.view_model.HomeViewModel;
-import com.yihucha.hbyhc.presentation.home.zibubaojian.ZibubaojianActivity;
 import com.yihucha.hbyhc.presentation.members.AGuestMemberActivity;
 import com.yihucha.hbyhc.presentation.message.MessageActivity;
-import com.yihucha.hbyhc.presentation.message.TheAnnouncementActivity;
 import com.yihucha.hbyhc.presentation.message.model.TheAnnouncementBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
-import com.yihucha.hbyhc.presentation.mine.model.YanglaojinBean;
 import com.yihucha.hbyhc.presentation.product.OtherItemsListActivity;
 import com.yihucha.hbyhc.presentation.product.OtherMerchandiseDetailsActivity;
 import com.yihucha.hbyhc.presentation.product.ProductDetailsActivity;
 import com.yihucha.hbyhc.presentation.shop.VipAreaActivity;
+import com.yihucha.hbyhc.presentation.shop.model.VipAreaBean;
+import com.yihucha.hbyhc.presentation.shop.view_model.VipAreaViewModel;
 import com.yihucha.hbyhc.utils.GlideUtils;
 import com.yihucha.hbyhc.utils.ImmersedStatusbarUtils;
 import com.yihucha.hbyhc.utils.LogUtil;
@@ -64,7 +64,6 @@ import com.yihucha.hbyhc.utils.TimeUtils;
 import com.yihucha.hbyhc.view.MyToast;
 import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
 import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
-import com.sunfusheng.marqueeview.MarqueeView;
 import com.youth.banner.indicator.CircleIndicator;
 import com.youth.banner.listener.OnBannerListener;
 
@@ -75,41 +74,30 @@ import qiu.niorgai.StatusBarCompat;
 
 public class
 HomeFragment extends BaseFragment implements View.OnClickListener {
-
-    private MainActivity mActivity;
     private FragmentHomeBinding binding;
 
     private HomeViewModel homeViewModel;
     private BigWarehouseViewModel seckillViewModel;
-    private GestureDetector mDetector;//手势探测器
-//    private MyGestureListener mMyGestureListener;
+    private VipAreaViewModel vipAreaViewModel;
 
-    private List<HomeProductListBean> homeProductListBeans = new ArrayList<>();
+    private List<HomeProductBean.PageInfoDTO.ListDTO> homeProductListBeans = new ArrayList<>();
     private HomeProductListAdapter homeProductListAdapter;
 
     //秒杀商品
     private HomeMSAdapter adapter;
+    private HomeVipAdapter adapterVip;
     private List<DcSeckillBean.Product_data> seckillBeans = new ArrayList<>();
+    private List<VipAreaBean.ListDTO> vipBeans = new ArrayList<>();
     private int mPage = 1;
+    private String mer_keyword = "1";
+    private String isNew = "0";
+    private String priceType = "1";
+    private String sales = "0";
 
-    /**
-     * 公告
-     */
-    private List<TheAnnouncementBean.TheAnnouncementList> mTheAnnouncementBean = new ArrayList<>();
-
-    /**
-     * 接收MainActivity的Touch回调的对象，重写其中的onTouchEvent函数
-     */
-//    MainActivity.MyTouchListener myTouchListener = new MainActivity.MyTouchListener() {
-//        @Override
-//        public boolean onTouchEvent(MotionEvent event) {
-//            //处理手势事件（根据个人需要去返回和逻辑的处理）
-//            return mDetector.onTouchEvent(event);
-//        }
-//    };
+    private boolean isPriceUp = false;
+    private boolean isSalesUp = false;
 
-
-//正在滚动
+    //正在滚动
     public static final int SCROLL_STATE_IDLE = 0;
 
     //正在被外部拖拽,一般为用户正在用手指滚动
@@ -123,7 +111,7 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         //状态栏深色模式
-        StatusBarCompat.cancelLightStatusBar(getActivity());
+        StatusBarCompat.changeToLightStatusBar(getActivity());
     }
 
     public View onCreateView(@NonNull LayoutInflater inflater,
@@ -133,6 +121,9 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
                 new ViewModelProvider(this).get(HomeViewModel.class);
         seckillViewModel =
                 new ViewModelProvider(this).get(BigWarehouseViewModel.class);
+        vipAreaViewModel =
+                new ViewModelProvider(this).get(VipAreaViewModel.class);
+
 
         binding = FragmentHomeBinding.inflate(inflater, container, false);
         View root = binding.getRoot();
@@ -156,87 +147,38 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
         binding.headView.ivMessage.setOnClickListener(this);
         binding.headView.tvMessage.setOnClickListener(this);
         binding.tvGetMore.setOnClickListener(this);
-        homeProductListAdapter.setOnClickListener(new HomeProductListAdapter.OnClickListener() {
-            @Override
-            public void onItemClick(int position) {
-                if (!homeProductListBeans.get(position).getType().equals("6")) {
-                    //单击事件 跳进商品详情
-                    ProductDetailsActivity.launch(getActivity(), homeProductListBeans.get(position).getProduct_id());
-                } else {
-                    if (LoginUtils.isLogin(getActivity())) {
-                        OtherMerchandiseDetailsActivity.launch(getActivity(), Constants.JINGDONG, homeProductListBeans.get(position).getSkuId(),
-                                homeProductListBeans.get(position).getCoupon_money().get(0).getGetStartTime(),
-                                homeProductListBeans.get(position).getCoupon_money().get(0).getGetEndTime());
-                    }
-                }
-            }
-        });
-
-        binding.viewJingangqu.llSeckill.setOnClickListener(this);
-        binding.viewJingangqu.llDacang.setOnClickListener(this);
-        binding.viewJingangqu.llJingdong.setOnClickListener(this);
-        binding.viewJingangqu.llWeipinhui.setOnClickListener(this);
-        binding.viewJingangqu.llTaobao.setOnClickListener(this);
-        binding.viewJingangqu.llPinduoduo.setOnClickListener(this);
-        binding.viewJingangqu.llSuning.setOnClickListener(this);
-
-        binding.viewJingangqu.llGengduo.setOnClickListener(this);
-        binding.viewJingangqu.llJifentongdui.setOnClickListener(this);
-        binding.ivHuiyuan.setOnClickListener(this);
-        binding.viewJingangqu.llDouyin.setOnClickListener(this);
-        binding.viewJingangqu.llElderlyZone.setOnClickListener(this);
-        binding.viewJingangqu.llTheStudentZone.setOnClickListener(this);
-        binding.viewJingangqu.llNewZone.setOnClickListener(this);
-        binding.viewJingangqu.llGongchang.setOnClickListener(this);
-        binding.viewJingangqu.llSection.setOnClickListener(this);
-        binding.viewJingangqu.llZibubaojian.setOnClickListener(this);
-        binding.viewJingangqu.llDslm.setOnClickListener(this);
+        binding.tvBuyNow.setOnClickListener(this);
+        homeProductListAdapter.setOnClickListener(position -> ProductDetailsActivity.launch(getActivity(),
+                homeProductListBeans.get(position).getProduct_id() + ""));
         binding.tvScrollTop.setOnClickListener(this);
-        binding.marqueeView.setOnItemClickListener(new MarqueeView.OnItemClickListener() {
-            @Override
-            public void onItemClick(int position, TextView textView) {
-                //跳进页面
-                TheAnnouncementActivity.launch(getActivity(), mTheAnnouncementBean.get(position).getTitle(),
-                        mTheAnnouncementBean.get(position).getContent(), mTheAnnouncementBean.get(position).getCreate_time());
 
-            }
-        });
+        binding.llRecommend.setOnClickListener(this);
+        binding.llSearchUpdate.setOnClickListener(this);
+        binding.llSearchSales.setOnClickListener(this);
+        binding.llSearchPrice.setOnClickListener(this);
+        binding.headView.ivMessage.setOnClickListener(this);
+        binding.headView.tvMessage.setOnClickListener(this);
+
     }
 
     private void initApi() {
-        //金刚区
-        homeViewModel.getHomeQuickLink();
-        homeViewModel.mHomeQuickLink.observe(getActivity(), new Observer<HomeQuickLink>() {
-            @Override
-            public void onChanged(HomeQuickLink homeQuickLink) {
-
-//                GlideUtils.loadImage(getActivity(),homeQuickLink.getImage(), binding.viewJingangqu.ivImage);
-                Glide.with(getActivity())
-                        .load(homeQuickLink.getImage())
-                        .error(R.mipmap.in_figure_220907)
-                        .placeholder(R.mipmap.in_figure_220907)
-                        .into(binding.viewJingangqu.ivImage);
-//                System.out.println("滋补保健图片--->"+homeQuickLink.getImage());
-                binding.viewJingangqu.tvTitle.setText(homeQuickLink.getTitle());
-            }
-        });
         //商品列表
-        homeViewModel.getHomeProductListData(mPage + "");
+        homeViewModel.getHomeProductListData(mPage, mer_keyword, isNew, priceType, sales);
         //网络发生错误
-        homeViewModel.failed.observe(getActivity(), new Observer<String>() {
-            @Override
-            public void onChanged(String s) {
-                MyToast.makeText(getContext(), s, Toast.LENGTH_LONG).show();
-            }
-        });
+        homeViewModel.failed.observe(getActivity(), s -> MyToast.makeText(getContext(), s, Toast.LENGTH_LONG).show());
         //商品列表请求成功
-        homeViewModel.homeProductListData.observe(getActivity(), new Observer<List<HomeProductListBean>>() {
-            @Override
-            public void onChanged(List<HomeProductListBean> data) {
-                homeProductListBeans = data;
-//                homeProductListAdapter.addData(homeProductListBeans);
-                homeProductListAdapter.updateData(homeProductListBeans);
+        homeViewModel.homeProductListDataYHC.observe(getActivity(), data -> {
+            if (data == null || data.size() == 0) {
+                if (mPage > 1) {
+                    mPage -= 1;
+                }
+                return;
             }
+            if (mPage == 1) {
+                homeProductListBeans.clear();
+            }
+            homeProductListBeans.addAll(data);
+            homeProductListAdapter.setData(homeProductListBeans);
         });
         //用户信息
         homeViewModel.userModel.observe(getActivity(), new Observer<UserInfoModel>() {
@@ -245,39 +187,23 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
                 Log.i("qmz", "235");
                 GlideUtils.loadCircleImage(getActivity(), uesrInfoMpdel.getAvatar(), binding.headView.ivHead, R.mipmap.home_default_avatar_220614);
                 binding.headView.btvName.setText(uesrInfoMpdel.getNickname());
-//                binding.headView.tvAnnuity.setText(uesrInfoMpdel.getAnnuity() + "元养老金");
             }
         });
-        homeViewModel.yanglaojinBeanMutableLiveData.observe(getActivity(), new Observer<YanglaojinBean>() {
-            @Override
-            public void onChanged(YanglaojinBean yanglaojinBean) {
 
-                binding.headView.tvAnnuity.setText(yanglaojinBean.getAll_yanglao() + "元养老金");
-            }
-        });
+        homeViewModel.getBannerData();
+        getBanner();
 
-        //公告
-        homeViewModel.getNoticeList();
-        homeViewModel.mTheAnnouncementData.observe(getActivity(), new Observer<List<TheAnnouncementBean.TheAnnouncementList>>() {
-            @Override
-            public void onChanged(List<TheAnnouncementBean.TheAnnouncementList> theAnnouncementBeans) {
-                if (!theAnnouncementBeans.isEmpty() && theAnnouncementBeans.size() > 0) {
-                    mTheAnnouncementBean = theAnnouncementBeans;
-                    List<String> info = new ArrayList<>();
-                    for (int i = 0; i < mTheAnnouncementBean.size(); i++) {
-                        info.add(mTheAnnouncementBean.get(i).getTitle());
-                    }
-                    binding.marqueeView.startWithList(info);
-                    binding.llTheAnnouncement.setVisibility(View.GONE);
-                } else {
-                    binding.llTheAnnouncement.setVisibility(View.GONE);
-                }
+        vipAreaViewModel.requestData(1, 10, "");
+        vipAreaViewModel.vipAreaData.observe(getViewLifecycleOwner(), data -> {
+            if (data == null || data.size() == 0) {
+                binding.layoutVip.setVisibility(View.GONE);
+                return;
+            }else {
+                binding.layoutVip.setVisibility(View.VISIBLE);
             }
+            adapterVip.setDatas(data);
         });
 
-        homeViewModel.getBannerData();
-        getBanner();
-
         seckillViewModel.getDcSeckill();
         seckillViewModel.mDcSeckillBean.observe(getViewLifecycleOwner(), dcSeckillBeans -> {
             if (dcSeckillBeans == null || dcSeckillBeans.size() == 0) {
@@ -293,8 +219,9 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
             }
         });
     }
+
     //设置秒杀的显示状态
-    private void setMS(List<DcSeckillBean> dcSeckillBeans){
+    private void setMS(List<DcSeckillBean> dcSeckillBeans) {
         int usePos = -1;
         for (int i = 0; i < dcSeckillBeans.size(); i++) {
             //找秒杀中或者下一场秒杀的数据
@@ -303,14 +230,16 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
                 break;
             }
         }
-        if (usePos==-1) {
+        if (usePos == -1) {
             binding.layoutSeckill.setVisibility(View.GONE);
             return;
+        }else {
+            binding.layoutSeckill.setVisibility(View.VISIBLE);
         }
         //数据
         DcSeckillBean dcSeckillBean = dcSeckillBeans.get(usePos);
         List<DcSeckillBean.Product_data> product_data = dcSeckillBean.getProduct_data();
-        if (product_data == null||product_data.size()<1) {
+        if (product_data == null || product_data.size() < 1) {
             binding.layoutSeckill.setVisibility(View.GONE);
             return;
         }
@@ -318,7 +247,7 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
         seckillBeans.clear();
         seckillBeans.addAll(product_data);
         adapter.setDatas(seckillBeans);
-        if (dcSeckillBean.getStatus()==1){
+        if (dcSeckillBean.getStatus() == 1) {
             //正在秒杀
             binding.layoutTime.setVisibility(View.VISIBLE);
             if (TimeUtils.init(dcSeckillBean.getSeckill_date())) {
@@ -327,12 +256,13 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
                     @Override
                     public void onTick(long l) {
                         long timeHour = StringsUtil.getHour(l);
-                        binding.tvHours.setText(timeHour>=10?timeHour+"":"0"+timeHour);
+                        binding.tvHours.setText(timeHour >= 10 ? timeHour + "" : "0" + timeHour);
                         long timeMinute = StringsUtil.getMinute(l);
-                        binding.tvMinute.setText(timeMinute>=10?timeMinute+"":"0"+timeMinute);
+                        binding.tvMinute.setText(timeMinute >= 10 ? timeMinute + "" : "0" + timeMinute);
                         long timeSecond = StringsUtil.getSecond(l);
-                        binding.tvSencond.setText(timeSecond>=10?timeSecond+"":"0"+timeSecond);
+                        binding.tvSencond.setText(timeSecond >= 10 ? timeSecond + "" : "0" + timeSecond);
                     }
+
                     @Override
                     public void onFinish() {
                         timer.cancel();
@@ -342,11 +272,12 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
                 };
                 timer.start();
             }
-        }else {
+        } else {
             //即将开始
             binding.layoutTime.setVisibility(View.GONE);
         }
     }
+
     private void initData() {
 
         if (!"".equals(MVUtils.getString(Constants.TOKEN))) {
@@ -355,15 +286,12 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
         }
 
 //养老金
-        if (!"".equals(MVUtils.getString(Constants.TOKEN))) {
+        /*if (!"".equals(MVUtils.getString(Constants.TOKEN))) {
             homeViewModel.getYanglaojin();
-        }
+        }*/
     }
 
     private void initView() {
-        /** 触摸事件的注册 */
-//        ((MainActivity)this.getActivity()).registerMyTouchListener(myTouchListener);
-
         binding.scrollview.setOnScrollChangeListener(new NestedScrollView.OnScrollChangeListener() {
             @Override
             public void onScrollChange(NestedScrollView v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
@@ -371,34 +299,24 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
                 showHeaderAlphaAction(scrollY);
             }
         });
-        //实例化SimpleOnGestureListener与GestureDetector对象
-//        mMyGestureListener=new MyGestureListener();
-//        mDetector=new GestureDetector(getActivity(),mMyGestureListener);
-
-
-//        //建立布局管理
-//        StaggeredGridLayoutManager layoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL) {
-//            @Override
-//            public boolean canScrollVertically() {
-//                return false;
-//            }
-//        };
-//        //布局
-////        LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity());
-//        binding.rvHomeList.setLayoutManager(layoutManager);
+        //会员专区
+        LinearLayoutManager layoutManagerVip = new LinearLayoutManager(getActivity()
+                , LinearLayoutManager.HORIZONTAL, false);
+        binding.rvVip.setLayoutManager(layoutManagerVip);
+        binding.rvVip.addItemDecoration(new DividerItemDecoration(getContext(), LinearLayoutManager.HORIZONTAL));
+        adapterVip = new HomeVipAdapter(vipBeans, getActivity());
+        binding.rvVip.setAdapter(adapterVip);
+
+//        //布局 秒杀
         LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity()
                 , LinearLayoutManager.HORIZONTAL, false);
         binding.rvMiaosha.setLayoutManager(layoutManager);
-        adapter = new HomeMSAdapter(seckillBeans,getActivity());
+        binding.rvMiaosha.addItemDecoration(new DividerItemDecoration(getContext(), LinearLayoutManager.HORIZONTAL));
+        adapter = new HomeMSAdapter(seckillBeans, getActivity());
         binding.rvMiaosha.setAdapter(adapter);
 
         GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), 2);
         binding.rvHomeList.setLayoutManager(gridLayoutManager);
-//        binding.rvHomeList.addItemDecoration(new GridSpacingItemDecoration(2, 16, false));
-        //设置item间距，30dp
-//        binding.rvHomeList.addItemDecoration(new SpaceItemDecoration(26));
-        //建立适配器
-//        homeProductListAdapter = new HomeProductListAdapter(getActivity(),R.layout.item_home_productlist, homeProductListBeans);
         homeProductListAdapter = new HomeProductListAdapter(getActivity(), homeProductListBeans);
         //给RecyclerView设置适配器
         binding.rvHomeList.setAdapter(homeProductListAdapter);
@@ -416,11 +334,8 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
                     new Handler().postDelayed(new Runnable() {
                         @Override
                         public void run() {
-
                             mPage++;
-                            homeViewModel.getHomeProductListData(mPage + "");
-
-
+                            homeViewModel.getHomeProductListData(mPage, mer_keyword, isNew, priceType, sales);
                         }
                     }, 1000);
                 }
@@ -429,63 +344,19 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
             @Override
             public void onPullDownReleasing(TwinklingRefreshLayout refreshLayout, float fraction) {
                 super.onPullDownReleasing(refreshLayout, fraction);
-                if (fraction == 0.0){
+                if (fraction == 0.0) {
                     seckillViewModel.getDcSeckill();
                 }
-//                if (fraction == 0.0) {
-//                    new Handler().postDelayed(new Runnable() {
-//                        @Override
-//                        public void run() {//刷新
-//                            refreshLayout.finishRefreshing();
-//
-//                            homeViewModel.getBannerData();
-//                            mPage = 1;
-//                            homeProductListBeans.clear();
-//                            homeViewModel.getHomeProductListData(mPage + "");
-//
-//                            if (!"".equals(MVUtils.getString(Constants.TOKEN))) {
-//                                //用户信息
-//                                homeViewModel.getUserInfo();
-//                            }
-//                        }
-//                    }, 250);
-//                }
             }
 
             @Override
             public void onRefresh(final TwinklingRefreshLayout refreshLayout) {
-//                new Handler().postDelayed(new Runnable() {
-//                    @Override
-//                    public void run() {//刷新
-//                        refreshLayout.finishRefreshing();
-//
-//                        homeViewModel.getBannerData();
-//                        mPage = 1;
-//                        homeProductListBeans.clear();
-//                        homeViewModel.getHomeProductListData(mPage + "");
-//
-//                        if (!"".equals(MVUtils.getString(Constants.TOKEN))) {
-//                            //用户信息
-//                            homeViewModel.getUserInfo();
-//                        }
-//                    }
-//                }, 250);
-
 
 
             }
 
             @Override
             public void onLoadMore(final TwinklingRefreshLayout refreshLayout) {
-//                new Handler().postDelayed(new Runnable() {
-//                    @Override
-//                    public void run() {
-//                        //加载
-//                        refreshLayout.finishLoadmore();
-//                        mPage++;
-//                        homeViewModel.getHomeProductListData(mPage + "");
-//                    }
-//                }, 0);
             }
         });
 
@@ -560,7 +431,7 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
                                 } else if (listDataResponse.getData().get(position).getUrl().equals("rich")) {
                                     //VIP专区
                                     VipAreaActivity.lanuch(getActivity());
-                                }else if (listDataResponse.getData().get(position).getUrl().equals(Constants.SHOP)){
+                                } else if (listDataResponse.getData().get(position).getUrl().equals(Constants.SHOP)) {
                                     //精品商城
                                     DingShengLianMengActivity.lanunch(getActivity(), 1);
                                 }
@@ -579,33 +450,12 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
     private void showHeaderAlphaAction(int y) {
         final int rootPicHeight = binding.headView.viewTop.getHeight();
         if (y <= rootPicHeight) {
-            float scale = (float) y / rootPicHeight;
-            binding.headView.viewHeaderBg.setAlpha(scale);
+            binding.headView.viewHeaderBg.setBackgroundResource(R.mipmap.home_top_bg_scroll);
             //状态栏深色模式
-            StatusBarCompat.cancelLightStatusBar(getActivity());
-
-            binding.headView.btvName.setTextColor(ContextCompat.getColor(getActivity(), R.color.white));
-            binding.headView.tvAnnuity.setTextColor(ContextCompat.getColor(getActivity(), R.color.white));
-            binding.headView.tvSendAnnuity.setTextColor(ContextCompat.getColor(getActivity(), R.color.white));
-            binding.headView.tvMessage.setTextColor(ContextCompat.getColor(getActivity(), R.color.white));
-
-            binding.headView.ivMessage.setImageResource(R.mipmap.home_message_220614);
-            binding.headView.llSearch.setBackgroundResource(R.drawable.shape_ffffff_15dp);
             binding.tvScrollTop.setVisibility(View.GONE);
         } else {
             binding.tvScrollTop.setVisibility(View.VISIBLE);
-            //上划之后的效果
-            binding.headView.viewHeaderBg.setAlpha(1);
-            //状态栏浅色模式
-            StatusBarCompat.changeToLightStatusBar(getActivity());
-
-            binding.headView.btvName.setTextColor(ContextCompat.getColor(getActivity(), R.color.black_333333));
-            binding.headView.tvAnnuity.setTextColor(ContextCompat.getColor(getActivity(), R.color.black_333333));
-            binding.headView.tvSendAnnuity.setTextColor(ContextCompat.getColor(getActivity(), R.color.black_333333));
-            binding.headView.tvMessage.setTextColor(ContextCompat.getColor(getActivity(), R.color.black_333333));
-
-            binding.headView.ivMessage.setImageResource(R.mipmap.home_black_message_220614);
-            binding.headView.llSearch.setBackgroundResource(R.drawable.shape_line_fe0032_15dp);
+            binding.headView.viewHeaderBg.setBackgroundResource(R.mipmap.home_top_bg);
         }
     }
 
@@ -616,18 +466,6 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
-        binding.marqueeView.startFlipping();
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        binding.marqueeView.stopFlipping();
-    }
-
-    @Override
     public void onDestroyView() {
         super.onDestroyView();
         binding = null;
@@ -642,84 +480,110 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
             binding.scrollview.scrollTo(0, 0);
             binding.rvHomeList.scrollToPosition(0);
         } else if (view == binding.headView.rlTop) {
-            //判断登录
             //养老金
             if (LoginUtils.isLogin(getActivity())) {
                 AnnuityActivity.launch(getActivity());
             }
         } else if (view == binding.headView.llSearch) {
             //搜索
-            //京东
-            OtherItemsListActivity.launch(getActivity(), Constants.JINGDONG);
-        } else if (view == binding.viewJingangqu.llSeckill) {
-            //秒杀
-            if (LoginUtils.isLogin(getActivity())) {
-                DacangSeckillActivity.launch(getActivity());
-            }
-        } else if (view == binding.viewJingangqu.llDacang) {
-            //大仓
-//            MainActivity.launch(getActivity(), "3");
-            DingShengLianMengActivity.lanunch(getActivity(), 1);
-        } else if (view == binding.viewJingangqu.llJingdong) {
-            //京东
-            OtherItemsListActivity.launch(getActivity(), Constants.JINGDONG);
-        } else if (view == binding.viewJingangqu.llWeipinhui) {
-            //唯品会
-            OtherItemsListActivity.launch(getActivity(), Constants.WEIPINGHUI);
-        } else if (view == binding.viewJingangqu.llTaobao) {
-            //淘宝
-            OtherItemsListActivity.launch(getActivity(), Constants.TAOBAO);
-        } else if (view == binding.viewJingangqu.llPinduoduo) {
-            //拼多多
-            OtherItemsListActivity.launch(getActivity(), Constants.PINDUODUO);
-        } else if (view == binding.viewJingangqu.llSuning) {
-            //苏宁
-            OtherItemsListActivity.launch(getActivity(), Constants.SUNING);
-        } else if (view == binding.viewJingangqu.llJifentongdui) {
-            if (LoginUtils.isLogin(getActivity())) {
-                //积分通兑
-                IntegralarActivity.launch(getActivity());
-            }
-        } else if (view == binding.headView.ivMessage||view == binding.headView.tvMessage) {
-            //消息
-            MessageActivity.launch(getActivity());
-        } else if (view == binding.ivHuiyuan) {
-            if (LoginUtils.isLogin(getActivity())) {
-                AGuestMemberActivity.launch(getActivity());
-            }
-        } else if (view == binding.viewJingangqu.llDouyin) {
-            //抖音
-            OtherItemsListActivity.launch(getActivity(), Constants.DOUYIN);
-        } else if (view == binding.viewJingangqu.llElderlyZone) {
-            //老年专区
-//            getActivity().finish();
-            MainActivity.launch(getActivity(), "3", "571");
-        } else if (view == binding.viewJingangqu.llTheStudentZone) {
-            //学生专区
-//            getActivity().finish();
-            MainActivity.launch(getActivity(), "3", "576");
-        } else if (view == binding.viewJingangqu.llNewZone) {
+//            SearchActivity2.launch(getActivity());
+            YHCHomeSearchActivity.launch(getActivity());
+        } else if (view == binding.tvBuyNow) {
             //新人专区
             VipAreaActivity.lanuch(getActivity());
-        } else if (view == binding.viewJingangqu.llGongchang) {
-            VipAreaActivity.lanuch(getActivity(),1);
-        } else if (view == binding.viewJingangqu.llSection) {
-            //9.9
-//            getActivity().finish();
-            MainActivity.launch(getActivity(), "3", "567");
-        } else if (view == binding.viewJingangqu.llGengduo) {
-//            getActivity().finish();
-            MainActivity.launch(getActivity(), "2");
-        } else if (view == binding.viewJingangqu.llZibubaojian) {
-            ZibubaojianActivity.launch(getActivity(), "430");
-        } else if (view == binding.viewJingangqu.llDslm) {
-            //精品商城
-            DingShengLianMengActivity.lanunch(getActivity());
         } else if (view == binding.tvGetMore) {
             DacangSeckillActivity.launch(getActivity());
+        }else if (view == binding.headView.ivMessage || view == binding.headView.tvMessage){
+            MessageActivity.launch(getActivity());
+        }else if (view == binding.llRecommend){
+            //推荐，默认选项
+            isPriceUp = false;
+            isSalesUp = false;
+            mPage =1;
+            isNew = "0";
+            priceType = "1";
+            sales = "0";
+            setSelectButton(0);
+        } else if (view == binding.llSearchUpdate){
+            //上新
+            isPriceUp = false;
+            isSalesUp = false;
+            mPage =1;
+            isNew = "1";
+            priceType = "1";
+            sales = "0";
+            setSelectButton(1);
+        } else if (view == binding.llSearchSales){
+            //销量
+            isPriceUp = false;
+            isSalesUp = !isSalesUp;
+            mPage =1;
+            isNew = "0";
+            priceType = "1";
+            sales = isSalesUp?"1":"0";
+            setSelectButton(2);
+        } else if (view == binding.llSearchPrice){
+            //价格
+            isSalesUp = false;
+            isPriceUp = !isPriceUp;
+            mPage =1;
+            isNew = "0";
+            priceType = isPriceUp?"1":"0";
+            sales = "1";
+            setSelectButton(3);
         }
     }
+    private int currentPos = 0;
+    private void setSelectButton(int pos){
+        if (currentPos == pos && (pos==0||pos==1)) return;  //重复点击 推荐 和 上新选项是无意义的，直接返回
+
+        binding.btvRecommend.setTextColor(ContextCompat.getColor(getContext(), R.color.black_333333));
+        binding.btvSearchUpdate.setTextColor(ContextCompat.getColor(getContext(), R.color.black_333333));
+        binding.btvSearchSales.setTextColor(ContextCompat.getColor(getContext(), R.color.black_333333));
+        binding.btvSearchPrice.setTextColor(ContextCompat.getColor(getContext(), R.color.black_333333));
+        if (pos != 2){
+            binding.ivShengxuSales.setImageResource(R.mipmap.tuijian_shangla);
+            binding.ivJiangxuSale.setImageResource(R.mipmap.tuijian_xiala);
+        }
+        if (pos != 3){
+            binding.ivShengxu.setImageResource(R.mipmap.tuijian_shangla);
+            binding.ivJiangxu.setImageResource(R.mipmap.tuijian_xiala);
+        }
+        switch (pos) {
+            case 0:
+                binding.btvRecommend.setTextColor(ContextCompat.getColor(getContext(), R.color.red_fe0032));
+                homeViewModel.getHomeProductListData(mPage, mer_keyword, null, null, null);
+                break;
+            case 1:
+                binding.btvSearchUpdate.setTextColor(ContextCompat.getColor(getContext(), R.color.red_fe0032));
+                homeViewModel.getHomeProductListData(mPage, mer_keyword, isNew, null, null);
+                break;
+            case 2:
+                binding.btvSearchSales.setTextColor(ContextCompat.getColor(getContext(), R.color.red_fe0032));
+                homeViewModel.getHomeProductListData(mPage, mer_keyword, null, null, sales);
+                if (isSalesUp){
+                    binding.ivShengxuSales.setImageResource(R.mipmap.search_red_shangla_220617);
+                    binding.ivJiangxuSale.setImageResource(R.mipmap.tuijian_xiala);
+                }else {
+                    binding.ivShengxuSales.setImageResource(R.mipmap.tuijian_shangla);
+                    binding.ivJiangxuSale.setImageResource(R.mipmap.search_red_xiala_220617);
+                }
+                break;
+            case 3:
+                binding.btvSearchPrice.setTextColor(ContextCompat.getColor(getContext(), R.color.red_fe0032));
+                homeViewModel.getHomeProductListData(mPage, mer_keyword, null, priceType, null);
+                if (isPriceUp){
+                    binding.ivShengxu.setImageResource(R.mipmap.search_red_shangla_220617);
+                    binding.ivJiangxu.setImageResource(R.mipmap.tuijian_xiala);
+                }else {
+                    binding.ivShengxu.setImageResource(R.mipmap.tuijian_shangla);
+                    binding.ivJiangxu.setImageResource(R.mipmap.search_red_xiala_220617);
+                }
+                break;
+        }
+        currentPos = pos;
 
+    }
     @Override
     public void onDestroy() {
         super.onDestroy();

app/src/main/java/com/yihucha/hbyhc/presentation/home/SearchActivity2.java

@@ -69,7 +69,7 @@ public class SearchActivity2 extends ViewBindingBaseActivity<ActivitySearch2Bind
     private RecordsDao mRecordsDao;//搜索db
     //默然展示词条个数
     private final int DEFAULT_RECORD_NUMBER = 30;
-    private List<String> listOne = new ArrayList<String>();
+    private List<String> listOne = new ArrayList();
     private TagAdapter hotTagAdapter;//热门关键字
 
     private SearchViewModel searchViewModel;
@@ -332,17 +332,14 @@ public class SearchActivity2 extends ViewBindingBaseActivity<ActivitySearch2Bind
             }
         });
         //热门关键字
-        searchViewModel.hotkeyData.observe(this, new Observer<List<HotKetWordBean>>() {
-            @Override
-            public void onChanged(List<HotKetWordBean> hotKetWordBeans) {
-                for (int i = 0; i < hotKetWordBeans.size(); i++) {
-                    listOne.add(hotKetWordBeans.get(i).getKeyword());
-                }
-                Log.i("num", JSON.toJSONString(listOne));
-                if (hotTagAdapter != null) {
-                    hotTagAdapter.setData(listOne);
-                    hotTagAdapter.notifyDataChanged();
-                }
+        searchViewModel.hotkeyData.observe(this, hotKetWordBeans -> {
+            for (int i = 0; i < hotKetWordBeans.size(); i++) {
+                listOne.add(hotKetWordBeans.get(i).getKeyword());
+            }
+            Log.i("num", JSON.toJSONString(listOne));
+            if (hotTagAdapter != null) {
+                hotTagAdapter.setData(listOne);
+                hotTagAdapter.notifyDataChanged();
             }
         });
         //商品搜索结果
@@ -355,7 +352,7 @@ public class SearchActivity2 extends ViewBindingBaseActivity<ActivitySearch2Bind
                     mViewBinding.searchRecords.llSearchHistoryIsRecommended.setVisibility(View.GONE);
                     mViewBinding.searchList.noSearch.llNotFound.setVisibility(View.VISIBLE);
                     mViewBinding.searchList.llContent.setVisibility(View.GONE);
-                }else if (mPage == 1 && productLists.size() > 0) {
+                } else if (mPage == 1 && productLists.size() > 0) {
                     //第一次搜索数据没有清空干净
 //                    mViewBinding.searchList.llTabList.setVisibility(View.GONE);
                     mViewBinding.searchRecords.llSearchHistoryIsRecommended.setVisibility(View.GONE);
@@ -399,31 +396,23 @@ public class SearchActivity2 extends ViewBindingBaseActivity<ActivitySearch2Bind
 
     @SuppressLint("CheckResult")
     private void setRecordsDao() {
-        Observable.create(new ObservableOnSubscribe<List<String>>() {
-                    @Override
-                    public void subscribe(ObservableEmitter<List<String>> emitter) throws Exception {
-                        emitter.onNext(mRecordsDao.getRecordsByNumber(DEFAULT_RECORD_NUMBER));
-                    }
-                }).subscribeOn(Schedulers.io())
+        Observable.create((ObservableOnSubscribe<List<String>>) emitter -> emitter.onNext(mRecordsDao.getRecordsByNumber(DEFAULT_RECORD_NUMBER))).subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<List<String>>() {
-                    @Override
-                    public void accept(List<String> s) throws Exception {
-                        recordList.clear();
-                        recordList = s;
-//                        if (null == recordList || recordList.size() == 0) {
-//                            mHistoryContent.setVisibility(View.GONE);
-//                        } else {
-//                            mHistoryContent.setVisibility(View.VISIBLE);
-//                        }
-                        if (mRecordsAdapter != null) {
-                            mRecordsAdapter.setData(recordList);
-                            mRecordsAdapter.notifyDataChanged();
-                        }
-                        if (mDeleteRecordsAdapter != null) {
-                            mDeleteRecordsAdapter.setData(recordList);
-                            mDeleteRecordsAdapter.notifyDataChanged();
-                        }
+                .subscribe(s -> {
+                    recordList.clear();
+                    recordList = s;
+                    if (null == recordList || recordList.size() == 0) {
+                        mViewBinding.searchRecords.llHistoryContent.setVisibility(View.GONE);
+                    } else {
+                        mViewBinding.searchRecords.llHistoryContent.setVisibility(View.VISIBLE);
+                    }
+                    if (mRecordsAdapter != null) {
+                        mRecordsAdapter.setData(recordList);
+                        mRecordsAdapter.notifyDataChanged();
+                    }
+                    if (mDeleteRecordsAdapter != null) {
+                        mDeleteRecordsAdapter.setData(recordList);
+                        mDeleteRecordsAdapter.notifyDataChanged();
                     }
                 });
     }
@@ -445,115 +434,88 @@ public class SearchActivity2 extends ViewBindingBaseActivity<ActivitySearch2Bind
         mViewBinding.searchList.tvSearchNewest.setOnClickListener(this);
 
         //热门点击
-        mViewBinding.searchRecords.flSearchHot.setOnTagClickListener(new TagFlowLayout.OnTagClickListener() {
-            @Override
-            public void onTagClick(View view, int position, FlowLayout parent) {
-                //清空editText之前的数据
-                mViewBinding.etSearch.setText("");
-                //将获取到的字符串传到搜索结果界面,点击后搜索对应条目内容
-                mViewBinding.etSearch.setText(listOne.get(position));
-                //输入焦点位置
-                mViewBinding.etSearch.setSelection(mViewBinding.etSearch.length());
+        mViewBinding.searchRecords.flSearchHot.setOnTagClickListener((view, position, parent) -> {
+            //清空editText之前的数据
+            mViewBinding.etSearch.setText("");
+            //将获取到的字符串传到搜索结果界面,点击后搜索对应条目内容
+            mViewBinding.etSearch.setText(listOne.get(position));
+            //输入焦点位置
+            mViewBinding.etSearch.setSelection(mViewBinding.etSearch.length());
+
+            //搜索记录
+            searchStr = mViewBinding.etSearch.getText().toString();
+            if (!TextUtils.isEmpty(searchStr)) {
+                //清空店铺和商品数据
+                productListsData.clear();
+                storeListData.clear();
+                mPage = 1;
+
+                //添加数据
+                mRecordsDao.addRecords(searchStr);
+                //调用接口
+                //搜索商品
+                searchViewModel.getSearchProduct(mPage, "", searchStr);
+                //如果没有开启gps或者网络定位
+                if (location == null) {
+                    ToastUtils.showLong("定位权限不可用,请检查gps或者网络定位是否开启");
+                    finish();
+                    MainActivity.launch(context, "1");
+                    return;
+                }
+                //搜索店铺
+                searchViewModel.getSearchStore(mShopPage, location.getLatitude(), location.getLongitude(), searchStr, mCareCount, mIsNew, mDistanceAsc);
+                //隐藏与显示
+//                    mViewBinding.searchList.llTabList.setVisibility(View.VISIBLE);
+                mViewBinding.searchRecords.llSearchHistoryIsRecommended.setVisibility(View.GONE);
+                mViewBinding.searchList.noSearch.llNotFound.setVisibility(View.GONE);
 
-                //搜索记录
-                searchStr = mViewBinding.etSearch.getText().toString();
-                if (!TextUtils.isEmpty(searchStr)) {
-                    //清空店铺和商品数据
-                    productListsData.clear();
-                    storeListData.clear();
-                    mPage = 1;
+            }
 
-                    //添加数据
-                    mRecordsDao.addRecords(searchStr);
-                    //调用接口
+        });
+        //搜索历史点击
+        mViewBinding.searchRecords.flSearchRecords.setOnTagClickListener((view, position, parent) -> {
+            //清空editText之前的数据
+            mViewBinding.etSearch.setText("");
+            //将获取到的字符串传到搜索结果界面,点击后搜索对应条目内容
+            mViewBinding.etSearch.setText(recordList.get(position));
+            //输入焦点位置
+            mViewBinding.etSearch.setSelection(mViewBinding.etSearch.length());
+
+            //搜索记录
+            searchStr = mViewBinding.etSearch.getText().toString();
+            if (!TextUtils.isEmpty(searchStr)) {
+                //清空店铺和商品数据
+                productListsData.clear();
+                storeListData.clear();
+                mPage = 1;
+                mShopPage = 1;
+                //添加数据
+                mRecordsDao.addRecords(searchStr);
+                //调用接口
+                if (type == 1) {
                     //搜索商品
                     searchViewModel.getSearchProduct(mPage, "", searchStr);
-                    //如果没有开启gps或者网络定位
-                    if (location==null){
-                        ToastUtils.showLong("定位权限不可用,请检查gps或者网络定位是否开启");
-                        finish();
-                        MainActivity.launch(context,"1");
-                        return;
-                    }
+                } else {
                     //搜索店铺
                     searchViewModel.getSearchStore(mShopPage, location.getLatitude(), location.getLongitude(), searchStr, mCareCount, mIsNew, mDistanceAsc);
-                    //隐藏与显示
-//                    mViewBinding.searchList.llTabList.setVisibility(View.VISIBLE);
-                    mViewBinding.searchRecords.llSearchHistoryIsRecommended.setVisibility(View.GONE);
-                    mViewBinding.searchList.noSearch.llNotFound.setVisibility(View.GONE);
-
                 }
+                //隐藏与显示
+                mViewBinding.searchList.llTabList.setVisibility(View.VISIBLE);
+                mViewBinding.searchRecords.llSearchHistoryIsRecommended.setVisibility(View.GONE);
+                mViewBinding.searchList.noSearch.llNotFound.setVisibility(View.GONE);
 
             }
         });
-        //搜索历史点击
-        mViewBinding.searchRecords.flSearchRecords.setOnTagClickListener(new TagFlowLayout.OnTagClickListener() {
-            @Override
-            public void onTagClick(View view, int position, FlowLayout parent) {
-                //清空editText之前的数据
-                mViewBinding.etSearch.setText("");
-                //将获取到的字符串传到搜索结果界面,点击后搜索对应条目内容
-                mViewBinding.etSearch.setText(recordList.get(position));
-                //输入焦点位置
-                mViewBinding.etSearch.setSelection(mViewBinding.etSearch.length());
-
-                //搜索记录
-                searchStr = mViewBinding.etSearch.getText().toString();
-                if (!TextUtils.isEmpty(searchStr)) {
-                    //清空店铺和商品数据
-                    productListsData.clear();
-                    storeListData.clear();
-                    mPage = 1;
-                    mShopPage = 1;
-                    //添加数据
-                    mRecordsDao.addRecords(searchStr);
-                    //调用接口
-                    if (type == 1) {
-                        //搜索商品
-                        searchViewModel.getSearchProduct(mPage, "", searchStr);
-                    } else {
-                        //搜索店铺
-                        searchViewModel.getSearchStore(mShopPage, location.getLatitude(), location.getLongitude(), searchStr, mCareCount, mIsNew, mDistanceAsc);
-                    }
-                    //隐藏与显示
-                    mViewBinding.searchList.llTabList.setVisibility(View.VISIBLE);
-                    mViewBinding.searchRecords.llSearchHistoryIsRecommended.setVisibility(View.GONE);
-                    mViewBinding.searchList.noSearch.llNotFound.setVisibility(View.GONE);
-
-                }
-            }
-        });
         //删除某一条
-        mViewBinding.searchRecords.flSearchRecordsDelete.setOnTagClickListener(new TagFlowLayout.OnTagClickListener() {
-            @Override
-            public void onTagClick(View view, int position, FlowLayout parent) {
+        mViewBinding.searchRecords.flSearchRecordsDelete.setOnTagClickListener((view, position, parent) -> {
 
-                mRecordsDao.deleteRecord(recordList.get(position));
+            mRecordsDao.deleteRecord(recordList.get(position));
 
-                mViewBinding.searchRecords.clearAllRecords.setVisibility(View.VISIBLE);
-                mViewBinding.searchRecords.llDeleteLayout.setVisibility(View.GONE);
-                mViewBinding.searchRecords.flSearchRecords.setVisibility(View.VISIBLE);
-                mViewBinding.searchRecords.flSearchRecordsDelete.setVisibility(View.GONE);
-            }
+            mViewBinding.searchRecords.clearAllRecords.setVisibility(View.VISIBLE);
+            mViewBinding.searchRecords.llDeleteLayout.setVisibility(View.GONE);
+            mViewBinding.searchRecords.flSearchRecords.setVisibility(View.VISIBLE);
+            mViewBinding.searchRecords.flSearchRecordsDelete.setVisibility(View.GONE);
         });
-//        mViewBinding.etSearch.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-//            @Override
-//            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
-//                if (i == EditorInfo.IME_ACTION_SEARCH) {
-//                    //点击搜索的时候隐藏软键盘
-//                    hideKeyboard(mViewBinding.etSearch);
-//                    // 在这里写搜索的操作,一般都是网络请求数据
-//                    //搜索记录
-//                    if (!TextUtils.isEmpty( mViewBinding.etSearch.getText().toString().trim())) {
-//                        //添加数据
-//                        mRecordsDao.addRecords(mViewBinding.etSearch.getText().toString().trim());
-//
-//                    }
-//                    return true;
-//                }
-//                return false;
-//            }
-//        });
         searchShopAdapter.setOnClickListener(new SearchShopAdapter.OnClickListener() {
             @Override
             public void onItemClick(int position) {
@@ -587,7 +549,7 @@ public class SearchActivity2 extends ViewBindingBaseActivity<ActivitySearch2Bind
         if (view == mViewBinding.ivGoback) {
             finish();
         } else if (view == mViewBinding.tvClickSearch) {
-            if (!isFastClick()){
+            if (!isFastClick()) {
                 //点击搜索的时候隐藏软键盘
                 hideKeyboard(mViewBinding.etSearch);
                 // 在这里写搜索的操作,一般都是网络请求数据
@@ -612,10 +574,10 @@ public class SearchActivity2 extends ViewBindingBaseActivity<ActivitySearch2Bind
                     }
                     //搜索商品
                     searchViewModel.getSearchProduct(mPage, "", searchStr);
-                    if (location==null){
+                    if (location == null) {
                         ToastUtils.showLong("定位权限不可用,请检查gps或者网络定位是否开启");
                         finish();
-                        MainActivity.launch(context,"1");
+                        MainActivity.launch(context, "1");
                         return;
                     }
                     //搜索店铺
@@ -658,7 +620,7 @@ public class SearchActivity2 extends ViewBindingBaseActivity<ActivitySearch2Bind
             mViewBinding.searchList.ivXiala.setImageResource(R.mipmap.tuijian_xiala);
 
 
-            mPage=1;
+            mPage = 1;
             // 清空数据
             productListsData.clear();
             //请求接口
@@ -674,7 +636,7 @@ public class SearchActivity2 extends ViewBindingBaseActivity<ActivitySearch2Bind
             mViewBinding.searchList.ivShangla.setImageResource(R.mipmap.tuijian_shangla);
             mViewBinding.searchList.ivXiala.setImageResource(R.mipmap.tuijian_xiala);
 
-            mPage=1;
+            mPage = 1;
             // 清空数据
             productListsData.clear();
             //请求接口
@@ -690,7 +652,7 @@ public class SearchActivity2 extends ViewBindingBaseActivity<ActivitySearch2Bind
             mViewBinding.searchList.ivShangla.setImageResource(R.mipmap.tuijian_shangla);
             mViewBinding.searchList.ivXiala.setImageResource(R.mipmap.tuijian_xiala);
 
-            mPage=1;
+            mPage = 1;
             // 清空数据
             productListsData.clear();
             //请求接口
@@ -714,7 +676,7 @@ public class SearchActivity2 extends ViewBindingBaseActivity<ActivitySearch2Bind
                 mViewBinding.searchList.ivXiala.setImageResource(R.mipmap.search_red_xiala_220617);
                 mPriceRank = 1;
             }
-            mPage=1;
+            mPage = 1;
             // 清空数据
             productListsData.clear();
             //请求接口
@@ -731,7 +693,7 @@ public class SearchActivity2 extends ViewBindingBaseActivity<ActivitySearch2Bind
             mViewBinding.searchList.refreshLayout2.setVisibility(View.GONE);
             mViewBinding.searchList.llShop.setVisibility(View.GONE);
             type = 1;
-            mPage=1;
+            mPage = 1;
             // 清空数据
             productListsData.clear();
             //搜索商品

app/src/main/java/com/yihucha/hbyhc/presentation/home/YHCHomeSearchActivity.kt

@@ -0,0 +1,451 @@
+package com.yihucha.hbyhc.presentation.home
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.os.Handler
+import android.text.TextUtils
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.TextView
+import android.widget.Toast
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.GridLayoutManager
+import com.alibaba.fastjson.JSON
+import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter
+import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
+import com.yihucha.hbyhc.R
+import com.yihucha.hbyhc.base.ViewBindingBaseActivity
+import com.yihucha.hbyhc.config.Constants
+import com.yihucha.hbyhc.databinding.ActivityYhchomeSearchBinding
+import com.yihucha.hbyhc.presentation.home.adapter.HomeProductListAdapter
+import com.yihucha.hbyhc.presentation.home.model.HomeProductBean.PageInfoDTO
+import com.yihucha.hbyhc.presentation.home.model.HotKetWordBean
+import com.yihucha.hbyhc.presentation.home.view_model.HomeViewModel
+import com.yihucha.hbyhc.presentation.home.view_model.SearchViewModel
+import com.yihucha.hbyhc.utils.EmptyCheckUtils
+import com.yihucha.hbyhc.utils.GridSpacingItemDecoration
+import com.yihucha.hbyhc.utils.MVUtils
+import com.yihucha.hbyhc.utils.StringsUtil
+import com.yihucha.hbyhc.utils.search_db.RecordsDao
+import com.yihucha.hbyhc.view.CustomDialog
+import com.zhy.view.flowlayout.FlowLayout
+import com.zhy.view.flowlayout.TagAdapter
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+
+class YHCHomeSearchActivity : ViewBindingBaseActivity<ActivityYhchomeSearchBinding>(),
+    View.OnClickListener {
+    private lateinit var mRecordsDao: RecordsDao
+    private var recordList = mutableListOf<String>()
+    private var productListsData = mutableListOf<PageInfoDTO.ListDTO>()
+    private lateinit var mRecordsAdapter: TagAdapter<String>//初始化搜索历史
+    private lateinit var mDeleteRecordsAdapter: TagAdapter<String> //带删除的搜索历史
+    private var homeProductListAdapter: HomeProductListAdapter? = null
+
+    //默然展示词条个数
+    private val DEFAULT_RECORD_NUMBER = 30
+    private val listOne = ArrayList<String>()
+    private lateinit var hotTagAdapter: TagAdapter<String>//热门关键字
+
+    private var mPage = 1
+    private var mer_keyword = "1"
+    private var isNew = "0"
+    private var priceType = "1"
+    private var sales = "0"
+    private var isPriceUp = false
+    private var isSalesUp = false
+
+    private val searchViewModel by lazy {
+        ViewModelProvider(this)[SearchViewModel::class.java]
+    }
+    private val homeViewModel by lazy {
+        ViewModelProvider(this)[HomeViewModel::class.java]
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        initView()
+        initData()
+        initListener()
+    }
+
+    private fun initListener() {
+        mViewBinding.ivGoback.setOnClickListener(this)
+        mViewBinding.tvClickSearch.setOnClickListener(this)
+        mViewBinding.searchRecords.clearAllRecords.setOnClickListener(this)
+        mViewBinding.searchRecords.tvAlldelete.setOnClickListener(this)
+        mViewBinding.searchRecords.tvComplete.setOnClickListener(this)
+        mViewBinding.llRecommend.setOnClickListener(this)
+        mViewBinding.llSearchSales.setOnClickListener(this)
+        mViewBinding.llSearchPrice.setOnClickListener(this)
+
+        //热门点击
+        mViewBinding.searchRecords.flSearchHot.setOnTagClickListener { view, position, parent ->
+            //清空editText之前的数据
+            mViewBinding.etSearch.setText("")
+            //将获取到的字符串传到搜索结果界面,点击后搜索对应条目内容
+            mViewBinding.etSearch.setText(listOne[position])
+            //输入焦点位置
+            mViewBinding.etSearch.setSelection(mViewBinding.etSearch.length())
+
+            //搜索记录
+            mer_keyword = mViewBinding.etSearch.text.toString()
+            if (!TextUtils.isEmpty(mer_keyword)) {
+                //清空店铺和商品数据
+                productListsData.clear()
+                mPage = 1
+                //添加数据
+                mRecordsDao.addRecords(mer_keyword)
+                //调用接口
+                homeViewModel.getHomeProductListData(mPage, mer_keyword, null, null, null)
+                //隐藏与显示
+                mViewBinding.searchRecords.llSearchHistoryIsRecommended.visibility = View.GONE
+            }
+        }
+        //搜索历史点击
+        mViewBinding.searchRecords.flSearchRecords.setOnTagClickListener { _, position, _ ->
+            //清空editText之前的数据
+            mViewBinding.etSearch.setText("")
+            //将获取到的字符串传到搜索结果界面,点击后搜索对应条目内容
+            mViewBinding.etSearch.setText(recordList[position])
+            //输入焦点位置
+            mViewBinding.etSearch.setSelection(mViewBinding.etSearch.length())
+            //搜索记录
+            mer_keyword = mViewBinding.etSearch.text.toString()
+            if (!TextUtils.isEmpty(mer_keyword)) {
+                //清空店铺和商品数据
+                mPage = 1
+                //添加数据
+                mRecordsDao.addRecords(mer_keyword)
+                //调用接口
+                homeViewModel.getHomeProductListData(mPage, mer_keyword, null, null, null)
+                //隐藏与显示
+                mViewBinding.searchRecords.llSearchHistoryIsRecommended.visibility = View.GONE
+            }
+        }
+        //删除某一条
+        mViewBinding.searchRecords.flSearchRecordsDelete.setOnTagClickListener { view, position, parent ->
+            mRecordsDao.deleteRecord(recordList[position])
+            mViewBinding.searchRecords.clearAllRecords.visibility = View.VISIBLE
+            mViewBinding.searchRecords.llDeleteLayout.visibility = View.GONE
+            mViewBinding.searchRecords.flSearchRecords.visibility = View.VISIBLE
+            mViewBinding.searchRecords.flSearchRecordsDelete.visibility = View.GONE
+        }
+    }
+
+    private fun initData() {
+        //商品列表请求成功
+        homeViewModel.homeProductListDataYHC.observe(
+            this
+        ) { data ->
+            mViewBinding.refreshLayout?.apply {
+                finishRefreshing()
+                finishLoadmore()
+            }
+            if (EmptyCheckUtils.isEmpty(data) && mPage > 1) {
+                mPage -= 1
+                return@observe
+            }
+            if (mPage == 1) {
+                productListsData.clear()
+            }
+            productListsData.addAll(data)
+            if (EmptyCheckUtils.isEmpty(productListsData)) {
+                mViewBinding.noSearch.llNotFound.visibility = View.VISIBLE
+                mViewBinding.rvProductSearch.visibility = View.GONE
+                mViewBinding.layoutSelect.visibility = View.GONE
+            } else {
+                mViewBinding.noSearch.llNotFound.visibility = View.GONE
+                mViewBinding.rvProductSearch.visibility = View.VISIBLE
+                mViewBinding.layoutSelect.visibility = View.VISIBLE
+            }
+            homeProductListAdapter!!.setData(productListsData)
+
+
+        }
+        //热门关键字
+        searchViewModel.getHotKeyWordData()
+        searchViewModel.hotkeyData.observe(this) { hotKetWordBeans: List<HotKetWordBean> ->
+            for (i in hotKetWordBeans.indices) {
+                listOne.add(hotKetWordBeans[i].keyword)
+            }
+            Log.i("num", JSON.toJSONString(listOne))
+            if (hotTagAdapter != null) {
+                hotTagAdapter.setData(listOne)
+                hotTagAdapter.notifyDataChanged()
+            }
+        }
+        setRecordsDao()
+    }
+
+    private fun initView() {
+        mRecordsDao = if (TextUtils.isEmpty(MVUtils.getString(Constants.TOKEN))) {
+            //初始化数据库
+            RecordsDao(this, MVUtils.getString(Constants.TOKEN))
+        } else {
+            RecordsDao(this, "0")
+        }
+
+        mRecordsAdapter = object : TagAdapter<String>(recordList) {
+            override fun getView(parent: FlowLayout, position: Int, s: String): View {
+                val tv = LayoutInflater.from(this@YHCHomeSearchActivity).inflate(
+                    R.layout.item_history,
+                    mViewBinding.searchRecords.flSearchRecords, false
+                ) as TextView
+                //为标签设置对应的内容
+                tv.text = s
+                return tv
+            }
+        }
+        mViewBinding.searchRecords.flSearchRecords.adapter = mRecordsAdapter
+
+        //带删除的搜索历史
+        mDeleteRecordsAdapter = object : TagAdapter<String>(recordList) {
+            override fun getView(parent: FlowLayout, position: Int, s: String): View {
+                val tv = LayoutInflater.from(this@YHCHomeSearchActivity).inflate(
+                    R.layout.item_delete_history,
+                    mViewBinding.searchRecords.flSearchRecords, false
+                ) as TextView
+                //为标签设置对应的内容
+                tv.text = s
+                return tv
+            }
+        }
+        mViewBinding.searchRecords.flSearchRecordsDelete.adapter = mDeleteRecordsAdapter
+
+        //热门初始化
+        hotTagAdapter = object : TagAdapter<String>(listOne) {
+            override fun getView(parent: FlowLayout, position: Int, s: String): View {
+                val tv = LayoutInflater.from(this@YHCHomeSearchActivity).inflate(
+                    R.layout.item_history,
+                    mViewBinding.searchRecords.flSearchHot, false
+                ) as TextView
+                //为标签设置对应的内容
+                tv.text = s
+                return tv
+            }
+        }
+        mViewBinding.searchRecords.flSearchHot.adapter = hotTagAdapter
+
+        //db更新
+        mRecordsDao.setNotifyDataChanged { setRecordsDao() }
+
+        //商品搜索布局
+        val gridLayoutManager = GridLayoutManager(context, 2)
+        mViewBinding.rvProductSearch.layoutManager = gridLayoutManager
+        mViewBinding.rvProductSearch.addItemDecoration(
+            GridSpacingItemDecoration(
+                2,
+                50,
+                false
+            )
+        )
+        homeProductListAdapter = HomeProductListAdapter(context, productListsData)
+        mViewBinding.rvProductSearch.adapter = homeProductListAdapter
+        mViewBinding.refreshLayout.setEnableRefresh(true)
+        mViewBinding.refreshLayout.setEnableLoadmore(true)
+        //商品刷新
+        mViewBinding.refreshLayout.setOnRefreshListener(object : RefreshListenerAdapter() {
+            override fun onRefresh(refreshLayout: TwinklingRefreshLayout) {
+                Handler().postDelayed({ //刷新
+                    refreshLayout.finishRefreshing()
+                    mPage = 1
+                    productListsData.clear()
+                    homeViewModel.getHomeProductListData(mPage, mer_keyword, null, null, null)
+                }, 2000)
+            }
+
+            override fun onLoadMore(refreshLayout: TwinklingRefreshLayout) {
+                Handler().postDelayed({ //加载
+                    refreshLayout.finishLoadmore()
+                    mPage++
+                    homeViewModel.getHomeProductListData(mPage, mer_keyword, null, null, null)
+                }, 2000)
+            }
+        })
+        //是否自动加载更多, 滑到底部默认加载更多,默认false
+//        mViewBinding.refreshLayout.setAutoLoadMore(true)
+
+    }
+
+    @SuppressLint("CheckResult")
+    private fun setRecordsDao() {
+        Observable.create { emitter ->
+            emitter.onNext(
+                mRecordsDao.getRecordsByNumber(DEFAULT_RECORD_NUMBER)
+            )
+        }.subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe { s ->
+                recordList.clear()
+                recordList.addAll(s)
+                if (null == recordList || recordList.size == 0) {
+                    mViewBinding.searchRecords.llHistoryContent.visibility = View.GONE
+                } else {
+                    mViewBinding.searchRecords.llHistoryContent.visibility = View.VISIBLE
+                }
+                if (mRecordsAdapter != null) {
+                    mRecordsAdapter.setData(recordList)
+                    mRecordsAdapter.notifyDataChanged()
+                }
+                if (mDeleteRecordsAdapter != null) {
+                    mDeleteRecordsAdapter.setData(recordList)
+                    mDeleteRecordsAdapter.notifyDataChanged()
+                }
+            }
+    }
+
+
+    override fun onClick(v: View?) {
+        v?.apply {
+            when (this) {
+                mViewBinding.ivGoback -> finish()
+                mViewBinding.tvClickSearch -> {
+                    //搜索记录
+                    mer_keyword = mViewBinding.etSearch.text.toString().trim()
+                    if (StringsUtil.isEmpty(mer_keyword)) {
+                        Toast.makeText(this@YHCHomeSearchActivity, "请输入搜索关键字", Toast.LENGTH_LONG)
+                        return
+                    }
+                    hideKeyboard(mViewBinding.etSearch)
+                    mPage = 1
+                    //添加数据
+                    mRecordsDao.addRecords(mer_keyword)
+                    mViewBinding.searchRecords.llSearchHistoryIsRecommended.visibility = View.GONE
+                    homeViewModel.getHomeProductListData(
+                        mPage,
+                        mer_keyword,
+                        null,
+                        null,
+                        null
+                    )
+                }
+                mViewBinding.searchRecords.clearAllRecords -> {
+                    //点击删除按钮
+                    mViewBinding.searchRecords.clearAllRecords.visibility = View.GONE
+                    mViewBinding.searchRecords.llDeleteLayout.visibility = View.VISIBLE
+                    mViewBinding.searchRecords.flSearchRecords.visibility = View.GONE
+                    mViewBinding.searchRecords.flSearchRecordsDelete.visibility = View.VISIBLE
+                }
+                mViewBinding.searchRecords.tvAlldelete -> {
+                    CustomDialog.showConfirmDialog(
+                        this@YHCHomeSearchActivity,
+                        null,
+                        "确定要删除全部搜索记录？",
+                        "取消",
+                        "确认",
+                    ) {
+                        mViewBinding.apply {
+                            //点击全部删除
+                            searchRecords.clearAllRecords.visibility = View.VISIBLE
+                            searchRecords.llDeleteLayout.visibility = View.GONE
+                            searchRecords.flSearchRecords.visibility = View.VISIBLE
+                            searchRecords.flSearchRecordsDelete.visibility = View.GONE
+                            //数据清空
+                            mRecordsDao.deleteUsernameAllRecords()
+                        }
+                    }
+                }
+                mViewBinding.searchRecords.tvComplete -> {
+                    //点击完成
+                    mViewBinding.searchRecords.clearAllRecords.visibility = View.VISIBLE
+                    mViewBinding.searchRecords.llDeleteLayout.visibility = View.GONE
+                    mViewBinding.searchRecords.flSearchRecords.visibility = View.VISIBLE
+                    mViewBinding.searchRecords.flSearchRecordsDelete.visibility = View.GONE
+                }
+                mViewBinding.llRecommend -> {
+                    mViewBinding.apply {
+                        btvRecommend.setTextColor(Color.parseColor("#fe0032"))
+                        btvSearchSales.setTextColor(Color.parseColor("#333333"))
+                        btvSearchPrice.setTextColor(Color.parseColor("#333333"))
+                        ivJiangxuZonghe.setImageResource(R.mipmap.tuijian_xiala_red)
+                        ivJiangxu.setImageResource(R.mipmap.tuijian_xiala)
+                        ivShengxu.setImageResource(R.mipmap.tuijian_shangla)
+                        ivJiangxuSale.setImageResource(R.mipmap.tuijian_xiala)
+                        ivShengxuSales.setImageResource(R.mipmap.tuijian_shangla)
+                        mPage = 1
+                        isPriceUp = false
+                        isSalesUp = false
+                        homeViewModel.getHomeProductListData(mPage, mer_keyword, null, null, null)
+                    }
+                }
+                mViewBinding.llSearchSales -> {
+                    mViewBinding.apply {
+                        btvRecommend.setTextColor(Color.parseColor("#333333"))
+                        btvSearchSales.setTextColor(Color.parseColor("#fe0032"))
+                        btvSearchPrice.setTextColor(Color.parseColor("#333333"))
+                        ivJiangxuZonghe.setImageResource(R.mipmap.tuijian_xiala)
+                        ivJiangxu.setImageResource(R.mipmap.tuijian_xiala)
+                        ivShengxu.setImageResource(R.mipmap.tuijian_shangla)
+                        isPriceUp = false
+                        isSalesUp = !isSalesUp
+                        mPage = 1
+                        sales = if (isSalesUp) "1" else "0"
+                        if (isSalesUp) {
+                            ivJiangxuSale.setImageResource(R.mipmap.tuijian_xiala)
+                            ivShengxuSales.setImageResource(R.mipmap.search_red_shangla_220617)
+                        } else {
+                            ivJiangxuSale.setImageResource(R.mipmap.tuijian_xiala_red)
+                            ivShengxuSales.setImageResource(R.mipmap.tuijian_shangla)
+                        }
+                        homeViewModel.getHomeProductListData(mPage, mer_keyword, null, null, sales)
+                    }
+                }
+                mViewBinding.llSearchPrice -> {
+                    mViewBinding.apply {
+                        btvRecommend.setTextColor(Color.parseColor("#333333"))
+                        btvSearchSales.setTextColor(Color.parseColor("#333333"))
+                        btvSearchPrice.setTextColor(Color.parseColor("#fe0032"))
+                        ivJiangxuZonghe.setImageResource(R.mipmap.tuijian_xiala)
+                        ivJiangxuSale.setImageResource(R.mipmap.tuijian_xiala)
+                        ivShengxuSales.setImageResource(R.mipmap.tuijian_shangla)
+                        isSalesUp = false
+                        isPriceUp = !isPriceUp
+                        mPage = 1
+                        priceType = if (isPriceUp) "1" else "0"
+                        if (isPriceUp) {
+                            ivJiangxu.setImageResource(R.mipmap.tuijian_xiala)
+                            ivShengxu.setImageResource(R.mipmap.search_red_shangla_220617)
+                        } else {
+                            ivJiangxu.setImageResource(R.mipmap.tuijian_xiala_red)
+                            ivShengxu.setImageResource(R.mipmap.tuijian_shangla)
+                        }
+                        homeViewModel.getHomeProductListData(
+                            mPage,
+                            mer_keyword,
+                            null,
+                            priceType,
+                            null
+                        )
+                    }
+
+                }
+            }
+        }
+    }
+
+    /**
+     * 隐藏软键盘
+     *
+     * @param :上下文
+     * @param view :一般为EditText
+     */
+    private fun hideKeyboard(view: View) {
+        val manager = view.context
+            .getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
+        manager.hideSoftInputFromWindow(view.windowToken, 0)
+    }
+
+    companion object {
+        @JvmStatic
+        fun launch(context: Context) {
+            context.startActivity(Intent(context, YHCHomeSearchActivity::class.java))
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/home/adapter/HomeProductListAdapter.java

@@ -12,7 +12,9 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.bumptech.glide.Glide;
 import com.yihucha.hbyhc.R;
+import com.yihucha.hbyhc.presentation.home.model.HomeProductBean;
 import com.yihucha.hbyhc.presentation.home.model.HomeProductListBean;
 import com.yihucha.hbyhc.utils.GlideUtils;
 import com.yihucha.hbyhc.view.DrawLineTextView;
@@ -28,37 +30,20 @@ import java.util.List;
  */
 public class HomeProductListAdapter extends RecyclerView.Adapter<HomeProductListAdapter.ViewHolder> {
     private Context context;
-    private List<HomeProductListBean> goodsPageBeans;
-    private LayoutInflater inflater;
+    private List<HomeProductBean.PageInfoDTO.ListDTO> goodsPageBeans;
 
     private OnClickListener mClickListener;
 
     private int mAllNumber;
 
-    public HomeProductListAdapter(Context context, List<HomeProductListBean> goodsPageBeans) {
-        inflater = LayoutInflater.from(context);
+    public HomeProductListAdapter(Context context, List<HomeProductBean.PageInfoDTO.ListDTO> goodsPageBeans) {
         this.context = context;
-        this.setList(goodsPageBeans);
+        this.goodsPageBeans = goodsPageBeans;
     }
 
-    private void setList(List<HomeProductListBean> goodsPageBeans) {
-        if (goodsPageBeans != null) {
-            this.goodsPageBeans = goodsPageBeans;
-        } else {
-            this.goodsPageBeans = new ArrayList<>();
-        }
-    }
-
-    /**
-     * 更新数据
-     *
-     * @param goodsPageBeans
-     */
-    public void updateData(List<HomeProductListBean> goodsPageBeans) {
-        // TODO Auto-generated method stub
-        setList(goodsPageBeans);
-//        notifyDataSetChanged();
-        notifyItemChanged(goodsPageBeans.size()-1);
+    public void setData(List<HomeProductBean.PageInfoDTO.ListDTO> goodsPageBeans) {
+        this.goodsPageBeans = goodsPageBeans;
+        notifyDataSetChanged();
     }
 
     @NonNull
@@ -70,44 +55,28 @@ public class HomeProductListAdapter extends RecyclerView.Adapter<HomeProductList
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
-        HomeProductListBean goodsPageBean = goodsPageBeans.get(position);
+        HomeProductBean.PageInfoDTO.ListDTO goodsPageBean = goodsPageBeans.get(position);
 
         holder.tv_sales.setVisibility(View.GONE);
         holder.tv_jingdong.setVisibility(View.GONE);
         holder.tv_dacang.setVisibility(View.GONE);
         holder.iv_dacang.setVisibility(View.GONE);
-
-        if (goodsPageBean.getType().equals("6")) {
-            //京东商品
-            holder.tv_jingdong.setVisibility(View.VISIBLE);
-//            holder.tv_lowestCouponPrice.setVisibility(View.GONE);
-            GlideUtils.loadImage(context, goodsPageBean.getThumb(), holder.card_image);
-            holder.card_title.setText(goodsPageBean.getName());//名称
-            holder.tv_yanglaojin.setText("养老金 ¥" + goodsPageBean.getCommission());//养老金
-            holder.tv_price.setText(goodsPageBean.getLowestCouponPrice());
-
-
-            holder.tv_lowestCouponPrice.setText("¥" + goodsPageBean.getPrice());
-        } else {
-            GlideUtils.loadImage(context, goodsPageBean.getImage(), holder.card_image);
-            holder.card_title.setText(goodsPageBean.getStore_name());//名称
-            holder.tv_yanglaojin.setText("养老金 ¥" + goodsPageBean.getYanglao());//养老金
+        String image = goodsPageBean.getImage();
+//        GlideUtils.loadImage(context,image, holder.card_image);
+        System.out.println(position+" : "+image);
+        Glide.with(context).load(image).into(holder.card_image);
+        holder.card_title.setText(goodsPageBean.getStore_name());//名称
+        holder.tv_yanglaojin.setText("养老金 ¥" + goodsPageBean.getYanglao_price());//养老金
+        holder.tv_price.setText(goodsPageBean.getPrice());//实际价格
+        holder.tv_lowestCouponPrice.setText("¥" + goodsPageBean.getOt_price());
+        if (goodsPageBean.getType() == 5) {
+            //大仓
+            holder.tv_dacang.setVisibility(View.VISIBLE);
             holder.tv_price.setText(goodsPageBean.getPrice());//实际价格
-            //if (goodsPageBean.getType().equals("1")||goodsPageBean.getType().equals("2")){
+            holder.iv_dacang.setVisibility(View.GONE);
+            //原价
             holder.tv_lowestCouponPrice.setText("¥" + goodsPageBean.getOt_price());
-            //  }
-
-
-            if (goodsPageBean.getType().equals("5")) {
-//大仓
-                holder.tv_dacang.setVisibility(View.VISIBLE);
-                holder.tv_price.setText(goodsPageBean.getPrice());//实际价格
-                holder.iv_dacang.setVisibility(View.GONE);
-                //原价
-                holder.tv_lowestCouponPrice.setText("¥" + goodsPageBean.getOt_price());
-                holder.tv_lowestCouponPrice.setVisibility(View.VISIBLE);
-            }
-
+            holder.tv_lowestCouponPrice.setVisibility(View.VISIBLE);
         }
 
 
@@ -121,7 +90,7 @@ public class HomeProductListAdapter extends RecyclerView.Adapter<HomeProductList
             }
         });
 
-        mAllNumber=position;
+        mAllNumber = position;
 
 
     }

app/src/main/java/com/yihucha/hbyhc/presentation/home/adapter/ItemMessageAdapter.java

@@ -0,0 +1,78 @@
+package com.yihucha.hbyhc.presentation.home.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.huantansheng.easyphotos.utils.String.StringUtils;
+import com.yihucha.hbyhc.R;
+import com.yihucha.hbyhc.databinding.ItemMessageBinding;
+import com.yihucha.hbyhc.presentation.message.model.TheAnnouncementBean;
+import com.yihucha.hbyhc.utils.StringsUtil;
+
+import java.util.List;
+
+/**
+ * author : zhangbing
+ * time   : 2024/1/28 18:25
+ * com.yihucha.hbyhc.presentation.home.adapter
+ */
+public class ItemMessageAdapter extends BaseAdapter {
+    private List<TheAnnouncementBean.TheAnnouncementList> datas;
+    private Context context;
+
+    public ItemMessageAdapter(List<TheAnnouncementBean.TheAnnouncementList> datas, Context context) {
+        this.datas = datas;
+        this.context = context;
+    }
+
+    public void setDatas(List<TheAnnouncementBean.TheAnnouncementList> datas) {
+        this.datas = datas;
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getCount() {
+        return datas==null?0:datas.size();
+    }
+
+    @Override
+    public TheAnnouncementBean.TheAnnouncementList getItem(int position) {
+        return datas.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        MsgViewHolder holder;
+        if (convertView == null){
+            convertView = LayoutInflater.from(context).inflate(R.layout.item_message, parent, false);
+            holder = new MsgViewHolder(convertView);
+            convertView.setTag(holder);
+        } else {
+            holder = (MsgViewHolder) convertView.getTag();
+        }
+        String time = "";
+        if (!StringsUtil.isEmpty(getItem(position).getCreate_time())){
+            time = getItem(position).getCreate_time().split(" ")[0];
+        }
+        holder.binding.tvContent.setText(getItem(position).getContent());
+        holder.binding.tvTime.setText(time+"");
+        holder.binding.tvTitle.setText(getItem(position).getTitle());
+        return convertView;
+    }
+
+    class MsgViewHolder{
+        ItemMessageBinding binding;
+        public MsgViewHolder(View view){
+            binding = ItemMessageBinding.bind(view);
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/home/model/HomeProductBean.java

@@ -0,0 +1,389 @@
+package com.yihucha.hbyhc.presentation.home.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import java.util.List;
+
+/**
+ * author : zhangbing
+ * time   : 2024/1/28 16:04
+ * com.yihucha.hbyhc.presentation.home.model
+ */
+public class HomeProductBean {
+
+    private PageInfoDTO pageInfo;
+
+    public PageInfoDTO getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PageInfoDTO pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+
+    public static class PageInfoDTO {
+        private int total;
+        private int pageNum;
+        private int pageSize;
+        private int size;
+        private int startRow;
+        private int endRow;
+        private int pages;
+        private int prePage;
+        private int nextPage;
+        private boolean isFirstPage;
+        private boolean isLastPage;
+        private boolean hasPreviousPage;
+        private boolean hasNextPage;
+        private int navigatePages;
+        private int navigateFirstPage;
+        private int navigateLastPage;
+        private List<ListDTO> list;
+        private List<Integer> navigatepageNums;
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+        public int getPageNum() {
+            return pageNum;
+        }
+
+        public void setPageNum(int pageNum) {
+            this.pageNum = pageNum;
+        }
+
+        public int getPageSize() {
+            return pageSize;
+        }
+
+        public void setPageSize(int pageSize) {
+            this.pageSize = pageSize;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+
+        public int getStartRow() {
+            return startRow;
+        }
+
+        public void setStartRow(int startRow) {
+            this.startRow = startRow;
+        }
+
+        public int getEndRow() {
+            return endRow;
+        }
+
+        public void setEndRow(int endRow) {
+            this.endRow = endRow;
+        }
+
+        public int getPages() {
+            return pages;
+        }
+
+        public void setPages(int pages) {
+            this.pages = pages;
+        }
+
+        public int getPrePage() {
+            return prePage;
+        }
+
+        public void setPrePage(int prePage) {
+            this.prePage = prePage;
+        }
+
+        public int getNextPage() {
+            return nextPage;
+        }
+
+        public void setNextPage(int nextPage) {
+            this.nextPage = nextPage;
+        }
+
+        public boolean isIsFirstPage() {
+            return isFirstPage;
+        }
+
+        public void setIsFirstPage(boolean isFirstPage) {
+            this.isFirstPage = isFirstPage;
+        }
+
+        public boolean isIsLastPage() {
+            return isLastPage;
+        }
+
+        public void setIsLastPage(boolean isLastPage) {
+            this.isLastPage = isLastPage;
+        }
+
+        public boolean isHasPreviousPage() {
+            return hasPreviousPage;
+        }
+
+        public void setHasPreviousPage(boolean hasPreviousPage) {
+            this.hasPreviousPage = hasPreviousPage;
+        }
+
+        public boolean isHasNextPage() {
+            return hasNextPage;
+        }
+
+        public void setHasNextPage(boolean hasNextPage) {
+            this.hasNextPage = hasNextPage;
+        }
+
+        public int getNavigatePages() {
+            return navigatePages;
+        }
+
+        public void setNavigatePages(int navigatePages) {
+            this.navigatePages = navigatePages;
+        }
+
+        public int getNavigateFirstPage() {
+            return navigateFirstPage;
+        }
+
+        public void setNavigateFirstPage(int navigateFirstPage) {
+            this.navigateFirstPage = navigateFirstPage;
+        }
+
+        public int getNavigateLastPage() {
+            return navigateLastPage;
+        }
+
+        public void setNavigateLastPage(int navigateLastPage) {
+            this.navigateLastPage = navigateLastPage;
+        }
+
+        public List<ListDTO> getList() {
+            return list;
+        }
+
+        public void setList(List<ListDTO> list) {
+            this.list = list;
+        }
+
+        public List<Integer> getNavigatepageNums() {
+            return navigatepageNums;
+        }
+
+        public void setNavigatepageNums(List<Integer> navigatepageNums) {
+            this.navigatepageNums = navigatepageNums;
+        }
+
+        public static class ListDTO {
+            private int product_id;
+            private int mer_id;
+            private String image;
+            private String slider_image;
+            private Object slider_image_list;
+            private String store_name;
+            private String store_info;
+            private String unit_name;
+            private String price;
+            private String cost;
+            private String ot_price;
+            private String stock;
+            private String sales;
+            private String ficti;
+            private String video_link;
+            private String product_type;
+            private int type;
+            private String dc_price;
+            private String seckill;
+            private int extension_type;
+            private String yanglao_price;
+            private Object spu_id;
+
+            public int getProduct_id() {
+                return product_id;
+            }
+
+            public void setProduct_id(int product_id) {
+                this.product_id = product_id;
+            }
+
+            public int getMer_id() {
+                return mer_id;
+            }
+
+            public void setMer_id(int mer_id) {
+                this.mer_id = mer_id;
+            }
+
+            public String getImage() {
+                return image;
+            }
+
+            public void setImage(String image) {
+                this.image = image;
+            }
+
+            public String getSlider_image() {
+                return slider_image;
+            }
+
+            public void setSlider_image(String slider_image) {
+                this.slider_image = slider_image;
+            }
+
+            public Object getSlider_image_list() {
+                return slider_image_list;
+            }
+
+            public void setSlider_image_list(Object slider_image_list) {
+                this.slider_image_list = slider_image_list;
+            }
+
+            public String getStore_name() {
+                return store_name;
+            }
+
+            public void setStore_name(String store_name) {
+                this.store_name = store_name;
+            }
+
+            public String getStore_info() {
+                return store_info;
+            }
+
+            public void setStore_info(String store_info) {
+                this.store_info = store_info;
+            }
+
+            public String getUnit_name() {
+                return unit_name;
+            }
+
+            public void setUnit_name(String unit_name) {
+                this.unit_name = unit_name;
+            }
+
+            public String getPrice() {
+                return price;
+            }
+
+            public void setPrice(String price) {
+                this.price = price;
+            }
+
+            public String getCost() {
+                return cost;
+            }
+
+            public void setCost(String cost) {
+                this.cost = cost;
+            }
+
+            public String getOt_price() {
+                return ot_price;
+            }
+
+            public void setOt_price(String ot_price) {
+                this.ot_price = ot_price;
+            }
+
+            public String getStock() {
+                return stock;
+            }
+
+            public void setStock(String stock) {
+                this.stock = stock;
+            }
+
+            public String getSales() {
+                return sales;
+            }
+
+            public void setSales(String sales) {
+                this.sales = sales;
+            }
+
+            public String getFicti() {
+                return ficti;
+            }
+
+            public void setFicti(String ficti) {
+                this.ficti = ficti;
+            }
+
+            public String getVideo_link() {
+                return video_link;
+            }
+
+            public void setVideo_link(String video_link) {
+                this.video_link = video_link;
+            }
+
+            public String getProduct_type() {
+                return product_type;
+            }
+
+            public void setProduct_type(String product_type) {
+                this.product_type = product_type;
+            }
+
+            public int getType() {
+                return type;
+            }
+
+            public void setType(int type) {
+                this.type = type;
+            }
+
+            public String getDc_price() {
+                return dc_price;
+            }
+
+            public void setDc_price(String dc_price) {
+                this.dc_price = dc_price;
+            }
+
+            public String getSeckill() {
+                return seckill;
+            }
+
+            public void setSeckill(String seckill) {
+                this.seckill = seckill;
+            }
+
+            public int getExtension_type() {
+                return extension_type;
+            }
+
+            public void setExtension_type(int extension_type) {
+                this.extension_type = extension_type;
+            }
+
+            public String getYanglao_price() {
+                return yanglao_price;
+            }
+
+            public void setYanglao_price(String yanglao_price) {
+                this.yanglao_price = yanglao_price;
+            }
+
+            public Object getSpu_id() {
+                return spu_id;
+            }
+
+            public void setSpu_id(Object spu_id) {
+                this.spu_id = spu_id;
+            }
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/home/view_model/HomeViewModel.java

@@ -13,6 +13,7 @@ import com.yihucha.hbyhc.network.NetworkApi;
 import com.yihucha.hbyhc.network.service.ApiService;
 import com.yihucha.hbyhc.network.service.ProductService;
 import com.yihucha.hbyhc.presentation.home.model.BannerDataBean;
+import com.yihucha.hbyhc.presentation.home.model.HomeProductBean;
 import com.yihucha.hbyhc.presentation.home.model.HomeProductListBean;
 import com.yihucha.hbyhc.presentation.home.model.HomeQuickLink;
 import com.yihucha.hbyhc.presentation.message.model.TheAnnouncementBean;
@@ -31,6 +32,7 @@ public class HomeViewModel extends BaseViewModel {
 
     public MutableLiveData<DataResponse<List<BannerDataBean>>> bannerData = new MutableLiveData<>();//轮播图实体
     public MutableLiveData<List<HomeProductListBean>> homeProductListData = new MutableLiveData<>();//商品列表实体类
+    public MutableLiveData<List<HomeProductBean.PageInfoDTO.ListDTO>> homeProductListDataYHC = new MutableLiveData<>();//一壶茶首页商品列表实体类
     private List<HomeProductListBean> homeProductListBeans = new ArrayList<>();
 
     public MutableLiveData<UserInfoModel> userModel = new MutableLiveData<>();//用户资料
@@ -48,7 +50,7 @@ public class HomeViewModel extends BaseViewModel {
 //    public  MutableLiveData<CreateAnnualOrderBean> mCreateAnnualOrderData=new MutableLiveData<>();
 
 
-    public MutableLiveData<HomeQuickLink> mHomeQuickLink=new MutableLiveData<>();
+    public MutableLiveData<HomeQuickLink> mHomeQuickLink = new MutableLiveData<>();
 
     public void getUserInfo() {
         UserRepository.getUserInfo(new NormalListener<UserInfoModel>() {
@@ -66,7 +68,7 @@ public class HomeViewModel extends BaseViewModel {
 
     public MutableLiveData<YanglaojinBean> yanglaojinBeanMutableLiveData = new MutableLiveData<>();//养老金
 
-    public MutableLiveData<List<TheAnnouncementBean.TheAnnouncementList>> mTheAnnouncementData=new MutableLiveData<>();//公告列表
+    public MutableLiveData<List<TheAnnouncementBean.TheAnnouncementList>> mTheAnnouncementData = new MutableLiveData<>();//公告列表
 
     /**
      * 调用轮播图数据
@@ -92,13 +94,14 @@ public class HomeViewModel extends BaseViewModel {
             }
         }));
     }
+
     @SuppressLint("CheckResult")
-    public void getHomeQuickLink(){
+    public void getHomeQuickLink() {
         ApiService apiService = NetworkApi.createService(ApiService.class);
         apiService.getHomeQuickLink().compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<List<HomeQuickLink>>>() {
             @Override
             public void onSuccess(DataResponse<List<HomeQuickLink>> listDataResponse) {
-                if (listDataResponse.responseCode==200){
+                if (listDataResponse.responseCode == 200) {
                     mHomeQuickLink.postValue(listDataResponse.getData().get(0));
                 }
             }
@@ -109,6 +112,7 @@ public class HomeViewModel extends BaseViewModel {
             }
         }));
     }
+
     /**
      * 首页商品蕾列表
      *
@@ -140,6 +144,49 @@ public class HomeViewModel extends BaseViewModel {
         }));
     }
 
+    /**
+     * 首页商品列表---一壶茶
+     *
+     * @param page        当前页码
+     * @param mer_keyword 搜索关键字，没有就传 1
+     * @param isNew       0：排序上新
+     * @param priceType   排序 0-价格升序 1-价格降序
+     * @param sales       排序 销量 0-销量倒序 1-销量升序
+     */
+    @SuppressLint("CheckResult")
+    public void getHomeProductListData(int page, String mer_keyword, String isNew, String priceType, String sales) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("mer_id", "496");
+        map.put("pageNum", page + "");
+        map.put("pageSize", "10");
+        map.put("mer_keyword", mer_keyword);
+        if (isNew != null)
+            map.put("is_new", isNew);
+        if (priceType != null)
+            map.put("priceType", priceType);
+        if (sales != null)
+            map.put("sales", sales);
+        ProductService productService = NetworkApi.createService(ProductService.class);
+        productService.homeProductListYHC(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<HomeProductBean>>() {
+            @Override
+            public void onSuccess(DataResponse<HomeProductBean> listDataResponse) {
+                if (listDataResponse.responseCode == 200) {
+                    List<HomeProductBean.PageInfoDTO.ListDTO> list = listDataResponse.getData().getPageInfo().getList();
+                    homeProductListDataYHC.postValue(list);
+                } else {
+                    ToastUtils.showLong(listDataResponse.responseError);
+                }
+
+            }
+
+            @Override
+            public void onFailure(Throwable e) {
+                LogUtil.LogInfo("Throwable", e.getMessage());
+                //  failed.postValue(getString(R.string.failed_string));
+            }
+        }));
+    }
+
     @SuppressLint("CheckResult")
     public void getElemeUrl() {
         ApiService apiService = NetworkApi.createService(ApiService.class);
@@ -177,8 +224,9 @@ public class HomeViewModel extends BaseViewModel {
             }
         });
     }
+
     //公告
-    public void getNoticeList(){
+    public void getNoticeList() {
         MessageRepositoy.getNoticeList(new NormalListener<List<TheAnnouncementBean.TheAnnouncementList>>() {
             @Override
             public void success(List<TheAnnouncementBean.TheAnnouncementList> theAnnouncementBeans) {

app/src/main/java/com/yihucha/hbyhc/presentation/login/LoginActivity.java

@@ -26,7 +26,10 @@ import com.yihucha.hbyhc.presentation.login.model.LoginModel;
 import com.yihucha.hbyhc.presentation.login.view_model.LoginViewModel;
 import com.yihucha.hbyhc.config.Constants;
 import com.yihucha.hbyhc.utils.CountDownTimeUtil;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 import com.yihucha.hbyhc.utils.MVUtils;
+import com.yihucha.hbyhc.utils.StringUtils;
+import com.yihucha.hbyhc.view.CustomDialog;
 import com.yihucha.hbyhc.view.MyToast;
 
 import java.util.ArrayList;
@@ -60,13 +63,9 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
         mViewBinding.tvLogin.setOnClickListener(this);
         mViewBinding.tvRegistrationProtocol.setOnClickListener(this);
         mViewBinding.tvPrivacyAgreement.setOnClickListener(this);
-        mViewBinding.ivCxbName.setOnClickListener(this);
     }
 
     private void initView() {
-//        mViewBinding.cbSelector.setSelected(true);
-//        loginViewModel.mPwd.postValue(mViewBinding.etPwd.getText().toString().trim());
-//        loginViewModel.mPwd.postValue(mViewBinding.etPwd.getText().toString().trim());
     }
 
     private void initData() {
@@ -107,31 +106,36 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
                 }
             }
         });
-        loginViewModel.loginModel.observe(LoginActivity.this, new Observer<DataResponse<LoginModel>>() {
-            @Override
-            public void onChanged(DataResponse<LoginModel> loginModelDataResponse) {
-                loginModel=  loginModelDataResponse.getData();
-                //保存token
-                MVUtils.put(Constants.TOKEN,loginModel.getToken());
-                MVUtils.put(Constants.PHONE,loginModel.getUser().getPhone());
-                MVUtils.put(Constants.USER_ID,loginModel.getUser().getUid());
-                MVUtils.put(Constants.AVATAR,loginModel.getUser().getAvatar());
-                MVUtils.put(Constants.NICK_NAME,loginModel.getUser().getNickname());
+        loginViewModel.loginModel.observe(LoginActivity.this, loginModelDataResponse -> {
+            loginModel=  loginModelDataResponse.getData();
+            //保存token
+            MVUtils.put(Constants.TOKEN,loginModel.getToken());
+            MVUtils.put(Constants.PHONE,loginModel.getUser().getPhone());
+            MVUtils.put(Constants.USER_ID,loginModel.getUser().getUid());
+            MVUtils.put(Constants.AVATAR,loginModel.getUser().getAvatar());
+            MVUtils.put(Constants.NICK_NAME,loginModel.getUser().getNickname());
 
 //                MainActivity.launch(LoginActivity.this);
 
-                List<String> activityList = new ArrayList<>();
-                activityList.add(LoginHomeActivity.class.getSimpleName());
-                ActivityStack.getScreenManager().finishArrayActivity(activityList);
-                finish();
+            List<String> activityList = new ArrayList<>();
+            activityList.add(LoginHomeActivity.class.getSimpleName());
+            ActivityStack.getScreenManager().finishArrayActivity(activityList);
+            finish();
+        });
+        loginViewModel.failed.observe(LoginActivity.this,msg->{
+            //如果返回了400 表示需要填写邀请人信息，弹窗进行绑定
+            if ("400".equals(msg)){
+                CustomDialog.getEnterCodeWithTitle(this,"请输入邀请人手机号",phone->{
+                    if (!StringUtils.isPhone(phone)) {
+                        Toast.makeText(context, "手机号码格式输入错误", Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+                    /**
+                     * 下面做绑定手机号流程，暂时不做处理
+                     */
+                });
             }
         });
-//        loginViewModel.xieyi.observe(this, new Observer<DataResponse<LoginHomeXieyiModel>>() {
-//            @Override
-//            public void onChanged(DataResponse<LoginHomeXieyiModel> loginHomeXieyiModelDataResponse) {
-//                WebViewTitleBaseActivity.launch(LoginActivity.this,loginHomeXieyiModelDataResponse.getData().getTitle(),loginHomeXieyiModelDataResponse.getData().getContent());
-//            }
-//        });
     }
 
     @Override
@@ -230,17 +234,12 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
 
         }else if (v == mViewBinding.tvRegistrationProtocol){
             //注册协议
-//            loginViewModel.getXieyi(context,"2");
             WebViewTitleBaseActivity.launch(LoginActivity.this,getString(R.string.registration_protocol),
                     Constants.PROTOCOL+Constants.SERVICE_AGREEMENT);
         }else if (v ==  mViewBinding.tvPrivacyAgreement){
             //隐私协议
-//            loginViewModel.getXieyi(context,"1");
             WebViewTitleBaseActivity.launch(LoginActivity.this,getString(R.string.privacy_agreement),
                     Constants.PROTOCOL+Constants.PRIVACY_AGREEMENT);
-        }else if (v == mViewBinding.ivCxbName){
-            //账号密码登录
-            loginViewModel.getPhonePasswordLogin("16600000118","123456");
         }
     }
 

app/src/main/java/com/yihucha/hbyhc/presentation/login/model/LoginModel.java

@@ -30,7 +30,7 @@ public class LoginModel {
         this.user = user;
     }
 
-    public class User{
+    public class User {
         private String uid;//用户id
         private String wechat_user_id;//微信用户 id
         private String ali_user_id;//支付宝用户id
@@ -74,6 +74,118 @@ public class LoginModel {
         private String im_uuid;//环信UUID
         private String test_user;//是否是测试用户
         private String is_channel;//是否是渠道商
+        /**
+         *  以下部分为一壶茶新增字段
+         */
+        private String member_brokerage_price;
+        private String score;
+        private String annuity_once;
+        private String first_sign;
+        private String is_del;
+        private String first_shopping;
+        private String external;
+        private String external_id;
+        private String score_beishengtang;
+        private String level_id;
+        private String level;
+
+        public String getMember_brokerage_price() {
+            return member_brokerage_price;
+        }
+
+        public void setMember_brokerage_price(String member_brokerage_price) {
+            this.member_brokerage_price = member_brokerage_price;
+        }
+
+        public String getScore() {
+            return score;
+        }
+
+        public void setScore(String score) {
+            this.score = score;
+        }
+
+        public String getAnnuity_once() {
+            return annuity_once;
+        }
+
+        public void setAnnuity_once(String annuity_once) {
+            this.annuity_once = annuity_once;
+        }
+
+        public String getFirst_sign() {
+            return first_sign;
+        }
+
+        public void setFirst_sign(String first_sign) {
+            this.first_sign = first_sign;
+        }
+
+        public String getIs_del() {
+            return is_del;
+        }
+
+        public void setIs_del(String is_del) {
+            this.is_del = is_del;
+        }
+
+        public String getFirst_shopping() {
+            return first_shopping;
+        }
+
+        public void setFirst_shopping(String first_shopping) {
+            this.first_shopping = first_shopping;
+        }
+
+        public String getExternal() {
+            return external;
+        }
+
+        public void setExternal(String external) {
+            this.external = external;
+        }
+
+        public String getExternal_id() {
+            return external_id;
+        }
+
+        public void setExternal_id(String external_id) {
+            this.external_id = external_id;
+        }
+
+        public String getScore_beishengtang() {
+            return score_beishengtang;
+        }
+
+        public void setScore_beishengtang(String score_beishengtang) {
+            this.score_beishengtang = score_beishengtang;
+        }
+
+        public String getLevel_id() {
+            return level_id;
+        }
+
+        public void setLevel_id(String level_id) {
+            this.level_id = level_id;
+        }
+
+        public String getLevel() {
+            return level;
+        }
+
+        public void setLevel(String level) {
+            this.level = level;
+        }
+
+        public String getIs_show() {
+            return is_show;
+        }
+
+        public void setIs_show(String is_show) {
+            this.is_show = is_show;
+        }
+
+        private String is_show;
 
         public String getUid() {
             return uid == null ? "" : uid;

app/src/main/java/com/yihucha/hbyhc/presentation/login/view_model/LoginViewModel.java

@@ -95,6 +95,8 @@ public class LoginViewModel extends BaseViewModel {
             public void onSuccess(DataResponse<LoginModel> loginModelDataResponse) {
                 if (loginModelDataResponse.responseCode==200){
                     loginModel.postValue(loginModelDataResponse);
+                }else if (loginModelDataResponse.responseCode == 400){
+                    failed.postValue("400");
                 }else {
                     MyToast.makeText(context, loginModelDataResponse.responseError, Toast.LENGTH_LONG).show();
                 }

app/src/main/java/com/yihucha/hbyhc/presentation/message/MessageActivity.java

@@ -12,6 +12,7 @@ import androidx.lifecycle.ViewModelProvider;
 
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
 import com.yihucha.hbyhc.databinding.ActivityMessageBinding;
+import com.yihucha.hbyhc.presentation.home.adapter.ItemMessageAdapter;
 import com.yihucha.hbyhc.presentation.home.view_model.HomeViewModel;
 import com.yihucha.hbyhc.presentation.message.model.TheAnnouncementBean;
 import com.yihucha.hbyhc.utils.StringsUtil;
@@ -26,30 +27,21 @@ import java.util.List;
  */
 public class MessageActivity extends ViewBindingTitleBaseActivity<ActivityMessageBinding> implements View.OnClickListener{
     private HomeViewModel homeViewModel;
+    private ItemMessageAdapter adapter;
     private List<TheAnnouncementBean.TheAnnouncementList> mTheAnnouncementBean = new ArrayList<>();
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         homeViewModel = new ViewModelProvider(this).get(HomeViewModel.class);
         homeViewModel.getNoticeList();
-        homeViewModel.mTheAnnouncementData.observe(this, new Observer<List<TheAnnouncementBean.TheAnnouncementList>>() {
-            @Override
-            public void onChanged(List<TheAnnouncementBean.TheAnnouncementList> theAnnouncementBeans) {
-                if (!theAnnouncementBeans.isEmpty() && theAnnouncementBeans.size() > 0) {
-                    mTheAnnouncementBean = theAnnouncementBeans;
-                    List<String> info = new ArrayList<>();
-                    for (int i = 0; i < mTheAnnouncementBean.size(); i++) {
-                        info.add(mTheAnnouncementBean.get(i).getTitle());
-                    }
-                    if (StringsUtil.isEmpty(info)){
-                        mViewBinding.layoutNodata.setVisibility(View.VISIBLE);
-                    }else {
-                        mViewBinding.layoutNodata.setVisibility(View.GONE);
-                    }
-                    mViewBinding.rvMessage.setAdapter(new ArrayAdapter<>(MessageActivity.this, android.R.layout.simple_list_item_1,info));
-                } else {
-                    mViewBinding.layoutNodata.setVisibility(View.VISIBLE);
-                }
+        adapter = new ItemMessageAdapter(mTheAnnouncementBean,this);
+        mViewBinding.rvMessage.setAdapter(adapter);
+        homeViewModel.mTheAnnouncementData.observe(this, theAnnouncementBeans -> {
+            if (theAnnouncementBeans!=null&&theAnnouncementBeans.size()>0) {
+                mTheAnnouncementBean = theAnnouncementBeans;
+                adapter.setDatas(mTheAnnouncementBean);
+            } else {
+                mViewBinding.layoutNodata.setVisibility(View.VISIBLE);
             }
         });
         mViewBinding.rvMessage.setOnItemClickListener(new AdapterView.OnItemClickListener() {

app/src/main/java/com/yihucha/hbyhc/presentation/shop/VipAreaActivity.java

@@ -43,7 +43,7 @@ public class VipAreaActivity extends BaseActivity implements View.OnClickListene
     private VipAreaAdapter adapter;
     private VipBannerAdapter bannerAdapter;
     private List<BannerDataBean> banner = new ArrayList<>();
-    private List<VipAreaBean.Data.ListDTO> beans = new ArrayList<>();
+    private List<VipAreaBean.ListDTO> beans = new ArrayList<>();
     private int page = 1;
     private VipAreaViewModel viewModel;
     private int flag = 0;  // 0 vip   1 gongchang
@@ -142,21 +142,18 @@ public class VipAreaActivity extends BaseActivity implements View.OnClickListene
             binding.titleVip.setText("工厂直供");
             viewModel.requestGongchang(page, 10, "");
         }
-        viewModel.vipAreaData.observe(this, new Observer<List<VipAreaBean.Data.ListDTO>>() {
-            @Override
-            public void onChanged(List<VipAreaBean.Data.ListDTO> listDTOS) {
-                if (page == 1) beans.clear();
-                if (listDTOS != null) {
-                    beans.addAll(listDTOS);
-                }
+        viewModel.vipAreaData.observe(this, listDTOS -> {
+            if (page == 1) beans.clear();
+            if (listDTOS != null) {
+                beans.addAll(listDTOS);
+            }
 //                beans.clear();
-                if (StringsUtil.isEmpty(beans)) {
-                    binding.layoutNoData.setVisibility(View.VISIBLE);
-                } else {
-                    binding.layoutNoData.setVisibility(View.GONE);
-                }
-                adapter.replaceData(beans);
+            if (StringsUtil.isEmpty(beans)) {
+                binding.layoutNoData.setVisibility(View.VISIBLE);
+            } else {
+                binding.layoutNoData.setVisibility(View.GONE);
             }
+            adapter.replaceData(beans);
         });
         viewModel.failed.observe(this, new Observer<String>() {
             @Override
@@ -179,7 +176,7 @@ public class VipAreaActivity extends BaseActivity implements View.OnClickListene
         adapter.setOnClickListener(new VipAreaAdapter.OnClickListener() {
             @Override
             public void onItemClick(int position) {
-                ProductDetailsActivity.launch(VipAreaActivity.this, beans.get(position).getProductId());
+                ProductDetailsActivity.launch(VipAreaActivity.this, beans.get(position).getProduct_id());
             }
         });
         binding.refreshlayout.setEnableRefresh(false);

app/src/main/java/com/yihucha/hbyhc/presentation/shop/adapter/VipAreaAdapter.java

@@ -20,22 +20,22 @@ import java.util.List;
  * @date: 2023-06-17
  * @note：
  */
-public class VipAreaAdapter extends BaseQuickAdapter<VipAreaBean.Data.ListDTO, BaseViewHolder> {
+public class VipAreaAdapter extends BaseQuickAdapter<VipAreaBean.ListDTO, BaseViewHolder> {
     private Context context;
     private VipAreaAdapter.OnClickListener mClickListener;
 
-    public VipAreaAdapter(int layoutResId, @Nullable List<VipAreaBean.Data.ListDTO> data, Context context) {
+    public VipAreaAdapter(int layoutResId, @Nullable List<VipAreaBean.ListDTO> data, Context context) {
         super(layoutResId, data);
         this.context = context;
     }
 
     @Override
-    protected void convert(BaseViewHolder helper, VipAreaBean.Data.ListDTO item) {
+    protected void convert(BaseViewHolder helper, VipAreaBean.ListDTO item) {
         RoundCornerImageView card_image = helper.getView(R.id.card_image);
         GlideUtils.loadImage(context, item.getImage(), card_image);
-        helper.setText(R.id.card_title, item.getStoreName());
+        helper.setText(R.id.card_title, item.getStore_name());
         helper.setText(R.id.tv_price, item.getPrice());
-        helper.setText(R.id.tv_da_cang_price, "¥" + item.getOtPrice());
+        helper.setText(R.id.tv_da_cang_price, "¥" + item.getOt_price());
         helper.setText(R.id.tv_yanglaojin, "养老金 ¥" + item.getYanglao());
         if ("15".equals(item.getType())) {
             helper.setVisible(R.id.ll_yanglaojin, false);

app/src/main/java/com/yihucha/hbyhc/presentation/shop/model/VipAreaBean.java

@@ -1,339 +1,303 @@
 package com.yihucha.hbyhc.presentation.shop.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.List;
 
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class VipAreaBean {
 
+    private int count;
+    private List<ListDTO> list;
 
-    private int status;
-    private String message;
-    private Data data;
-
-    public Integer getStatus() {
-        return status;
+    public int getCount() {
+        return count;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setCount(int count) {
+        this.count = count;
     }
 
-    public String getMessage() {
-        return message;
+    public List<ListDTO> getList() {
+        return list;
     }
 
-    public void setMessage(String message) {
-        this.message = message;
+    public void setList(List<ListDTO> list) {
+        this.list = list;
     }
 
-    public Data getData() {
-        return data;
-    }
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class ListDTO {
+        private String product_id;
+        private String mer_id;
+        private String brand_id;
+        private String unit_name;
+        private String rate;
+        private String reply_count;
+        private String store_info;
+        private String cate_id;
+        private String image;
+        private String slider_image;
+        private String store_name;
+        private String keyword;
+        private String sort;
+        private String is_show;
+        private int sales;
+        private String price;
+        private Object refusal;
+        private String cost;
+        private String ot_price;
+        private String stock;
+        private String is_gift_bag;
+        private Object care_count;
+        private String status;
+        private String is_used;
+        private String create_time;
+        private String seckill;
+        private Object plate_mer_profit;
+        private String type;
+        private String yanglao;
+        private String special_merchant;
+
+        public String getProduct_id() {
+            return product_id;
+        }
 
-    public void setData(Data data) {
-        this.data = data;
-    }
+        public void setProduct_id(String product_id) {
+            this.product_id = product_id;
+        }
+
+        public String getMer_id() {
+            return mer_id;
+        }
+
+        public void setMer_id(String mer_id) {
+            this.mer_id = mer_id;
+        }
+
+        public String getBrand_id() {
+            return brand_id;
+        }
+
+        public void setBrand_id(String brand_id) {
+            this.brand_id = brand_id;
+        }
+
+        public String getUnit_name() {
+            return unit_name;
+        }
+
+        public void setUnit_name(String unit_name) {
+            this.unit_name = unit_name;
+        }
+
+        public String getRate() {
+            return rate;
+        }
+
+        public void setRate(String rate) {
+            this.rate = rate;
+        }
+
+        public String getReply_count() {
+            return reply_count;
+        }
+
+        public void setReply_count(String reply_count) {
+            this.reply_count = reply_count;
+        }
+
+        public String getStore_info() {
+            return store_info;
+        }
+
+        public void setStore_info(String store_info) {
+            this.store_info = store_info;
+        }
+
+        public String getCate_id() {
+            return cate_id;
+        }
+
+        public void setCate_id(String cate_id) {
+            this.cate_id = cate_id;
+        }
+
+        public String getImage() {
+            return image;
+        }
+
+        public void setImage(String image) {
+            this.image = image;
+        }
+
+        public String getSlider_image() {
+            return slider_image;
+        }
+
+        public void setSlider_image(String slider_image) {
+            this.slider_image = slider_image;
+        }
 
-    public static class Data {
-        private Integer count;
-        private List<ListDTO> list;
-
-        public Integer getCount() {
-            return count;
-        }
-
-        public void setCount(Integer count) {
-            this.count = count;
-        }
-
-        public List<ListDTO> getList() {
-            return list;
-        }
-
-        public void setList(List<ListDTO> list) {
-            this.list = list;
-        }
-
-        public static class ListDTO {
-            private String product_id;
-            private String mer_id;
-            private Object brand_id;
-            private String unit_name;
-            private String rate;
-            private String reply_count;
-            private String store_info;
-            private String cate_id;
-            private String image;
-            private String store_name;
-            private String keyword;
-            private String sort;
-            private String is_show;
-            private Integer sales;
-            private String price;
-            private Object refusal;
-            private String cost;
-            private String ot_price;
-            private String stock;
-            private String is_gift_bag;
-            private Object care_count;
-            private String status;
-            private String isUsed;
-            private String create_time;
-            private String seckill;
-            private String plate_mer_profit;
-            private String type;
-            private String yanglao;
-            private String special_merchant;
-            private Object issetCoupon;
-            private List<String> slider_image;
-
-            public String getProductId() {
-                return product_id;
-            }
-
-            public void setProductId(String product_id) {
-                this.product_id = product_id;
-            }
-
-            public String getMerId() {
-                return mer_id;
-            }
-
-            public void setMerId(String mer_id) {
-                this.mer_id = mer_id;
-            }
-
-            public Object getBrandId() {
-                return brand_id;
-            }
-
-            public void setBrandId(Object brand_id) {
-                this.brand_id = brand_id;
-            }
-
-            public String getUnitName() {
-                return unit_name;
-            }
-
-            public void setUnitName(String unit_name) {
-                this.unit_name = unit_name;
-            }
-
-            public String getRate() {
-                return rate;
-            }
-
-            public void setRate(String rate) {
-                this.rate = rate;
-            }
-
-            public String getReplyCount() {
-                return reply_count;
-            }
-
-            public void setReplyCount(String reply_count) {
-                this.reply_count = reply_count;
-            }
-
-            public String getStoreInfo() {
-                return store_info;
-            }
-
-            public void setStoreInfo(String store_info) {
-                this.store_info = store_info;
-            }
-
-            public String getCateId() {
-                return cate_id;
-            }
-
-            public void setCateId(String cate_id) {
-                this.cate_id = cate_id;
-            }
-
-            public String getImage() {
-                return image;
-            }
-
-            public void setImage(String image) {
-                this.image = image;
-            }
-
-            public String getStoreName() {
-                return store_name;
-            }
-
-            public void setStoreName(String store_name) {
-                this.store_name = store_name;
-            }
-
-            public String getKeyword() {
-                return keyword;
-            }
-
-            public void setKeyword(String keyword) {
-                this.keyword = keyword;
-            }
-
-            public String getSort() {
-                return sort;
-            }
-
-            public void setSort(String sort) {
-                this.sort = sort;
-            }
+        public String getStore_name() {
+            return store_name;
+        }
 
-            public String getIsShow() {
-                return is_show;
-            }
+        public void setStore_name(String store_name) {
+            this.store_name = store_name;
+        }
 
-            public void setIsShow(String is_show) {
-                this.is_show = is_show;
-            }
+        public String getKeyword() {
+            return keyword;
+        }
 
-            public Integer getSales() {
-                return sales;
-            }
+        public void setKeyword(String keyword) {
+            this.keyword = keyword;
+        }
 
-            public void setSales(Integer sales) {
-                this.sales = sales;
-            }
+        public String getSort() {
+            return sort;
+        }
 
-            public String getPrice() {
-                return price;
-            }
+        public void setSort(String sort) {
+            this.sort = sort;
+        }
 
-            public void setPrice(String price) {
-                this.price = price;
-            }
+        public String getIs_show() {
+            return is_show;
+        }
 
-            public Object getRefusal() {
-                return refusal;
-            }
+        public void setIs_show(String is_show) {
+            this.is_show = is_show;
+        }
 
-            public void setRefusal(Object refusal) {
-                this.refusal = refusal;
-            }
+        public int getSales() {
+            return sales;
+        }
 
-            public String getCost() {
-                return cost;
-            }
+        public void setSales(int sales) {
+            this.sales = sales;
+        }
 
-            public void setCost(String cost) {
-                this.cost = cost;
-            }
+        public String getPrice() {
+            return price;
+        }
 
-            public String getOtPrice() {
-                return ot_price;
-            }
+        public void setPrice(String price) {
+            this.price = price;
+        }
 
-            public void setOtPrice(String ot_price) {
-                this.ot_price = ot_price;
-            }
+        public Object getRefusal() {
+            return refusal;
+        }
 
-            public String getStock() {
-                return stock;
-            }
+        public void setRefusal(Object refusal) {
+            this.refusal = refusal;
+        }
 
-            public void setStock(String stock) {
-                this.stock = stock;
-            }
+        public String getCost() {
+            return cost;
+        }
 
-            public String getIsGiftBag() {
-                return is_gift_bag;
-            }
+        public void setCost(String cost) {
+            this.cost = cost;
+        }
 
-            public void setIsGiftBag(String is_gift_bag) {
-                this.is_gift_bag = is_gift_bag;
-            }
+        public String getOt_price() {
+            return ot_price;
+        }
 
-            public Object getCareCount() {
-                return care_count;
-            }
+        public void setOt_price(String ot_price) {
+            this.ot_price = ot_price;
+        }
 
-            public void setCareCount(Object care_count) {
-                this.care_count = care_count;
-            }
+        public String getStock() {
+            return stock;
+        }
 
-            public String getStatus() {
-                return status;
-            }
+        public void setStock(String stock) {
+            this.stock = stock;
+        }
 
-            public void setStatus(String status) {
-                this.status = status;
-            }
+        public String getIs_gift_bag() {
+            return is_gift_bag;
+        }
 
-            public String getIsUsed() {
-                return isUsed;
-            }
+        public void setIs_gift_bag(String is_gift_bag) {
+            this.is_gift_bag = is_gift_bag;
+        }
 
-            public void setIsUsed(String isUsed) {
-                this.isUsed = isUsed;
-            }
+        public Object getCare_count() {
+            return care_count;
+        }
+
+        public void setCare_count(Object care_count) {
+            this.care_count = care_count;
+        }
 
-            public String getCreateTime() {
-                return create_time;
-            }
+        public String getStatus() {
+            return status;
+        }
 
-            public void setCreateTime(String create_time) {
-                this.create_time = create_time;
-            }
+        public void setStatus(String status) {
+            this.status = status;
+        }
 
-            public String getSeckill() {
-                return seckill;
-            }
+        public String getIs_used() {
+            return is_used;
+        }
 
-            public void setSeckill(String seckill) {
-                this.seckill = seckill;
-            }
+        public void setIs_used(String is_used) {
+            this.is_used = is_used;
+        }
 
-            public String getPlateMerProfit() {
-                return plate_mer_profit;
-            }
+        public String getCreate_time() {
+            return create_time;
+        }
 
-            public void setPlateMerProfit(String plate_mer_profit) {
-                this.plate_mer_profit = plate_mer_profit;
-            }
+        public void setCreate_time(String create_time) {
+            this.create_time = create_time;
+        }
 
-            public String getType() {
-                return type;
-            }
+        public String getSeckill() {
+            return seckill;
+        }
 
-            public void setType(String type) {
-                this.type = type;
-            }
+        public void setSeckill(String seckill) {
+            this.seckill = seckill;
+        }
 
-            public String getYanglao() {
-                return yanglao;
-            }
+        public Object getPlate_mer_profit() {
+            return plate_mer_profit;
+        }
 
-            public void setYanglao(String yanglao) {
-                this.yanglao = yanglao;
-            }
+        public void setPlate_mer_profit(Object plate_mer_profit) {
+            this.plate_mer_profit = plate_mer_profit;
+        }
 
-            public String getSpecialMerchant() {
-                return special_merchant;
-            }
+        public String getType() {
+            return type;
+        }
 
-            public void setSpecialMerchant(String special_merchant) {
-                this.special_merchant = special_merchant;
-            }
+        public void setType(String type) {
+            this.type = type;
+        }
 
-            public Object getIssetCoupon() {
-                return issetCoupon;
-            }
+        public String getYanglao() {
+            return yanglao;
+        }
 
-            public void setIssetCoupon(Object issetCoupon) {
-                this.issetCoupon = issetCoupon;
-            }
+        public void setYanglao(String yanglao) {
+            this.yanglao = yanglao;
+        }
 
-            public List<String> getSliderImage() {
-                return slider_image;
-            }
+        public String getSpecial_merchant() {
+            return special_merchant;
+        }
 
-            public void setSliderImage(List<String> slider_image) {
-                this.slider_image = slider_image;
-            }
+        public void setSpecial_merchant(String special_merchant) {
+            this.special_merchant = special_merchant;
         }
     }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/shop/view_model/VipAreaViewModel.java

@@ -1,10 +1,13 @@
 package com.yihucha.hbyhc.presentation.shop.view_model;
 
+import android.annotation.SuppressLint;
+
 import androidx.lifecycle.MutableLiveData;
 
 import com.blankj.utilcode.util.ToastUtils;
 import com.yihucha.hbyhc.base.BaseViewModel;
 import com.yihucha.hbyhc.network.BaseObserver;
+import com.yihucha.hbyhc.network.DataJavaResponse;
 import com.yihucha.hbyhc.network.DataResponse;
 import com.yihucha.hbyhc.network.NetworkApi;
 import com.yihucha.hbyhc.network.service.ApiService;
@@ -26,57 +29,55 @@ import retrofit2.Response;
  */
 public class VipAreaViewModel extends BaseViewModel {
 
-    public MutableLiveData<List<VipAreaBean.Data.ListDTO>> vipAreaData = new MutableLiveData<>();
+    public MutableLiveData<List<VipAreaBean.ListDTO>> vipAreaData = new MutableLiveData<>();
     public MutableLiveData<List<BannerDataBean>> bannerData = new MutableLiveData<>();
 
-    public void requestData(int page,int limit,String keyword){
-        StoreService service = NetworkApi.createService(StoreService.class);
-        Call<VipAreaBean> call = service.getVipAreanList(page, limit,keyword);
-        call.enqueue(new Callback<VipAreaBean>() {
+    public void requestData(int page, int limit, String keyword) {
+        NetworkApi.createService(StoreService.class).getVipAreanList(page, limit, keyword)
+                .compose(NetworkApi.applySchedulers(new BaseObserver<DataJavaResponse<VipAreaBean>>() {
             @Override
-            public void onResponse(Call<VipAreaBean> call, Response<VipAreaBean> response) {
-                if (response.code() == 200 && response.body() != null) {
-                    if (response.body().getData() != null && response.body().getData().getCount() > 0) {
-                        vipAreaData.postValue(response.body().getData().getList());
-                        return;
-                    }
+            public void onSuccess(DataJavaResponse<VipAreaBean> response) {
+                if (response.responseCode == 200 && response.getData() != null) {
+                    vipAreaData.postValue(response.getData().getList());
+                    return;
                 }
                 vipAreaData.postValue(null);
             }
+
             @Override
-            public void onFailure(Call<VipAreaBean> call, Throwable t) {
+            public void onFailure(Throwable e) {
                 failed.postValue("数据加载失败！");
             }
-        });
+        }));
     }
 
-    public void requestGongchang(int page,int limit,String keyword){
-        StoreService service = NetworkApi.createService(StoreService.class);
-        Call<VipAreaBean> call = service.getGongchangAreanList(page, limit,"gongchang",keyword);
-        call.enqueue(new Callback<VipAreaBean>() {
-            @Override
-            public void onResponse(Call<VipAreaBean> call, Response<VipAreaBean> response) {
-                if (response.code() == 200 && response.body() != null) {
-                    if (response.body().getData() != null && response.body().getData().getCount() > 0) {
-                        vipAreaData.postValue(response.body().getData().getList());
-                        return;
+    public void requestGongchang(int page, int limit, String keyword) {
+        NetworkApi.createService(StoreService.class)
+                .getGongchangAreanList(page, limit, "gongchang", keyword)
+                .compose(NetworkApi.applySchedulers(new BaseObserver<DataJavaResponse<VipAreaBean>>() {
+                    @Override
+                    public void onSuccess(DataJavaResponse<VipAreaBean> response) {
+                        if (response.responseCode == 200 && response.getData() != null) {
+                            vipAreaData.postValue(response.getData().getList());
+                            return;
+                        }
+                        vipAreaData.postValue(null);
                     }
-                }
-                vipAreaData.postValue(null);
-            }
-            @Override
-            public void onFailure(Call<VipAreaBean> call, Throwable t) {
-                failed.postValue("数据加载失败！");
-            }
-        });
+
+                    @Override
+                    public void onFailure(Throwable e) {
+                        failed.postValue("数据加载失败！");
+                    }
+                }));
     }
+
     public void getUserData() {
         ApiService apiService = NetworkApi.createService(ApiService.class);
         apiService.userBanner().compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<List<BannerDataBean>>>() {
             @Override
             public void onSuccess(DataResponse<List<BannerDataBean>> listDataResponse) {
                 if (listDataResponse.responseCode == 200) {
-                    System.out.println(listDataResponse.getData().size()+"**********************");
+                    System.out.println(listDataResponse.getData().size() + "**********************");
                     bannerData.postValue(listDataResponse.getData());
                 } else {
                     ToastUtils.showLong(listDataResponse.responseError);
@@ -98,7 +99,7 @@ public class VipAreaViewModel extends BaseViewModel {
             @Override
             public void onSuccess(DataResponse<List<BannerDataBean>> listDataResponse) {
                 if (listDataResponse.responseCode == 200) {
-                    System.out.println(listDataResponse.getData().size()+"**********************");
+                    System.out.println(listDataResponse.getData().size() + "**********************");
                     bannerData.postValue(listDataResponse.getData());
                 } else {
                     ToastUtils.showLong(listDataResponse.responseError);

app/src/main/java/com/yihucha/hbyhc/utils/EmptyCheckUtils.kt

@@ -0,0 +1,29 @@
+package com.yihucha.hbyhc.utils
+
+/**
+ *  author : zhangbing
+ *  time   : 2023/10/27 11:14
+ *  com.jyd.spiapp.utils
+ */
+class EmptyCheckUtils {
+    companion object{
+        @JvmStatic
+        fun isEmpty(str: String?): Boolean = str?.trim()?.isEmpty() ?: true
+        @JvmStatic
+        fun isEmpty(collection: Collection<Any>?) = collection?.isEmpty() ?:true
+        @JvmStatic
+        fun isEmpty(collection: List<Any>?) = collection?.isEmpty() ?:true
+        @JvmStatic
+        fun isEmpty(arr: Array<Any>?) = arr?.isEmpty() ?:true
+
+        @JvmStatic
+        fun isEmpty(any: Any?) = any?.let { false }?:true
+
+        @JvmStatic
+        fun isNotEmpty(str: String?): Boolean = str?.trim()?.isNotEmpty() ?: false
+        @JvmStatic
+        fun isNotEmpty(collection: Collection<Any>?) = collection?.isNotEmpty() ?:false
+        @JvmStatic
+        fun isNotEmpty(any:Any?) = any?.let { true } ?: false
+    }
+}

app/src/main/java/com/yihucha/hbyhc/utils/StringUtils.kt

@@ -0,0 +1,209 @@
+package com.yihucha.hbyhc.utils
+
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+
+/**
+ *  author : zhangbing
+ *  time   : 2023/12/2 12:20
+ *  com.passenger.utils
+ */
+const val PHONE_REGEX = "^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\\d{8}$" //手机号正则
+const val EMAIL_REGEX = "^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$" //邮箱正则
+const val PASSWORD_REGEX = "^\\w{4,32}$" //密码正则。4~32位的字母、数字、下划线
+const val VERIFY_CODE_REGEX = "^[a-zA-Z\\d]{6}$" //验证码正则
+
+class StringUtils {
+    companion object {
+        /**
+         * 籍贯信息集合（全国省会、直辖市、自治区）
+         */
+        var oriGin = mutableMapOf<String, String>()
+
+        init {
+            oriGin["11"] = "北京市"
+
+            oriGin["12"] = "天津市"
+
+            oriGin["13"] = "河北省"
+
+            oriGin["14"] = "山西省"
+
+            oriGin["15"] = "内蒙古自治区"
+
+            oriGin["21"] = "辽宁省"
+
+            oriGin["22"] = "吉林省"
+
+            oriGin["23"] = "黑龙江省"
+
+            oriGin["31"] = "上海市"
+
+            oriGin["32"] = "江苏省"
+
+            oriGin["33"] = "浙江省"
+
+            oriGin["34"] = "安徽省"
+
+            oriGin["35"] = "福建省"
+
+            oriGin["36"] = "江西省"
+
+            oriGin["37"] = "山东省"
+
+            oriGin["41"] = "河南省"
+
+            oriGin["42"] = "湖北省"
+
+            oriGin["43"] = "湖南省"
+
+            oriGin["44"] = "广东省"
+
+            oriGin["45"] = "广西壮族自治区"
+
+            oriGin["46"] = "海南省"
+
+            oriGin["50"] = "重庆市"
+
+            oriGin["51"] = "四川省"
+
+            oriGin["52"] = "贵州省"
+
+            oriGin["53"] = "云南省"
+
+            oriGin["54"] = "西藏自治区"
+
+            oriGin["61"] = "陕西省"
+
+            oriGin["62"] = "甘肃省"
+
+            oriGin["63"] = "青海省"
+
+            oriGin["64"] = "宁夏回族自治区"
+
+            oriGin["65"] = "新疆维吾尔自治区"
+
+            oriGin["71"] = "台湾省"
+
+            oriGin["81"] = "香港特别行政区"
+
+            oriGin["82"] = "澳门特别行政区"
+
+            oriGin["91"] = "国外"
+        }
+
+        /**
+         * 手机号码检测
+         */
+        @JvmStatic
+        fun isPhone(phone: String?): Boolean {
+            return phone?.let { p ->
+                Pattern.compile(PHONE_REGEX)?.let {
+                    it.matcher(p).matches()
+                } ?: false
+            } ?: false
+        }
+
+        /**
+         * URL移除 http或https头部信息
+         */
+        @JvmStatic
+        fun formatUrl(source: String?): String? {
+            source
+                ?.replace("http://", "")
+                ?.replace("https://", "")
+                ?.apply {
+                    if (isEmpty()) {
+                        return source
+                    }
+                    var i = indexOf('/')
+                    if (i >= 0)
+                        return substring(i)
+                } ?: return source
+            return source
+        }
+
+        /**
+         * 手机号码脱敏
+         */
+        @JvmStatic
+        fun resetPhone(phone: String?): String {
+            return if (EmptyCheckUtils.isEmpty(phone)) "" else {
+                phone!!.let {
+                    var str1 = it.substring(0, 3)
+                    var str2 = it.substring(it.length - 4)
+                    "$str1****$str2"
+                }
+            }
+        }
+
+        /**
+         * 身份证号码脱敏
+         */
+        @JvmStatic
+        fun resetIdCard(idcard: String?): String {
+            return if (EmptyCheckUtils.isEmpty(idcard)) "" else {
+                idcard!!.let {
+                    var str1 = it.substring(0, 3)
+                    var str2 = it.substring(it.length - 4)
+                    "$str1************$str2"
+                }
+            }
+        }
+
+        /**
+         * 根据身份证前两位，获取籍贯信息
+         */
+        @JvmStatic
+        fun getOriGin(key: String): String {
+            return if (oriGin.contains(key)) {
+                oriGin[key]!!
+            } else {
+                "未知"
+            }
+        }
+
+        /**
+         * 根据时间戳，获取分钟、秒等信息
+         */
+        @JvmStatic
+        fun getTime(long: Long): String {
+            return if (long == 0L) "00:00" else {
+                if (long <= 59L) {
+                    if (long > 9) {
+                        "00:$long"
+                    } else {
+                        "00:0$long"
+                    }
+                } else {
+                    var time = ""
+                    var min = long / 60
+                    var sec = long % 60
+                    time += if (min > 9) {
+                        "$min"
+                    } else {
+                        "0$min"
+                    }
+                    time += ":"
+                    time += if (sec > 9) {
+                        "$sec"
+                    } else {
+                        "0$sec"
+                    }
+                    time
+                }
+            }
+        }
+
+        /**
+         * 数字前面自动拼接0
+         */
+        fun formatNumber(number: Int): String {
+            return if (number > 9) number.toString() else "0${number}"
+        }
+
+    }
+
+
+
+}

app/src/main/java/com/yihucha/hbyhc/view/CustomDialog.java

@@ -23,6 +23,7 @@ import com.yihucha.hbyhc.callback.ThreeInputButtonsListener;
 import com.yihucha.hbyhc.callback.TwoButtonsListener;
 import com.yihucha.hbyhc.callback.TwoInputButtonsListener;
 import com.yihucha.hbyhc.presentation.annuity.RealNameAuthenticationActivity;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 import com.yihucha.hbyhc.utils.GlideUtils;
 import com.yihucha.hbyhc.utils.StringsUtil;
 import com.liys.dialoglib.LDialog;
@@ -98,8 +99,8 @@ public class CustomDialog {
                                      int leftTextColor, int rightTextColor, final
                                      TwoButtonsListener twoButtonsListener) {
         LDialog dialog = LDialog.newInstance(context, R.layout.dialog_confirm);
-        if (StringsUtil.isEmpty(context.getString(title))){
-            dialog.setGone(R.id.confirm_title,false);
+        if (StringsUtil.isEmpty(context.getString(title))) {
+            dialog.setGone(R.id.confirm_title, false);
         }
         dialog.setMaskValue(0.5f).setText(R.id.confirm_title, title).setText(R.id.confirm_content, content)
                 .setText(R.id.confirm_negative, leftText)
@@ -165,6 +166,7 @@ public class CustomDialog {
         }
         dialog.show();
     }
+
     //版本升级进度条弹窗
     public static void downlaodDialog(AppCompatActivity context, LiveData<Integer> process) {
         LDialog dialog = LDialog.newInstance(context, R.layout.dialog_downlaod_process);
@@ -175,9 +177,9 @@ public class CustomDialog {
         progressBar.setMax(100);
         process.observe(context, process1 -> {
 //            System.out.println("CustomDialog.downlaodDialog----------"+process1);
-            if (process1 >= 100||process1<0) {
+            if (process1 >= 100 || process1 < 0) {
                 dialog.dismiss();
-            } else{
+            } else {
                 progressBar.setProgress(process1);
             }
         });
@@ -490,14 +492,27 @@ public class CustomDialog {
      * @param context
      */
     public static void getEnterTheInvitationCode(Context context, OneInputButtonsListener oneInputButtonsListener) {
+        getEnterCodeWithTitle(context, null, oneInputButtonsListener);
+    }
+
+    /**
+     * 输入邀请码
+     *
+     * @param context
+     * @title 标题提示语
+     */
+    public static void getEnterCodeWithTitle(Context context, String title, OneInputButtonsListener oneInputButtonsListener) {
         LDialog lDialog = LDialog.newInstance(context, R.layout.dialog_enter_the_invitation_code);
+        if (EmptyCheckUtils.isNotEmpty(title)) {
+            lDialog.setText(R.id.tv_title, title);
+        }
         EditText etInvitationCode = lDialog.getView(R.id.et_invitationcode);
-        lDialog.setMaskValue(0.5f).setGravity(Gravity.CENTER).setCancelBtn(R.id.confirm_negative).setOnClickListener(new LDialog.DialogOnClickListener() {
-            @Override
-            public void onClick(View v, LDialog lDialog) {
-                oneInputButtonsListener.clickButton(etInvitationCode.getText().toString());
-            }
-        }, R.id.confirm_positive).show();
+        lDialog.setMaskValue(0.5f)
+                .setGravity(Gravity.CENTER)
+                .setCancelBtn(R.id.confirm_negative)
+                .setOnClickListener((v, lDialog1) -> oneInputButtonsListener
+                        .clickButton(etInvitationCode.getText().toString()), R.id.confirm_positive)
+                .show();
     }
 
     /**
@@ -511,11 +526,12 @@ public class CustomDialog {
         tvContent.setText(s);
         lDialog.setMaskValue(0.5f).setGravity(Gravity.CENTER).setCancelBtn(R.id.confirm_negative).show();
     }
+
     /**
      * 取消支付弹窗
      */
-    public static void showCanclePayDialog(Context context,OneButtonsListener oneButtonsListener){
-        LDialog lDialog = LDialog.newInstance(context,R.layout.dialog_cancle_pay);
+    public static void showCanclePayDialog(Context context, OneButtonsListener oneButtonsListener) {
+        LDialog lDialog = LDialog.newInstance(context, R.layout.dialog_cancle_pay);
         //确认离开
         lDialog.getView(R.id.bt_likai).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -533,24 +549,40 @@ public class CustomDialog {
         });
         lDialog.show();
     }
-    public static void showCanclePayDialog(Context context,OneButtonsListener oneButtonsListener,String title,
-                                           String leftBtn,String rightBtn){
-        LDialog lDialog = LDialog.newInstance(context,R.layout.dialog_cancle_pay);
+
+    /**
+     * 确认弹窗dialog
+     *
+     * @param context
+     * @param oneButtonsListener 点击回调
+     * @param title              标题
+     * @param content            内容
+     * @param leftBtn            取消按钮
+     * @param rightBtn           类似确认按钮
+     */
+    public static void showConfirmDialog(Context context, String title,
+                                         String content, String leftBtn, String rightBtn,
+                                         OneButtonsListener oneButtonsListener) {
+        LDialog lDialog = LDialog.newInstance(context, R.layout.dialog_confirm);
+        if (EmptyCheckUtils.isEmpty(title)) {
+            lDialog.setGone(R.id.confirm_title, true);
+        } else {
+            lDialog.setText(R.id.confirm_title, title);
+        }
+        if (EmptyCheckUtils.isEmpty(content)) {
+            lDialog.setGone(R.id.confirm_content, true);
+        } else {
+            lDialog.setText(R.id.confirm_content, content);
+        }
+        lDialog.setText(R.id.confirm_negative, leftBtn);
+        lDialog.setText(R.id.confirm_positive, rightBtn);
         //确认离开
-        lDialog.getView(R.id.bt_likai).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                oneButtonsListener.clickButton();
-                lDialog.cancel();
-            }
+        lDialog.getView(R.id.confirm_positive).setOnClickListener(view -> {
+            oneButtonsListener.clickButton();
+            lDialog.cancel();
         });
         //继续支付
-        lDialog.getView(R.id.bt_continue).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                lDialog.cancel();
-            }
-        });
+        lDialog.getView(R.id.confirm_negative).setOnClickListener(view -> lDialog.cancel());
         lDialog.show();
     }
 
@@ -610,16 +642,16 @@ public class CustomDialog {
 
     /**
      * 区域代理弹窗
-     * @param area 区域信息
      *
+     * @param area 区域信息
      */
 
-    public static void getAreaDailiDialog(Context context,String area,boolean isCity){
-        LDialog lDialog = LDialog.newInstance(context,R.layout.layout_dialog_daili);
+    public static void getAreaDailiDialog(Context context, String area, boolean isCity) {
+        LDialog lDialog = LDialog.newInstance(context, R.layout.layout_dialog_daili);
         ConstraintLayout layout = lDialog.findViewById(R.id.parent_layout);
         if (isCity) {
             layout.setBackgroundResource(R.mipmap.img_daili_dialog_bg);
-        }else {
+        } else {
             layout.setBackgroundResource(R.mipmap.img_dialog_daili);
         }
         TextView areaView = lDialog.getView(R.id.tv_content_area);

app/src/main/res/drawable/shape_jiantou_right_red.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:width="12dp"
+        android:height="12dp">
+        <shape android:shape="rectangle">
+            <gradient
+                android:angle="90"
+                android:endColor="#fffc517d"
+                android:startColor="#fff52137"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+</shape>

app/src/main/res/drawable/shape_line_white_50dp.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+
+    <!-- 圆角 -->
+    <corners android:radius="50dp" />
+
+    <stroke
+        android:color="@color/white"
+        android:width="2dp"/>
+
+
+</shape>

app/src/main/res/drawable/shape_white_50dp.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"   android:shape="rectangle" >
+
+    <solid android:color="#ffffff" />
+
+<!--    <stroke-->
+<!--        android:color="@color/gray_9e9e9e"-->
+<!--        android:width="0.5dp"/>-->
+
+    <corners android:radius="50dp"/>
+
+
+</shape>

app/src/main/res/drawable/shape_white_with_line_color_8dp.xml

@@ -8,8 +8,8 @@
 <!--        android:width="0.5dp"/>-->
 
     <corners android:radius="8dp"/>
-    <stroke android:color="#FEF0F1"
-        android:width="2dp"
+    <stroke android:color="@color/gray_e5e5e5"
+        android:width="1dp"
         />
 
 </shape>

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

@@ -8,18 +8,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@mipmap/logo_220608"
-
         android:layout_marginTop="59dp"
         android:layout_gravity="center_horizontal"
         />
 
-    <ImageView
-        android:id="@+id/iv_cxb_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="13dp"
-        android:src="@mipmap/chuxubao_name"
-        android:layout_gravity="center_horizontal"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -41,6 +33,7 @@
                 android:maxLength="11"
                 android:inputType="number"
                 android:hint="@string/input_phone"
+                android:text="13718363025"
                 android:layout_height="wrap_content" />
 
             <TextView

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

@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white_f8f8f8"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical"
+    tools:context=".presentation.home.YHCHomeSearchActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/iv_goback"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:src="@mipmap/icon_title_back" />
+
+        <LinearLayout
+            android:id="@+id/ll_search"
+            android:layout_width="0dp"
+            android:layout_height="32dp"
+            android:layout_marginRight="13dp"
+            android:layout_weight="1"
+            android:background="@drawable/shape_line_fe0032_15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <EditText
+                android:id="@+id/et_search"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="13dp"
+                android:layout_weight="1"
+                android:background="@null"
+                android:hint="搜索"
+                android:textColor="@color/black_333333"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/tv_click_search"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:background="@drawable/shape_fe0032_50dp"
+                android:gravity="center"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="@string/search"
+                android:textColor="@color/white"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+    <include
+        android:id="@+id/search_records"
+        layout="@layout/search_history_is_recommended"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <LinearLayout
+        android:id="@+id/layout_select"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="22dp"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        >
+
+        <LinearLayout
+            android:id="@+id/ll_recommend"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="horizontal">
+            <com.yihucha.hbyhc.view.BoldText
+                android:id="@+id/btv_recommend"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="综合"
+                android:textColor="@color/red_fe0032"
+                android:textSize="16sp" />
+            <ImageView
+                android:id="@+id/iv_jiangxu_zonghe"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/tuijian_xiala_red"
+                android:layout_marginLeft="5dp"
+                />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_search_sales"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <com.yihucha.hbyhc.view.BoldText
+                    android:id="@+id/btv_search_sales"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/search_sales"
+                    android:textColor="@color/black_333333"
+                    android:textSize="16sp" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="3dp"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:id="@+id/iv_shengxu_sales"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@mipmap/tuijian_shangla" />
+
+                    <ImageView
+                        android:id="@+id/iv_jiangxu_sale"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@mipmap/tuijian_xiala" />
+                </LinearLayout>
+
+
+            </LinearLayout>
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/ll_search_price"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <com.yihucha.hbyhc.view.BoldText
+                    android:id="@+id/btv_search_price"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/search_price"
+                    android:textColor="@color/black_333333"
+                    android:textSize="16sp" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="3dp"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:id="@+id/iv_shengxu"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@mipmap/tuijian_shangla" />
+
+                    <ImageView
+                        android:id="@+id/iv_jiangxu"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@mipmap/tuijian_xiala" />
+                </LinearLayout>
+
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+    <com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
+        android:id="@+id/refreshLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="12dp"
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_product_search"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <include
+                android:id="@+id/no_search"
+                layout="@layout/search_not_found"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone" />
+        </RelativeLayout>
+
+    </com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout>
+
+</LinearLayout>

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

@@ -6,7 +6,7 @@
     android:background="@drawable/shape_ffffff_8dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:gravity="center_horizontal"
-    android:paddingTop="20dp"
+    android:paddingTop="10dp"
     android:orientation="vertical" >
 
     <com.yihucha.hbyhc.view.BoldText
@@ -15,19 +15,20 @@
         android:layout_height="wrap_content"
         android:textColor="#000000"
         android:textSize="18sp"
-        android:visibility="visible" />
+        android:visibility="visible"
+        android:layout_marginTop="10dp"
+        />
 
     <com.yihucha.hbyhc.view.JustifyTextView
         android:id="@+id/confirm_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="10dp"
         android:layout_marginLeft="22dp"
         android:layout_marginRight="22dp"
         android:layout_marginBottom="20dp"
         android:textColor="@color/black_333333"
         android:lineSpacingExtra="3dp"
-
         android:gravity="center"
         android:textSize="15sp"
       />

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

@@ -8,7 +8,8 @@
     android:layout_marginRight="47dp"
     android:layout_height="wrap_content">
 
-    <TextView
+    <com.yihucha.hbyhc.view.BoldText
+        android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/black_333333"

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

@@ -3,220 +3,433 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:orientation="vertical"
     android:layout_height="match_parent"
     android:background="@color/white_f8f8f8"
+    android:orientation="vertical"
     tools:context="com.yihucha.hbyhc.presentation.home.HomeFragment">
 
+    <include
+        android:id="@+id/head_view"
+        layout="@layout/home_head"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
-<com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
-    android:id="@+id/refreshLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:tr_pureScrollMode_on="true"
-    android:layout_below="@+id/head_view"
-    >
-    <com.yihucha.hbyhc.view.NaviBarChangeStatusScrollView
-        android:id="@+id/scrollview"
+    <com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
+        android:id="@+id/refreshLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:clipToPadding="false"
-        android:fitsSystemWindows="false"
-        android:orientation="vertical"
-        android:scrollbars="none">
-        <LinearLayout
+        android:layout_below="@+id/head_view"
+        android:layout_marginTop="-45dp"
+        app:tr_pureScrollMode_on="true">
+
+        <com.yihucha.hbyhc.view.NaviBarChangeStatusScrollView
+            android:id="@+id/scrollview"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical">
-            <View
-                android:id="@+id/virtual_status_bar"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:background="@color/translate" />
-            <com.youth.banner.Banner
-                android:id="@+id/banner_home"
-                android:layout_width="match_parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_height="140dp" />
-
-            <include
-                android:id="@+id/view_jingangqu"
-                layout="@layout/home_king_kong_area"
-                 android:layout_width="match_parent"
-                android:layout_marginTop="13dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:fillViewport="true"
+            android:fitsSystemWindows="false"
+            android:orientation="vertical"
+            android:scrollbars="none">
 
-                />
             <LinearLayout
-                android:id="@+id/ll_the_announcement"
-                android:layout_marginTop="13dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:background="#FFF9ED"
-                android:paddingLeft="13dp"
-                android:paddingRight="13dp"
-                android:paddingBottom="10dp"
-                android:paddingTop="10dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:visibility="gone"
-                android:orientation="horizontal">
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:orientation="vertical"
+                android:paddingTop="3dp">
 
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/home_the_horn_220926"/>
-                <com.sunfusheng.marqueeview.MarqueeView
-                    android:id="@+id/marqueeView"
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
-                    android:layout_marginLeft="7dp"
                     android:layout_height="wrap_content"
-                    app:mvAnimDuration="1000"
-                    app:mvDirection="bottom_to_top"
-                    app:mvInterval="3000"
-                    app:mvTextColor="@color/red_ff6010"
-                    app:mvTextSize="15sp"
-                    app:mvSingleLine="true"/>
-            </LinearLayout>
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    app:cardCornerRadius="10dp">
+
+                    <com.youth.banner.Banner
+                        android:id="@+id/banner_home"
+                        android:layout_width="match_parent"
+                        android:layout_height="140dp" />
+                </androidx.cardview.widget.CardView>
 
-            <RelativeLayout
-                android:id="@+id/layout_seckill"
-                android:layout_width="match_parent"
-                android:layout_height="220dp"
-                android:background="@mipmap/img_ms_bg"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:paddingTop="13dp"
-                android:paddingBottom="13dp"
-                android:layout_marginTop="13dp"
-                android:visibility="gone"
-                >
-                <ImageView
-                    android:id="@+id/imgv_xsms"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/img_miaosha_home"
-                    />
                 <LinearLayout
-                    android:id="@+id/layout_time"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignBottom="@+id/imgv_xsms"
-                    android:layout_toRightOf="@+id/imgv_xsms"
-                    android:layout_marginLeft="10dp"
-                    android:orientation="horizontal"
-                    >
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal">
+
                     <TextView
-                        android:id="@+id/tv_hours"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:textSize="11sp"
-                        android:text="12"
-                        android:textColor="@color/white"
-                        android:padding="1dp"
-                        android:background="@drawable/shape_black_2dp"
-                        />
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/icon_cxb"
+                        android:drawablePadding="4dp"
+                        android:gravity="center_horizontal"
+                        android:text="储蓄保商城" />
+
                     <TextView
-                        android:id="@+id/tv_maohao1"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text=" : "
-                        android:textSize="11sp"
-                        android:textColor="@color/black_333333"/>
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/icon_ms"
+                        android:drawablePadding="4dp"
+                        android:gravity="center_horizontal"
+                        android:text="限时秒杀" />
+
                     <TextView
-                        android:id="@+id/tv_minute"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/icon_vip"
+                        android:drawablePadding="4dp"
+                        android:gravity="center_horizontal"
+                        android:text="会员专区" />
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:id="@+id/layout_vip"
+                    android:layout_width="match_parent"
+                    android:layout_height="230dp"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="12dp"
+                    android:background="@mipmap/bg_vip_home"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="13dp"
+                    android:paddingRight="3dp"
+                    android:paddingBottom="13dp"
+                    android:visibility="gone">
+
+                    <com.yihucha.hbyhc.view.BoldText
+                        android:id="@+id/imgv_vip"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textSize="11sp"
-                        android:text="12"
+                        android:text="会员专区\t好物超值购"
                         android:textColor="@color/white"
-                        android:padding="1dp"
-                        android:background="@drawable/shape_black_2dp"
-                        />
-                    <TextView
-                        android:id="@+id/tv_maohao2"
+                        android:textSize="17sp" />
+
+                    <com.yihucha.hbyhc.view.BoldText
+                        android:id="@+id/tv_buy_now"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text=" : "
-                        android:textSize="11sp"
-                        android:textColor="@color/black_333333"
-                        />
-                    <TextView
-                        android:id="@+id/tv_sencond"
+                        android:layout_alignParentRight="true"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="12dp"
+                        android:background="@drawable/shape_line_white_50dp"
+                        android:drawableRight="@mipmap/img_jt_right"
+                        android:drawablePadding="5dp"
+                        android:paddingLeft="8dp"
+                        android:paddingTop="3dp"
+                        android:paddingRight="8dp"
+                        android:paddingBottom="3dp"
+                        android:text="立即抢购"
+                        android:textColor="@color/white"
+                        android:textSize="15sp" />
+
+                    <androidx.cardview.widget.CardView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/imgv_vip"
+                        android:layout_alignParentBottom="true"
+                        android:layout_marginTop="10dp"
+                        app:cardCornerRadius="5dp">
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/rv_vip"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                    </androidx.cardview.widget.CardView>
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/layout_seckill"
+                    android:layout_width="match_parent"
+                    android:layout_height="290dp"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="12dp"
+                    android:background="@mipmap/bg_ms_home"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="13dp"
+                    android:paddingRight="10dp"
+                    android:paddingBottom="13dp"
+                    android:visibility="gone">
+
+                    <com.yihucha.hbyhc.view.BoldText
+                        android:id="@+id/imgv_xsms"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textSize="11sp"
-                        android:text="12"
+                        android:text="超级秒杀\t低价限时抢"
                         android:textColor="@color/white"
-                        android:padding="1dp"
-                        android:background="@drawable/shape_black_2dp"
-                        />
-                </LinearLayout>
-                <TextView
-                    android:id="@+id/tv_get_more"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="查看更多"
-                    android:layout_alignParentRight="true"
-                    android:textColor="@color/white"
-                    android:textSize="11sp"
-                    android:drawableRight="@mipmap/img_jt_right"
-                    android:drawablePadding="5dp"
-                    />
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rv_miaosha"
+                        android:textSize="17sp" />
+
+                    <LinearLayout
+                        android:id="@+id/layout_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignTop="@+id/imgv_xsms"
+                        android:layout_alignBottom="@+id/imgv_xsms"
+                        android:layout_marginLeft="10dp"
+                        android:layout_toRightOf="@+id/imgv_xsms"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/tv_hours"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:background="@drawable/shape_white_2dp"
+                            android:padding="1dp"
+                            android:text="12"
+                            android:textColor="@color/red_fe0032"
+                            android:textSize="11sp" />
+
+                        <TextView
+                            android:id="@+id/tv_maohao1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text=" : "
+                            android:textColor="@color/white"
+                            android:textSize="11sp" />
+
+                        <TextView
+                            android:id="@+id/tv_minute"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:background="@drawable/shape_white_2dp"
+                            android:padding="1dp"
+                            android:text="12"
+                            android:textColor="@color/red_fe0032"
+                            android:textSize="11sp" />
+
+                        <TextView
+                            android:id="@+id/tv_maohao2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text=" : "
+                            android:textColor="@color/white"
+                            android:textSize="11sp" />
+
+                        <TextView
+                            android:id="@+id/tv_sencond"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:background="@drawable/shape_white_2dp"
+                            android:padding="1dp"
+                            android:text="12"
+                            android:textColor="@color/red_fe0032"
+                            android:textSize="11sp" />
+                    </LinearLayout>
+
+                    <androidx.cardview.widget.CardView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_above="@+id/layout_get_more"
+                        android:layout_below="@id/imgv_xsms"
+                        android:layout_marginTop="10dp"
+                        app:cardCornerRadius="5dp">
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/rv_miaosha"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                    </androidx.cardview.widget.CardView>
+
+                    <LinearLayout
+                        android:id="@+id/layout_get_more"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentBottom="true"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="23dp"
+                        android:layout_marginBottom="13dp"
+                        android:background="@drawable/shape_white_50dp"
+                        android:orientation="horizontal"
+                        android:paddingLeft="15dp"
+                        android:paddingTop="5dp"
+                        android:paddingRight="15dp"
+                        android:paddingBottom="5dp">
+
+                        <com.yihucha.hbyhc.view.BoldText
+                            android:id="@+id/tv_get_more"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:drawablePadding="5dp"
+                            android:text="立即前往"
+                            android:textColor="@color/red_f83554"
+                            android:textSize="15sp" />
+
+                        <ImageView
+                            android:layout_width="15dp"
+                            android:layout_height="15dp"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="5dp"
+                            android:background="@drawable/shape_fe0032_50dp"
+                            android:padding="3dp"
+                            android:src="@mipmap/img_jt_right" />
+                    </LinearLayout>
+
+                </RelativeLayout>
+
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_below="@id/imgv_xsms"
-                    android:layout_marginTop="10dp"
-                    />
-            </RelativeLayout>
+                    android:layout_marginTop="22dp"
+                    android:orientation="horizontal">
 
-            <ImageView
-                android:id="@+id/iv_huiyuan"
-                android:layout_width="match_parent"
-                android:layout_marginTop="26px"
-                android:layout_height="wrap_content"
-                android:src="@mipmap/img_ckvip"/>
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:layout_marginTop="13dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:nestedScrollingEnabled="false"
-                android:id="@+id/rv_home_list"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                    <LinearLayout
+                        android:id="@+id/ll_recommend"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
+                        <com.yihucha.hbyhc.view.BoldText
+                            android:id="@+id/btv_recommend"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="推荐"
+                            android:textColor="@color/red_fe0032"
+                            android:textSize="16sp" />
+                    </LinearLayout>
 
-        </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/ll_search_update"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
-    </com.yihucha.hbyhc.view.NaviBarChangeStatusScrollView>
+                        <com.yihucha.hbyhc.view.BoldText
+                            android:id="@+id/btv_search_update"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/search_update"
+                            android:textColor="@color/black_333333"
+                            android:textSize="16sp" />
+                    </LinearLayout>
 
-</com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout>
+                    <LinearLayout
+                        android:id="@+id/ll_search_sales"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
-    <include
-        android:id="@+id/head_view"
-        layout="@layout/home_head"
-        android:layout_width="wrap_content"
-        android:layout_height="141dp"></include>
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <com.yihucha.hbyhc.view.BoldText
+                                android:id="@+id/btv_search_sales"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/search_sales"
+                                android:textColor="@color/black_333333"
+                                android:textSize="16sp" />
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="3dp"
+                                android:orientation="vertical">
+
+                                <ImageView
+                                    android:id="@+id/iv_shengxu_sales"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:src="@mipmap/tuijian_shangla" />
+
+                                <ImageView
+                                    android:id="@+id/iv_jiangxu_sale"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:src="@mipmap/tuijian_xiala" />
+                            </LinearLayout>
+
+
+                        </LinearLayout>
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:id="@+id/ll_search_price"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <com.yihucha.hbyhc.view.BoldText
+                                android:id="@+id/btv_search_price"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/search_price"
+                                android:textColor="@color/black_333333"
+                                android:textSize="16sp" />
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="3dp"
+                                android:orientation="vertical">
 
-<!--站位-->
+                                <ImageView
+                                    android:id="@+id/iv_shengxu"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:src="@mipmap/tuijian_shangla" />
+
+                                <ImageView
+                                    android:id="@+id/iv_jiangxu"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:src="@mipmap/tuijian_xiala" />
+                            </LinearLayout>
+
+                        </LinearLayout>
+                    </LinearLayout>
+                </LinearLayout>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_home_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginTop="13dp"
+                    android:layout_marginRight="16dp"
+                    android:nestedScrollingEnabled="false" />
+            </LinearLayout>
+
+        </com.yihucha.hbyhc.view.NaviBarChangeStatusScrollView>
+
+    </com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout>
+
+
+    <!--站位-->
     <View
         android:id="@+id/view_occupy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
+
     <ImageView
         android:id="@+id/tv_scroll_top"
         android:layout_width="@dimen/to_top"
@@ -225,7 +438,6 @@
         android:layout_alignParentBottom="true"
         android:layout_marginRight="16dp"
         android:layout_marginBottom="30dp"
-        android:visibility="gone"
         android:src="@mipmap/to_top"
-        />
+        android:visibility="gone" />
 </RelativeLayout>

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

@@ -2,14 +2,15 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/rl_top"
     android:layout_width="match_parent"
-    android:layout_height="140dp">
+    android:layout_height="wrap_content"
+    >
 
     <View
         android:id="@+id/view_header_bg"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:alpha="0"
-        android:background="@color/white" />
+        android:layout_height="190dp"
+        android:alpha="1"
+        android:background="@mipmap/home_top_bg" />
 
     <View
         android:id="@+id/view_top"
@@ -18,7 +19,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_below="@id/view_top"
         android:orientation="vertical">
 
@@ -35,56 +36,22 @@
                 android:layout_height="36dp"
                 android:src="@mipmap/img_head_pig" />
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="8dp"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <com.yihucha.hbyhc.view.BoldText
-                    android:id="@+id/btv_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/login"
-                    android:textColor="@color/white"
-                    android:textSize="15sp" />
-
-                <TextView
-                    android:id="@+id/tv_annuity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/draw_pension"
-                    android:textColor="@color/white"
-                    android:textSize="12sp" />
-            </LinearLayout>
-
-            <LinearLayout
+            <com.yihucha.hbyhc.view.BoldText
+                android:id="@+id/btv_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="gone">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/home_annuity_220614" />
-
-                <TextView
-                    android:id="@+id/tv_send_annuity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="3dp"
-                    android:text="@string/send_pension"
-                    android:textColor="@color/white"
-                    android:textSize="9.5sp" />
-            </LinearLayout>
-
+                android:layout_weight="1"
+                android:text="@string/login"
+                android:textColor="@color/black_333333"
+                android:textSize="17sp"
+                android:paddingLeft="12dp"
+                android:layout_gravity="center_vertical"
+                />
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="8dp"
+                android:paddingLeft="15dp"
+                android:paddingRight="8dp"
                 android:gravity="center"
                 android:orientation="vertical">
 
@@ -92,7 +59,7 @@
                     android:id="@+id/iv_message"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:src="@mipmap/home_message_220614"
+                    android:src="@mipmap/icon_home_msg"
                     />
 
                 <TextView
@@ -101,7 +68,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="3dp"
                     android:text="@string/message"
-                    android:textColor="@color/white"
+                    android:textColor="@color/black_333333"
                     android:textSize="9.5sp" />
             </LinearLayout>
         </LinearLayout>

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

@@ -1,55 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layout_parent"
-    android:paddingLeft="5dp"
-    android:paddingRight="5dp"
-    >
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:padding="5dp">
+
     <RelativeLayout
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="10dp"
-        android:background="@drawable/shape_white_with_line_color_8dp">
+        android:layout_height="match_parent">
 
         <com.yihucha.hbyhc.view.RoundCornerImageView
             android:id="@+id/imgv_item"
             android:layout_width="match_parent"
             android:layout_height="90dp"
-            app:rciv_left_top_radius="8dp"
-            app:rciv_right_top_radius="8dp"
             android:padding="1dp"
             android:scaleType="fitXY"
-            />
+            app:rciv_left_top_radius="8dp"
+            app:rciv_right_top_radius="8dp" />
 
         <TextView
             android:id="@+id/tv_name_item"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/imgv_item"
+            android:layout_marginLeft="5dp"
             android:layout_marginTop="11dp"
+            android:layout_marginRight="5dp"
             android:ellipsize="end"
             android:maxLines="1"
             android:text="迪奥Dior花香"
             android:textColor="@color/black_333333"
-            android:textSize="12sp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            />
+            android:textSize="12sp" />
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/tv_name_item"
+            android:layout_centerHorizontal="true"
+            android:layout_marginLeft="5dp"
             android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp"
             android:layout_marginBottom="10dp"
-            android:paddingRight="3dp"
             android:background="@drawable/shape_line_fe0032_2dp"
             android:orientation="horizontal"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            >
+            android:paddingRight="3dp">
 
             <ImageView
                 android:id="@+id/imgv_yanglaojin"
@@ -69,37 +64,42 @@
                 android:textColor="@color/red_fe0032"
                 android:textSize="9sp" />
         </LinearLayout>
-    </RelativeLayout>
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:background="@mipmap/img_ms_item_bg"
-        android:orientation="horizontal">
 
-        <LinearLayout
+        <RelativeLayout
+            android:id="@+id/price_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
+            android:background="@mipmap/img_ms_qiang"
+            android:orientation="horizontal"
+            android:visibility="visible">
 
-            <TextView
-                android:id="@+id/tv_rmb_item"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="￥"
-                android:textColor="@color/white"
-                android:textSize="10sp" />
+                android:layout_centerVertical="true"
+                android:orientation="horizontal"
+                android:paddingLeft="15dp">
 
-            <TextView
-                android:id="@+id/tv_price_item"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="86"
-                android:textColor="@color/white"
-                android:textSize="13sp" />
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/tv_rmb_item"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="￥"
+                    android:textColor="@color/red_fe0032"
+                    android:textSize="9sp" />
+
+                <com.yihucha.hbyhc.view.BoldText
+                    android:id="@+id/tv_price_item"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="86"
+                    android:textColor="@color/red_fe0032"
+                    android:textSize="15sp" />
+            </LinearLayout>
+        </RelativeLayout>
     </RelativeLayout>
 
+
 </RelativeLayout>

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

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/layout_parent"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:padding="5dp"
+    >
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        >
+
+        <com.yihucha.hbyhc.view.RoundCornerImageView
+            android:id="@+id/imgv_item"
+            android:layout_width="match_parent"
+            android:layout_height="90dp"
+            android:padding="1dp"
+            android:scaleType="fitXY"
+            app:rciv_left_top_radius="8dp"
+            app:rciv_right_top_radius="8dp" />
+
+        <TextView
+            android:id="@+id/tv_name_item"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/imgv_item"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="11dp"
+            android:layout_marginRight="5dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="迪奥Dior花香"
+            android:textColor="@color/black_333333"
+            android:textSize="12sp" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/tv_name_item"
+            android:layout_centerHorizontal="true"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="10dp"
+            android:background="@drawable/shape_line_fe0032_2dp"
+            android:orientation="horizontal"
+            android:paddingRight="3dp">
+
+            <ImageView
+                android:id="@+id/imgv_yanglaojin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/img_yg" />
+
+            <TextView
+                android:id="@+id/tv_yanglaojin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="5dp"
+                android:layout_weight="1"
+                android:gravity="left"
+                android:text="养老金 ￥11.11"
+                android:textColor="@color/red_fe0032"
+                android:textSize="9sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/price_layout_vip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:orientation="horizontal"
+            android:visibility="visible">
+
+            <TextView
+                android:id="@+id/tv_rmb_item_vip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="￥"
+                android:textColor="@color/red_fe0032"
+                android:textSize="9sp" />
+
+            <com.yihucha.hbyhc.view.BoldText
+                android:id="@+id/tv_price_item_vip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="86"
+                android:textColor="@color/red_fe0032"
+                android:textSize="15sp" />
+        </LinearLayout>
+    </RelativeLayout>
+
+
+</RelativeLayout>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="80dp"
+    android:padding="12dp">
+
+    <ImageView
+        android:id="@+id/imgv_msg"
+        android:layout_width="45dp"
+        android:layout_height="45dp"
+        android:src="@mipmap/img_msg" />
+
+    <com.yihucha.hbyhc.view.BoldText
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/imgv_msg"
+        android:layout_marginLeft="12dp"
+        android:layout_toRightOf="@+id/imgv_msg"
+        android:text="养老金结算通知"
+        android:textColor="@color/black_333333"
+        android:textSize="16sp" />
+
+    <TextView
+        android:id="@+id/tv_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/tv_title"
+        android:layout_marginLeft="12dp"
+        android:layout_alignBottom="@+id/tv_title"
+        android:layout_alignParentRight="true"
+        android:text="2019-12-03"
+        android:textColor="@color/gray_999999"
+        android:textSize="12sp" />
+    <TextView
+        android:id="@+id/tv_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/tv_title"
+        android:layout_below="@+id/tv_title"
+        android:text="这是公告内容这是公告内容这是公告这是公告内容这是公告内容这是公告这是公告内容…"
+        android:textColor="@color/gray_999999"
+        android:layout_marginTop="5dp"
+        android:textSize="13sp" />
+
+</RelativeLayout>

app/src/main/res/values/colors.xml

@@ -22,6 +22,7 @@
 
     <color name="translate33">#33000000</color>
     <color name="red_fe0032">#FE0032</color>
+    <color name="red_f83554">#F83554</color>
     <color name="red_ff6010">#FF6010</color>
     <color name="red_fe7577">#FE7577</color>
     <color name="red_fd1b48">#FD1B48</color>

jd_sdk_lib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1,8 +1,8 @@
-#Thu Jan 25 17:14:02 CST 2024
+#Sun Jan 28 13:37:21 CST 2024
 com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/kepler_back_pressed.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\kepler_back_pressed.png
 com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/pressbar_color.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable\\pressbar_color.xml
-com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/sdk_title_bg_with_shadow.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable\\sdk_title_bg_with_shadow.xml
 com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/web_bottom_layout.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\layout\\web_bottom_layout.xml
+com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/sdk_title_bg_with_shadow.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable\\sdk_title_bg_with_shadow.xml
 com.jd.jdsdk.jd_sdk_lib-main-7\:/layout/neterror_layout.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\layout\\neterror_layout.xml
 com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable-xxhdpi/seclect_item_serch.png=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\seclect_item_serch.png
 com.jd.jdsdk.jd_sdk_lib-main-7\:/drawable/kepler_dialog_button_ne.xml=E\:\\Android_project\\yihucha\\jd_sdk_lib\\build\\intermediates\\packaged_res\\debug\\drawable\\kepler_dialog_button_ne.xml

jd_sdk_lib/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="Illegal_info"> Illegal application ,check init !</string>
-    <string name="app_name">sdk</string>
-    <string name="give_up_affirm">确认离开</string>
-    <string name="give_up_goon">继续支付</string>
-    <string name="give_up_message">"下单后24小时内未支付成功，订单将被取消，请尽快完成支付。"</string>
-    <string name="give_up_title">确定要离开收银台</string>
-    <string name="history">最近浏览</string>
-    <string name="kepler_check_net">请检查您的网络环境</string>
-    <string name="loginout">退出登录</string>
-    <string name="loginout_success">注销成功</string>
-    <string name="message">消息</string>
-    <string name="not_login">未登录</string>
-    <string name="order">订单中心</string>
-    <string name="search">搜索</string>
-    <style name="AppBaseTheme" parent="android:Theme.Light">
-        
-    </style>
-    <style name="AppTheme" parent="AppBaseTheme">
-        
-    </style>
-    <style name="KeplerDialog" parent="android:style/Theme.Dialog">
-        <item name="android:background">#00000000</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-    </style>
-    <style name="sdw_79351b">
-        <item name="android:shadowColor">#ff79351b</item>
-        <item name="android:shadowDx">0.0</item>
-        <item name="android:shadowDy">1.0</item>
-        <item name="android:shadowRadius">1.0</item>
-    </style>
-    <style name="sdw_white">
-        <item name="android:shadowColor">#7fffffff</item>
-        <item name="android:shadowDx">0.0</item>
-        <item name="android:shadowDy">0.65</item>
-        <item name="android:shadowRadius">1.0</item>
-    </style>
-    <style name="text_15_666666_sdw" parent="@style/sdw_white">
-        <item name="android:textSize">15.0dip</item>
-        <item name="android:textColor">#ff666666</item>
-    </style>
-    <style name="text_15_ffffff_sdw" parent="@style/sdw_79351b">
-        <item name="android:textSize">15.0dip</item>
-        <item name="android:textColor">#ffffffff</item>
-    </style>
-    <style name="text_16_666666">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">#000000</item>
-    </style>
-    <style name="text_18_black">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">#000000</item>
-    </style>
-    <style name="text_18_red">
-        <item name="android:textSize">20sp</item>
-        <item name="android:textColor">#FF0000</item>
-    </style>
-    <style name="text_18_white">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">#ffffff</item>
-    </style>
-</resources>

jd_sdk_lib/build/intermediates/packaged_res/debug/layout/web_bottom_layout.xml

@@ -35,6 +35,9 @@
 
     <include
         android:layout_marginTop="40dp"
-        layout="@layout/neterror_layout" />
+        layout="@layout/neterror_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
 
 </RelativeLayout>