2024-2-5 代码备份

商品详情页UI调整
提交订单页面UI调整，绿积分数据未找到
我的团队页面开发，数据未调整
我的页面UI改版

app/src/main/AndroidManifest.xml

@@ -78,15 +78,17 @@
         tools:replace="android:theme"
         tools:targetApi="31">
         <activity
+            android:name=".presentation.mine.MyTeamActivity"
+            android:label="我的团队"
+            android:exported="false" />
+        <activity
             android:name=".presentation.mine.TiXianRecordActivity"
             android:exported="false"
-            android:label="提现记录"
-            />
+            android:label="提现记录" />
         <activity
             android:name=".presentation.mine.MyCommissionActivity"
             android:exported="false"
-            android:label="我的佣金"
-            />
+            android:label="我的佣金" />
         <activity
             android:name=".presentation.annuity.AnnuityRecordsActivity"
             android:exported="false"

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

@@ -49,6 +49,7 @@ import com.yihucha.hbyhc.presentation.mine.model.UserAnnuityInfoBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
 import com.yihucha.hbyhc.presentation.mine.model.UserVipInfoBean;
 import com.yihucha.hbyhc.presentation.mine.model.YanglaojinBean;
+import com.yihucha.hbyhc.presentation.mine.view_model.MineSpreadInfo;
 import com.yihucha.hbyhc.presentation.shopping.model.CollectBean;
 import com.yihucha.hbyhc.presentation.shopping.model.ShoppingBean;
 
