2024-1-29 代码备份

1、首页秒杀、秒杀页面已完成
2、商城（原大仓）页面改版完成

.idea/deploymentTargetDropDown.xml

@@ -1,17 +0,0 @@
-<?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/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/BigWarehouseFragment.java

@@ -93,25 +93,7 @@ public class BigWarehouseFragment extends BaseFragment implements View.OnClickLi
     }
 
     private void initData() {
-        //轮播图
-        bigWarehouseViewModel.getBannerData();
-        bigWarehouseViewModel.bannerData.observe(getActivity(), new Observer<DataResponse<List<BannerDataBean>>>() {
-            @Override
-            public void onChanged(DataResponse<List<BannerDataBean>> listDataResponse) {
-                LogUtil.LogInfo("listDataResponse", JSON.toJSONString(listDataResponse));
-                GlideUtils.loadImage(getActivity(), listDataResponse.getData().get(0).getPic(), binding.ivBanner);
-            }
-        });
         //金刚区
-//        bigWarehouseViewModel.getKingKongArea();
-//        bigWarehouseViewModel.mDcHomeMerchantList.observe(getActivity(), new Observer<List<DcHomeMerchantBean>>() {
-//            @Override
-//            public void onChanged(List<DcHomeMerchantBean> dcHomeMerchantBeans) {
-//                mDcHomeMerchantBean.addAll(dcHomeMerchantBeans);
-//                LogUtil.LogInfo("mDcHomeMerchantBean", JSON.toJSONString(mDcHomeMerchantBean));
-//                mDcKingKongAreaAdapter.replaceData(mDcHomeMerchantBean);
-//            }
-//        });
         mClassifyBean = new DCItemListClassificationBean();
         mClassifyBean.setCate_name("全部");
         mClassifyBean.setStore_category_id("");
@@ -171,18 +153,10 @@ public class BigWarehouseFragment extends BaseFragment implements View.OnClickLi
 //                mDcProductBean.addAll(dcProductBeans);
                 if (mDcProductBean == null || mDcProductBean.size() == 0) {
                     binding.noSearch.llNotFound.setVisibility(View.VISIBLE);
-                    binding.ivBanner.setVisibility(View.GONE);
-//                    binding.tvScrollTop.setVisibility(View.VISIBLE);
                     //上划之后的效果
-                    binding.viewHeaderBg.setBackgroundResource(R.color.red_fd214c);
-                    binding.llTop.setBackgroundResource(R.color.red_fd214c);
                     return;
                 } else {
                     binding.noSearch.llNotFound.setVisibility(View.GONE);
-                    binding.ivBanner.setVisibility(View.VISIBLE);
-                    binding.viewHeaderBg.setBackgroundResource(R.color.translate);
-                    binding.llTop.setBackgroundResource(R.color.translate);
-//                    binding.tvScrollTop.setVisibility(View.GONE);
                 }
                 mDcProductAdapter.replaceData(mDcProductBean);
                 int currentPos = itemPos.get(classify) == null ? 0 : itemPos.get(classify);
@@ -191,77 +165,44 @@ public class BigWarehouseFragment extends BaseFragment implements View.OnClickLi
         });
         binding.rvRecommendedList.setVisibility(View.VISIBLE);
         binding.rvProductList.setVisibility(View.GONE);
