2024-5-11 代码备份

首页bannerUI开发完成
首页中部导航视图UI开发完成
365专区UI开发完成
首页商品列表UI开发完成

.idea/gradle.xml

@@ -19,6 +19,5 @@
         </option>
       </GradleProjectSettings>
     </option>
-    <option name="offlineMode" value="true" />
   </component>
 </project>

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

@@ -3,6 +3,7 @@ package com.yihucha.hbyhc.presentation.home;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.CountDownTimer;
@@ -82,7 +83,7 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
 
     private List<HomeProductBean.PageInfoDTO.ListDTO> homeProductListBeans = new ArrayList<>();
     private HomeProductListAdapter homeProductListAdapter;
-
+    private boolean isScrolled = false;
     //秒杀商品
     private HomeMSAdapter adapter;
     private HomeVipAdapter adapterVip;
@@ -204,7 +205,7 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
             adapterVip.setDatas(data);
         });
 
-        seckillViewModel.getDcSeckill();
+//        seckillViewModel.getDcSeckill(); //秒杀模块隐藏掉
         seckillViewModel.mDcSeckillBean.observe(getViewLifecycleOwner(), dcSeckillBeans -> {
             if (dcSeckillBeans == null || dcSeckillBeans.size() == 0) {
                 binding.layoutSeckill.setVisibility(View.GONE);
@@ -450,15 +451,21 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
     private void showHeaderAlphaAction(int y) {
         final int rootPicHeight = binding.headView.viewTop.getHeight();
         if (y <= rootPicHeight) {
-            binding.headView.viewHeaderBg.setBackgroundResource(R.mipmap.home_top_bg_scroll);
             //状态栏深色模式
             binding.tvScrollTop.setVisibility(View.GONE);
+            isScrolled = false;
         } else {
             binding.tvScrollTop.setVisibility(View.VISIBLE);
-            binding.headView.viewHeaderBg.setBackgroundResource(R.mipmap.home_top_bg);
+            isScrolled = true;
         }
+        setTitleColor();
+    }
+    private void setTitleColor(){
+        binding.headView.btvName.setTextColor(!isScrolled?Color.WHITE:Color.parseColor("#333333"));
+        binding.headView.tvMessage.setTextColor(!isScrolled?Color.WHITE:Color.parseColor("#333333"));
+        binding.headView.viewTop.setVisibility(isScrolled?View.VISIBLE:View.INVISIBLE);
+        binding.headView.viewHeaderBg.setVisibility(isScrolled?View.VISIBLE:View.INVISIBLE);
     }
-
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);

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

@@ -0,0 +1,605 @@
+package com.yihucha.hbyhc.presentation.home;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+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;
+
+import com.bumptech.glide.Glide;
+import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
+import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
+import com.yihucha.hbyhc.R;
+import com.yihucha.hbyhc.base.BaseFragment;
+import com.yihucha.hbyhc.config.Constants;
+import com.yihucha.hbyhc.databinding.FragmentHomeBinding;
+import com.yihucha.hbyhc.network.DataResponse;
+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.view_model.HomeViewModel;
+import com.yihucha.hbyhc.presentation.members.AGuestMemberActivity;
+import com.yihucha.hbyhc.presentation.message.MessageActivity;
+import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
+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;
+import com.yihucha.hbyhc.utils.LoginUtils;
+import com.yihucha.hbyhc.utils.MVUtils;
+import com.yihucha.hbyhc.utils.StringsUtil;
+import com.yihucha.hbyhc.utils.TimeUtils;
+import com.yihucha.hbyhc.view.MyToast;
+import com.youth.banner.indicator.CircleIndicator;
+import com.youth.banner.listener.OnBannerListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import qiu.niorgai.StatusBarCompat;
+
+public class HomeFragment_copy extends BaseFragment {
+    /*private FragmentHomeBinding binding;
+
+    private HomeViewModel homeViewModel;
+    private BigWarehouseViewModel seckillViewModel;
+    private VipAreaViewModel vipAreaViewModel;
+
+    private List<HomeProductBean.PageInfoDTO.ListDTO> homeProductListBeans = new ArrayList<>();
+    private HomeProductListAdapter homeProductListAdapter;
+    private boolean isScrolled = false;
+    //秒杀商品
+    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 boolean isPriceUp = false;
+    private boolean isSalesUp = false;
+
+    //正在滚动
+    public static final int SCROLL_STATE_IDLE = 0;
+
+    //正在被外部拖拽,一般为用户正在用手指滚动
+    public static final int SCROLL_STATE_DRAGGING = 1;
+
+    //自动滚动开始
+    public static final int SCROLL_STATE_SETTLING = 2;
+    private CountDownTimer timer;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //状态栏深色模式
+        StatusBarCompat.changeToLightStatusBar(getActivity());
+    }
+
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             ViewGroup container, Bundle savedInstanceState) {
+
+        homeViewModel =
+                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();
+        ImmersedStatusbarUtils.initAfterSetContentView(getActivity(), binding.viewOccupy);
+        initView();
+        initClick();
+        initApi();
+        return root;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        initData();
+    }
+
+
+    private void initClick() {
+        binding.headView.rlTop.setOnClickListener(this);
+        binding.headView.llSearch.setOnClickListener(this);
+        binding.headView.ivMessage.setOnClickListener(this);
+        binding.headView.tvMessage.setOnClickListener(this);
+        binding.tvGetMore.setOnClickListener(this);
+        binding.tvBuyNow.setOnClickListener(this);
+        homeProductListAdapter.setOnClickListener(position -> ProductDetailsActivity.launch(getActivity(),
+                homeProductListBeans.get(position).getProduct_id() + ""));
+        binding.tvScrollTop.setOnClickListener(this);
+
+        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.getHomeProductListData(mPage, mer_keyword, isNew, priceType, sales);
+        //网络发生错误
+        homeViewModel.failed.observe(getActivity(), s -> MyToast.makeText(getContext(), s, Toast.LENGTH_LONG).show());
+        //商品列表请求成功
+        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>() {
+            @Override
+            public void onChanged(UserInfoModel uesrInfoMpdel) {
+                Log.i("qmz", "235");
+                GlideUtils.loadCircleImage(getActivity(), uesrInfoMpdel.getAvatar(), binding.headView.ivHead, R.mipmap.home_default_avatar_220614);
+                binding.headView.btvName.setText(uesrInfoMpdel.getNickname());
+            }
+        });
+
+        homeViewModel.getBannerData();
+        getBanner();
+
+        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);
+        });
+
+        seckillViewModel.getDcSeckill();
+        seckillViewModel.mDcSeckillBean.observe(getViewLifecycleOwner(), dcSeckillBeans -> {
+            if (dcSeckillBeans == null || dcSeckillBeans.size() == 0) {
+                binding.layoutSeckill.setVisibility(View.GONE);
+                return;
+            }
+            setMS(dcSeckillBeans);
+        });
+        seckillViewModel.failed.observe(getViewLifecycleOwner(), new Observer<String>() {
+            @Override
+            public void onChanged(String s) {
+                binding.layoutSeckill.setVisibility(View.GONE);
+            }
+        });
+    }
+
+    //设置秒杀的显示状态
+    private void setMS(List<DcSeckillBean> dcSeckillBeans) {
+        int usePos = -1;
+        for (int i = 0; i < dcSeckillBeans.size(); i++) {
+            //找秒杀中或者下一场秒杀的数据
+            if (dcSeckillBeans.get(i).getStatus() == 1 || dcSeckillBeans.get(i).getStatus() == 2) {
+                usePos = i;
+                break;
+            }
+        }
+        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) {
+            binding.layoutSeckill.setVisibility(View.GONE);
+            return;
+        }
+        binding.layoutSeckill.setVisibility(View.VISIBLE);
+        seckillBeans.clear();
+        seckillBeans.addAll(product_data);
+        adapter.setDatas(seckillBeans);
+        if (dcSeckillBean.getStatus() == 1) {
+            //正在秒杀
+            binding.layoutTime.setVisibility(View.VISIBLE);
+            if (TimeUtils.init(dcSeckillBean.getSeckill_date())) {
+                long timeLong = TimeUtils.getTimeLong();
+                timer = new CountDownTimer(timeLong, 1000) {
+                    @Override
+                    public void onTick(long l) {
+                        long timeHour = StringsUtil.getHour(l);
+                        binding.tvHours.setText(timeHour >= 10 ? timeHour + "" : "0" + timeHour);
+                        long timeMinute = StringsUtil.getMinute(l);
+                        binding.tvMinute.setText(timeMinute >= 10 ? timeMinute + "" : "0" + timeMinute);
+                        long timeSecond = StringsUtil.getSecond(l);
+                        binding.tvSencond.setText(timeSecond >= 10 ? timeSecond + "" : "0" + timeSecond);
+                    }
+
+                    @Override
+                    public void onFinish() {
+                        timer.cancel();
+                        //重新加载秒杀数据
+                        seckillViewModel.getDcSeckill();
+                    }
+                };
+                timer.start();
+            }
+        } else {
+            //即将开始
+            binding.layoutTime.setVisibility(View.GONE);
+        }
+    }
+
+    private void initData() {
+
+        if (!"".equals(MVUtils.getString(Constants.TOKEN))) {
+            //用户信息
+            homeViewModel.getUserInfo();
+        }
+
+//养老金
+        *//*if (!"".equals(MVUtils.getString(Constants.TOKEN))) {
+            homeViewModel.getYanglaojin();
+        }*//*
+    }
+
+    private void initView() {
+        binding.scrollview.setOnScrollChangeListener(new NestedScrollView.OnScrollChangeListener() {
+            @Override
+            public void onScrollChange(NestedScrollView v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
+                LogUtil.LogError("fjy", "222");
+                showHeaderAlphaAction(scrollY);
+            }
+        });
+        //会员专区
+        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);
+        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);
+        homeProductListAdapter = new HomeProductListAdapter(getActivity(), homeProductListBeans);
+        //给RecyclerView设置适配器
+        binding.rvHomeList.setAdapter(homeProductListAdapter);
+
+        binding.refreshLayout.setAutoLoadMore(true);
+
+        binding.refreshLayout.setOverScrollRefreshShow(false);
+        //刷新
+        binding.refreshLayout.setOnRefreshListener(new RefreshListenerAdapter() {
+            @Override
+            public void onPullUpReleasing(TwinklingRefreshLayout refreshLayout, float fraction) {
+                super.onPullUpReleasing(refreshLayout, fraction);
+                LogUtil.LogInfo("qmzzzzz", "上拉释放过程" + fraction);
+                if (fraction == 0.0) {
+                    new Handler().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            mPage++;
+                            homeViewModel.getHomeProductListData(mPage, mer_keyword, isNew, priceType, sales);
+                        }
+                    }, 1000);
+                }
+            }
+
+            @Override
+            public void onPullDownReleasing(TwinklingRefreshLayout refreshLayout, float fraction) {
+                super.onPullDownReleasing(refreshLayout, fraction);
+                if (fraction == 0.0) {
+                    seckillViewModel.getDcSeckill();
+                }
+            }
+
+            @Override
+            public void onRefresh(final TwinklingRefreshLayout refreshLayout) {
+
+
+            }
+
+            @Override
+            public void onLoadMore(final TwinklingRefreshLayout refreshLayout) {
+            }
+        });
+
+        binding.rvHomeList.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+//                LinearLayoutManager manager = (LinearLayoutManager) recyclerView.getLayoutManager();
+                //停止滚动时才加载图片，可以很大的提升流畅度
+                if (newState == SCROLL_STATE_IDLE) {
+                    Glide.with(getActivity()).resumeRequests();
+                } else {
+                    Glide.with(getActivity()).pauseRequests();
+
+                }
+            }
+
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                LogUtil.LogInfo("qmzzz", dy + "" + dx);
+
+            }
+        });
+    }
+
+    private void getBanner() {
+        homeViewModel.bannerData.observe(getActivity(), new Observer<DataResponse<List<BannerDataBean>>>() {
+            @Override
+            public void onChanged(DataResponse<List<BannerDataBean>> listDataResponse) {
+                HomeImageAdapter imageAdapter = new HomeImageAdapter(getActivity(), listDataResponse.getData());
+                //加载本地图片
+                binding.bannerHome.setAdapter(imageAdapter)
+                        .addBannerLifecycleObserver(getActivity())
+                        .setIndicator(new CircleIndicator(getContext()), false)
+                        .setOnBannerListener(new OnBannerListener() {
+                            @Override
+                            public void OnBannerClick(Object data, int position) {
+//                                if (LoginUtils.isLogin(getContext())) {
+                                if (listDataResponse.getData().get(position).getUrl().equals(Constants.JINKA)) {
+                                    //金卡
+
+//                                    DacangMemberActivity.launch(getActivity(), "2");
+                                    AGuestMemberActivity.launch(getActivity());
+                                } else if (listDataResponse.getData().get(position).getUrl().equals(Constants.YINKA)) {
+                                    //银卡
+                                    // DacangMemberActivity.launch(getActivity(), "2");
+                                    AGuestMemberActivity.launch(getActivity());
+
+                                } else if (listDataResponse.getData().get(position).getUrl().equals(Constants.YINKA)) {
+                                    //五一
+                                } else if (listDataResponse.getData().get(position).getUrl().contains(Constants.DACANG)) {
+
+                                    if (listDataResponse.getData().get(position).getUrl().length() > 11) {
+                                        //
+                                        String index = listDataResponse.getData().get(position).getUrl().substring(13, listDataResponse.getData().get(position).getUrl().length());
+                                        LogUtil.LogInfo("urrrr", index);
+//                                            getActivity().finish();
+                                        MainActivity.launch(getActivity(), "3", index);
+                                    } else {
+                                        //大仓
+//                                            getActivity().finish();
+                                        MainActivity.launch(getActivity(), "3");
+                                    }
+//                                       String str =listDataResponse.getData().get(position).getUrl().replace(listDataResponse.getData().get(position).getUrl().length()-5,listDataResponse.getData().get(position).getUrl().length());
+
+                                } else if (listDataResponse.getData().get(position).getUrl().equals(Constants.MIAOSHA)) {
+                                    //秒杀
+                                    if (LoginUtils.isLogin(getActivity())) {
+                                        DacangSeckillActivity.launch(getActivity());
+                                    }
+                                } else if (listDataResponse.getData().get(position).getUrl().equals("rich")) {
+                                    //VIP专区
+                                    VipAreaActivity.lanuch(getActivity());
+                                } else if (listDataResponse.getData().get(position).getUrl().equals(Constants.SHOP)) {
+                                    //精品商城
+                                    DingShengLianMengActivity.lanunch(getActivity(), 1);
+                                }
+                            }
+
+                        });
+            }
+        });
+    }
+
+    *//**
+     * 设置顶部view 上方渐变效果
+     *
+     * @param y 滑动距离
+     *//*
+    private void showHeaderAlphaAction(int y) {
+        final int rootPicHeight = binding.headView.viewTop.getHeight();
+        if (y <= rootPicHeight) {
+            binding.headView.viewHeaderBg.setBackgroundResource(R.mipmap.home_top_bg_scroll);
+            //状态栏深色模式
+            binding.tvScrollTop.setVisibility(View.GONE);
+        } else {
+            binding.tvScrollTop.setVisibility(View.VISIBLE);
+            binding.headView.viewHeaderBg.setBackgroundResource(R.mipmap.home_top_bg);
+        }
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+        if (timer != null) {
+            timer.cancel();
+        }
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == binding.tvScrollTop) {
+            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) {
+            //搜索
+//            SearchActivity2.launch(getActivity());
+            YHCHomeSearchActivity.launch(getActivity());
+        } else if (view == binding.tvBuyNow) {
+            //新人专区
+            VipAreaActivity.lanuch(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();
+        *//** 触摸事件的注销 *//*
+//        ((MainActivity)this.getActivity()).unRegisterMyTouchListener(myTouchListener);
+    }
+
+
+    *//**
+     * 跳转至商品页
+     *
+     * @param activity Activity
+     * @param url      商铺地址/商品详情地址
+     *//*
+    public static void gotoShop(Activity activity, String url) {
+        try {
+            Intent intent = new Intent();
+            intent.setAction("android.intent.action.VIEW");
+            intent.setData(Uri.parse(url));
+            activity.startActivity(intent);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }*/
+}

app/src/main/java/com/yihucha/hbyhc/utils/explainpermissions/ExplainPermissionsUtil.kt

@@ -36,7 +36,6 @@ class ExplainPermissionsUtil : AppCompatActivity() {
     //需要申请的权限字符串数组
     private lateinit var permissions: Array<String>
     private lateinit var recyclerView: RecyclerView
-    private var callback: Callback<Boolean>? = null
     private lateinit var intercept: Intercept
 
     //用于展示未授予的权限列表数据
@@ -198,7 +197,7 @@ class ExplainPermissionsUtil : AppCompatActivity() {
                 if (grant == PackageManager.PERMISSION_DENIED) {
                     if (intercept == Intercept.NORMAL) {
                         //不需要弹框级别的在这里就直接返回了
-                        Companion.callback?.onCallback(false)
+                        callback?.onCallback(false)
                         toFinish()
                         return
                     }
@@ -213,7 +212,7 @@ class ExplainPermissionsUtil : AppCompatActivity() {
 
             if (unGranted.size == 0) {
                 //已全部授予权限
-                Companion.callback?.onCallback(true)
+                callback?.onCallback(true)
                 toFinish()
             } else if (intercept == Intercept.LOW && (shouldShow == null || shouldShow == true)) {
                 //LOW级别，未设置不再提示，就不弹框

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

@@ -8,18 +8,12 @@
     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"
-        android:layout_below="@+id/head_view"
-        android:layout_marginTop="-45dp"
         app:tr_pureScrollMode_on="true">
 
         <com.yihucha.hbyhc.view.NaviBarChangeStatusScrollView
@@ -40,51 +34,61 @@
                 android:orientation="vertical"
                 android:paddingTop="3dp">
 
-                <androidx.cardview.widget.CardView
+                <com.youth.banner.Banner
+                    android:id="@+id/banner_home"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    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>
+                    android:layout_height="240dp"
+                    />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
-                    android:orientation="horizontal">
-
+                    android:orientation="horizontal"
+                    android:padding="16dp"
+                    >
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:drawableTop="@mipmap/icon_cxb"
+                        android:drawableTop="@mipmap/icon_jd"
                         android:drawablePadding="4dp"
                         android:gravity="center_horizontal"
-                        android:text="储蓄保商城" />
+                        android:text="京东" />
 
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:drawableTop="@mipmap/icon_ms"
+                        android:drawableTop="@mipmap/icon_pdd"
                         android:drawablePadding="4dp"
                         android:gravity="center_horizontal"
-                        android:text="限时秒杀" />
+                        android:text="拼多多" />
 
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:drawableTop="@mipmap/icon_vip"
+                        android:drawableTop="@mipmap/icon_vph"
+                        android:drawablePadding="4dp"
+                        android:gravity="center_horizontal"
+                        android:text="唯品会" />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/icon_dy"
+                        android:drawablePadding="4dp"
+                        android:gravity="center_horizontal"
+                        android:text="抖音" />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/icon_sn"
                         android:drawablePadding="4dp"
                         android:gravity="center_horizontal"
-                        android:text="会员专区" />
+                        android:text="苏宁易购" />
                 </LinearLayout>
 
                 <RelativeLayout
@@ -94,7 +98,7 @@
                     android:layout_marginLeft="12dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginRight="12dp"
-                    android:background="@mipmap/bg_vip_home"
+                    android:background="@mipmap/img_bg"
                     android:paddingLeft="3dp"
                     android:paddingTop="13dp"
                     android:paddingRight="3dp"
@@ -105,29 +109,25 @@
                         android:id="@+id/imgv_vip"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="会员专区\t好物超值购"
-                        android:textColor="@color/white"
-                        android:textSize="17sp"
-                        android:paddingLeft="13dp"
+                        android:text="365专区"
+                        android:textColor="@color/black_333333"
+                        android:textSize="22sp"
+                        android:paddingLeft="10dp"
                         />
 
-                    <com.yihucha.hbyhc.view.BoldText
+                    <TextView
                         android:id="@+id/tv_buy_now"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         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:text="更多"
+                        android:textColor="@color/gray_666666"
+                        android:textSize="15sp"
+                        android:drawableRight="@mipmap/jiantou_right_gray"
                         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"
@@ -144,7 +144,16 @@
                     </androidx.cardview.widget.CardView>
 
                 </RelativeLayout>
-
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/vip_chuangke"
+                    android:scaleType="centerCrop"
+                    android:paddingLeft="12dp"
+                    android:paddingRight="12dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginBottom="12dp"
+                    />
                 <RelativeLayout
                     android:id="@+id/layout_seckill"
                     android:layout_width="match_parent"
@@ -157,7 +166,7 @@
                     android:paddingTop="13dp"
                     android:paddingRight="10dp"
                     android:paddingBottom="3dp"
-                    android:visibility="visible">
+                    android:visibility="gone">
 
                     <com.yihucha.hbyhc.view.BoldText
                         android:id="@+id/imgv_xsms"
@@ -426,7 +435,11 @@
         </com.yihucha.hbyhc.view.NaviBarChangeStatusScrollView>
 
     </com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout>
-
+    <include
+        android:id="@+id/head_view"
+        layout="@layout/home_head"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
     <!--站位-->
     <View

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

@@ -8,14 +8,18 @@
     <View
         android:id="@+id/view_header_bg"
         android:layout_width="match_parent"
-        android:layout_height="190dp"
-        android:alpha="1"
-        android:background="@mipmap/home_top_bg" />
+        android:layout_height="150dp"
+        android:background="@color/white"
+        android:visibility="invisible"
+        android:alpha="1" />
 
     <View
         android:id="@+id/view_top"
         android:layout_width="wrap_content"
-        android:layout_height="51dp"/>
+        android:layout_height="51dp"
+        android:visibility="invisible"
+        android:background="@color/white"
+        />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -41,9 +45,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/login"
-                android:textColor="@color/black_333333"
-                android:textSize="17sp"
+                android:text="登录\n领取养老金"
+                android:textColor="@color/white"
+                android:textSize="15sp"
                 android:paddingLeft="12dp"
                 android:layout_gravity="center_vertical"
                 />
@@ -68,7 +72,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="3dp"
                     android:text="@string/message"
-                    android:textColor="@color/black_333333"
+                    android:textColor="@color/white"
                     android:textSize="9.5sp" />
             </LinearLayout>
         </LinearLayout>
@@ -80,7 +84,7 @@
             android:layout_marginLeft="16dp"
             android:layout_marginTop="8dp"
             android:layout_marginRight="16dp"
-            android:background="@drawable/shape_ffffff_15dp"
+            android:background="@drawable/shape_line_fe0032_15dp"
             android:gravity="center_vertical"
             android:orientation="horizontal">