@@ -76,6 +77,13 @@ public interface UserService {
     @GET("/api/user/yanglaolog")
     Observable<DataResponse<AnnuityRecordsBean>> getYanglaoList(@QueryMap Map<String,Object> map);
 
+    /**
+     * 我的页面信息  spread——info
+     */
+    @GET("/api/user/spread_info_yhc")
+    Observable<DataResponse<MineSpreadInfo>> getSpreadInfoYhc();
+
+
     @GET("api/user/bill")
     Call<JiangjinBean> getJiangjin(@Query("page") int page, @Query("limit") int limit, @Query("is_red") boolean is_red);
 

app/src/main/java/com/yihucha/hbyhc/presentation/mine/MineFragment.java

@@ -61,7 +61,6 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
 
         binding = FragmentMineBinding.inflate(inflater, container, false);
         View root = binding.getRoot();
-//        ImmersedStatusbarUtils.initAfterSetContentView(getActivity(), binding.viewOccupy);
         initView();
         initClick();
         return root;
@@ -71,116 +70,122 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
         if (!"".equals(MVUtils.getString(Constants.TOKEN))) {
             //用户信息
             mMineViewModel.getUserInfo();
-            mMineViewModel.userModel.observe(getActivity(), new Observer<UserInfoModel>() {
-                @Override
-                public void onChanged(UserInfoModel uesrInfoModel) {
-                    mUserInfoModel = uesrInfoModel;
-                    if (!TextUtils.isEmpty(uesrInfoModel.getAvatar())) {
-                        GlideUtils.loadCircleImage(getActivity(), uesrInfoModel.getAvatar(), binding.ivAvatar, R.mipmap.home_default_avatar_220614);
-                    }
-                    //我的邀请码
-                    MVUtils.put(Constants.USER_NUMBER, uesrInfoModel.getUser_number());
-                    //昵称
-                    MVUtils.put(Constants.NICK_NAME, uesrInfoModel.getNickname());
-                    binding.tvNickname.setText(uesrInfoModel.getNickname());
-                    String tel = StringsUtil.encodeTel(uesrInfoModel.getPhone());
-                    binding.tvPhone.setText(tel);
-                    binding.tvMyIntegral.setText(StringsUtil.getNumber(uesrInfoModel.getScore()));
-                    binding.tvRedIntegral.setText(StringsUtil.getNumber(mUserInfoModel.getMember_brokerage_price()));
-                    binding.tvTeamCount.setText(StringsUtil.getNumber(mUserInfoModel.getSbreak()));
-
-                    String member = mUserInfoModel.getUser_rich_type();
-                    if (mUserInfoModel.getIs_merchant() == 1) {
-                        binding.tvDianpu.setText("我的店铺");
-                    }
-
-                    String area_manage_type = mUserInfoModel.getArea_manage_type();
-                    String stockholder = mUserInfoModel.getStockholder();
+            mMineViewModel.getSpreadInfoYhc();
+            mMineViewModel.spreadInfo.observe(getActivity(), mineSpreadInfo -> {
+                if (!TextUtils.isEmpty(mineSpreadInfo.getAvatar())) {
+                    GlideUtils.loadCircleImage(getActivity(), mineSpreadInfo.getAvatar(), binding.ivAvatar, R.mipmap.home_default_avatar_220614);
+                }
+                //昵称
+                MVUtils.put(Constants.NICK_NAME, mineSpreadInfo.getNickname());
+                binding.tvNickname.setText(mineSpreadInfo.getNickname());
+                String area_manage_type = mineSpreadInfo.getLevel();
+                String stockholder = mineSpreadInfo.getPartnership();
+                String member = mineSpreadInfo.getIdentity();
+
+                if ("101".equals(area_manage_type)) {
+                    //社区服务中心
+                    binding.ivMemberDaili.setVisibility(View.VISIBLE);
+                    binding.ivMemberDaili.setImageResource(R.mipmap.icon_daili_shequ);
+                } else if ("102".equals(area_manage_type)) {
+                    //乡镇服务中心
+                    binding.ivMemberDaili.setVisibility(View.VISIBLE);
+                    binding.ivMemberDaili.setImageResource(R.mipmap.icon_daili_xiang);
+                } else if ("103".equals(area_manage_type)) {
+                    //区县服务中心
+                    binding.ivMemberDaili.setVisibility(View.VISIBLE);
+                    binding.ivMemberDaili.setImageResource(R.mipmap.icon_daili_qu);
+                } else if ("104".equals(area_manage_type)) {
+                    //市级运营中心
+                    binding.ivMemberDaili.setVisibility(View.VISIBLE);
+                    binding.ivMemberDaili.setImageResource(R.mipmap.icon_daili_shi);
+                } else if ("105".equals(area_manage_type)) {
+                    //省级分公司
+                    binding.ivMemberDaili.setVisibility(View.VISIBLE);
+                    binding.ivMemberDaili.setImageResource(R.mipmap.icon_daili_sheng);
+                } else {
+                    binding.ivMemberDaili.setVisibility(View.GONE);
+                }
+                if ("0".equals(member)) {
+                    //普通用户
+                    binding.ivMemberMember.setImageResource(R.mipmap.icon_member_yonghu);
+                } else if ("100".equals(member)) {
+                    //合伙人
+                    binding.ivMemberMember.setImageResource(R.mipmap.hehuoren);
+                } else if ("101".equals(member)) {
+                    //主任
+                    binding.ivMemberMember.setImageResource(R.mipmap.icon_member_zhuren);
+                } else if ("102".equals(member)) {
+                    //经理
+                    binding.ivMemberMember.setImageResource(R.mipmap.icon_member_jingli);
+                } else if ("103".equals(member)) {
+                    //总监
+                    binding.ivMemberMember.setImageResource(R.mipmap.icon_member_zongjian);
+                } else if ("104".equals(member)) {
+                    //合伙商户
+                    binding.ivMemberMember.setImageResource(R.mipmap.icon_member_shanghu);
+                } else if ("105".equals(member)) {
+                    //合伙公司
+                    binding.ivMemberMember.setImageResource(R.mipmap.icon_member_gongsi);
+                } else {
+                    //合伙董事  （猜的）
+                    binding.ivMemberMember.setImageResource(R.mipmap.icon_member_dongshi);
+                }
 
-                    if ("district".equals(area_manage_type)) {
-                        binding.ivMemberDaili.setVisibility(View.VISIBLE);
-                        binding.ivMemberDaili.setImageResource(R.mipmap.qxdl);
-                    }else if ("city".equals(area_manage_type)){
-                        binding.ivMemberDaili.setVisibility(View.VISIBLE);
-                        binding.ivMemberDaili.setImageResource(R.mipmap.citydl);
-                    }else {
-                        binding.ivMemberDaili.setVisibility(View.GONE);
-                    }
-                    if ("0".equals(member)) {
-                        binding.ivMemberMember.setImageResource(R.mipmap.user);
-                    } else if ("1".equals(member)) {
-                        binding.ivMemberMember.setImageResource(R.mipmap.vip1);
-                    }else if ("3".equals(member)) {
-                        binding.ivMemberMember.setImageResource(R.mipmap.chuangshiren);
-                    } else if ("4".equals(member)) {
-                        binding.ivMemberMember.setImageResource(R.mipmap.vip2);
-                    } else if ("8".equals(member)) {
-                        //合伙人
-                        binding.ivMemberMember.setImageResource(R.mipmap.hehuoren);
-                    }else if ("9".equals(member)) {
-                        //联合创始人
-                        binding.ivMemberMember.setImageResource(R.mipmap.lh_chuangshiren);
-                    }
+                if ("1".equals(stockholder)) {
+                    binding.ivMemberLhcsr.setVisibility(View.VISIBLE);
+                    binding.ivMemberLhcsr.setImageResource(R.mipmap.icon_qiye);
+                } else {
+                    binding.ivMemberLhcsr.setVisibility(View.GONE);
+                }
 
-                    if ("1".equals(stockholder)){
-                        binding.ivMemberLhcsr.setVisibility(View.VISIBLE);
-                        binding.ivMemberLhcsr.setImageResource(R.mipmap.gd);
-                    }else {
-                        binding.ivMemberLhcsr.setVisibility(View.GONE);
-                    }
+            });
+            mMineViewModel.userModel.observe(getActivity(), uesrInfoModel -> {
+                mUserInfoModel = uesrInfoModel;
+                //我的邀请码
+                MVUtils.put(Constants.USER_NUMBER, uesrInfoModel.getUser_number());
+                String tel = StringsUtil.encodeTel(uesrInfoModel.getPhone());
+                binding.tvPhone.setText(tel);
 
-                }
             });
 
             mMineViewModel.getOrderQuantity();
-            mMineViewModel.orderQuantityData.observe(getActivity(), new Observer<OrderQuantityBean>() {
-                @Override
-                public void onChanged(OrderQuantityBean orderQuantityBean) {
-                    //待付款
-                    if (!orderQuantityBean.getNoPay().equals("0")) {
-                        binding.llPaymentRequired.setVisibility(View.VISIBLE);
-                        binding.tvPaymentRequired.setText(orderQuantityBean.getNoPay());
-                    } else {
-                        binding.llPaymentRequired.setVisibility(View.GONE);
-                    }
-                    //代发货
-                    if (!orderQuantityBean.getNoPostage().equals("0")) {
-                        binding.llWaitForDelivery.setVisibility(View.VISIBLE);
-                        binding.tvWaitForDelivery.setText(orderQuantityBean.getNoPostage());
-                    } else {
-                        binding.llWaitForDelivery.setVisibility(View.GONE);
-                    }
-                    //待收货
-                    if (!orderQuantityBean.getNoDeliver().equals("0")) {
-                        binding.llWaitingForTheGoods.setVisibility(View.VISIBLE);
-                        binding.tvWaitingForTheGoods.setText(orderQuantityBean.getNoDeliver());
-                    } else {
-                        binding.llWaitingForTheGoods.setVisibility(View.GONE);
-                    }
-                    //待评价
-                    if (!orderQuantityBean.getNoComment().equals("0")) {
+            mMineViewModel.orderQuantityData.observe(getActivity(), orderQuantityBean -> {
+                //待付款
+                if (!orderQuantityBean.getNoPay().equals("0")) {
+                    binding.llPaymentRequired.setVisibility(View.VISIBLE);
+                    binding.tvPaymentRequired.setText(orderQuantityBean.getNoPay());
+                } else {
+                    binding.llPaymentRequired.setVisibility(View.GONE);
+                }
+                //代发货
+                if (!orderQuantityBean.getNoPostage().equals("0")) {
+                    binding.llWaitForDelivery.setVisibility(View.VISIBLE);
+                    binding.tvWaitForDelivery.setText(orderQuantityBean.getNoPostage());
+                } else {
+                    binding.llWaitForDelivery.setVisibility(View.GONE);
+                }
+                //待收货
+                if (!orderQuantityBean.getNoDeliver().equals("0")) {
+                    binding.llWaitingForTheGoods.setVisibility(View.VISIBLE);
+                    binding.tvWaitingForTheGoods.setText(orderQuantityBean.getNoDeliver());
+                } else {
+                    binding.llWaitingForTheGoods.setVisibility(View.GONE);
+                }
+                //待评价
+                if (!orderQuantityBean.getNoComment().equals("0")) {
 //                        tv_waiting_for_the_evaluation
-                        binding.llWaitingForTheEvaluation.setVisibility(View.VISIBLE);
-                        binding.tvWaitingForTheEvaluation.setText(orderQuantityBean.getNoComment());
-                    } else {
-                        binding.llWaitingForTheEvaluation.setVisibility(View.GONE);
-                    }
-                    //退款收货
-                    if (!orderQuantityBean.getRefund().equals("0")) {
-//                        tv_after_sale
-                        binding.llAfterSale.setVisibility(View.VISIBLE);
-                        binding.tvAfterSale.setText(orderQuantityBean.getRefund());
-                    } else {
-                        binding.llAfterSale.setVisibility(View.GONE);
-                    }
+                    binding.llWaitingForTheEvaluation.setVisibility(View.VISIBLE);
+                    binding.tvWaitingForTheEvaluation.setText(orderQuantityBean.getNoComment());
+                } else {
+                    binding.llWaitingForTheEvaluation.setVisibility(View.GONE);
                 }
-            });
-            //养老金
-            mMineViewModel.getYanglaojin();
-            mMineViewModel.yanglaojinBeanMutableLiveData.observe(getActivity(), new Observer<YanglaojinBean>() {
-                @Override
-                public void onChanged(YanglaojinBean yanglaojinBean) {
-                    binding.tvAnnuity.setText(StringsUtil.getNumber(yanglaojinBean.getAll_yanglao()) + "");
+                //退款收货
+                if (!orderQuantityBean.getRefund().equals("0")) {
+//                        tv_after_sale
+                    binding.llAfterSale.setVisibility(View.VISIBLE);
+                    binding.tvAfterSale.setText(orderQuantityBean.getRefund());
+                } else {
+                    binding.llAfterSale.setVisibility(View.GONE);
                 }
             });
             //网络请求失败
@@ -190,14 +195,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
                     ToastUtils.showLong(s);
                 }
             });
-            //我的邀请
-            mMineViewModel.getMyInvitation();
-            mMineViewModel.myInvitationBeanMutableLiveData.observe(getActivity(), new Observer<MyInvitationBean>() {
-                @Override
-                public void onChanged(MyInvitationBean myInvitationBean) {
-                    binding.tvMyCommission.setText(StringsUtil.getNumber(myInvitationBean.getBrokerage_price()));
-                }
-            });
+
 
         }
 
@@ -206,7 +204,6 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
     private void initClick() {
         binding.llAddress.setOnClickListener(this);
         binding.ivAvatar.setOnClickListener(this);
-        binding.ivAvatar.setOnClickListener(this);
         binding.tvNickname.setOnClickListener(this);
         binding.tvPhone.setOnClickListener(this);
         binding.llAllOrder.setOnClickListener(this);
@@ -217,32 +214,18 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
         binding.llClickWaitingForTheEvaluation.setOnClickListener(this);
         binding.llClickAfterSale.setOnClickListener(this);
 
-        binding.tvAnnuity.setOnClickListener(this);
-        binding.tvNameAnnuity.setOnClickListener(this);
-
         binding.llSettingup.setOnClickListener(this);
         binding.llMyFavorite.setOnClickListener(this);
-        binding.llWodeguanzhu.setOnClickListener(this);
         binding.llBangzhuzhongxin.setOnClickListener(this);
         binding.llWodepingjia.setOnClickListener(this);
-        binding.llWodeerweima.setOnClickListener(this);
-        binding.llMyInvitation.setOnClickListener(this);
-        binding.llSanfangdingdan.setOnClickListener(this);
-        binding.tvMyCommission.setOnClickListener(this);
-        binding.tvNameCommission.setOnClickListener(this);
-        binding.tvMyIntegral.setOnClickListener(this);
-        binding.llShangpuruzhu.setOnClickListener(this);
-        binding.llChuangfubao.setOnClickListener(this);
-        binding.llAccountServiceFee.setOnClickListener(this);
-
-        binding.tvRedIntegral.setOnClickListener(this);
-        binding.tvNameRedintegral.setOnClickListener(this);
-        binding.ivMemberMember.setOnClickListener(this);
 
+        binding.tvMineYj.setOnClickListener(this);
+        binding.tvMineLjf.setOnClickListener(this);
+        binding.tvMineTd.setOnClickListener(this);
+        binding.tvMineYq.setOnClickListener(this);
 
-        binding.llBangfuzhongxin.setOnClickListener(this);
         binding.llConnectUs.setOnClickListener(this);
-        binding.ivMemberDaili.setOnClickListener(this);
+//        binding.ivMemberDaili.setOnClickListener(this);
     }
 
     private void initView() {
@@ -251,13 +234,15 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
 
     @Override
     public void onClick(View view) {
-        if (view == binding.llAddress) {
+        if (view == binding.tvMineTd) {
+            //我的团队
+        } else if (view == binding.llAddress) {
             //我的地址
             MyAddressActivity.launch(getActivity());
         } else if (view == binding.ivAvatar) {
             //个人资料
             MyProfileActivity.launch(getActivity());
-        } else if (view == binding.ivAvatar||view == binding.tvNickname||view==binding.tvPhone) {
+        } else if (view == binding.ivAvatar || view == binding.tvNickname || view == binding.tvPhone) {
             //个人资料
             MyProfileActivity.launch(getActivity());
         } else if (view == binding.llAllOrder) {
@@ -278,114 +263,28 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
         } else if (view == binding.llClickAfterSale) {
             //退款售后
             AfterSalesOrderListActivity.launch(getActivity());
-        } else if (view == binding.tvAnnuity||view == binding.tvNameAnnuity) {
-            isAnnuity = true;
-            //账号服务费
-//            mMineViewModel.getAccountServiceFee();
-            if (isAnnuity) {
-                //养老金
-                AnnuityActivity.launch(getActivity());
-            } else {
-                PensionAccountPaySucceedActivity.launch(getActivity());
-            }
         } else if (view == binding.llSettingup) {
             //设置
             SettingUpActivity.launch(getActivity());
         } else if (view == binding.llMyFavorite) {
             //我的收藏
             MyFavoriteActivity.launch(getActivity());
-        } else if (view == binding.llWodeguanzhu) {
-            //我的关注
-            MyFocusActivity.launch(getActivity());
         } else if (view == binding.llBangzhuzhongxin) {
             //帮助中心
             HelpCenterActivity.launch(getActivity());
         } else if (view == binding.llWodepingjia) {
             //我的评价
             MyEvaluateActivity.launch(getActivity());
-        } else if (view == binding.llWodeerweima) {
-            //我的二维码
-//            MyQRCodeActivity.launch(getActivity());
-            //邀请好友
-            InviteFriendsActivity.launch(getActivity());
-        } else if (view == binding.llMyInvitation) {
+        } else if (view == binding.tvMineYq) {
             //我的邀请
             MyInvitationActivity.launch(getActivity());
-        } else if (view == binding.llSanfangdingdan) {
-            //三方订单
-            TripartiteOrderActivity.launch(getActivity());
-        } else if (view == binding.tvMyCommission||view == binding.tvNameCommission) {
+        } else if (view == binding.tvMineYj) {
             //点击我的佣金进入我的邀请
 //            MyInvitationActivity.launch(getActivity());
             MyCommissionActivity.launch(getActivity());
-        } else if (view == binding.tvMyIntegral || view == binding.tvNameIntegral) {
-            //我的积分
+        } else if (view == binding.tvMineLjf) {
+            //绿积分
             MyIntegralActivity.launch(getActivity());
-        } else if (view == binding.llShangpuruzhu) {
-            //商铺入驻
-            IWXAPI api = WXAPIFactory.createWXAPI(getActivity(), Constants.WX_APP_ID);
-
-            WXLaunchMiniProgram.Req req = new WXLaunchMiniProgram.Req();
-            req.userName = Constants.SHOPS_IN_APPLET_ID; // 填小程序原始id
-            req.path = Constants.SHOPS_IN_OFFICE_URL;                  ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
-            req.miniprogramType = HttpUrl.IS_RELEASE ? WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE :
-                    WXLaunchMiniProgram.Req.MINIPROGRAM_TYPE_PREVIEW;// 可选打开 开发版，体验版和正式版
-
-            api.sendReq(req);
-        } else if (view == binding.llChuangfubao) {
-            H5TitleActivity.launch(getActivity(), "",
-                    Constants.CHUANGFUBAO + MVUtils.getString(Constants.TOKEN));
-        } else if (view == binding.llAccountServiceFee) {
-            //账号服务费
-            isAnnuity = false;
-//            mMineViewModel.getAccountServiceFee();
-            if (isAnnuity) {
-                //养老金
-                AnnuityActivity.launch(getActivity());
-            } else {
-                PensionAccountPaySucceedActivity.launch(getActivity());
-            }
-        } else if (view == binding.tvRedIntegral||view == binding.tvNameRedintegral) {
-            //红积分
-            Bundle bundle = new Bundle();
-            bundle.putString("nickname", mUserInfoModel.getNickname());
-            bundle.putString("phone", mUserInfoModel.getPhone());
-            bundle.putString("avatar", mUserInfoModel.getAvatar());
-            bundle.putString("member", mUserInfoModel.getUser_rich_type());
-            bundle.putString("member_brokerage_price", mUserInfoModel.getMember_brokerage_price());
-            bundle.putString("red", mUserInfoModel.getRed());
-            bundle.putBoolean("is_bangfu", mUserInfoModel.is_bangfu);
-            RedIntegralActivity.launch(getContext(), bundle);
-        } else if (view == binding.ivMemberMember) {
-            //会员中心
-            Bundle bundle = new Bundle();
-            bundle.putString("nickname", mUserInfoModel.getNickname());
-            bundle.putString("phone", mUserInfoModel.getPhone());
-            bundle.putString("avatar", mUserInfoModel.getAvatar());
-            bundle.putString("member", mUserInfoModel.getUser_rich_type());
-
-            bundle.putString("annuity", binding.tvAnnuity.getText().toString());
-            bundle.putString("commission", binding.tvMyCommission.getText().toString());
-            bundle.putString("integral", binding.tvMyIntegral.getText().toString());
-            bundle.putString("red_integral", binding.tvRedIntegral.getText().toString());
-            bundle.putString("team_count", binding.tvTeamCount.getText().toString());
-            bundle.putBoolean("is_bangfu", mUserInfoModel.is_bangfu());
-
-            RulesActivity.launch(getActivity(), bundle);
-        } else if (view == binding.llBangfuzhongxin) {
-            Bundle bundle = new Bundle();
-            bundle.putString("nickname", mUserInfoModel.getNickname());
-            bundle.putString("phone", mUserInfoModel.getPhone());
-            bundle.putString("avatar", mUserInfoModel.getAvatar());
-            bundle.putString("member", mUserInfoModel.getUser_rich_type());
-
-            bundle.putString("annuity", binding.tvAnnuity.getText().toString());
-            bundle.putString("commission", binding.tvMyCommission.getText().toString());
-            bundle.putString("integral", binding.tvMyIntegral.getText().toString());
-            bundle.putString("red_integral", binding.tvRedIntegral.getText().toString());
-            bundle.putString("team_count", binding.tvTeamCount.getText().toString());
-            bundle.putBoolean("is_bangfu", mUserInfoModel.is_bangfu);
-            BangfuzhongxinActivity.launch(getActivity(), bundle);
         } else if (view == binding.llConnectUs) {
 
             String appId = "wxbf753066ac8686ba";
@@ -396,22 +295,24 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
                 req.url = "https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db";
                 wxapi.sendReq(req);
             }
-        } else if (view == binding.ivMemberDaili) {
+        } /*else if (view == binding.ivMemberDaili) {
+            //暂时隐藏
             if (mUserInfoModel.getArea_manage() != null) {
                 List<String> area_name =
                         mUserInfoModel.getArea_manage().getArea_name();
-                if (!StringsUtil.isEmpty(area_name)){
+                if (!StringsUtil.isEmpty(area_name)) {
                     StringBuffer sb = new StringBuffer();
                     for (String s : area_name) {
                         sb.append(s);
                     }
                     CustomDialog.getAreaDailiDialog(getActivity()
-                            ,sb.toString()
-                            ,"city".equals(mUserInfoModel.getArea_manage_type()));
+                            , sb.toString()
+                            , "city".equals(mUserInfoModel.getArea_manage_type()));
                 }
             }
-        }
+        }*/
     }
+
     @Override
     public void onResume() {
         super.onResume();

app/src/main/java/com/yihucha/hbyhc/presentation/mine/MyTeamActivity.kt

@@ -0,0 +1,14 @@
+package com.yihucha.hbyhc.presentation.mine
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
+import com.yihucha.hbyhc.databinding.ActivityMyTeamBinding
+
+class MyTeamActivity : ViewBindingTitleBaseActivity<ActivityMyTeamBinding>() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/model/TeamBean.java

@@ -0,0 +1,194 @@
+package com.yihucha.hbyhc.presentation.mine.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+/**
+ * author : zhangbing
+ * time   : 2024/2/5 16:51
+ * com.yihucha.hbyhc.presentation.mine.model
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TeamBean {
+
+    @JsonProperty("direct_fans_num")
+    private Integer directFansNum;
+    @JsonProperty("fans_num")
+    private Integer fansNum;
+    @JsonProperty("team_list")
+    private TeamListDTO teamList;
+    @JsonProperty("effective_fans_num")
+    private Integer effectiveFansNum;
+
+    public Integer getDirectFansNum() {
+        return directFansNum;
+    }
+
+    public void setDirectFansNum(Integer directFansNum) {
+        this.directFansNum = directFansNum;
+    }
+
+    public Integer getFansNum() {
+        return fansNum;
+    }
+
+    public void setFansNum(Integer fansNum) {
+        this.fansNum = fansNum;
+    }
+
+    public TeamListDTO getTeamList() {
+        return teamList;
+    }
+
+    public void setTeamList(TeamListDTO teamList) {
+        this.teamList = teamList;
+    }
+
+    public Integer getEffectiveFansNum() {
+        return effectiveFansNum;
+    }
+
+    public void setEffectiveFansNum(Integer effectiveFansNum) {
+        this.effectiveFansNum = effectiveFansNum;
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class TeamListDTO {
+        @JsonProperty("total")
+        private Integer total;
+        @JsonProperty("per_page")
+        private Integer perPage;
+        @JsonProperty("current_page")
+        private Integer currentPage;
+        @JsonProperty("last_page")
+        private Integer lastPage;
+        @JsonProperty("data")
+        private List<DataDTO> data;
+
+        public Integer getTotal() {
+            return total;
+        }
+
+        public void setTotal(Integer total) {
+            this.total = total;
+        }
+
+        public Integer getPerPage() {
+            return perPage;
+        }
+
+        public void setPerPage(Integer perPage) {
+            this.perPage = perPage;
+        }
+
+        public Integer getCurrentPage() {
+            return currentPage;
+        }
+
+        public void setCurrentPage(Integer currentPage) {
+            this.currentPage = currentPage;
+        }
+
+        public Integer getLastPage() {
+            return lastPage;
+        }
+
+        public void setLastPage(Integer lastPage) {
+            this.lastPage = lastPage;
+        }
+
+        public List<DataDTO> getData() {
+            return data;
+        }
+
+        public void setData(List<DataDTO> data) {
+            this.data = data;
+        }
+
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        public static class DataDTO {
+            @JsonProperty("uid")
+            private String uid;
+            @JsonProperty("nickname")
+            private String nickname;
+            @JsonProperty("phone")
+            private String phone;
+            @JsonProperty("avatar")
+            private String avatar;
+            @JsonProperty("create_time")
+            private String createTime;
+            @JsonProperty("identity")
+            private String identity;
+            @JsonProperty("level")
+            private String level;
+            @JsonProperty("partnership")
+            private String partnership;
+
+            public String getUid() {
+                return uid;
+            }
+
+            public void setUid(String uid) {
+                this.uid = uid;
+            }
+
+            public String getNickname() {
+                return nickname;
+            }
+
+            public void setNickname(String nickname) {
+                this.nickname = nickname;
+            }
+
+            public String getPhone() {
+                return phone;
+            }
+
+            public void setPhone(String phone) {
+                this.phone = phone;
+            }
+
+            public String getAvatar() {
+                return avatar;
+            }
+
+            public void setAvatar(String avatar) {
+                this.avatar = avatar;
+            }
+
+            public String getCreateTime() {
+                return createTime;
+            }
+
+            public void setCreateTime(String createTime) {
+                this.createTime = createTime;
+            }
+
+            public String getIdentity() {
+                return identity;
+            }
+
+            public void setIdentity(String identity) {
+                this.identity = identity;
+            }
+
+            public String getLevel() {
+                return level;
+            }
+
+            public void setLevel(String level) {
+                this.level = level;
+            }
+
+            public String getPartnership() {
+                return partnership;
+            }
+
+            public void setPartnership(String partnership) {
+                this.partnership = partnership;
+            }
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/model/TeamViewModel.kt

@@ -0,0 +1,21 @@
+package com.yihucha.hbyhc.presentation.mine.model
+
+import androidx.lifecycle.ViewModel
+
+/**
+ *  author : zhangbing
+ *  time   : 2024/2/5 17:30
+ *  com.yihucha.hbyhc.presentation.mine.model
+ */
+class TeamViewModel : ViewModel() {
+
+
+
+    /**
+     * 请求团队列表
+     */
+    fun requestTeamList(){
+
+
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/repository/UserRepository.java

@@ -21,6 +21,7 @@ import com.yihucha.hbyhc.presentation.mine.model.UpdateAccountBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserAnnuityInfoBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
 import com.yihucha.hbyhc.presentation.mine.model.YanglaojinBean;
+import com.yihucha.hbyhc.presentation.mine.view_model.MineSpreadInfo;
 import com.yihucha.hbyhc.presentation.shopping.model.CollectBean;
 import com.yihucha.hbyhc.utils.LogUtil;
 import com.yihucha.hbyhc.utils.MVUtils;
@@ -57,6 +58,26 @@ public class UserRepository {
             }
         }));
     }
+    /**
+     * 我的信息
+     */
+    @SuppressWarnings("CheckResult")
+    public  static void getSpreadInfoYhc(final NormalListener<MineSpreadInfo> listener) {
+        UserService userService = NetworkApi.createService(UserService.class);
+        userService.getSpreadInfoYhc().compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<MineSpreadInfo>>() {
+            @Override
+            public void onSuccess(DataResponse<MineSpreadInfo> uesrInfoMpdelDataResponse) {
+                if (uesrInfoMpdelDataResponse.responseCode ==200){
+                    listener.success(uesrInfoMpdelDataResponse.getData());
+                }
+            }
+
+            @Override
+            public void onFailure(Throwable e) {
+            }
+        }));
+    }
+
 
     /**
      * 地址列表

app/src/main/java/com/yihucha/hbyhc/presentation/mine/view_model/MineSpreadInfo.java

@@ -0,0 +1,154 @@
+package com.yihucha.hbyhc.presentation.mine.view_model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * author : zhangbing
+ * time   : 2024/2/5 14:51
+ * com.yihucha.hbyhc.presentation.mine.view_model
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MineSpreadInfo {
+
+    @JsonProperty("current_balance")
+    private String currentBalance;
+    @JsonProperty("unsettled_balance")
+    private Integer unsettledBalance;
+    @JsonProperty("withdrawn_balance")
+    private String withdrawnBalance;
+    @JsonProperty("total_balance")
+    private String totalBalance;
+    @JsonProperty("identity")
+    private String identity;
+    @JsonProperty("level")
+    private String level;
+    @JsonProperty("partnership")
+    private String partnership;
+    @JsonProperty("green_integral")
+    private String greenIntegral;
+    @JsonProperty("green_integral_is")
+    private String greenIntegralIs;
+    @JsonProperty("nickname")
+    private String nickname;
+    @JsonProperty("avatar")
+    private String avatar;
+    @JsonProperty("fans_num")
+    private Integer fansNum;
+    @JsonProperty("ylj")
+    private String ylj;
+    @JsonProperty("yhc_withdrawal_money")
+    private Integer yhcWithdrawalMoney;
+
+    public String getCurrentBalance() {
+        return currentBalance;
+    }
+
+    public void setCurrentBalance(String currentBalance) {
+        this.currentBalance = currentBalance;
+    }
+
+    public Integer getUnsettledBalance() {
+        return unsettledBalance;
+    }
+
+    public void setUnsettledBalance(Integer unsettledBalance) {
+        this.unsettledBalance = unsettledBalance;
+    }
+
+    public String getWithdrawnBalance() {
+        return withdrawnBalance;
+    }
+
+    public void setWithdrawnBalance(String withdrawnBalance) {
+        this.withdrawnBalance = withdrawnBalance;
+    }
+
+    public String getTotalBalance() {
+        return totalBalance;
+    }
+
+    public void setTotalBalance(String totalBalance) {
+        this.totalBalance = totalBalance;
+    }
+
+    public String getIdentity() {
+        return identity;
+    }
+
+    public void setIdentity(String identity) {
+        this.identity = identity;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public String getPartnership() {
+        return partnership;
+    }
+
+    public void setPartnership(String partnership) {
+        this.partnership = partnership;
+    }
+
+    public String getGreenIntegral() {
+        return greenIntegral;
+    }
+
+    public void setGreenIntegral(String greenIntegral) {
+        this.greenIntegral = greenIntegral;
+    }
+
+    public String getGreenIntegralIs() {
+        return greenIntegralIs;
+    }
+
+    public void setGreenIntegralIs(String greenIntegralIs) {
+        this.greenIntegralIs = greenIntegralIs;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public Integer getFansNum() {
+        return fansNum;
+    }
+
+    public void setFansNum(Integer fansNum) {
+        this.fansNum = fansNum;
+    }
+
+    public String getYlj() {
+        return ylj;
+    }
+
+    public void setYlj(String ylj) {
+        this.ylj = ylj;
+    }
+
+    public Integer getYhcWithdrawalMoney() {
+        return yhcWithdrawalMoney;
+    }
+
+    public void setYhcWithdrawalMoney(Integer yhcWithdrawalMoney) {
+        this.yhcWithdrawalMoney = yhcWithdrawalMoney;
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/view_model/MineViewModel.java

@@ -52,6 +52,7 @@ import io.reactivex.Observer;
 public class MineViewModel extends BaseViewModel {
     private static final String TAG = MineViewModel.class.getSimpleName();
     public MutableLiveData<UserInfoModel> userModel = new MutableLiveData<>();//用户资料
+    public MutableLiveData<MineSpreadInfo> spreadInfo = new MutableLiveData<>();//用户资料
     public MutableLiveData<OrderQuantityBean> orderQuantityData = new MutableLiveData<>();//订单统计
     public MutableLiveData<YanglaojinBean> yanglaojinBeanMutableLiveData = new MutableLiveData<>();//养老金
     public MutableLiveData<UserAnnuityInfoBean> userAnnuityInfoBeanMutableLiveData = new MutableLiveData<>();//养老金信息
@@ -104,6 +105,20 @@ public class MineViewModel extends BaseViewModel {
         });
     }
 
+    public void getSpreadInfoYhc() {
+        UserRepository.getSpreadInfoYhc(new NormalListener<MineSpreadInfo>() {
+            @Override
+            public void success(MineSpreadInfo mineSpreadInfo) {
+                spreadInfo.postValue(mineSpreadInfo);
+            }
+
+            @Override
+            public void fail(String s) {
+
+            }
+        });
+    }
+
     /**
      * 订单统计
      */
@@ -150,26 +165,27 @@ public class MineViewModel extends BaseViewModel {
      * 养老金列表
      */
     @SuppressLint("CheckResult")
-    public void getYanglaoList(int page,String sorce,String month,int status) {
+    public void getYanglaoList(int page, String sorce, String month, int status) {
         Map<String, Object> map = new HashMap<>();
-        map.put("page",page);
-        map.put("limit",10);
-        map.put("sorce",sorce);
-        map.put("month",month);
-        map.put("status",status);
+        map.put("page", page);
+        map.put("limit", 10);
+        map.put("sorce", sorce);
+        map.put("month", month);
+        map.put("status", status);
         UserService service = NetworkApi.createService(UserService.class);
         service.getYanglaoList(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<AnnuityRecordsBean>>() {
             @Override
             public void onSuccess(DataResponse<AnnuityRecordsBean> response) {
-                if (response.responseCode==200) {
+                if (response.responseCode == 200) {
                     annuityRecordsList.postValue(response.getData());
-                }else {
+                } else {
                     failed.postValue(response.responseError);
                 }
             }
+
             @Override
             public void onFailure(Throwable e) {
-                LogUtil.LogError(TAG,e.getMessage());
+                LogUtil.LogError(TAG, e.getMessage());
             }
         }));
     }

app/src/main/java/com/yihucha/hbyhc/presentation/order/ApplicationForDrawbackActivity.java

@@ -22,11 +22,15 @@ import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
 import com.yihucha.hbyhc.callback.TwoButtonsListener;
 import com.yihucha.hbyhc.databinding.ActivityApplicationForDrawbackBinding;
+import com.yihucha.hbyhc.network.request_bean.CartIdRequest;
 import com.yihucha.hbyhc.network.request_bean.RefundApplyRequest;
+import com.yihucha.hbyhc.presentation.mine.MyAddressActivity;
+import com.yihucha.hbyhc.presentation.mine.model.AddressListBean;
 import com.yihucha.hbyhc.presentation.mine.model.PathBean;
 import com.yihucha.hbyhc.presentation.order.adapter.EvaluatePhotosAdapter;
 import com.yihucha.hbyhc.presentation.order.model.OrderListBean;
 import com.yihucha.hbyhc.presentation.order.view_model.ApplicationForDrawbackViewModel;
+import com.yihucha.hbyhc.presentation.order.view_model.OrderViewModel;
 import com.yihucha.hbyhc.utils.GridSpacingItemDecoration;
 import com.yihucha.hbyhc.utils.ImageEngineUtils.GlideEngine;
 import com.yihucha.hbyhc.utils.LogUtil;
@@ -39,6 +43,10 @@ import com.zs.easy.imgcompress.EasyImgCompress;
 import com.zs.easy.imgcompress.listener.OnCompressSinglePicListener;
 import com.zs.easy.imgcompress.util.GBMBKBUtil;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -71,21 +79,30 @@ public class ApplicationForDrawbackActivity extends ViewBindingTitleBaseActivity
     private ArrayList<Photo> mSelectedPhotos = new ArrayList<>();//用户上一次勾选过的图片集合，ArrayList<Photo>类型
 
     private ApplicationForDrawbackViewModel mApplicationForDrawbackViewModel;
+    private OrderViewModel orderViewModel;
 
     private ApplicationTypeDialog applicationTypeDialog;
+    private List<AddressListBean.AddressList> addressListData;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mApplicationForDrawbackViewModel = new ViewModelProvider(this).get(ApplicationForDrawbackViewModel.class);
+        orderViewModel = new ViewModelProvider(this).get(OrderViewModel.class);
         orderBean = (OrderListBean.ListBean) getIntent().getSerializableExtra(INTENT_ORDER_BEAN);
         refundType = getIntent().getStringExtra(INTENT_REFUND_TYPE);
+        EventBus.getDefault().register(this);
         initView();
         initClick();
         initData();
     }
 
     private void initData() {
+        if ("3".equals(refundType)) {
+            mViewBinding.tvAddress.setText(orderBean.getUser_address());
+            mViewBinding.tvUserInfo.setText(orderBean.getReal_name()
+                    + "\t" + StringsUtil.encodeTel(orderBean.getUser_phone()));
+        }
         mApplicationForDrawbackViewModel.pathData.observe(this, pathBeans -> {
             pics.clear();
             LogUtil.LogInfo("pics1", pics.size() + "");
@@ -110,14 +127,18 @@ public class ApplicationForDrawbackActivity extends ViewBindingTitleBaseActivity
             evaluatePhotosAdapter.notifyDataSetChanged();
         });
 
+
+
         /**
          * 退款申请成功
          */
         mApplicationForDrawbackViewModel.mRefundOrderId.observe(this, s -> {
             if (refundType.equals("1")) {
                 ToastUtils.showLong("退款申请成功");
-            }else {
+            } else if ("2".equals(refundType)) {
                 ToastUtils.showLong("退货退款申请成功");
+            } else {
+                ToastUtils.showLong("申请换货成功");
             }
             AfterSalesOrderDateilsActivity.launch(context, s);
         });
@@ -139,6 +160,7 @@ public class ApplicationForDrawbackActivity extends ViewBindingTitleBaseActivity
         mViewBinding.llARefundReason.setOnClickListener(this);
         mViewBinding.llAddPhotos.setOnClickListener(this);
         mViewBinding.tvSave.setOnClickListener(this);
+        mViewBinding.llAfterSaleAddress.setOnClickListener(this);
 //        mViewBinding.llApplicationType.setOnClickListener(this);
     }
 
@@ -167,7 +189,7 @@ public class ApplicationForDrawbackActivity extends ViewBindingTitleBaseActivity
         }
         if (!StringsUtil.isEmpty(orderBean.getDelivery_type())) {
             mViewBinding.btvMoney.setText(orderBean.getTotal_price());
-        }else {
+        } else {
             mViewBinding.btvMoney.setText(orderBean.getPay_price());
         }
 
@@ -181,7 +203,18 @@ public class ApplicationForDrawbackActivity extends ViewBindingTitleBaseActivity
             mViewBinding.imgvRight.setVisibility(View.INVISIBLE);
             mViewBinding.llApplicationType.setClickable(false);
         } else {
-            mViewBinding.tvApplicationType.setText(R.string.i_d_like_a_refund);
+            if (refundType.equals("2")) {
+                mViewBinding.tvApplicationType.setText(R.string.i_d_like_a_refund);
+                mViewBinding.tvNameReason.setText("退款原因");
+            } else {
+                mViewBinding.tvApplicationType.setText(R.string.i_d_like_to_exchange_this);
+                mViewBinding.tvNameReason.setText("申请原因");
+                mViewBinding.llStateOfGoods.setVisibility(View.GONE);
+                mViewBinding.llAfterSaleMoney.setVisibility(View.GONE);
+                mViewBinding.viewLineStateGoods.setVisibility(View.GONE);
+                mViewBinding.llAfterSaleAddress.setVisibility(View.VISIBLE);
+            }
+
             mViewBinding.tvStateGoods.setText("已收到货");
             mViewBinding.imgvRightState.setVisibility(View.INVISIBLE);
             mViewBinding.imgvRight.setVisibility(View.INVISIBLE);
@@ -189,13 +222,38 @@ public class ApplicationForDrawbackActivity extends ViewBindingTitleBaseActivity
             mViewBinding.llApplicationType.setClickable(false);
             mStateGoods = "2";
         }
-        mViewBinding.main.post(() -> setTitle(refundType.equals("1") ? "申请退款" : "申请退货退款"));
+        mViewBinding.main.post(() -> {
+            String str = "";
+            if (refundType.equals("1")) {
+                str = "申请退款";
+            } else if (refundType.equals("2")) {
+                str = "申请退货退款";
+            } else {
+                str = "我要换货";
+            }
+            setTitle(str);
+        });
+    }
+
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void Event(AddressListBean.AddressList addressList) {
+        String dizhi = addressList.getProvince() +
+                addressList.getCity() + addressList.getDistrict() +
+                addressList.getDetail();
+        mViewBinding.tvAddress.setText(dizhi);
+        mViewBinding.tvUserInfo.setText(addressList.getReal_name()
+                + "\t" + StringsUtil.encodeTel(addressList.getPhone()));
     }
 