-        //大仓推荐
-//        bigWarehouseViewModel.recommendList();
-//        bigWarehouseViewModel.mRecommendListData.observe(getActivity(), new Observer<List<RecommendListBean>>() {
-//            @Override
-//            public void onChanged(List<RecommendListBean> recommendListBeans) {
-//                mRecommendListBean.addAll(recommendListBeans);
-//                mRecommendListAdapter.replaceData(mRecommendListBean);
-//            }
-//        });
     }
 
     private void initClick() {
         //商品点击
-        mDcProductAdapter.setOnClickListener(new DcProductAdapter.OnClickListener() {
-            @Override
-            public void onItemClick(int position) {
-                ProductDetailsActivity.launch(getActivity(), mDcProductBean.get(position).getProduct_id());
-            }
-        });
+        mDcProductAdapter.setOnClickListener(position ->
+                ProductDetailsActivity.launch(getActivity(), mDcProductBean.get(position).getProduct_id()));
         //大仓分类点击
-        mDCItemListClassificationAdapter.setOnClickListener(new DCItemListClassificationAdapter.OnClickListener() {
-            @Override
-            public void onItemClick(int position) {
-                for (int i = 0; i < mDCItemListClassificationBean.size(); i++) {
-                    mDCItemListClassificationBean.get(i).setClick(false);
-                }
-                MainActivity.storeCategoryId = mDCItemListClassificationBean.get(position).getStore_category_id();
-                mDCItemListClassificationBean.get(position).setClick(true);
-                mDCItemListClassificationAdapter.notifyDataSetChanged();
-                classify = mDCItemListClassificationBean.get(position).getStore_category_id();
-//                if (TextUtils.isEmpty(classify)) {
-//                    //大仓推荐
-//                    binding.rvProductList.setVisibility(View.GONE);
-//                    binding.rvRecommendedList.setVisibility(View.VISIBLE);
-////                    mPage = 1;
-//                    mRecommendListBean.clear();
-//                    bigWarehouseViewModel.recommendList();
-//
-//                } else {
-                binding.rvProductList.setVisibility(View.VISIBLE);
-                binding.rvRecommendedList.setVisibility(View.GONE);
-//                mPage = 1;
-                int loadPage=1;
-                Integer mpage = page.get(classify);
-                if (mpage != null) {
-                    mPage = mpage;
-                }else {
-                    mPage = loadPage;
-                }
-                mDcProductBean.clear();
-                bigWarehouseViewModel.getDaCangProductList(loadPage, classify,mPage*10);
-                //   }
+        mDCItemListClassificationAdapter.setOnClickListener(position -> {
+            for (int i = 0; i < mDCItemListClassificationBean.size(); i++) {
+                mDCItemListClassificationBean.get(i).setClick(false);
+            }
+            MainActivity.storeCategoryId = mDCItemListClassificationBean.get(position).getStore_category_id();
+            mDCItemListClassificationBean.get(position).setClick(true);
+            mDCItemListClassificationAdapter.notifyDataSetChanged();
+            classify = mDCItemListClassificationBean.get(position).getStore_category_id();
+            binding.rvProductList.setVisibility(View.VISIBLE);
+            binding.rvRecommendedList.setVisibility(View.GONE);
+            int loadPage=1;
+            Integer mpage = page.get(classify);
+            if (mpage != null) {
+                mPage = mpage;
+            }else {
+                mPage = loadPage;
             }
+            mDcProductBean.clear();
+            bigWarehouseViewModel.getDaCangProductList(loadPage, classify,mPage*10);
+            //   }
         });
 
-        binding.ivSeckill.setOnClickListener(this);
-        binding.ivBanner.setOnClickListener(this);
         binding.llSearch.setOnClickListener(this);
         binding.tvScrollTop.setOnClickListener(this);
     }
-
-    //    private int previousScrollY = 0;
     private void initView() {
         binding.scrollview.setOnScrollChangeListener(new NestedScrollView.OnScrollChangeListener() {
             @Override
             public void onScrollChange(NestedScrollView v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
-//                LogUtil.LogInfo("fjy", "222");
                 showHeaderAlphaAction(scrollY);
                 itemPos.put(classify, v.getScrollY());
-//                System.out.println(classify +" aaaaaa ---->"+v.getScrollY());
-
             }
         });
 
@@ -275,28 +216,15 @@ public class BigWarehouseFragment extends BaseFragment implements View.OnClickLi
         //大仓商品
         GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), 2);
         binding.rvProductList.setLayoutManager(gridLayoutManager);
-//        binding.rvProductList.addItemDecoration(new GridSpacingItemDecoration(2, 50, false));
         //建立适配器
         mDcProductAdapter = new DcProductAdapter(R.layout.item_dacang_productlist, mDcProductBean, getActivity());
         //给RecyclerView设置适配器
         binding.rvProductList.setAdapter(mDcProductAdapter);
 
-        //大仓推荐
-//        LinearLayoutManager linearLayoutManager1 = new LinearLayoutManager(getActivity());
-//        binding.rvRecommendedList.setLayoutManager(linearLayoutManager1);
-////        binding.rvProductList.addItemDecoration(new GridSpacingItemDecoration(2, 50, false));
-//        //建立适配器
-//        mRecommendListAdapter = new DcRecommendListAdapter(R.layout.item_dc_recommended_date, mRecommendListBean, getActivity());
-//        //给RecyclerView设置适配器
-//        binding.rvRecommendedList.setAdapter(mRecommendListAdapter);
-
-
         binding.refreshLayout.setAutoLoadMore(true);
 
         binding.refreshLayout.setOverScrollRefreshShow(false);
 
-//        binding.refreshLayout.setEnableLoadmore(false);
-
         binding.refreshLayout.setOnRefreshListener(new RefreshListenerAdapter() {
             @Override
             public void onPullingDown(TwinklingRefreshLayout refreshLayout, float fraction) {
@@ -348,23 +276,6 @@ public class BigWarehouseFragment extends BaseFragment implements View.OnClickLi
                 LogUtil.LogInfo("qmzzzzz", "正在加载更多");
             }
         });
-        //刷新
-//        binding.refreshLayout.setOnRefreshListener(new RefreshListenerAdapter() {
-//            @Override
-//            public void onLoadMore(final TwinklingRefreshLayout refreshLayout) {
-//                new Handler().postDelayed(new Runnable() {
-//                    @Override
-//                    public void run() {
-////                        if (!TextUtils.isEmpty(classify)) {
-//                        //加载
-//                        mPage++;
-//                        bigWarehouseViewModel.getDaCangProductList(mPage, classify);
-////                        }
-//                        refreshLayout.finishLoadmore();
-//                    }
-//                }, 250);
-//            }
-//        });
     }
 
     /**
@@ -376,15 +287,9 @@ public class BigWarehouseFragment extends BaseFragment implements View.OnClickLi
         final int rootPicHeight = binding.viewTop.getHeight();
 
         if (y <= rootPicHeight) {
-            binding.viewHeaderBg.setBackgroundResource(R.color.translate);
-            binding.llTop.setBackgroundResource(R.color.translate);
             binding.tvScrollTop.setVisibility(View.GONE);
         } else {
             binding.tvScrollTop.setVisibility(View.VISIBLE);
-            //上划之后的效果
-            binding.viewHeaderBg.setBackgroundResource(R.color.red_fd214c);
-            binding.llTop.setBackgroundResource(R.color.red_fd214c);
-
         }
     }
 
@@ -394,17 +299,6 @@ public class BigWarehouseFragment extends BaseFragment implements View.OnClickLi
             binding.scrollview.scrollTo(0, 0);
 //            binding.rvProductList.scrollToPosition(0);
 //            binding.rvRecommendedList.scrollToPosition(0);
-        } else if (view == binding.ivSeckill) {
-            if (LoginUtils.isLogin(getActivity())) {
-                //限时秒杀
-                DacangSeckillActivity.launch(getActivity());
-            }
-        } else if (view == binding.ivBanner) {
-            if (LoginUtils.isLogin(getActivity())) {
-                //大仓会员购买
-                AGuestMemberActivity.launch(getActivity());
-//                DcMemberActivity.launch(getActivity());
-            }
         } else if (view == binding.llSearch) {
             //搜索
             if (ActivityCompat.checkSelfPermission(getActivity(), android.Manifest.permission.ACCESS_COARSE_LOCATION)

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/DacangSeckillActivity.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.os.CountDownTimer;
 import android.view.View;
 import android.widget.RelativeLayout;
 
@@ -21,8 +22,11 @@ import com.yihucha.hbyhc.presentation.big_storehouse.adapter.DcSecondsKillProduc
 import com.yihucha.hbyhc.presentation.big_storehouse.model.DcSeckillBean;
 import com.yihucha.hbyhc.presentation.big_storehouse.view_model.BigWarehouseViewModel;
 import com.yihucha.hbyhc.presentation.product.ProductDetailsActivity;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 import com.yihucha.hbyhc.utils.ImmersedStatusbarUtils;
 import com.yihucha.hbyhc.utils.LogUtil;
+import com.yihucha.hbyhc.utils.StringsUtil;
+import com.yihucha.hbyhc.utils.TimeUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -77,6 +81,14 @@ public class DacangSeckillActivity extends BaseActivity implements View.OnClickL
 
                     LogUtil.LogInfo("mDcSeckillBean", JSON.toJSONString(mDcSeckillBean));
                     mDcSeckillDateAdapter.replaceData(mDcSeckillBean);
+                    boolean hasStart = false;
+                    for (DcSeckillBean dcSeckillBean : mDcSeckillBean) {
+                        if (dcSeckillBean.getStatus() == 1) {
+                            hasStart = true;
+                            setMsNotice(dcSeckillBean.getSeckill_date());
+                        }
+                    }
+                    if (!hasStart) setMsNotice(null);
                     mProduct_data.clear();
                     mProduct_data.addAll(mDcSeckillBean.get(0).getProduct_data());
                     if (mProduct_data == null || mProduct_data.size() == 0) {
@@ -128,13 +140,12 @@ public class DacangSeckillActivity extends BaseActivity implements View.OnClickL
         mDcSeckillDateAdapter = new DcSeckillDateAdapter(R.layout.item_seckill, mDcSeckillBean, context);
         //给RecyclerView设置适配器
         mViewBinding.rvSeckillDate.setAdapter(mDcSeckillDateAdapter);
-        mDcSeckillDateAdapter.setclickPosition(0);
 
         LinearLayoutManager linearLayoutManager1 = new LinearLayoutManager(context);
         linearLayoutManager1.setOrientation(LinearLayoutManager.VERTICAL);
         mViewBinding.rvSeckillProductList.setLayoutManager(linearLayoutManager1);
         DividerItemDecoration itemDecoration = new DividerItemDecoration(this, LinearLayoutManager.VERTICAL);
-        itemDecoration.setDrawable(getDrawable(R.drawable.shape_divider_recycleview));
+//        itemDecoration.setDrawable(getDrawable(R.drawable.shape_divider_recycleview));
         mViewBinding.rvSeckillProductList.addItemDecoration(itemDecoration);
         mDcSecondsKillProductsAdapter = new DcSecondsKillProductsAdapter(R.layout.item_seconds_kill_products, mProduct_data, context);
         //给RecyclerView设置适配器
@@ -142,6 +153,42 @@ public class DacangSeckillActivity extends BaseActivity implements View.OnClickL
 
     }
 
+    private CountDownTimer timer;
+
+    private void setMsNotice(String time) {
+        if (EmptyCheckUtils.isNotEmpty(time)) {
+            mViewBinding.layoutTime.setVisibility(View.VISIBLE);
+            mViewBinding.tvNotice1.setVisibility(View.VISIBLE);
+            mViewBinding.tvNotice.setText("距本场结束");
+            if (TimeUtils.init(time)) {
+                long timeLong = TimeUtils.getTimeLong();
+                timer = new CountDownTimer(timeLong, 1000) {
+                    @Override
+                    public void onTick(long l) {
+                        long timeHour = StringsUtil.getHour(l);
+                        mViewBinding.tvHours.setText(timeHour >= 10 ? timeHour + "" : "0" + timeHour);
+                        long timeMinute = StringsUtil.getMinute(l);
+                        mViewBinding.tvMinute.setText(timeMinute >= 10 ? timeMinute + "" : "0" + timeMinute);
+                        long timeSecond = StringsUtil.getSecond(l);
+                        mViewBinding.tvSencond.setText(timeSecond >= 10 ? timeSecond + "" : "0" + timeSecond);
+                    }
+
+                    @Override
+                    public void onFinish() {
+                        timer.cancel();
+                        //重新加载秒杀数据
+                        mBigWarehouseViewModel.getDcSeckill();
+                    }
+                };
+                timer.start();
+            }
+        } else {
+            mViewBinding.layoutTime.setVisibility(View.INVISIBLE);
+            mViewBinding.tvNotice1.setVisibility(View.INVISIBLE);
+            mViewBinding.tvNotice.setText("秒杀即将开始，请耐心等待~");
+        }
+    }
+
     @Override
     public void onClick(View v) {
         if (v == mViewBinding.imgvBack) {
@@ -152,8 +199,8 @@ public class DacangSeckillActivity extends BaseActivity implements View.OnClickL
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (mDcSeckillDateAdapter != null) {
-            mDcSeckillDateAdapter.onDestory();
+        if (EmptyCheckUtils.isNotEmpty(timer)) {
+            timer.cancel();
         }
     }
 

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

@@ -1,5 +1,6 @@
 package com.yihucha.hbyhc.presentation.big_storehouse.adapter;
 
+import android.graphics.Color;
 import android.view.View;
 import android.widget.LinearLayout;
 
@@ -29,16 +30,13 @@ public class DCItemListClassificationAdapter extends BaseQuickAdapter<DCItemList
         View viewLine=helper.getView(R.id.view_line);
         if (item.isClick()){
             viewLine.setVisibility(View.VISIBLE);
+            helper.setTextColor(R.id.tv_name, Color.parseColor("#fe0032"));
         }else {
             viewLine.setVisibility(View.INVISIBLE);
+            helper.setTextColor(R.id.tv_name, Color.parseColor("#333333"));
         }
         LinearLayout llRoot=helper.getView(R.id.ll_root);
-        llRoot.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mClickListener.onItemClick(helper.getLayoutPosition());
-            }
-        });
+        llRoot.setOnClickListener(view -> mClickListener.onItemClick(helper.getLayoutPosition()));
     }
     //点击回调
     public interface OnClickListener {

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

@@ -31,144 +31,37 @@ import java.util.List;
 public class DcSeckillDateAdapter extends RecyclerView.Adapter<DcSeckillDateAdapter.ItemHolder> {
     private OnClickListener mClickListener;
     private List<DcSeckillBean> data;
-    private int position;
+    private int position = 0;
     private Context context;
-    private CountDownTimer timer;
 
     public DcSeckillDateAdapter(int layoutResId, @Nullable List<DcSeckillBean> data, Context context) {
         this.context = context;
         this.data = data;
     }
 
-    public void setclickPosition(int position) {
-        this.position = position;
-        if (timer != null) {
-            timer.cancel();
-        }
-    }
-
-    protected void convert(DcSeckillDateAdapter.ItemHolder helper, DcSeckillBean item,int pos) {
+    protected void convert(DcSeckillDateAdapter.ItemHolder helper, DcSeckillBean item, int pos) {
         String date = item.getSeckill_date();
         date = date.replace("即将开始","").replace("抢购中","");
         helper.binding.tvSeckillDate.setText(date);
-
         helper.binding.bgItem.setOnClickListener(view -> {
             mClickListener.onItemClick(helper.getLayoutPosition());
-            setclickPosition(helper.getLayoutPosition());
+            this.position = pos;
             notifyDataSetChanged();
         });
-        helper.binding.tvSeckillDate.setTextColor(ContextCompat.getColor(context, R.color.black_333333));
+
+        if (item.getStatus() == 1) {
+            helper.binding.tvNotice.setText("抢购中");
+        } else if (item.getStatus() == 2) {
+            helper.binding.tvNotice.setText("即将开枪");
+        } else {
+            helper.binding.tvNotice.setText("已结束");
+        }
         if (position == pos) {
-            helper.binding.tvSeckillDate.setTextColor(ContextCompat.getColor(context, R.color.red_fe0032));
-//            imgvBg.setVisibility(View.VISIBLE);
-            helper.binding.bgItem.setBackgroundResource(R.mipmap.img_miaosha_item_checked);
-            if (item.getStatus() == 1){
-                helper.binding.layoutTime.setVisibility(View.VISIBLE);
-                helper.binding.tvNotice.setVisibility(View.GONE);
-                //字体颜色
-                helper.binding.tvHours.setTextColor(Color.WHITE);
-                helper.binding.tvMinute.setTextColor(Color.WHITE);
-                helper.binding.tvSencond.setTextColor(Color.WHITE);
-                helper.binding.tvMaohao1.setTextColor(Color.parseColor("#333333"));
-                helper.binding.tvMaohao2.setTextColor(Color.parseColor("#333333"));
-                //背景颜色
-                helper.binding.tvHours.setBackgroundResource(R.drawable.shape_black_2dp);
-                helper.binding.tvMinute.setBackgroundResource(R.drawable.shape_black_2dp);
-                helper.binding.tvSencond.setBackgroundResource(R.drawable.shape_black_2dp);
-/*                helper.binding.tvHours.setBackgroundColor(Color.parseColor("#333333"));
-                helper.binding.tvMinute.setBackgroundColor(Color.parseColor("#333333"));
-                helper.binding.tvSencond.setBackgroundColor(Color.parseColor("#333333"));*/
-
-                if (TimeUtils.init(date)) {
-                    long timeLong = TimeUtils.getTimeLong();
-                    timer = new CountDownTimer(timeLong, 1000) {
-                        @Override
-                        public void onTick(long l) {
-                            long timeHour = StringsUtil.getHour(l);
-                            helper.binding.tvHours.setText(timeHour>=10?timeHour+"":"0"+timeHour);
-                            long timeMinute = StringsUtil.getMinute(l);
-                            helper.binding.tvMinute.setText(timeMinute>=10?timeMinute+"":"0"+timeMinute);
-                            long timeSecond = StringsUtil.getSecond(l);
-                            helper.binding.tvSencond.setText(timeSecond>=10?timeSecond+"":"0"+timeSecond);
-                        }
-                        @Override
-                        public void onFinish() {
-                            timer.cancel();
-                            //重新加载秒杀数据
-                            helper.binding.layoutTime.setVisibility(View.GONE);
-                            helper.binding.tvNotice.setVisibility(View.VISIBLE);
-                            helper.binding.tvNotice.setTextColor(Color.parseColor("#fe0032"));
-                            helper.binding.tvNotice.setText("已结束");
-                        }
-                    };
-                    timer.start();
-                }
-
-            }else if (item.getStatus() == 2){
-                helper.binding.layoutTime.setVisibility(View.GONE);
-                helper.binding.tvNotice.setVisibility(View.VISIBLE);
-                helper.binding.tvNotice.setTextColor(Color.parseColor("#fe0032"));
-                helper.binding.tvNotice.setText("即将开枪");
-            }else {
-                helper.binding.layoutTime.setVisibility(View.GONE);
-                helper.binding.tvNotice.setVisibility(View.VISIBLE);
-                helper.binding.tvNotice.setTextColor(Color.parseColor("#fe0032"));
-                helper.binding.tvNotice.setText("已结束");
-            }
-        }else {
-            helper.binding.tvSeckillDate.setTextColor(ContextCompat.getColor(context, R.color.white));
-            helper.binding.bgItem.setBackground(null);
-//            imgvBg.setVisibility(View.GONE);
-            if (item.getStatus() == 1){
-                helper.binding.layoutTime.setVisibility(View.VISIBLE);
-                helper.binding.tvNotice.setVisibility(View.GONE);
-                //字体颜色
-                helper.binding.tvHours.setTextColor(Color.parseColor("#fe0032"));
-                helper.binding.tvMinute.setTextColor(Color.parseColor("#fe0032"));
-                helper.binding.tvSencond.setTextColor(Color.parseColor("#fe0032"));
-                helper.binding.tvMaohao1.setTextColor(Color.WHITE);
-                helper.binding.tvMaohao2.setTextColor(Color.WHITE);
-                //背景颜色
-                helper.binding.tvHours.setBackgroundResource(R.drawable.shape_white_2dp);
-                helper.binding.tvMinute.setBackgroundResource(R.drawable.shape_white_2dp);
-                helper.binding.tvSencond.setBackgroundResource(R.drawable.shape_white_2dp);
-
-                if (TimeUtils.init(date)) {
-                    long timeLong = TimeUtils.getTimeLong();
-                    timer = new CountDownTimer(timeLong, 1000) {
-                        @Override
-                        public void onTick(long l) {
-                            long timeHour = StringsUtil.getHour(l);
-                            helper.binding.tvHours.setText(timeHour>=10?timeHour+"":"0"+timeHour);
-                            long timeMinute = StringsUtil.getMinute(l);
-                            helper.binding.tvMinute.setText(timeMinute>=10?timeMinute+"":"0"+timeMinute);
-                            long timeSecond = StringsUtil.getSecond(l);
-                            helper.binding.tvSencond.setText(timeSecond>=10?timeSecond+"":"0"+timeSecond);
-                        }
-                        @Override
-                        public void onFinish() {
-                            timer.cancel();
-                            //重新加载秒杀数据
-                            helper.binding.layoutTime.setVisibility(View.GONE);
-                            helper.binding.tvNotice.setVisibility(View.VISIBLE);
-                            helper.binding.tvNotice.setTextColor(Color.parseColor("#fe0032"));
-                            helper.binding.tvNotice.setText("已结束");
-                        }
-                    };
-                    timer.start();
-                }
-
-            }else if (item.getStatus() == 2){
-                helper.binding.layoutTime.setVisibility(View.GONE);
-                helper.binding.tvNotice.setVisibility(View.VISIBLE);
-                helper.binding.tvNotice.setTextColor(Color.WHITE);
-                helper.binding.tvNotice.setText("即将开枪");
-            }else {
-                helper.binding.layoutTime.setVisibility(View.GONE);
-                helper.binding.tvNotice.setVisibility(View.VISIBLE);
-                helper.binding.tvNotice.setTextColor(Color.WHITE);
-                helper.binding.tvNotice.setText("已结束");
-            }
+            helper.binding.tvNotice.setTextColor(Color.parseColor("#fe0032"));
+            helper.binding.tvNotice.setBackgroundResource(R.drawable.shape_white_50dp);
+        } else {
+            helper.binding.tvNotice.setTextColor(Color.WHITE);
+            helper.binding.tvNotice.setBackground(null);
         }
     }
 
@@ -181,40 +74,35 @@ public class DcSeckillDateAdapter extends RecyclerView.Adapter<DcSeckillDateAdap
 
     @Override
     public void onBindViewHolder(@NonNull DcSeckillDateAdapter.ItemHolder holder, int position) {
-        convert(holder,data.get(position),position);
+        convert(holder, data.get(position), position);
     }
 
     @Override
     public int getItemCount() {
-        return data == null?0:data.size();
+        return data == null ? 0 : data.size();
     }
 
     public void replaceData(List<DcSeckillBean> data) {
         this.data = data;
         notifyDataSetChanged();
-        if (timer != null) {
-            timer.cancel();
-        }
-    }
-    public void onDestory(){
-        if (timer != null) {
-            timer.cancel();
-        }
     }
-    public class ItemHolder extends RecyclerView.ViewHolder{
+
+    public class ItemHolder extends RecyclerView.ViewHolder {
         public ItemSeckillBinding binding;
+
         public ItemHolder(@NonNull View itemView) {
             super(itemView);
             WindowManager windowManager = (WindowManager) itemView.getContext()
                     .getSystemService(Context.WINDOW_SERVICE);
             Display display = windowManager.getDefaultDisplay();
             ViewGroup.LayoutParams layoutParams = itemView.getLayoutParams();
-            layoutParams.width = display.getWidth()/3;
+            layoutParams.width = display.getWidth() / 3;
             layoutParams.height = DensityUtils.dip2px(60f);
             itemView.setLayoutParams(layoutParams);
             binding = ItemSeckillBinding.bind(itemView);
         }
     }
+
     //点击回调
     public interface OnClickListener {
         void onItemClick(int position);

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

@@ -43,41 +43,26 @@ public class DcSecondsKillProductsAdapter extends BaseQuickAdapter<DcSeckillBean
         helper.setText(R.id.tv_store_name,item.getStore_name());
         helper.setText(R.id.tv_yanglaojin,"养老金¥"+item.getYanglao());
         helper.setText(R.id.tv_price,"￥"+item.getSeckill_price());
-        helper.setText(R.id.text_img,item.getImg_text());
         helper.setText(R.id.tv_lowestCouponPrice,"￥"+item.getOt_price());
         ImageView ivImg=helper.getView(R.id.riv_image);
         GlideUtils.loadImage(context,item.getImage(),ivImg);
 
-//        ImageView iv_img=helper.getView(R.id.iv_img);
         TextView iv_status=helper.getView(R.id.iv_status);
 
         if (status==1){
-//            iv_img.setImageResource(R.mipmap.qianggouzhong);
-            iv_status.setBackgroundResource(R.mipmap.mashangqiang);
+            iv_status.setBackgroundResource(R.mipmap.xianshiqiang);
             iv_status.setText("");
         }else if (status == 2){
-//            iv_img.setImageResource(R.mipmap.dacangmiaosha);
-            iv_status.setBackgroundResource(R.mipmap.jijiangkaiqiang);
-            iv_status.setText("");
+            iv_status.setBackgroundResource(R.drawable.shape_org_ms);
+            iv_status.setText("即将开始");
         }else {
             //已结束
-            iv_status.setBackgroundResource(R.mipmap.miaosha_yijieshu_220908);
-            iv_status.setText("");
-
+            iv_status.setBackgroundResource(R.drawable.shape_org_ms);
+            iv_status.setText("即将开始");
         }
         RelativeLayout llRoot=helper.getView(R.id.ll_root);
-        llRoot.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mClickListener.onItemClick(helper.getLayoutPosition());
-            }
-        });
-/*        //结束时间
-        long seckillDateEnd = DateUtil.dateToStamp(item.getSeckill_date_end());
-        //现在时间
-        long time = System.currentTimeMillis();
-        //倒计时时间
-        long countDown = seckillDateEnd - time;*/
+        llRoot.setOnClickListener(view -> mClickListener.onItemClick(helper.getLayoutPosition()));
+
     }
 
 

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#ff8e74"
+        android:endColor="#fb5022"
+        />
+    <corners android:radius="50dp"/>
+</shape>