+
     @Override
     public void onClick(View v) {
         super.onClick(v);
-        if (v == mViewBinding.llStateOfGoods) {
+        if (v == mViewBinding.llAfterSaleAddress) {
+            //选择收货地址
+            MyAddressActivity.launch(context, "1");
+        } else if (v == mViewBinding.llStateOfGoods) {
             showStateGoodsDialogs();
         } else if (v == mViewBinding.llARefundReason) {
             showARefundReasonDialogs();
@@ -204,6 +262,7 @@ public class ApplicationForDrawbackActivity extends ViewBindingTitleBaseActivity
         } else if (v == mViewBinding.llApplicationType) {
             showApplicationTypeDialogs();
         } else if (v == mViewBinding.tvSave) {
+            //TODO 换货的接口是什么？
             isSubmit();
             CustomDialog.defaultDialog(context, R.string.warm_prompt, "您确定继续退款吗？", R.string.cancel, R.string.affirm, new TwoButtonsListener() {
                 @Override
@@ -214,7 +273,6 @@ public class ApplicationForDrawbackActivity extends ViewBindingTitleBaseActivity
                 @Override
                 public void rightButton() {
                     //确认
-                    //todo::需要测试两件商品的
                     RefundApplyRequest request = new RefundApplyRequest();
                     if (orderBean.getOrderProduct().size() > 1) {
                         StringBuilder sb = new StringBuilder();
@@ -235,7 +293,7 @@ public class ApplicationForDrawbackActivity extends ViewBindingTitleBaseActivity
                     request.setPhone(orderBean.getUser_phone());
                     request.setRefund_message(refundReason);
                     request.setRefund_price(orderBean.getTotal_price());
-                    request.setRefund_type(refundType);
+                    request.setRefund_type(refundType); //售后类型
                     request.setGoods(mViewBinding.tvStateGoods.getText().toString().trim());
                     if (pics.size() > 0) {
                         List<String> picture = new ArrayList<>();
@@ -346,52 +404,52 @@ public class ApplicationForDrawbackActivity extends ViewBindingTitleBaseActivity
                         .setCount(4)
                         .setSelectedPhotos(mSelectedPhotos)
                         .start(new SelectCallback() {
-                    @Override
-                    public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
-                        mSelectedPhotos.clear();
-                        mSelectedPhotos.addAll(photos);
-                        pics.clear();
-                        mApplicationForDrawbackViewModel.listPath.clear();
-                        for (int i = 0; i < mSelectedPhotos.size(); i++) {
-                            String pathName = mSelectedPhotos.get(i).path;
-                            //压缩图片
-                            EasyImgCompress.withSinglePic(context, mSelectedPhotos.get(i).path)
-                                    .maxPx(1200)
-                                    .maxSize(100)
-                                    .enableLog(true)
-                                    .setOnCompressSinglePicListener(new OnCompressSinglePicListener() {
-                                        @Override
-                                        public void onStart() {
-                                            Log.i("EasyImgCompress", "onStart");
-                                        }
-
-                                        @Override
-                                        public void onSuccess(File file) {
-                                            Log.i("EasyImgCompress", "onSuccess size = " + GBMBKBUtil.getSize(file.length()) + " getAbsolutePath= " + file.getAbsolutePath());
-                                            LogUtil.LogInfo("qmz11", file.length() / 1024 + "k");
-                                            RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
-                                            MultipartBody.Part imageBodyPart = MultipartBody.Part.createFormData("field", file.getName(), imageBody);
-
-
-                                            mApplicationForDrawbackViewModel.uploadPictures(imageBodyPart, pathName);
-
-                                        }
-
-                                        @Override
-                                        public void onError(String error) {
-                                            Log.e("EasyImgCompress", "onError error = " + error);
-                                        }
-                                    }).start();
+                            @Override
+                            public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
+                                mSelectedPhotos.clear();
+                                mSelectedPhotos.addAll(photos);
+                                pics.clear();
+                                mApplicationForDrawbackViewModel.listPath.clear();
+                                for (int i = 0; i < mSelectedPhotos.size(); i++) {
+                                    String pathName = mSelectedPhotos.get(i).path;
+                                    //压缩图片
+                                    EasyImgCompress.withSinglePic(context, mSelectedPhotos.get(i).path)
+                                            .maxPx(1200)
+                                            .maxSize(100)
+                                            .enableLog(true)
+                                            .setOnCompressSinglePicListener(new OnCompressSinglePicListener() {
+                                                @Override
+                                                public void onStart() {
+                                                    Log.i("EasyImgCompress", "onStart");
+                                                }
 
-                        }
+                                                @Override
+                                                public void onSuccess(File file) {
+                                                    Log.i("EasyImgCompress", "onSuccess size = " + GBMBKBUtil.getSize(file.length()) + " getAbsolutePath= " + file.getAbsolutePath());
+                                                    LogUtil.LogInfo("qmz11", file.length() / 1024 + "k");
+                                                    RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
+                                                    MultipartBody.Part imageBodyPart = MultipartBody.Part.createFormData("field", file.getName(), imageBody);
 
-                    }
 
-                    @Override
-                    public void onCancel() {
+                                                    mApplicationForDrawbackViewModel.uploadPictures(imageBodyPart, pathName);
 
-                    }
-                });
+                                                }
+
+                                                @Override
+                                                public void onError(String error) {
+                                                    Log.e("EasyImgCompress", "onError error = " + error);
+                                                }
+                                            }).start();
+
+                                }
+
+                            }
+
+                            @Override
+                            public void onCancel() {
+
+                            }
+                        });
             }
         });
     }