app/src/main/res/drawable/shape_red_circle.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="#fe0032" />
+
+<!--    <stroke-->
+<!--        android:color="@color/gray_9e9e9e"-->
+<!--        android:width="0.5dp"/>-->
+
+    <corners android:radius="50dp"/>
+
+
+</shape>

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

@@ -1,5 +1,6 @@
 <?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/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -8,7 +9,7 @@
     <View
         android:id="@+id/view_bg"
         android:layout_width="match_parent"
-        android:layout_height="150dp"
+        android:layout_height="220dp"
         android:background="@mipmap/xsms_bg" />
 
     <RelativeLayout
@@ -48,19 +49,117 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_seckill_date"
         android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:layout_alignBottom="@+id/view_bg"
-        android:layout_marginBottom="-3dp"
+        android:layout_height="70dp"
+        android:layout_below="@id/title_layout"
+        android:layout_marginTop="24dp"
         />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/layout_notice"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:background="@drawable/shape_white_8dp"
+        android:layout_below="@+id/rv_seckill_date"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:orientation="horizontal"
+        >
+        <TextView
+            android:id="@+id/tv_notice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="距本场结束"
+            android:textSize="13sp"
+            android:textColor="@color/black_333333"
+            android:layout_marginLeft="10dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/layout_time"
+            app:layout_constraintBottom_toBottomOf="@+id/layout_time"
+            app:layout_constraintRight_toLeftOf="@+id/layout_time"
+            />
+        <LinearLayout
+            android:id="@+id/layout_time"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="14dp"
+            app:layout_constraintLeft_toRightOf="@+id/tv_notice"
+            app:layout_constraintRight_toLeftOf="@+id/tv_notice1"
+            app:layout_constraintTop_toTopOf="parent"
+            >
+            <TextView
+                android:id="@+id/tv_hours"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="11sp"
+                android:text="12"
+                android:textColor="@color/white"
+                android:padding="3dp"
+                android:background="@drawable/shape_red_circle"
+                />
+            <TextView
+                android:id="@+id/tv_maohao1"
+                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_minute"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="11sp"
+                android:text="12"
+                android:textColor="@color/white"
+                android:padding="3dp"
+                android:background="@drawable/shape_red_circle"
+                />
+            <TextView
+                android:id="@+id/tv_maohao2"
+                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_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="11sp"
+                android:text="12"
+                android:textColor="@color/white"
+                android:padding="3dp"
+                android:background="@drawable/shape_red_circle"
+                />
+        </LinearLayout>
 
+        <TextView
+            android:id="@+id/tv_notice1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="抓紧时间抢购哦～"
+            android:textSize="12sp"
+            android:textColor="@color/gray_999999"
+            android:drawableLeft="@mipmap/icon_notice_ms"
+            android:drawablePadding="5dp"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toRightOf="@+id/layout_time"
+            app:layout_constraintTop_toTopOf="@id/layout_time"
+            app:layout_constraintBottom_toBottomOf="@id/layout_time"
+            android:paddingRight="16dp"
+            />
+    </androidx.constraintlayout.widget.ConstraintLayout>
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_seckill_product_list"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/rv_seckill_date"
+        android:layout_height="match_parent"
+        android:layout_alignTop="@+id/layout_notice"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
-        android:layout_marginTop="7dp"
+        android:layout_marginTop="50dp"
+        android:background="@color/white"
         />
 
     <include
@@ -70,7 +169,6 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:visibility="gone" />
-    <!--        </com.laolaixiang.bjtdba.view.NaviBarChangeStatusScrollView>-->
 
 
 </RelativeLayout>

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

@@ -5,13 +5,80 @@
     android:layout_height="match_parent"
     android:background="@color/white_f8f8f8"
     android:orientation="vertical">
+    <LinearLayout
+        android:id="@+id/ll_top"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@mipmap/bg_shop_home"
+        android:paddingBottom="8dp">
+        <com.yihucha.hbyhc.view.BoldText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="一壶茶商城"
+            android:textColor="@color/black_333333"
+            android:textSize="17sp"
+            android:layout_marginTop="55dp"
+            android:layout_marginLeft="16dp"
+            />
+        <LinearLayout
+            android:id="@+id/ll_search"
+            android:layout_width="match_parent"
+            android:layout_height="32dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginRight="16dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:background="@drawable/shape_line_fe0032_15dp"
+            >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:src="@mipmap/home_search_220614" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="1dp"
+                android:layout_weight="1"
+                android:text="搜索"
+                android:textColor="@color/gray_999999" />
+
+            <TextView
+                android:layout_width="48.5dp"
+                android:layout_height="29dp"
+                android:layout_marginRight="1dp"
+                android:background="@drawable/shape_fe0032_15dp"
+                android:gravity="center"
+                android:text="@string/search"
+                android:textColor="@color/white"
+                android:textSize="14sp" />
+        </LinearLayout>
 
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_king_kong_area"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            android:paddingTop="13dp" />
+    </LinearLayout>
+
+
+    <View
+        android:id="@+id/view_top"
+        android:layout_width="wrap_content"
+        android:layout_height="51dp"></View>
 
     <com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
         android:id="@+id/refreshLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:tr_pureScrollMode_on="true">