@@ -460,12 +518,12 @@ public class ApplicationForDrawbackActivity extends ViewBindingTitleBaseActivity
             ToastUtils.showLong("请选择退款原因");
             return;
         }
-       /* if (TextUtils.isEmpty(mViewBinding.etMark.getText().toString())) {
-            ToastUtils.showLong("请填写补充描述和凭证");
-            return;
-        }*/
+    }
 
-//        mViewBinding.tvSave.setEnabled(true);
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
     }
 
     public static void launch(Context context, OrderListBean.ListBean bean, String refund_type) {

app/src/main/java/com/yihucha/hbyhc/presentation/order/ApplyForRefundOptionPageActivity.java

@@ -37,6 +37,7 @@ public class ApplyForRefundOptionPageActivity  extends ViewBindingTitleBaseActiv
     private void initClick() {
         mViewBinding.llApplicationForDrawback.setOnClickListener(this);
         mViewBinding.llRefundAndReturnTheProduct.setOnClickListener(this);
+        mViewBinding.llExchangeProducts.setOnClickListener(this);
     }
 
     private void initView() {
@@ -58,6 +59,8 @@ public class ApplyForRefundOptionPageActivity  extends ViewBindingTitleBaseActiv
             ApplicationForDrawbackActivity.launch(context,orderBean,"1");
         }else if (v ==mViewBinding.llRefundAndReturnTheProduct){
             ApplicationForDrawbackActivity.launch(context,orderBean,"2");
+        }else if (v == mViewBinding.llExchangeProducts){
+            ApplicationForDrawbackActivity.launch(context,orderBean,"3");
         }
     }
 

app/src/main/java/com/yihucha/hbyhc/presentation/order/SubmitOrderActivity.java

@@ -31,6 +31,7 @@ import com.yihucha.hbyhc.utils.DoubleFormatTool;
 import com.yihucha.hbyhc.utils.LogUtil;
 import com.yihucha.hbyhc.utils.NumberUtil;
 import com.yihucha.hbyhc.utils.StringsUtil;
+import com.yihucha.hbyhc.view.CustomDialog;
 import com.yihucha.hbyhc.view.RemarkDialog;
 
 import org.greenrobot.eventbus.EventBus;
@@ -138,6 +139,11 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
                 mDcListDialog.showAtLocation(SubmitOrderActivity.this.findViewById(R.id.main),
                         Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0, 0); //设置layout在PopupWindow中显示的位置*/
             }
+
+            @Override
+            public void onWenHaoClick() {
+                CustomDialog.getGreenIntegralDialog(SubmitOrderActivity.this);
+            }
         });
         mViewBinding.tvSubmitOrder.setOnClickListener(this);
         mViewBinding.llNoAddress.setOnClickListener(this);
@@ -158,19 +164,13 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
             totalPrice += Double.parseDouble(orderDataList.get(i).getOrder().getPostagePrice());
         }*/
         totalPrice += Double.parseDouble(orderBean == null ? "0.00" : orderBean.getOrderPrice());
-        mViewBinding.tvTotalPrice.setText(StringsUtil.getNumber(DoubleFormatTool.getRoundHalfUpDouble(totalPrice)+"") + "");
+        mViewBinding.tvTotalPrice.setText(StringsUtil.getNumber(DoubleFormatTool.getRoundHalfUpDouble(totalPrice) + "") + "");
     }
 
     private void initData() {
         //获取是否大仓会员
         orderViewModel.getUserInfo();
-        orderViewModel.userModel.observe(this, new Observer<UserInfoModel>() {
-            @Override
-            public void onChanged(UserInfoModel uesrInfoModel) {
-                is_da_cang_vip = uesrInfoModel.getIs_da_cang_vip();
-
-            }
-        });
+        orderViewModel.userModel.observe(this, uesrInfoModel -> is_da_cang_vip = uesrInfoModel.getIs_da_cang_vip());
 
         //如果是大仓进入,请求大仓列表
         if (flag.equals("2")) {
@@ -249,7 +249,7 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
                    */
                     totalPrice += Double.parseDouble(orderBean == null ? "0.00" : orderBean.getOrderPrice());
                     //积分兑换金额==商品金额*30
-                    mViewBinding.tvTotalPrice.setText(StringsUtil.getNumber(NumberUtil.multiply(totalPrice+"", "30")));
+                    mViewBinding.tvTotalPrice.setText(StringsUtil.getNumber(NumberUtil.multiply(totalPrice + "", "30")));
                 } else if ("7".equals(special_type) && "beishengtang".equals(special_merchant)) {
                     mViewBinding.tvAmountPayable.setVisibility(View.GONE);
                     mViewBinding.tvJifen.setVisibility(View.VISIBLE);
@@ -342,7 +342,7 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
                 ToastUtils.showLong("请选择地址");
                 return;
             }
-            if (StringsUtil.isEmpty(mMerId)){
+            if (StringsUtil.isEmpty(mMerId)) {
                 return;
             }
             List<String> cartId = new ArrayList<>();

app/src/main/java/com/yihucha/hbyhc/presentation/order/adapter/OrderShopAdapter.java

@@ -1,5 +1,6 @@
 package com.yihucha.hbyhc.presentation.order.adapter;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
@@ -42,6 +43,7 @@ public class OrderShopAdapter extends BaseQuickAdapter<OrderCheckBean.DataDTO.Or
         this.isMember = isMember;
     }
 
+    @SuppressLint("SetTextI18n")
     @Override
     protected void convert(@NonNull BaseViewHolder holder, OrderCheckBean.DataDTO.OrderDTOX orderData) {
         ImageView ivShopLogo = holder.getView(R.id.iv_shop_logo);
@@ -85,20 +87,29 @@ public class OrderShopAdapter extends BaseQuickAdapter<OrderCheckBean.DataDTO.Or
             }
         });
         TextView tvYhj = holder.getView(R.id.tv_yhq);
+        TextView tvSjj = holder.getView(R.id.tv_sjj);
+        //TODO 不知道从哪里获取参数来赋值(绿积分数据)
+        TextView tvHjf = holder.getView(R.id.tv_hjf);
+        //绿积分使用说明
+        holder.getView(R.id.imgv_wh).setOnClickListener(v -> {
+            if (mClickListener != null) {
+                mClickListener.onWenHaoClick();
+            }
+        });
         List<?> coupon = orderData.getCoupon();
         if (coupon != null || coupon.size() == 0) {
-            tvYhj.setText("暂无可用优惠券");
+            tvYhj.setText("无可用");
         } else {
             tvYhj.setText("请选择优惠券");
         }
-        if (!StringsUtil.isEmpty(orderData.getOrder().getYouhui_price()) && !"0".equals(orderData.getOrder().getYouhui_price()))
-            tvYhj.setText(orderData.getOrder().getYouhui_price());
+        if (!StringsUtil.isEmpty(orderData.getOrder().getYouhui_price()))
+            tvSjj.setText(orderData.getOrder().getYouhui_price());
         TextView tvYf = holder.getView(R.id.tv_yf);
         String postagePrice = orderData.getOrder().getPostagePrice();
         if (Double.parseDouble(postagePrice) > 0) {
-            tvYf.setText(Double.parseDouble(postagePrice) + "");
+            tvYf.setText("￥"+Double.parseDouble(postagePrice));
         } else {
-            tvYf.setText("免运费");
+            tvYf.setText("包邮");
         }
     }
 
@@ -112,6 +123,10 @@ public class OrderShopAdapter extends BaseQuickAdapter<OrderCheckBean.DataDTO.Or
 
         //选择大仓
         void onItemlChooseABigWarehouseClick(int position);