+        app:tr_pureScrollMode_on="true"
+        android:layout_marginTop="180dp"
+        >
 
         <com.yihucha.hbyhc.view.NaviBarChangeStatusScrollView
             android:id="@+id/scrollview"
@@ -30,19 +97,6 @@
                 android:focusableInTouchMode="true"
                 android:orientation="vertical">
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <ImageView
-                        android:id="@+id/iv_banner"
-                        android:layout_width="match_parent"
-                        android:layout_height="250dp"
-                        android:scaleType="fitXY" />
-
-
-                </RelativeLayout>
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -56,40 +110,15 @@
                         android:layout_height="wrap_content" />
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginTop="22dp"
-                    android:layout_marginRight="16dp"
-                    android:orientation="horizontal"
-                    android:visibility="gone">
-
-                    <ImageView
-                        android:id="@+id/iv_seckill"
-                        android:layout_width="0dp"
-                        android:layout_height="108.5dp"
-                        android:layout_weight="1"
-                        android:src="@mipmap/xianshimiaosha" />
-
-                    <View
-                        android:layout_width="12.5dp"
-                        android:layout_height="1dp" />
-
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="108.5dp"
-                        android:layout_weight="1"
-                        android:src="@mipmap/mianfeilingshangpin" />
-                </LinearLayout>
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_product_list"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="13dp"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp" />
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_recommended_list"
@@ -101,68 +130,6 @@
         </com.yihucha.hbyhc.view.NaviBarChangeStatusScrollView>
 
     </com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout>
-
-    <LinearLayout
-        android:id="@+id/ll_top"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="8dp">
-
-        <LinearLayout
-            android:id="@+id/ll_search"
-            android:layout_width="match_parent"
-            android:layout_height="32dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginTop="55dp"
-            android:layout_marginRight="16dp"
-            android:background="@drawable/shape_ffffff_15dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:src="@mipmap/home_search_220614" />
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="1dp"
-                android:layout_weight="1"
-                android:text="搜索"
-                android:textColor="@color/gray_999999" />
-
-            <TextView
-                android:layout_width="48.5dp"
-                android:layout_height="29dp"
-                android:layout_marginRight="1dp"
-                android:background="@drawable/shape_fe0032_15dp"
-                android:gravity="center"
-                android:text="@string/search"
-                android:textColor="@color/white"
-                android:textSize="14sp" />
-        </LinearLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_king_kong_area"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="13dp" />
-    </LinearLayout>
-
-    <View
-        android:id="@+id/view_header_bg"
-        android:layout_width="match_parent"
-        android:layout_height="51dp"
-
-        />
-
-    <View
-        android:id="@+id/view_top"
-        android:layout_width="wrap_content"
-        android:layout_height="51dp"></View>
     <!--站位-->
     <ImageView
         android:id="@+id/tv_scroll_top"

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

@@ -99,7 +99,7 @@
                     android:paddingTop="13dp"
                     android:paddingRight="3dp"
                     android:paddingBottom="13dp"
-                    android:visibility="gone">
+                    android:visibility="visible">
 
                     <com.yihucha.hbyhc.view.BoldText
                         android:id="@+id/imgv_vip"
@@ -107,7 +107,9 @@
                         android:layout_height="wrap_content"
                         android:text="会员专区\t好物超值购"
                         android:textColor="@color/white"
-                        android:textSize="17sp" />
+                        android:textSize="17sp"
+                        android:paddingLeft="13dp"
+                        />
 
                     <com.yihucha.hbyhc.view.BoldText
                         android:id="@+id/tv_buy_now"
@@ -151,11 +153,11 @@
                     android:layout_marginTop="10dp"
                     android:layout_marginRight="12dp"
                     android:background="@mipmap/bg_ms_home"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="3dp"
                     android:paddingTop="13dp"
                     android:paddingRight="10dp"
-                    android:paddingBottom="13dp"
-                    android:visibility="gone">
+                    android:paddingBottom="3dp"
+                    android:visibility="visible">
 
                     <com.yihucha.hbyhc.view.BoldText
                         android:id="@+id/imgv_xsms"
@@ -163,7 +165,9 @@
                         android:layout_height="wrap_content"
                         android:text="超级秒杀\t低价限时抢"
                         android:textColor="@color/white"
-                        android:textSize="17sp" />
+                        android:textSize="17sp"
+                        android:paddingLeft="13dp"
+                        />
 
                     <LinearLayout
                         android:id="@+id/layout_time"
@@ -247,8 +251,8 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentBottom="true"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginTop="23dp"
-                        android:layout_marginBottom="13dp"
+                        android:layout_marginTop="20dp"
+                        android:layout_marginBottom="10dp"
                         android:background="@drawable/shape_white_50dp"
                         android:orientation="horizontal"
                         android:paddingLeft="15dp"

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

@@ -12,8 +12,8 @@
         android:id="@+id/tv_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/white"
-        android:textSize="15sp"
+        android:textColor="@color/black_333333"
+        android:textSize="14sp"
         android:text="内衣"/>
 
     <View