+
+        default void onWenHaoClick(){
+
+        }
     }
 
     public void setOnClickListener(OnClickListener listener) {

app/src/main/java/com/yihucha/hbyhc/presentation/order/model/OrderCheckBean.java

@@ -43,6 +43,8 @@ public class OrderCheckBean {
 
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static class DataDTO {
+        @JsonProperty("youhui_price")
+        private String youHuiPrice;
         @JsonProperty("order_price")
         private String order_price;
         @JsonProperty("total_price")
@@ -56,6 +58,14 @@ public class OrderCheckBean {
         @JsonProperty("order")
         private List<OrderDTOX> order;
 
+        public String getYouHuiPrice() {
+            return youHuiPrice;
+        }
+
+        public void setYouHuiPrice(String youHuiPrice) {
+            this.youHuiPrice = youHuiPrice;
+        }
+
         public String getOrderPrice() {
             return order_price;
         }

app/src/main/java/com/yihucha/hbyhc/presentation/product/ProductDetailsActivity.java

@@ -10,6 +10,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -239,24 +240,16 @@ public class ProductDetailsActivity extends ViewBindingBaseActivity<ActivityProd
                 Log.i("productDetailsBean", JSON.toJSONString(productDetailsBean));
                 productDetailsData = productDetailsBean;
                 isRelation = productDetailsBean.isRelation();
-                if (isRelation) {
-                    mViewBinding.ivCollect.setImageResource(R.mipmap.wjx_select);
-                    mViewBinding.ivCollect.setVisibility(View.VISIBLE);
-                    mViewBinding.ivCollect1.setImageResource(R.mipmap.shoucang_220908);
-                } else {
-                    mViewBinding.ivCollect.setImageResource(R.mipmap.wjx_unselect);
-                    mViewBinding.ivCollect.setVisibility(View.VISIBLE);
-                    mViewBinding.ivCollect1.setImageResource(R.mipmap.product_collect_220619);
-                }
+                setCollect(isRelation);
                 if (!TextUtils.isEmpty(productDetailsData.getStore_info())) {
                     mViewBinding.llStoreInfo.setVisibility(View.VISIBLE);
                     mViewBinding.tvStoreInfo.setText(productDetailsData.getStore_info());
-                    if (mViewBinding.tvStoreInfo.getLineCount() > 2) {
+                    /*if (mViewBinding.tvStoreInfo.getLineCount() > 2) {
                         mViewBinding.tvStoreInfo.setMaxLines(2);
                         mViewBinding.tvOpen.setVisibility(View.VISIBLE);
                     } else {
                         mViewBinding.tvOpen.setVisibility(View.GONE);
-                    }
+                    }*/
                 } else {
                     mViewBinding.llStoreInfo.setVisibility(View.GONE);
                     mViewBinding.tvOpen.setVisibility(View.GONE);
@@ -290,8 +283,7 @@ public class ProductDetailsActivity extends ViewBindingBaseActivity<ActivityProd
                     mViewBinding.tvBuyNow.setText("立即抢购");
                     mViewBinding.llShop.setVisibility(View.GONE);
                     mViewBinding.llShopMsg.setVisibility(View.GONE);
-                    mViewBinding.ivCollect1.setVisibility(View.GONE);
-                    mViewBinding.ivCollect.setVisibility(View.GONE);
+                    mViewBinding.tvCollect.setVisibility(View.GONE);
                 } else {
                     mViewBinding.tvYanglaojin.setText("养老金 ¥" + productDetailsBean.getYanglao());//养老金
                     if (productDetailsBean.getSeckill().equals("0")) {
@@ -315,13 +307,17 @@ public class ProductDetailsActivity extends ViewBindingBaseActivity<ActivityProd
                         if ("1".equals(productDetailsBean.getSeckill_s())) {
                             handler.sendEmptyMessageDelayed(0, 1000);
 
+                        }else if ("2".equals(productDetailsBean.getSeckill_s())){
+                            //TODO 需要结合接口调试数据
+                            mViewBinding.tvIsOver.setText("11点开枪");
                         }
                         mViewBinding.tvOtPrice.setText("¥" + StringsUtil.getAllNumber(productDetailsBean.getOt_price()));//原价
                         mViewBinding.llTopPrice.setVisibility(View.GONE);
                         mViewBinding.llSeckill.setVisibility(View.VISIBLE);
                         mViewBinding.tvBuyNow.setText("立即抢购");
                         mViewBinding.tvPrices.setText(StringsUtil.getNumber(productDetailsBean.getDc_price()));//价格
-
+                        mViewBinding.tvCollect.setVisibility(View.GONE);
+                        mViewBinding.tvCollect1.setVisibility(View.GONE);
                     }
                     String type1 = productDetailsBean.getType();
                     switch (type1) {
@@ -390,12 +386,6 @@ public class ProductDetailsActivity extends ViewBindingBaseActivity<ActivityProd
 //                Log.i("qqqqq",s);
             }
         });
-//        skuDialog.skuSelectedStr.observe(this, new Observer<String>() {
-//            @Override
-//            public void onChanged(String s) {
-//            mViewBinding.tvSkuSelectedName.setText(s);
-//            }
-//        });
 
         productDetailsViewModel.productShareBeanMutableLiveData.observe(this, new Observer<ProductShareBean>() {
             @Override
@@ -441,9 +431,7 @@ public class ProductDetailsActivity extends ViewBindingBaseActivity<ActivityProd
         productDetailsViewModel.mRelation.observe(this, new Observer<String>() {
             @Override
             public void onChanged(String s) {
-                mViewBinding.ivCollect.setImageResource(R.mipmap.wjx_select);
-                mViewBinding.ivCollect.setVisibility(View.VISIBLE);
-                mViewBinding.ivCollect1.setImageResource(R.mipmap.shoucang_220908);
+                setCollect(true);
                 isRelation = true;
             }
         });
@@ -451,22 +439,33 @@ public class ProductDetailsActivity extends ViewBindingBaseActivity<ActivityProd
         productDetailsViewModel.deleteAttentionStatus.observe(this, new Observer<Integer>() {
             @Override
             public void onChanged(Integer integer) {
-                mViewBinding.ivCollect.setImageResource(R.mipmap.wjx_unselect);
-                mViewBinding.ivCollect.setVisibility(View.VISIBLE);
-                mViewBinding.ivCollect1.setImageResource(R.mipmap.product_collect_220619);
+                setCollect(false);
                 isRelation = false;
             }
         });
+    }
 
-        /**
-         * 创建订单
-         */
-//        productDetailsViewModel.mCreateAnnualOrderData.observe(this, new Observer<CreateAnnualOrderBean>() {
-//            @Override
-//            public void onChanged(CreateAnnualOrderBean createAnnualOrderBean) {
-//                PensionAccountPayActivity.launch(ProductDetailsActivity.this,createAnnualOrderBean.getOrder_id());
-//            }
-//        });
+    /**
+     * 设置收藏状态
+     * @param isCollect 是否收藏
+     */
+    private void setCollect(boolean isCollect){
+
+        if (isCollect) {
+            Drawable drawable = getDrawable(R.mipmap.wjx_select);
+            drawable.setBounds(0,0,drawable.getMinimumWidth(),drawable.getMinimumHeight());
+            mViewBinding.tvCollect.setCompoundDrawables(null,drawable,null,null);
+            mViewBinding.tvCollect1.setCompoundDrawables(null,drawable,null,null);
+//            mViewBinding.tvCollect.setVisibility(View.VISIBLE);
+//            mViewBinding.tvCollect1.setVisibility(View.VISIBLE);
+        }else {
+            Drawable drawable = getDrawable(R.mipmap.wjx_unselect);
+            drawable.setBounds(0,0,drawable.getMinimumWidth(),drawable.getMinimumHeight());
+            mViewBinding.tvCollect.setCompoundDrawables(null,drawable,null,null);
+            mViewBinding.tvCollect1.setCompoundDrawables(null,drawable,null,null);
+//            mViewBinding.tvCollect.setVisibility(View.VISIBLE);
+//            mViewBinding.tvCollect1.setVisibility(View.VISIBLE);
+        }
     }
 
     /**
@@ -539,8 +538,8 @@ public class ProductDetailsActivity extends ViewBindingBaseActivity<ActivityProd
 
 //        mViewBinding.ivShare.setOnClickListener(this);
 //        mViewBinding.ivShare1.setOnClickListener(this);
-        mViewBinding.ivCollect.setOnClickListener(this);
-        mViewBinding.ivCollect1.setOnClickListener(this);
+        mViewBinding.tvCollect.setOnClickListener(this);
+        mViewBinding.tvCollect1.setOnClickListener(this);
         mViewBinding.ivShareProduct.setOnClickListener(this);
         mViewBinding.llShop.setOnClickListener(this);
         mViewBinding.tvShop.setOnClickListener(this);
@@ -650,7 +649,10 @@ public class ProductDetailsActivity extends ViewBindingBaseActivity<ActivityProd
     @Override
     public void onClick(View view) {
         if (view == mViewBinding.tvOpen) {
-            isOpen = !isOpen;
+            /**
+             * 当前逻辑修改成最多展示两行，暂时隐藏此处功能
+             */
+            /*isOpen = !isOpen;
             if (isOpen) {
                 mViewBinding.tvStoreInfo.setMaxLines(1000);
                 mViewBinding.tvOpen.setVisibility(View.VISIBLE);
@@ -659,7 +661,7 @@ public class ProductDetailsActivity extends ViewBindingBaseActivity<ActivityProd
                 mViewBinding.tvStoreInfo.setMaxLines(2);
                 mViewBinding.tvOpen.setVisibility(View.VISIBLE);
                 mViewBinding.tvOpen.setText("展开");
-            }
+            }*/
         } else if (view == mViewBinding.ivGoBack || view == mViewBinding.ivGoBack1) {
             finish();
         } else if (view == mViewBinding.ivShareProduct) {
@@ -768,22 +770,7 @@ public class ProductDetailsActivity extends ViewBindingBaseActivity<ActivityProd
         } else if (view == mViewBinding.llPyqShare) {
             shareType = "2";
             productDetailsViewModel.getProductShare(this, product_id, shareType);
-        } else if (view == mViewBinding.ivCollect) {
-            if (LoginUtils.isLogin(context)) {
-                if (isRelation) {
-                    RelationRequest request = new RelationRequest();
-                    request.setType("1");
-                    request.setType_id(productDetailsData.getProduct_id());
-                    productDetailsViewModel.getRelationDelete(request);
-                } else {
-                    //收藏
-                    RelationRequest request = new RelationRequest();
-                    request.setType("1");
-                    request.setType_id(productDetailsData.getProduct_id());
-                    productDetailsViewModel.getRelation(request);
-                }
-            }
-        } else if (view == mViewBinding.ivCollect1) {
+        } else if (view == mViewBinding.tvCollect || view == mViewBinding.tvCollect1) {
             if (LoginUtils.isLogin(context)) {
                 if (isRelation) {
                     RelationRequest request = new RelationRequest();

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

@@ -44,9 +44,7 @@ public class CustomDialog {
      */
     public static void defaultDialog(Context context, int title, String content, int leftText, int rightText, final TwoButtonsListener twoButtonsListener) {
         LDialog dialog = LDialog.newInstance(context, R.layout.dialog_confirm);
-        dialog.setMaskValue(0.5f).setText(R.id.confirm_title, title).setText(R.id.confirm_content, content)
-                .setText(R.id.confirm_negative, leftText).setText(R.id.confirm_positive, rightText)
-                .setOnClickListener(new LDialog.DialogOnClickListener() {
+        dialog.setMaskValue(0.5f).setText(R.id.confirm_title, title).setText(R.id.confirm_content, content).setText(R.id.confirm_negative, leftText).setText(R.id.confirm_positive, rightText).setOnClickListener(new LDialog.DialogOnClickListener() {
                     @Override
                     public void onClick(View v, LDialog lDialog) {
                         lDialog.dismiss();
@@ -64,9 +62,7 @@ public class CustomDialog {
 
     public static LDialog defaultDialog2(Context context, int title, String content, int leftText, int rightText, final TwoButtonsListener twoButtonsListener) {
         LDialog dialog = LDialog.newInstance(context, R.layout.dialog_confirm);
-        dialog.setMaskValue(0.5f).setText(R.id.confirm_title, title).setText(R.id.confirm_content, content)
-                .setText(R.id.confirm_negative, leftText).setText(R.id.confirm_positive, rightText)
-                .setOnClickListener(new LDialog.DialogOnClickListener() {
+        dialog.setMaskValue(0.5f).setText(R.id.confirm_title, title).setText(R.id.confirm_content, content).setText(R.id.confirm_negative, leftText).setText(R.id.confirm_positive, rightText).setOnClickListener(new LDialog.DialogOnClickListener() {
                     @Override
                     public void onClick(View v, LDialog lDialog) {
                         twoButtonsListener.leftButton();
@@ -95,26 +91,18 @@ public class CustomDialog {
      * @param rightTextColor     右边文字颜色
      * @param twoButtonsListener 点击回调
      */
-    public static void defaultDialog(Context context, int title, String content, int leftText, int rightText,
-                                     int leftTextColor, int rightTextColor, final
-                                     TwoButtonsListener twoButtonsListener) {
+    public static void defaultDialog(Context context, int title, String content, int leftText, int rightText, int leftTextColor, int rightTextColor, final TwoButtonsListener twoButtonsListener) {
         LDialog dialog = LDialog.newInstance(context, R.layout.dialog_confirm);
         if (StringsUtil.isEmpty(context.getString(title))) {
             dialog.setGone(R.id.confirm_title, false);
         }
-        dialog.setMaskValue(0.5f).setText(R.id.confirm_title, title).setText(R.id.confirm_content, content)
-                .setText(R.id.confirm_negative, leftText)
-                .setTextColor(R.id.confirm_negative, ContextCompat.getColor(context, leftTextColor))
-                .setText(R.id.confirm_positive, rightText)
-                .setTextColor(R.id.confirm_positive, ContextCompat.getColor(context, rightTextColor))
-                .setCancelBtn(R.id.confirm_negative)
-                .setOnClickListener(new LDialog.DialogOnClickListener() {
-                    @Override
-                    public void onClick(View v, LDialog lDialog) {
-                        twoButtonsListener.rightButton();
-                        lDialog.dismiss();
-                    }
-                }, R.id.confirm_positive).show();
+        dialog.setMaskValue(0.5f).setText(R.id.confirm_title, title).setText(R.id.confirm_content, content).setText(R.id.confirm_negative, leftText).setTextColor(R.id.confirm_negative, ContextCompat.getColor(context, leftTextColor)).setText(R.id.confirm_positive, rightText).setTextColor(R.id.confirm_positive, ContextCompat.getColor(context, rightTextColor)).setCancelBtn(R.id.confirm_negative).setOnClickListener(new LDialog.DialogOnClickListener() {
+            @Override
+            public void onClick(View v, LDialog lDialog) {
+                twoButtonsListener.rightButton();
+                lDialog.dismiss();
+            }
+        }, R.id.confirm_positive).show();
     }
 
     /**
@@ -147,19 +135,16 @@ public class CustomDialog {
      * @param forcedUpdate       是否强制更新，0否1是
      * @param twoButtonsListener 回调
      */
-    public static void versionUpdating(Context context, String content, String forcedUpdate, final
-    TwoButtonsListener twoButtonsListener) {
+    public static void versionUpdating(Context context, String content, String forcedUpdate, final TwoButtonsListener twoButtonsListener) {
         LDialog dialog = LDialog.newInstance(context, R.layout.dialog_updating);
-        dialog.setMaskValue(0.5f).setText(R.id.confirm_content, content)
-                .setOnClickListener((v, lDialog) -> {
-                    lDialog.dismiss();
-                }, R.id.confirm_negative);
-        dialog.getView(R.id.confirm_positive).setOnClickListener(
-                v -> {
-                    dialog.dismiss();
-                    twoButtonsListener.rightButton();
-                    Toast.makeText(context, "正在下载。。。", Toast.LENGTH_SHORT).show();
-                });
+        dialog.setMaskValue(0.5f).setText(R.id.confirm_content, content).setOnClickListener((v, lDialog) -> {
+            lDialog.dismiss();
+        }, R.id.confirm_negative);
+        dialog.getView(R.id.confirm_positive).setOnClickListener(v -> {
+            dialog.dismiss();
+            twoButtonsListener.rightButton();
+            Toast.makeText(context, "正在下载。。。", Toast.LENGTH_SHORT).show();
+        });
         if ("1".equals(forcedUpdate)) {
             dialog.setGone(R.id.confirm_negative, false);
             dialog.setCancelable(false);
@@ -215,29 +200,28 @@ public class CustomDialog {
      */
     public static void BottomShareCopyDialog(Context context, ShareButtonsListener shareButtonsListener) {
         LDialog dialog = LDialog.newInstance(context, R.layout.share_copy_dialog);
-        dialog.setMaskValue(0.5f).setGravity(Gravity.BOTTOM).setCancelBtn(R.id.tv_cancel)
-                .setOnClickListener(new LDialog.DialogOnClickListener() {
-                    @Override
-                    public void onClick(View v, LDialog lDialog) {
-                        //微信
-                        shareButtonsListener.weChatButton();
-                        lDialog.dismiss();
-                    }
-                }, R.id.ll_wechat).setOnClickListener(new LDialog.DialogOnClickListener() {
-                    @Override
-                    public void onClick(View v, LDialog lDialog) {
-                        //朋友圈
-                        shareButtonsListener.circleFriendsButton();
-                        lDialog.dismiss();
-                    }
-                }, R.id.ll_circlefriends).setOnClickListener(new LDialog.DialogOnClickListener() {
-                    @Override
-                    public void onClick(View v, LDialog lDialog) {
-                        //复制链接
-                        shareButtonsListener.copylink();
-                        lDialog.dismiss();
-                    }
-                }, R.id.ll_copylink).show();
+        dialog.setMaskValue(0.5f).setGravity(Gravity.BOTTOM).setCancelBtn(R.id.tv_cancel).setOnClickListener(new LDialog.DialogOnClickListener() {
+            @Override
+            public void onClick(View v, LDialog lDialog) {
+                //微信
+                shareButtonsListener.weChatButton();
+                lDialog.dismiss();
+            }
+        }, R.id.ll_wechat).setOnClickListener(new LDialog.DialogOnClickListener() {
+            @Override
+            public void onClick(View v, LDialog lDialog) {
+                //朋友圈
+                shareButtonsListener.circleFriendsButton();
+                lDialog.dismiss();
+            }
+        }, R.id.ll_circlefriends).setOnClickListener(new LDialog.DialogOnClickListener() {
+            @Override
+            public void onClick(View v, LDialog lDialog) {
+                //复制链接
+                shareButtonsListener.copylink();
+                lDialog.dismiss();
+            }
+        }, R.id.ll_copylink).show();
     }
 
     /**
@@ -481,8 +465,7 @@ public class CustomDialog {
         LDialog dialog = LDialog.newInstance(context, R.layout.dialog_signin_succeed);
         TextView tvScore = dialog.getView(R.id.tv_score);
         tvScore.setText("恭喜获得积分 +" + score);
-        dialog.setMaskValue(0.5f).setGravity(Gravity.CENTER).setCancelBtn(R.id.iv_sign_in_close)
-                .setCancelBtn(R.id.tv_sign_in_close).show();
+        dialog.setMaskValue(0.5f).setGravity(Gravity.CENTER).setCancelBtn(R.id.iv_sign_in_close).setCancelBtn(R.id.tv_sign_in_close).show();
     }
 //    dialog_enter_the_invitation_code
 
@@ -507,12 +490,7 @@ public class CustomDialog {
             lDialog.setText(R.id.tv_title, title);
         }
         EditText etInvitationCode = lDialog.getView(R.id.et_invitationcode);
-        lDialog.setMaskValue(0.5f)
-                .setGravity(Gravity.CENTER)
-                .setCancelBtn(R.id.confirm_negative)
-                .setOnClickListener((v, lDialog1) -> oneInputButtonsListener
-                        .clickButton(etInvitationCode.getText().toString()), R.id.confirm_positive)
-                .show();
+        lDialog.setMaskValue(0.5f).setGravity(Gravity.CENTER).setCancelBtn(R.id.confirm_negative).setOnClickListener((v, lDialog1) -> oneInputButtonsListener.clickButton(etInvitationCode.getText().toString()), R.id.confirm_positive).show();
     }
 
     /**
@@ -533,12 +511,9 @@ public class CustomDialog {
     public static void showCanclePayDialog(Context context, OneButtonsListener oneButtonsListener) {
         LDialog lDialog = LDialog.newInstance(context, R.layout.dialog_cancle_pay);
         //确认离开
-        lDialog.getView(R.id.bt_likai).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                oneButtonsListener.clickButton();
-                lDialog.cancel();
-            }
+        lDialog.getView(R.id.bt_likai).setOnClickListener(view -> {
+            oneButtonsListener.clickButton();
+            lDialog.cancel();
         });
         //继续支付
         lDialog.getView(R.id.bt_continue).setOnClickListener(new View.OnClickListener() {
@@ -560,9 +535,7 @@ public class CustomDialog {
      * @param leftBtn            取消按钮
      * @param rightBtn           类似确认按钮
      */
-    public static void showConfirmDialog(Context context, String title,
-                                         String content, String leftBtn, String rightBtn,
-                                         OneButtonsListener oneButtonsListener) {
+    public static void showConfirmDialog(Context context, String title, String content, String leftBtn, String rightBtn, OneButtonsListener oneButtonsListener) {
         LDialog lDialog = LDialog.newInstance(context, R.layout.dialog_confirm);
         if (EmptyCheckUtils.isEmpty(title)) {
             lDialog.setGone(R.id.confirm_title, true);
@@ -596,24 +569,15 @@ public class CustomDialog {
         LDialog lDialog = LDialog.newInstance(context, R.layout.dialog_invite_friends);
         RoundCornerImageView pic = lDialog.getView(R.id.card_image);
         GlideUtils.loadImage(context, picUrl, pic);
-        lDialog.setMaskValue(0.5f).setGravity(Gravity.CENTER).setOnClickListener(new LDialog.DialogOnClickListener() {
-            @Override
-            public void onClick(View v, LDialog lDialog) {
-                threeInputButtonsListener.leftButton();
-                lDialog.dismiss();
-            }
-        }, R.id.ll_wx).setOnClickListener(new LDialog.DialogOnClickListener() {
-            @Override
-            public void onClick(View v, LDialog lDialog) {
-                threeInputButtonsListener.middle();
-                lDialog.dismiss();
-            }
-        }, R.id.ll_pyq).setOnClickListener(new LDialog.DialogOnClickListener() {
-            @Override
-            public void onClick(View v, LDialog lDialog) {
-                threeInputButtonsListener.rightButton();
-                lDialog.dismiss();
-            }
+        lDialog.setMaskValue(0.5f).setGravity(Gravity.CENTER).setOnClickListener((v, lDialog1) -> {
+            threeInputButtonsListener.leftButton();
+            lDialog1.dismiss();
+        }, R.id.ll_wx).setOnClickListener((v, lDialog12) -> {
+            threeInputButtonsListener.middle();
+            lDialog12.dismiss();
+        }, R.id.ll_pyq).setOnClickListener((v, lDialog13) -> {
+            threeInputButtonsListener.rightButton();
+            lDialog13.dismiss();
         }, R.id.ll_bctu).show();
     }
 
@@ -664,4 +628,13 @@ public class CustomDialog {
         });
         lDialog.show();
     }
+
+    /**
+     * 绿积分使用说明
+     */
+    public static void getGreenIntegralDialog(Context context) {
+        LDialog lDialog = LDialog.newInstance(context, R.layout.green_integral_use_info);
+        lDialog.getView(R.id.tv_dialog_iknow).setOnClickListener(v -> lDialog.dismiss());
+        lDialog.show();
+    }
 }

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <gradient
+        android:startColor="#FDF8ED"
+        android:type="linear"
+
+        android:endColor="#FEE8E7"
+        />
+</shape>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <corners android:radius="8dp"/>
+    <solid android:color="#ffe2e3"/>
+</shape>

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

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

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

@@ -68,10 +68,11 @@
                 </LinearLayout>
 
                 <View
+                    android:id="@+id/view_line_state_goods"
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
                     android:layout_marginTop="16dp"
-                    android:background="@color/gray_e5e5e5"></View>
+                    android:background="@color/gray_e5e5e5"/>
 
                 <LinearLayout
                     android:id="@+id/ll_state_of_goods"
@@ -121,7 +122,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
                     android:layout_marginTop="16dp"
-                    android:background="@color/gray_e5e5e5"></View>
+                    android:background="@color/gray_e5e5e5"/>
 
                 <LinearLayout
                     android:id="@+id/ll_a_refund_reason"
@@ -131,6 +132,7 @@
                     android:orientation="horizontal">
 
                     <com.yihucha.hbyhc.view.BoldText
+                        android:id="@+id/tv_name_reason"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/a_refund_reason"
@@ -173,57 +175,120 @@
                     android:background="@color/gray_e5e5e5"></View>
 
                 <LinearLayout
+                    android:id="@+id/ll_after_sale_money"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:orientation="horizontal">
+                    android:orientation="vertical">
 
-                    <com.yihucha.hbyhc.view.BoldText
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/refund_amount"
-                        android:textColor="@color/black_333333"
-                        android:textSize="15sp" />
+                        android:layout_marginTop="16dp"
+                        android:orientation="horizontal">
+
+                        <com.yihucha.hbyhc.view.BoldText
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/refund_amount"
+                            android:textColor="@color/black_333333"
+                            android:textSize="15sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="5.5dp"
+                            android:text="*"
+                            android:textColor="@color/red_fe0032"
+                            android:textSize="16sp" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <com.yihucha.hbyhc.view.BoldText
+                            android:id="@+id/btv_jifen"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="¥"
+                            android:textColor="@color/red_fe0032"
+                            android:textSize="14.5sp" />
+
+                        <com.yihucha.hbyhc.view.BoldText
+                            android:id="@+id/btv_money"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="999.00"
+                            android:textColor="@color/red_fe0032"
+                            android:textSize="19sp" />
+                    </LinearLayout>
 
                     <TextView
+                        android:id="@+id/tv_money_postage"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="5.5dp"
-                        android:text="*"
-                        android:textColor="@color/red_fe0032"
-                        android:textSize="16sp" />
+                        android:layout_marginTop="6dp"
+                        android:text="xxxx"
+                        android:textColor="@color/gray_999999"
+                        android:textSize="13sp" />
                 </LinearLayout>
 
-                <LinearLayout
+                <RelativeLayout
+                    android:id="@+id/ll_after_sale_address"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:layout_marginTop="16dp"
+                    android:visibility="gone"
+                    >
 
                     <com.yihucha.hbyhc.view.BoldText
-                        android:id="@+id/btv_jifen"
+                        android:id="@+id/tv_address_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="¥"
-                        android:textColor="@color/red_fe0032"
-                        android:textSize="14.5sp" />
+                        android:layout_alignTop="@+id/tv_address"
+                        android:layout_alignBottom="@+id/tv_user_info"
+                        android:gravity="center"
+                        android:text="收货地址"
+                        android:textColor="@color/black_333333"
+                        android:textSize="15sp" />
 
-                    <com.yihucha.hbyhc.view.BoldText
-                        android:id="@+id/btv_money"
+                    <TextView
+                        android:id="@+id/tv_address"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginRight="10dp"
+                        android:layout_toLeftOf="@+id/imgv_address_jiantou"
+                        android:layout_toRightOf="@+id/tv_address_title"
+                        android:gravity="right"
+                        android:text="北京市通州区经开壹中心14号楼9层北京市通州区经开壹中心14号楼9层"
+                        android:textColor="@color/black_333333"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/tv_user_info"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="999.00"
-                        android:textColor="@color/red_fe0032"
-                        android:textSize="19sp" />
-                </LinearLayout>
+                        android:layout_below="@+id/tv_address"
+                        android:layout_alignRight="@+id/tv_address"
+                        android:layout_marginTop="5dp"
+                        android:text="郭郭\t188****3833"
+                        android:textColor="@color/gray_999999"
+                        android:textSize="14sp" />
 
-                <TextView
-                    android:id="@+id/tv_money_postage"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="6dp"
-                    android:text="xxxx"
-                    android:textColor="@color/gray_999999"
-                    android:textSize="13sp" />
+                    <ImageView
+                        android:id="@+id/imgv_address_jiantou"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignTop="@+id/tv_address"
+                        android:layout_alignBottom="@+id/tv_user_info"
+                        android:layout_alignParentRight="true"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="8dp"
+                        android:scaleType="centerInside"
+                        android:src="@mipmap/goin_220619" />
+                </RelativeLayout>
             </LinearLayout>
 
             <LinearLayout

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

@@ -117,9 +117,10 @@
             </LinearLayout>
         </LinearLayout>
         <LinearLayout
+            android:id="@+id/ll_exchange_products"
             android:layout_marginTop="20dp"
             android:layout_width="match_parent"
-            android:visibility="gone"
+            android:visibility="visible"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="horizontal">

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

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white_f8f8f8"
+    tools:context=".presentation.mine.MyTeamActivity">
+
+    <ImageView
+        android:id="@+id/imgv_team_bg"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:scaleType="fitXY"
+        android:src="@mipmap/bg_team_top"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_fans_count_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="28dp"
+        android:layout_marginTop="18dp"
+        android:text="粉丝总数"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        app:layout_constraintLeft_toLeftOf="@+id/imgv_team_bg"
+        app:layout_constraintTop_toTopOf="@+id/imgv_team_bg" />
+
+    <com.yihucha.hbyhc.view.BoldText
+        android:id="@+id/tv_fans_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:text="5776"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_fans_count_title"
+        app:layout_constraintTop_toBottomOf="@+id/tv_fans_count_title" />
+
+    <LinearLayout
+        android:id="@+id/ll_team_invitate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="28dp"
+        android:background="@drawable/shape_white_15dp"
+        android:orientation="horizontal"
+        android:paddingLeft="11dp"
+        android:paddingTop="8dp"
+        android:paddingRight="11dp"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_fans_count"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_fans_count_title">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:src="@mipmap/icon_team_invitate" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:text="邀请好友"
+            android:textColor="@color/red_fe0032"
+            android:textSize="13sp" />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/view_bg_bottom"
+        android:layout_width="0dp"
+        android:layout_height="60dp"
+        android:layout_marginBottom="32dp"
+        android:alpha="0.3"
+        android:background="@drawable/shape_ffe2e3_8dp"
+        app:layout_constraintBottom_toBottomOf="@+id/imgv_team_bg"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_fans_count_title"
+        app:layout_constraintRight_toRightOf="@+id/ll_team_invitate" />
+
+    <TextView
+        android:id="@+id/tv_fans_zhishu_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="直属粉丝"
+        android:textColor="@color/white"
+        android:textSize="13sp"
+        app:layout_constraintLeft_toLeftOf="@+id/view_bg_bottom"
+        app:layout_constraintRight_toLeftOf="@+id/tv_fans_youxiao_title"
+        app:layout_constraintTop_toTopOf="@+id/view_bg_bottom" />
+
+    <TextView
+        android:id="@+id/tv_fans_youxiao_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="有效粉丝"
+        android:textColor="@color/white"
+        android:textSize="13sp"
+        app:layout_constraintLeft_toRightOf="@+id/tv_fans_zhishu_title"
+        app:layout_constraintRight_toRightOf="@+id/view_bg_bottom"
+        app:layout_constraintTop_toTopOf="@+id/tv_fans_zhishu_title" />
+
+    <TextView
+        android:id="@+id/tv_fans_zhishu"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:text="3432"
+        android:textColor="@color/white"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="@+id/view_bg_bottom"
+        app:layout_constraintLeft_toLeftOf="@+id/view_bg_bottom"
+        app:layout_constraintRight_toLeftOf="@+id/tv_fans_youxiao" />
+
+    <TextView
+        android:id="@+id/tv_fans_youxiao"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="2344"
+        android:textColor="@color/white"
+        android:textSize="13sp"
+        app:layout_constraintLeft_toRightOf="@+id/tv_fans_zhishu"
+        app:layout_constraintRight_toRightOf="@+id/view_bg_bottom"
+        app:layout_constraintTop_toTopOf="@+id/tv_fans_zhishu" />
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="27dp"
+        android:background="@color/white"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_fans_zhishu"
+        app:layout_constraintLeft_toLeftOf="@+id/view_bg_bottom"
+        app:layout_constraintRight_toRightOf="@+id/view_bg_bottom"
+        app:layout_constraintTop_toTopOf="@+id/tv_fans_zhishu_title" />
+
+    <TextView
+        android:id="@+id/tv_team_list_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:background="@color/white"
+        android:paddingLeft="10dp"
+        android:paddingTop="18dp"
+        android:paddingBottom="5dp"
+        android:text="团队列表"
+        android:textColor="@color/black_333333"
+        android:textSize="15sp"
+        app:layout_constraintTop_toBottomOf="@+id/imgv_team_bg" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_team_list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_team_list_title" />
+
+    <include
+        android:id="@+id/ll_no_search"
+        layout="@layout/search_not_found"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@id/rv_team_list" />
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -108,6 +108,7 @@
             android:gravity="center_vertical"
             android:layout_marginRight="13dp"
             android:layout_marginLeft="13dp"
+            android:visibility="gone"
             android:orientation="horizontal">
 
             <ImageView

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

@@ -227,15 +227,13 @@
                         </LinearLayout>
                     </LinearLayout>
 
-                    <LinearLayout
+                    <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="13dp"
                         android:background="@drawable/shape_ffffff_5dp"
-                        android:orientation="vertical"
                         android:paddingLeft="16dp"
                         android:paddingTop="12dp"
-
                         android:paddingRight="16dp"
                         android:paddingBottom="16dp">
 
@@ -310,7 +308,7 @@
                             android:id="@+id/ll_yanglaojin"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-
+                            android:layout_below="@+id/ll_top_price"
                             android:background="@drawable/shape_line_fe0032_2dp"
                             android:gravity="center_vertical"
                             android:orientation="horizontal">
@@ -333,10 +331,14 @@
                         </LinearLayout>
 
                         <RelativeLayout
-                            android:layout_width="wrap_content"
+                            android:id="@+id/ll_product_name"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="3dp"
-                            android:orientation="horizontal">
+                            android:orientation="horizontal"
+                            android:layout_below="@+id/ll_yanglaojin"
+                            android:layout_toLeftOf="@+id/tv_collect1"
+                            >
 
                             <TextView
                                 android:id="@+id/tv_store_name"
@@ -365,9 +367,12 @@
 
                         <RelativeLayout
                             android:id="@+id/ll_store_info"
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp">
+                            android:layout_below="@+id/ll_product_name"
+                            android:layout_marginTop="5dp"
+                            android:layout_toLeftOf="@+id/tv_collect1"
+                            >
 
                             <TextView
                                 android:id="@+id/tv_store_info"
@@ -376,6 +381,7 @@
                                 android:ellipsize="end"
                                 android:padding="4dp"
                                 android:text="这是商品规格"
+                                android:maxLines="2"
                                 android:textColor="@color/gray_999999"
                                 android:textSize="12sp" />
 
@@ -391,7 +397,7 @@
                                 android:text="展开"
                                 android:textSize="12sp"
                                 android:textColor="@color/red_fe0032"
-                                android:visibility="visible"
+                                android:visibility="gone"
                                 android:background="@color/white"
                                 />
                         </RelativeLayout>
@@ -401,6 +407,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="11dp"
                             android:gravity="center_vertical"
+                            android:layout_below="@+id/ll_store_info"
                             android:orientation="horizontal">
 
                             <TextView
@@ -457,7 +464,40 @@
                                     android:textSize="12sp" />
                             </LinearLayout>
                         </LinearLayout>
-                    </LinearLayout>
+
+                        <TextView
+                            android:id="@+id/tv_collect"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="收藏"
+                            android:drawableTop="@mipmap/wjx_unselect"
+                            android:drawablePadding="5dp"
+                            android:gravity="center"
+                            android:layout_alignParentRight="true"
+                            android:layout_alignTop="@+id/ll_top_price"
+                            android:layout_alignBottom="@+id/ll_yanglaojin"
+                            android:layout_marginTop="8dp"
+                            android:layout_marginBottom="8dp"
+                            android:textSize="10sp"
+                            android:textColor="@color/black_333333"
+                            />
+                        <TextView
+                            android:id="@+id/tv_collect1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="收藏"
+                            android:drawableTop="@mipmap/wjx_unselect"
+                            android:drawablePadding="5dp"
+                            android:gravity="center"
+                            android:layout_alignParentRight="true"
+                            android:layout_alignTop="@+id/ll_product_name"
+                            android:layout_marginTop="8dp"
+                            android:layout_marginBottom="8dp"
+                            android:textSize="10sp"
+                            android:textColor="@color/black_333333"
+                            android:visibility="gone"
+                            />
+                    </RelativeLayout>
 
                     <com.yihucha.hbyhc.view.RoundCornerImageView
                         android:id="@+id/card_image"
@@ -874,17 +914,6 @@
                 android:paddingBottom="16dp"
                 android:visibility="invisible"
                 android:src="@mipmap/share_product" />
-
-            <ImageView
-                android:id="@+id/iv_collect"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="4dp"
-                android:paddingTop="16dp"
-                android:paddingRight="16dp"
-                android:paddingBottom="16dp"
-                android:layout_gravity="center_vertical"
-                android:src="@mipmap/wjx_unselect" />
         </LinearLayout>
     </LinearLayout>
     <!--站位-->
@@ -916,7 +945,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
-                    android:src="@mipmap/product_return_220619" />
+                    android:src="@mipmap/icon_title_back" />
             </LinearLayout>
 
             <TextView
@@ -934,17 +963,18 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="end"
+                android:visibility="invisible"
                 android:orientation="horizontal">
 
                 <ImageView
-                    android:id="@+id/iv_collect1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingLeft="4dp"
                     android:paddingTop="16dp"
                     android:paddingRight="16dp"
                     android:paddingBottom="16dp"
-                    android:src="@mipmap/product_collect_220619" />
+                    android:src="@mipmap/wjx_select"
+                    />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="@color/white_f8f8f8"
     android:orientation="vertical"
-    tools:context="com.yihucha.hbyhc.presentation.mine.MineFragment">
+    tools:context=".presentation.mine.MineFragment">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -16,73 +16,64 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <com.yihucha.hbyhc.view.BoldText
-                android:id="@+id/tv_title"
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:gravity="center"
-                android:text=""
-                android:textColor="@color/white"
-                android:background="@mipmap/mine_bg_220620"
-                android:textSize="18sp"
-                android:paddingBottom="16dp"
-                android:visibility="visible"
-                />
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-                <ImageView
+
+                <View
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@mipmap/mine_bg_220620"
+                    android:layout_height="210dp"
+                    android:background="@drawable/shape_bg_mine_top"
                     app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    />
+                    app:layout_constraintTop_toTopOf="parent" />
+
                 <ImageView
                     android:id="@+id/iv_avatar"
                     android:layout_width="51dp"
                     android:layout_height="51dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginTop="46dp"
                     android:src="@mipmap/default_head"
                     app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginTop="16dp"
-                    />
+                    app:layout_constraintTop_toTopOf="parent" />
+
                 <TextView
                     android:id="@+id/tv_nickname"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
                     android:ellipsize="end"
                     android:maxEms="7"
                     android:singleLine="true"
-                    android:text=""
-                    android:textColor="@color/white"
+                    android:text="清风徐来"
+                    android:textColor="@color/black_333333"
                     android:textSize="15sp"
-                    android:layout_marginLeft="5dp"
                     app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
-                    app:layout_constraintTop_toTopOf="@+id/iv_avatar"
-                    />
+                    app:layout_constraintTop_toTopOf="@+id/iv_avatar" />
+
                 <TextView
                     android:id="@+id/tv_phone"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text=""
-                    android:textColor="@color/white"
-                    android:textSize="15sp"
-                    android:layout_marginLeft="5dp"
-                    app:layout_constraintLeft_toRightOf="@+id/tv_nickname"
-                    app:layout_constraintTop_toTopOf="@+id/tv_nickname"
                     android:layout_alignBottom="@+id/tv_nickname"
+                    android:layout_marginLeft="5dp"
                     android:gravity="center_vertical"
-                    />
+                    android:text="13341145656"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp"
+                    app:layout_constraintLeft_toRightOf="@+id/tv_nickname"
+                    app:layout_constraintTop_toTopOf="@+id/tv_nickname" />
 
                 <LinearLayout
+                    android:id="@+id/layout_member"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
+                    android:orientation="horizontal"
                     app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
-                    app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
-                    android:orientation="horizontal">
+                    app:layout_constraintLeft_toRightOf="@+id/iv_avatar">
+
                     <ImageView
                         android:id="@+id/iv_member_member"
                         android:layout_width="wrap_content"
@@ -96,189 +87,74 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="3dp"
                         android:visibility="gone" />
+
                     <ImageView
                         android:id="@+id/iv_member_lhcsr"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:visibility="gone"
-                        />
+                        android:visibility="gone" />
                 </LinearLayout>
 
-                <androidx.constraintlayout.widget.ConstraintLayout
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="180dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="45dp"
+                    android:orientation="horizontal"
                     android:layout_marginLeft="16dp"
-                    android:layout_marginTop="30dp"
                     android:layout_marginRight="16dp"
-                    android:background="@drawable/shape_ffffff_8dp"
-                    android:paddingLeft="40dp"
-                    android:paddingTop="20dp"
-                    android:paddingRight="40dp"
-                    android:paddingBottom="20dp"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/iv_avatar"
-                    >
+                    android:background="@drawable/shape_white_8dp"
+                    android:paddingTop="13dp"
+                    android:paddingBottom="13dp"
+                    app:layout_constraintTop_toBottomOf="@+id/layout_member">
 
                     <TextView
-                        android:id="@+id/tv_name_annuity"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/yanglaojin"
-                        android:textColor="@color/black_333333"
-                        android:textSize="13sp"
-                        app:layout_constraintHorizontal_weight="3"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintRight_toLeftOf="@+id/tv_name_commission"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <com.yihucha.hbyhc.view.BoldText
-                        android:id="@+id/tv_annuity"
-                        android:layout_width="0dp"
+                        android:id="@+id/tv_mine_yj"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
-                        android:text="0"
-                        android:maxLines="1"
-                        android:maxLength="7"
-                        android:ellipsize="end"
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/icon_mine_yj"
+                        android:drawablePadding="8dp"
+                        android:gravity="center"
+                        android:text="我的佣金"
                         android:textColor="@color/black_333333"
-                        android:textSize="18sp"
-                        app:layout_constraintHorizontal_weight="3"
-                        app:layout_constraintLeft_toLeftOf="@+id/tv_name_annuity"
-                        app:layout_constraintRight_toLeftOf="@+id/tv_my_commission"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_name_annuity" />
+                        android:textSize="12sp" />
 
                     <TextView
-                        android:id="@+id/tv_name_commission"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/my_commission"
-                        android:textColor="@color/black_333333"
-                        android:textSize="13sp"
-                        android:paddingLeft="25dp"
-                        app:layout_constraintHorizontal_weight="2"
-                        app:layout_constraintLeft_toRightOf="@+id/tv_name_annuity"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/tv_name_annuity" />
-
-                    <com.yihucha.hbyhc.view.BoldText
-                        android:id="@+id/tv_my_commission"
-                        android:layout_width="0dp"
+                        android:id="@+id/tv_mine_ljf"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:maxLines="1"
-                        android:maxLength="7"
-                        android:paddingLeft="25dp"
-                        android:text="0"
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/icon_mine_lvf"
+                        android:drawablePadding="8dp"
+                        android:gravity="center"
+                        android:text="我的绿积分"
                         android:textColor="@color/black_333333"
-                        android:textSize="18sp"
-                        app:layout_constraintHorizontal_weight="2"
-                        app:layout_constraintLeft_toRightOf="@+id/tv_annuity"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/tv_annuity" />
+                        android:textSize="12sp" />
 
                     <TextView
-                        android:id="@+id/tv_name_integral"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="50dp"
-                        android:text="@string/my_integral"
-                        android:textColor="@color/black_333333"
-                        android:textSize="13sp"
-                        app:layout_constraintHorizontal_weight="3"
-                        app:layout_constraintLeft_toLeftOf="@+id/tv_name_annuity"
-                        app:layout_constraintRight_toLeftOf="@+id/tv_name_redintegral"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_annuity" />
-                    <View
-                        android:layout_width="1.5dp"
-                        android:layout_height="20dp"
-                        android:background="@color/gray_e5e5e5"
-                        app:layout_constraintTop_toTopOf="@+id/tv_name_integral"
-                        app:layout_constraintBottom_toBottomOf="@+id/tv_my_integral"
-                        app:layout_constraintLeft_toRightOf="@+id/tv_name_integral"
-                        />
-                    <View
-                        android:layout_width="1.5dp"
-                        android:layout_height="20dp"
-                        android:background="@color/gray_e5e5e5"
-                        app:layout_constraintTop_toTopOf="@+id/tv_name_redintegral"
-                        app:layout_constraintBottom_toBottomOf="@+id/tv_red_integral"
-                        app:layout_constraintLeft_toRightOf="@+id/tv_name_redintegral"
-                        />
-                    <TextView
-                        android:id="@+id/tv_name_redintegral"
-                        android:layout_width="0dp"
+                        android:id="@+id/tv_mine_td"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/red_integral"
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/icon_mine_td"
+                        android:drawablePadding="8dp"
+                        android:gravity="center"
+                        android:text="我的团队"
                         android:textColor="@color/black_333333"
-                        android:textSize="13sp"
-                        android:layout_marginLeft="15dp"
-                        app:layout_constraintHorizontal_weight="3"
-                        app:layout_constraintLeft_toRightOf="@+id/tv_name_integral"
-                        app:layout_constraintRight_toLeftOf="@+id/tv_name_team_count"
-                        app:layout_constraintTop_toTopOf="@+id/tv_name_integral" />
+                        android:textSize="12sp" />
 
                     <TextView
-                        android:id="@+id/tv_name_team_count"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/team_count"
-                        android:textColor="@color/black_333333"
-                        android:textSize="13sp"
-                        android:layout_marginLeft="15dp"
-                        app:layout_constraintHorizontal_weight="2"
-                        app:layout_constraintLeft_toRightOf="@+id/tv_name_redintegral"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/tv_name_integral" />
-
-                    <com.yihucha.hbyhc.view.BoldText
-                        android:id="@+id/tv_my_integral"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
-                        android:text="0"
-                        android:textColor="@color/black_333333"
-                        android:textSize="15sp"
-                        android:maxLength="7"
-                        android:ellipsize="end"
-                        app:layout_constraintHorizontal_weight="3"
-                        app:layout_constraintLeft_toLeftOf="@+id/tv_name_annuity"
-                        app:layout_constraintRight_toLeftOf="@+id/tv_red_integral"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_name_integral" />
-
-                    <com.yihucha.hbyhc.view.BoldText
-                        android:id="@+id/tv_red_integral"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:text="0"
-                        android:textColor="@color/black_333333"
-                        android:textSize="15sp"
-                        android:layout_marginLeft="15dp"
-                        android:maxLines="1"
-                        android:maxLength="7"
-                        android:ellipsize="end"
-                        app:layout_constraintHorizontal_weight="3"
-                        app:layout_constraintLeft_toRightOf="@+id/tv_my_integral"
-                        app:layout_constraintRight_toLeftOf="@+id/tv_team_count"
-                        app:layout_constraintTop_toTopOf="@+id/tv_my_integral" />
-
-                    <com.yihucha.hbyhc.view.BoldText
-                        android:id="@+id/tv_team_count"
-                        android:layout_width="0dp"
+                        android:id="@+id/tv_mine_yq"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="15dp"
-                        android:text="0"
-                        android:maxLines="1"
-                        android:maxLength="7"
-                        android:ellipsize="end"
+                        android:layout_weight="1"
+                        android:drawableTop="@mipmap/icon_mine_yq"
+                        android:drawablePadding="8dp"
+                        android:gravity="center"
+                        android:text="分享邀请"
                         android:textColor="@color/black_333333"
-                        android:textSize="15sp"
-                        app:layout_constraintHorizontal_weight="2"
-                        app:layout_constraintLeft_toRightOf="@+id/tv_red_integral"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/tv_my_integral" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                        android:textSize="12sp" />
+                </LinearLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <LinearLayout
@@ -597,383 +473,198 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_marginTop="16dp"
+                    android:orientation="horizontal">
 
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:id="@+id/ll_address"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
-                        android:orientation="horizontal">
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
-                        <LinearLayout
-                            android:id="@+id/ll_my_invitation"
-                            android:layout_width="0dp"
+                        <ImageView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical">
+                            android:src="@mipmap/wodedizhi_220620" />
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@mipmap/wodeyaoqing_220620" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:text="@string/wodeyaoqing"
-                                android:textColor="@color/black_5f6060"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/ll_address"
-                            android:layout_width="0dp"
+                        <TextView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical">
+                            android:layout_marginTop="13dp"
+                            android:text="@string/wodedizhi"
+                            android:textColor="@color/black_5f6060"
+                            android:textSize="12sp" />
+                    </LinearLayout>
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@mipmap/wodedizhi_220620" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:text="@string/wodedizhi"
-                                android:textColor="@color/black_5f6060"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/ll_my_favorite"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical">
+                    <LinearLayout
+                        android:id="@+id/ll_my_favorite"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@mipmap/wodeshoucang_220620" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:text="@string/wodeshoucang"
-                                android:textColor="@color/black_5f6060"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/ll_wodeguanzhu"
-                            android:layout_width="0dp"
+                        <ImageView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical">
+                            android:src="@mipmap/wodeshoucang_220620" />
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@mipmap/wodeguanzhu_220620" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:text="@string/wodeguanzhu"
-                                android:textColor="@color/black_5f6060"
-                                android:textSize="12sp" />
-                        </LinearLayout>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="13dp"
+                            android:text="@string/wodeshoucang"
+                            android:textColor="@color/black_5f6060"
+                            android:textSize="12sp" />
                     </LinearLayout>
 
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:id="@+id/ll_wodepingjia"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
-                        android:orientation="horizontal">
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
-                        <LinearLayout
-                            android:id="@+id/ll_sanfangdingdan"
-                            android:layout_width="0dp"
+                        <ImageView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical">
+                            android:src="@mipmap/wodepingjia_220620" />
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@mipmap/sanfangdingdan_220620" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:text="@string/sanfangdingdan"
-                                android:textColor="@color/black_5f6060"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-
-
-
-                        <LinearLayout
-                            android:id="@+id/ll_wodepingjia"
-                            android:layout_width="0dp"
+                        <TextView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical">
+                            android:layout_marginTop="13dp"
+                            android:text="@string/wodepingjia"
+                            android:textColor="@color/black_5f6060"
+                            android:textSize="12sp" />
+                    </LinearLayout>
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@mipmap/wodepingjia_220620" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:text="@string/wodepingjia"
-                                android:textColor="@color/black_5f6060"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/ll_wodeerweima"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical">
+                    <LinearLayout
+                        android:id="@+id/ll_bangzhuzhongxin"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@mipmap/invite_friends_221023" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:text="@string/invite_friends"
-                                android:textColor="@color/black_5f6060"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-                        <LinearLayout
-                            android:id="@+id/ll_shangpuruzhu"
-                            android:layout_width="0dp"
+                        <ImageView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical">
+                            android:src="@mipmap/bangzhuzhongxin_220620" />
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@mipmap/dianpuruzhu_220620" />
-
-                            <TextView
-                                android:id="@+id/tv_dianpu"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:text="@string/shangpuruzhu"
-                                android:textColor="@color/black_5f6060"
-                                android:textSize="12sp" />
-                        </LinearLayout>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="13dp"
+                            android:text="@string/bangzhuzhongxin"
+                            android:textColor="@color/black_5f6060"
+                            android:textSize="12sp" />
                     </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:orientation="horizontal">
 
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:id="@+id/ll_connect_us"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
-                        android:orientation="horizontal">
-                        <LinearLayout
-                            android:id="@+id/ll_settingup"
-                            android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical">
+                            android:src="@mipmap/connect_us" />
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@mipmap/mine_setting_220620" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:text="@string/setting"
-                                android:textColor="@color/black_5f6060"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-                        <LinearLayout
-                            android:id="@+id/ll_bangfuzhongxin"
-                            android:layout_width="0dp"
+                        <TextView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:visibility="invisible"
-                            android:orientation="vertical">
+                            android:layout_marginTop="13dp"
+                            android:text="@string/connect_kefu"
+                            android:textColor="@color/black_5f6060"
+                            android:textSize="12sp" />
+                    </LinearLayout>
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@mipmap/bfzx3" />
+                    <LinearLayout
+                        android:id="@+id/ll_settingup"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:text="帮扶中心"
-                                android:textColor="@color/black_5f6060"
-                                android:textSize="12sp" />
-                        </LinearLayout>
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@mipmap/mine_setting_220620" />
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="13dp"
+                            android:text="@string/setting"
+                            android:textColor="@color/black_5f6060"
+                            android:textSize="12sp" />
+                    </LinearLayout>
 
 
-                        <LinearLayout
-                            android:id="@+id/ll_chuangfubao"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical"
-                            android:visibility="gone">
+                    <LinearLayout
+                        android:id="@+id/ll_wodeerweima_x"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:visibility="invisible">
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@mipmap/me_chuangfubao_logo_230331" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:text="创富宝"
-                                android:textColor="@color/black_5f6060"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/ll_account_service_fee"
-                            android:layout_width="0dp"
+                        <ImageView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical"
-                            android:visibility="invisible">
+                            android:src="@mipmap/invite_friends_221023" />
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@mipmap/zhanghaofuwufei_230411" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="13dp"
-                                android:text="账号服务费"
-                                android:textColor="@color/black_5f6060"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-                        <View
-                            android:layout_width="0dp"
+                        <TextView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            />
+                            android:layout_marginTop="13dp"
+                            android:text="@string/invite_friends"
+                            android:textColor="@color/black_5f6060"
+                            android:textSize="12sp" />
                     </LinearLayout>
-                </LinearLayout>
-            </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginTop="13dp"
-            android:layout_marginRight="16dp"
-            android:background="@drawable/shape_ffffff_8dp"
-            android:orientation="vertical"
-            android:paddingLeft="10dp"
-            android:paddingTop="16dp"
-            android:paddingRight="10dp"
-            android:paddingBottom="16dp">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/connect_us"
-                android:textColor="@color/black_333333"
-                android:textSize="15dp" />
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_marginTop="15dp"
-                >
-                <LinearLayout
-                    android:id="@+id/ll_connect_us"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical">
 
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/connect_us" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:id="@+id/ll_shangpuruzhu_x"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="13dp"
-                        android:text="@string/connect_kefu"
-                        android:textColor="@color/black_5f6060"
-                        android:textSize="12sp" />
-                </LinearLayout>
-                <LinearLayout
-                    android:id="@+id/ll_bangzhuzhongxin"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical">
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:visibility="invisible">
 
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/bangzhuzhongxin_220620" />
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@mipmap/dianpuruzhu_220620" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="13dp"
-                        android:text="@string/bangzhuzhongxin"
-                        android:textColor="@color/black_5f6060"
-                        android:textSize="12sp" />
+                        <TextView
+                            android:id="@+id/tv_dianpu_x"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="13dp"
+                            android:text="@string/shangpuruzhu"
+                            android:textColor="@color/black_5f6060"
+                            android:textSize="12sp" />
+                    </LinearLayout>
                 </LinearLayout>
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    />
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    />
             </LinearLayout>
 
         </LinearLayout>
-        </LinearLayout>
     </ScrollView>
 </LinearLayout>

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="315dp"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_white_8dp"
+    android:padding="20dp">
+
+    <TextView
+        android:id="@+id/tv_dialog_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="绿积分使用说明"
+        android:textColor="@color/black_333333"
+        android:textSize="19sp" />
+
+    <TextView
+        android:id="@+id/tv_dialog_second_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_dialog_title"
+        android:layout_marginTop="16dp"
+        android:text="使用条件"
+        android:textColor="@color/black_333333"
+        android:textSize="15sp" />
+
+    <TextView
+        android:id="@+id/tv_dialog_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_dialog_second_title"
+        android:layout_marginTop="10dp"
+        android:text="1.必须邀请2个用户在会员区下单，绿积分才可使用;\n
+2.绿积分数≥单笔订单金额，才可使用;\n
+3.绿积分不支持兑换低于当前身份的商品；\n
+4.绿积分只能整数兑换，不支持小数扣减；\n
+5、使用绿积分兑换没有养老金。"
+        android:textColor="@color/black_333333"
+        android:textSize="14sp" />
+
+    <TextView
+        android:id="@+id/tv_dialog_iknow"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_dialog_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginRight="16dp"
+        android:background="@drawable/shape_fe0032_50dp"
+        android:gravity="center"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:text="我知道了"
+        android:textColor="@color/white"
+        android:textSize="16sp" />
+</RelativeLayout>

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

@@ -116,27 +116,27 @@
                     android:layout_marginLeft="4dp"
                     android:src="@mipmap/order_other_entry_220624" />
             </LinearLayout>
+
             <LinearLayout
-                android:id="@+id/layout_yhq"
+                android:id="@+id/layout_yf"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="25dp"
                 android:orientation="horizontal">
 
                 <TextView
-
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="@string/discount_coupon"
+                    android:text="@string/freight"
                     android:textColor="@color/black_333333"
                     android:textSize="14sp" />
 
                 <TextView
-                    android:id="@+id/tv_yhq"
+                    android:id="@+id/tv_yf"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="暂无可用优惠券"
+                    android:text="￥0.00"
                     android:textColor="@color/gray_999999"
                     android:textSize="14sp" />
 
@@ -144,29 +144,59 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="4dp"
+                    android:visibility="invisible"
                     android:src="@mipmap/order_other_entry_220624" />
             </LinearLayout>
+            <LinearLayout
+                android:id="@+id/layout_sjj"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="25dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="随机减"
+                    android:textColor="@color/black_333333"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tv_sjj"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="￥0.00"
+                    android:textColor="@color/red_fe0032"
+                    android:textSize="14sp" />
 
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:src="@mipmap/order_other_entry_220624" />
+            </LinearLayout>
             <LinearLayout
-                android:id="@+id/layout_yf"
+                android:id="@+id/layout_yhq"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="25dp"
                 android:orientation="horizontal">
 
                 <TextView
+
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="@string/freight"
+                    android:text="@string/discount_coupon"
                     android:textColor="@color/black_333333"
                     android:textSize="14sp" />
 
                 <TextView
-                    android:id="@+id/tv_yf"
+                    android:id="@+id/tv_yhq"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/freight_free"
+                    android:text="无可用"
                     android:textColor="@color/gray_999999"
                     android:textSize="14sp" />
 
@@ -176,7 +206,49 @@
                     android:layout_marginLeft="4dp"
                     android:src="@mipmap/order_other_entry_220624" />
             </LinearLayout>
+            <LinearLayout
+                android:id="@+id/layout_hjf"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="25dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="红积分"
+                    android:textColor="@color/black_333333"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:id="@+id/imgv_wh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/icon_wh"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="6dp"
+                    android:padding="5dp"
+                    />
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1"
+                    />
+                <TextView
+                    android:id="@+id/tv_hjf"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="共18000个，本次扣除3000个"
+                    android:textColor="@color/gray_999999"
+                    android:textSize="14sp" />
 
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:src="@mipmap/icon_jh"
+                    android:layout_gravity="center_vertical"
+                    />
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"