@@ -22,5 +22,5 @@
         android:visibility="invisible"
         android:layout_width="25dp"
         android:layout_height="3dp"
-        android:background="@drawable/shape_ffffff_1d5dp"/>
+        android:background="@drawable/shape_fe0032_8dp"/>
 </LinearLayout>

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

@@ -80,7 +80,9 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:orientation="horizontal"
-                android:paddingLeft="15dp">
+                android:layout_centerHorizontal="true"
+                android:paddingRight="15dp"
+                >
 
                 <TextView
                     android:id="@+id/tv_rmb_item"
@@ -94,7 +96,7 @@
                     android:id="@+id/tv_price_item"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="86"
+                    android:text="86.6666"
                     android:textColor="@color/red_fe0032"
                     android:textSize="15sp" />
             </LinearLayout>

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

@@ -2,87 +2,38 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="55dp"
+    android:layout_height="70dp"
     android:id="@+id/bg_item"
-    android:background="@mipmap/img_miaosha_item_checked"
     >
-    <TextView
+    <com.yihucha.hbyhc.view.BoldText
         android:id="@+id/tv_seckill_date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textFontWeight="1"
         android:text="11:00"
-        android:textSize="16sp"
+        android:textSize="19sp"
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
-        android:textColor="@color/black_333333"
+        android:textColor="@color/white"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="5dp"
+        android:gravity="center_vertical"
         />
     <TextView
         android:id="@+id/tv_notice"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="即将开枪"
-        android:textColor="@color/red_fe0032"
+        android:textColor="@color/white"
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="10dp"
-        android:textSize="13sp"
-        android:visibility="gone"
+        android:textSize="10sp"
+        android:visibility="visible"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"
+        android:gravity="center_vertical"
         />
-    <LinearLayout
-        android:id="@+id/layout_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal"
-        android:layout_marginBottom="10dp"
-        >
-        <TextView
-            android:id="@+id/tv_hours"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="11sp"
-            android:text="12"
-            android:textColor="@color/white"
-            android:padding="1dp"
-            android:background="@drawable/shape_white_2dp"
-            />
-        <TextView
-            android:id="@+id/tv_maohao1"
-            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_minute"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="11sp"
-            android:text="12"
-            android:textColor="@color/white"
-            android:padding="1dp"
-            android:background="@drawable/shape_white_2dp"
-            />
-        <TextView
-            android:id="@+id/tv_maohao2"
-            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_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="11sp"
-            android:text="12"
-            android:textColor="@color/white"
-            android:padding="1dp"
-            android:background="@drawable/shape_white_2dp"
-            />
-    </LinearLayout>
 </RelativeLayout>

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

@@ -15,45 +15,28 @@
         android:layout_marginBottom="13dp"
         android:scaleType="fitXY"
         app:rciv_radius="8dp" />
-
-    <TextView
-        android:id="@+id/text_img"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@id/riv_image"
-        android:layout_marginLeft="13dp"
-        android:layout_toRightOf="@+id/riv_image"
-        android:background="@mipmap/home_dacang_220615"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:paddingLeft="4dp"
-        android:paddingTop="1.5dp"
-        android:paddingRight="4dp"
-        android:paddingBottom="1.5dp"
-        android:text="大仓秒杀"
-        android:textColor="@color/white"
-        android:textSize="10sp" />
-
-    <TextView
+    <com.yihucha.hbyhc.view.BoldText
         android:id="@+id/tv_store_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/text_img"
-        android:layout_alignLeft="@+id/text_img"
+        android:layout_toRightOf="@+id/riv_image"
+        android:layout_alignTop="@+id/riv_image"
         android:ellipsize="end"
         android:maxLines="1"
         android:text="此处商品显示一行"
-        android:textColor="@color/black_202020"
-        android:textSize="15sp" />
+        android:textColor="@color/black_333333"
+        android:textSize="15sp"
+        android:layout_marginLeft="10dp"
+        />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/tv_store_name"
-        android:layout_alignLeft="@+id/text_img"
+        android:layout_alignLeft="@+id/tv_store_name"
+        android:layout_marginTop="5dp"
         android:layout_marginRight="10dp"
         android:layout_marginBottom="6.5dp"
-        android:layout_marginTop="5dp"
         android:background="@drawable/shape_line_fe0032_2dp"
         android:orientation="horizontal">
 
@@ -78,11 +61,10 @@
         android:id="@+id/layout_bottom"
         android:layout_width="match_parent"
         android:layout_height="30dp"
-        android:layout_alignLeft="@+id/text_img"
+        android:layout_alignLeft="@+id/tv_store_name"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="13dp"
         android:layout_marginRight="8dp"
-        android:background="#FEDCD3">
+        android:layout_marginBottom="13dp">
 
 
         <LinearLayout
@@ -103,25 +85,28 @@
             <com.yihucha.hbyhc.view.DrawLineTextView
                 android:id="@+id/tv_lowestCouponPrice"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
+                android:layout_height="match_parent"
+                android:gravity="bottom"
                 android:layout_marginLeft="8dp"
-                android:text="$100.00"
+                android:text="￥100.00"
                 android:textColor="@color/gray_999999"
-                android:textSize="12sp" />
+                android:textSize="12sp"
+                android:paddingBottom="3dp"
+                />
         </LinearLayout>
 
         <TextView
             android:id="@+id/iv_status"
             android:layout_width="wrap_content"
-            android:layout_height="30dp"
+            android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:layout_gravity="bottom"
-            android:background="@mipmap/img_bg_buy"
+            android:background="@mipmap/xianshiqiang"
             android:gravity="center"
-            android:text="马上抢"
             android:textColor="@color/white"
             android:textSize="14sp"
+            android:layout_centerHorizontal="true"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
             />
     </RelativeLayout>
 </RelativeLayout>