2024-2-27 代码备份

佣金支出列表增加跳转订单详情逻辑
订单详情页面逻辑调整
添加银行卡及提现页面逻辑调整
我的页面UI微调

app/build.gradle

@@ -223,4 +223,6 @@ dependencies {
     //zxing 二维码扫描
     implementation 'com.journeyapps:zxing-android-embedded:3.5.0'
 
+    //toast 吐司通知框架
+    implementation 'com.github.getActivity:Toaster:12.6'
 }

app/src/main/java/com/yihucha/hbyhc/application/MyApplication.java

@@ -15,6 +15,7 @@ import com.blankj.utilcode.util.Utils;
 import com.bytedance.sdk.openadsdk.TTAdConfig;
 import com.bytedance.sdk.openadsdk.TTAdConstant;
 import com.bytedance.sdk.openadsdk.TTAdSdk;
+import com.hjq.toast.Toaster;
 import com.kepler.jd.Listener.AsyncInitListener;
 import com.kepler.jd.login.KeplerApiManager;
 import com.yihucha.hbyhc.callback.AgreeToADealListener;
@@ -119,7 +120,8 @@ public class MyApplication extends Application {
         MVUtils.getInstance();
         //初始化
         NetworkApi.init(new NetworkRequiredInfo(this));
-
+        //toast 框架
+        Toaster.init(this);
 
         context = getApplicationContext();
         //接收到分享以及登录的intent传递handleIntent方法，处理结果

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

@@ -100,6 +100,12 @@ public class Constants {
     public static final String PROTOCOL = "http://vod.bjtdba.com/agreement/";
     //佣金规则
     public static final String PROTOCOL_YHC_YONGJIN = "https://app.bjtdba.com/api/agreement?type=3";
+    //隐私协议
+    public static final String PROTOCOL_YHC_YINSI = "https://app.bjtdba.com/api/agreement?type=1";
+    //注册协议、服务协议
+    public static final String PROTOCOL_YHC_REGIST= "https://app.bjtdba.com/api/agreement?type=2";
+    //养老金规则
+    public static final String PROTOCOL_YHC_YANGLAOJIN= "https://app.bjtdba.com/api/agreement?type=5";
     /**
      *
      */

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

@@ -17,6 +17,7 @@ import com.yihucha.hbyhc.presentation.order.model.MailCommonBean;
 import com.yihucha.hbyhc.presentation.order.model.OrderCheckBean;
 import com.yihucha.hbyhc.presentation.order.model.OrderCreateBean;
 import com.yihucha.hbyhc.presentation.order.model.OrderCreateShoppingBean;
+import com.yihucha.hbyhc.presentation.order.model.OrderDetailBean;
 import com.yihucha.hbyhc.presentation.order.model.OrderListBean;
 import com.yihucha.hbyhc.presentation.order.model.OrderListObligationBean;
 import com.yihucha.hbyhc.presentation.order.model.RefundApplyBean;
@@ -122,6 +123,12 @@ public interface OrderService {
     Observable<DataResponse<OrderListBean>> getOrderlist(@QueryMap Map<String, Object> request);
 
     /**
+     * 订单详情
+     */
+    @GET("api/order/detail/{id}")
+    Observable<DataResponse<OrderListBean.ListBean>> getOrderDetail(@Path("id") String id);
+
+    /**
      * 订单列表-待付款
      *
      * @param

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/AnnuityFragment.kt

@@ -151,7 +151,7 @@ class AnnuityFragment : BaseFragment(), View.OnClickListener {
         } else if (view == mViewBinding.tvAnnuityRules) {
             WebViewTitleBaseActivity.launch(
                 activity, getString(R.string.pension_rules),
-                Constants.PROTOCOL + Constants.PENSION_ACCOUNT_RULES
+                Constants.PROTOCOL_YHC_YANGLAOJIN
             )
         }
     }

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

@@ -5,11 +5,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.TextView;
 
-import com.huantansheng.easyphotos.utils.String.StringUtils;
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.databinding.ItemMessageBinding;
+import com.yihucha.hbyhc.utils.HtmlUtils;
 import com.yihucha.hbyhc.presentation.message.model.TheAnnouncementBean;
 import com.yihucha.hbyhc.utils.StringsUtil;
 
@@ -63,7 +62,7 @@ public class ItemMessageAdapter extends BaseAdapter {
         if (!StringsUtil.isEmpty(getItem(position).getCreate_time())){
             time = getItem(position).getCreate_time().split(" ")[0];
         }
-        holder.binding.tvContent.setText(getItem(position).getContent());
+        holder.binding.tvContent.setText(HtmlUtils.html2Text(getItem(position).getContent()));
         holder.binding.tvTime.setText(time+"");
         holder.binding.tvTitle.setText(getItem(position).getTitle());
         return convertView;

app/src/main/java/com/yihucha/hbyhc/presentation/integral/NewRedIntegralActivity.java

@@ -17,6 +17,7 @@ import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
 import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
 
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
+import com.yihucha.hbyhc.callback.OnRvItemClickListener;
 import com.yihucha.hbyhc.config.Constants;
 import com.yihucha.hbyhc.databinding.ActivityRedIntegralNewBinding;
 import com.yihucha.hbyhc.presentation.integral.adapter.NewRedIntegralAdapter;
@@ -24,6 +25,8 @@ import com.yihucha.hbyhc.presentation.integral.model.RedIntegralListBean;
 import com.yihucha.hbyhc.presentation.invitation.view_model.InviteViewModel;
 import com.yihucha.hbyhc.presentation.mine.view_model.MineSpreadInfo;
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel;
+import com.yihucha.hbyhc.presentation.order.OrderDetailsActivity;
+import com.yihucha.hbyhc.presentation.order.view_model.OrderViewModel;
 import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 import com.yihucha.hbyhc.utils.MVUtils;
 
@@ -57,9 +60,9 @@ public class NewRedIntegralActivity extends ViewBindingTitleBaseActivity<Activit
         });
         mInviteViewModel.redIntegralListBean.observe(this, datas -> {
 //            if (EmptyCheckUtils.isEmpty(datas)) page--; // 如果加载不成功，回滚分页
-            System.out.println(datas.size());
+//            System.out.println(datas.size());
             beans.addAll(datas);
-            System.out.println(beans.size());
+//            System.out.println(beans.size());
             if (EmptyCheckUtils.isNotEmpty(beans)) {
                 mViewBinding.layoutNoData.llNotFound.setVisibility(View.GONE);
                 mViewBinding.lvIntegral.setVisibility(View.VISIBLE);
@@ -116,6 +119,11 @@ public class NewRedIntegralActivity extends ViewBindingTitleBaseActivity<Activit
     }
 
     private void initListener() {
+
+        adapter.setOnItemClickListener(position -> {
+            OrderDetailsActivity.launch(NewRedIntegralActivity.this,beans.get(position).getOrderId());
+        });
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             mViewBinding.scrollView.setOnScrollChangeListener((View.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
                 int[] location = new int[2];

app/src/main/java/com/yihucha/hbyhc/presentation/integral/adapter/NewRedIntegralAdapter.kt

@@ -1,13 +1,18 @@
 package com.yihucha.hbyhc.presentation.integral.adapter
 
 import android.annotation.SuppressLint
+import android.content.res.ColorStateList
+import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView.Adapter
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.yihucha.hbyhc.R
+import com.yihucha.hbyhc.callback.OnRvItemClickListener
 import com.yihucha.hbyhc.databinding.ItemNewRedIntegralBinding
 import com.yihucha.hbyhc.presentation.integral.model.RedIntegralListBean
 import com.yihucha.hbyhc.utils.EmptyCheckUtils
@@ -20,10 +25,11 @@ import com.yihucha.hbyhc.utils.EmptyCheckUtils
 class NewRedIntegralAdapter(var beans: List<RedIntegralListBean>) :
     Adapter<NewRedIntegralAdapter.RedIntegralHolder>() {
 
-    fun setDataBeans(datas: List<RedIntegralListBean>){
+    fun setDataBeans(datas: List<RedIntegralListBean>) {
         this.beans = datas
         notifyDataSetChanged()
     }
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RedIntegralHolder {
         return RedIntegralHolder(
             LayoutInflater
@@ -33,21 +39,41 @@ class NewRedIntegralAdapter(var beans: List<RedIntegralListBean>) :
     }
 
     override fun getItemCount(): Int {
-        return if (EmptyCheckUtils.isEmpty(beans)) 0 else beans.size*10
+        return if (EmptyCheckUtils.isEmpty(beans)) 0 else beans.size
     }
 
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: RedIntegralHolder, position: Int) {
-        val bean = beans[position%3]
+        val bean = beans[position]
         holder.tvIntegral.text = "${if (bean.pm == "1") "+" else "-"}${bean.rewardSocre}"
         holder.tvDescription.text = bean.mark
         holder.tvTime.text = bean.createTime
+        holder.jiantou.visibility = if (bean.pm == "1") View.INVISIBLE else View.VISIBLE
+        holder.tvIntegral.setTextColor(
+            if (bean.pm == "1")
+                Color.parseColor("#fe0032")
+            else
+                Color.parseColor("#333333")
+        )
+        if (bean.pm == "2") {
+            holder.parent.setOnClickListener {
+                listener?.onItemClick(position)
+            }
+        }
+
     }
 
 
+    var listener: OnRvItemClickListener? = null
+    fun setOnItemClickListener(listener: OnRvItemClickListener) {
+        this.listener = listener
+    }
+
     class RedIntegralHolder(var itemView: View) : ViewHolder(itemView) {
-        var tvIntegral:TextView = itemView.findViewById(R.id.tv_integral)
-        var tvDescription:TextView = itemView.findViewById(R.id.tv_description)
-        var tvTime:TextView = itemView.findViewById(R.id.tv_time)
+        var tvIntegral: TextView = itemView.findViewById(R.id.tv_integral)
+        var tvDescription: TextView = itemView.findViewById(R.id.tv_description)
+        var tvTime: TextView = itemView.findViewById(R.id.tv_time)
+        var jiantou: ImageView = itemView.findViewById(R.id.imgv_jiantou)
+        var parent: ConstraintLayout = itemView.findViewById(R.id.parent_view)
     }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/invitation/AddBankCardActivity.kt

@@ -7,6 +7,9 @@ import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import androidx.lifecycle.ViewModelProvider
+import com.hjq.toast.ToastParams
+import com.hjq.toast.Toaster
+import com.hjq.toast.style.BlackToastStyle
 import com.yihucha.hbyhc.R
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
 import com.yihucha.hbyhc.databinding.ActivityAddBankCardBinding
@@ -16,6 +19,7 @@ import com.yihucha.hbyhc.presentation.invitation.view_model.InviteViewModel
 import com.yihucha.hbyhc.utils.EditTextListener
 import com.yihucha.hbyhc.utils.EmptyCheckUtils
 import com.yihucha.hbyhc.utils.StringsUtil
+import com.yihucha.hbyhc.utils.ToasterUtils
 
 class AddBankCardActivity : ViewBindingTitleBaseActivity<ActivityAddBankCardBinding>() {
     var cardImg: String? = null
@@ -86,11 +90,12 @@ class AddBankCardActivity : ViewBindingTitleBaseActivity<ActivityAddBankCardBind
             mViewBinding.edtCardNumber.setText(it.user_card)
         }
         viewModel.addBankCardResult.observe(this) {
-            Toast.makeText(this, it, Toast.LENGTH_LONG).show()
+            ToasterUtils.showCustomView(it,R.layout.layout_add_card_success)
             finish()
         }
         viewModel.failed.observe(this) {
-            Toast.makeText(this, it, Toast.LENGTH_LONG).show()
+            ToasterUtils.showBlack(it)
+//            ToasterUtils.showCustomView(it,R.layout.layout_add_card_success)
         }
     }
 
@@ -129,27 +134,27 @@ class AddBankCardActivity : ViewBindingTitleBaseActivity<ActivityAddBankCardBind
             mViewBinding.apply {
                 //提交
                 if (EmptyCheckUtils.isEmpty(edtUserName.text.toString())) {
-                    Toast.makeText(this@AddBankCardActivity, "请输入持卡人姓名", Toast.LENGTH_LONG).show()
+                    ToasterUtils.showBlack("请输入持卡人姓名")
                     return
                 }
                 if (EmptyCheckUtils.isEmpty(edtCardNumber.text.toString())) {
-                    Toast.makeText(this@AddBankCardActivity, "请输入持卡人身份证号", Toast.LENGTH_LONG).show()
+                    ToasterUtils.showBlack("请输入持卡人身份证号")
                     return
                 }
                 if (EmptyCheckUtils.isEmpty(edtBankName.text.toString())) {
-                    Toast.makeText(this@AddBankCardActivity, "请输入银行", Toast.LENGTH_LONG).show()
+                    ToasterUtils.showBlack("请输入所属银行")
                     return
                 }
                 if (EmptyCheckUtils.isEmpty(edtBankName2.text.toString())) {
-                    Toast.makeText(this@AddBankCardActivity, "请输入开户支行", Toast.LENGTH_LONG).show()
+                    ToasterUtils.showBlack("请输入开户支行")
                     return
                 }
                 if (EmptyCheckUtils.isEmpty(edtBankCardNumber.text.toString())) {
-                    Toast.makeText(this@AddBankCardActivity, "请输入银行卡号", Toast.LENGTH_LONG).show()
+                    ToasterUtils.showBlack("请输入银行卡号")
                     return
                 }
                 if (!StringsUtil.isIdCard(edtCardNumber.text.toString())) {
-                    Toast.makeText(this@AddBankCardActivity, "身份证号格式错误", Toast.LENGTH_LONG).show()
+                    ToasterUtils.showBlack("身份证号格式错误")
                     return
                 }
 /*                if (!StringsUtil.isBank(edtBankCardNumber.text.toString())) {

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

@@ -130,9 +130,7 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
                         Toast.makeText(context, "手机号码格式输入错误", Toast.LENGTH_SHORT).show();
                         return;
                     }
-                    /**
-                     * 下面做绑定手机号流程，暂时不做处理
-                     */
+                    //TODO 下面做绑定手机号流程，暂时不做处理
                 });
             }
         });
@@ -235,11 +233,11 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
         }else if (v == mViewBinding.tvRegistrationProtocol){
             //注册协议
             WebViewTitleBaseActivity.launch(LoginActivity.this,getString(R.string.registration_protocol),
-                    Constants.PROTOCOL+Constants.SERVICE_AGREEMENT);
+                    Constants.PROTOCOL_YHC_REGIST);
         }else if (v ==  mViewBinding.tvPrivacyAgreement){
             //隐私协议
             WebViewTitleBaseActivity.launch(LoginActivity.this,getString(R.string.privacy_agreement),
-                    Constants.PROTOCOL+Constants.PRIVACY_AGREEMENT);
+                    Constants.PROTOCOL_YHC_YINSI);
         }
     }
 

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

@@ -25,14 +25,14 @@ import com.tencent.mm.opensdk.modelmsg.SendAuth;
 
 public class LoginHomeActivity extends ViewBindingTitleBaseActivity<ActivityLoginHomeBinding> implements View.OnClickListener {
     private LoginViewModel loginHomeViewModel;
-    private int num=1;
+    private int num = 1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-      //  setContentView(R.layout.activity_login_home);
+        //  setContentView(R.layout.activity_login_home);
         //绑定
-        loginHomeViewModel=new ViewModelProvider(this).get(LoginViewModel.class);
+        loginHomeViewModel = new ViewModelProvider(this).get(LoginViewModel.class);
 
         initView();
         initClick();
@@ -40,10 +40,11 @@ public class LoginHomeActivity extends ViewBindingTitleBaseActivity<ActivityLogi
 
     }
 
-    public void initView(){
+    public void initView() {
         mViewBinding.cbSelector.setSelected(false);
     }
-    public void initClick(){
+
+    public void initClick() {
         mViewBinding.tvWxLogin.setOnClickListener(this);
         mViewBinding.tvAlPhone.setOnClickListener(this);
         mViewBinding.cbSelector.setOnClickListener(this);
@@ -52,7 +53,8 @@ public class LoginHomeActivity extends ViewBindingTitleBaseActivity<ActivityLogi
         mViewBinding.tvPrivacyAgreement.setOnClickListener(this);
         mViewBinding.ivQiehuan.setOnClickListener(this);
     }
-    public void initData(){
+
+    public void initData() {
 
 //        loginHomeViewModel.xieyi.observe(this, new Observer<DataResponse<LoginHomeXieyiModel>>() {
 //            @Override
@@ -68,58 +70,47 @@ public class LoginHomeActivity extends ViewBindingTitleBaseActivity<ActivityLogi
             }
         });
     }
+
     @Override
     public void onClick(View v) {
         super.onClick(v);
         if (v == mViewBinding.tvWxLogin) {
-            if (mViewBinding.cbSelector.isSelected()){
+            if (mViewBinding.cbSelector.isSelected()) {
                 regToWx();
-            }else {
+            } else {
                 mViewBinding.ivTes.setVisibility(View.VISIBLE);
             }
-        } else if (v == mViewBinding.tvAlPhone){
-            if (mViewBinding.cbSelector.isSelected()){
-//                TokenResultListener mTokenResultListener = new TokenResultListener() {
-//                    @Override
-//                    public void onTokenSuccess(String ret) {
-//                    }
-//
-//                    @Override
-//                    public void onTokenFailed(String ret) {
-//                    }
-//                };
-//
-//                PhoneNumberAuthHelper mPhoneNumberAuthHelper = PhoneNumberAuthHelper.getInstance(this, mTokenResultListener);
-//                mPhoneNumberAuthHelper.checkEnvAvailable(2);
-                 Intent pIntent = new Intent(LoginHomeActivity.this, OneKeyLoginActivity.class);
-                    startActivity(pIntent);
-            }else {
+        } else if (v == mViewBinding.tvAlPhone) {
+            if (mViewBinding.cbSelector.isSelected()) {
+                Intent pIntent = new Intent(LoginHomeActivity.this, OneKeyLoginActivity.class);
+                startActivity(pIntent);
+            } else {
                 mViewBinding.ivTes.setVisibility(View.VISIBLE);
             }
-        }else if (v==mViewBinding.cbSelector){
+        } else if (v == mViewBinding.cbSelector) {
             mViewBinding.ivTes.setVisibility(View.INVISIBLE);
-            if (mViewBinding.cbSelector.isSelected()){
+            if (mViewBinding.cbSelector.isSelected()) {
                 mViewBinding.cbSelector.setSelected(false);
-            }else {
+            } else {
                 mViewBinding.cbSelector.setSelected(true);
             }
-        }else if (v == mViewBinding.tvPhoneLogin){
+        } else if (v == mViewBinding.tvPhoneLogin) {
             /*if (mViewBinding.cbSelector.isSelected()){
                 LoginActivity.launch(LoginHomeActivity.this);
             }else {
                 mViewBinding.ivTes.setVisibility(View.VISIBLE);
             }*/
             LoginActivity.launch(LoginHomeActivity.this);
-        }else if (v == mViewBinding.tvRegistrationProtocol){
+        } else if (v == mViewBinding.tvRegistrationProtocol) {
             //注册协议
 //            loginHomeViewModel.getXieyi(LoginHomeActivity.this,"2");
-            WebViewTitleBaseActivity.launch(LoginHomeActivity.this,getString(R.string.registration_protocol),
-                    Constants.PROTOCOL+Constants.SERVICE_AGREEMENT);
-        }else if (v ==  mViewBinding.tvPrivacyAgreement){
+            WebViewTitleBaseActivity.launch(LoginHomeActivity.this, getString(R.string.registration_protocol),
+                    Constants.PROTOCOL_YHC_REGIST);
+        } else if (v == mViewBinding.tvPrivacyAgreement) {
             //隐私协议
 //            loginHomeViewModel.getXieyi(LoginHomeActivity.this,"1");
-            WebViewTitleBaseActivity.launch(LoginHomeActivity.this,getString(R.string.privacy_agreement),
-                    Constants.PROTOCOL+Constants.PRIVACY_AGREEMENT);
+            WebViewTitleBaseActivity.launch(LoginHomeActivity.this, getString(R.string.privacy_agreement),
+                    Constants.PROTOCOL_YHC_YINSI);
         }
 //        else if (v == mViewBinding.ivQiehuan){
 //            if (num>=10){
@@ -143,13 +134,13 @@ public class LoginHomeActivity extends ViewBindingTitleBaseActivity<ActivityLogi
     //注册api
     private void regToWx() {
         if (!MyApplication.getApi().isWXAppInstalled()) {
-            MyToast.makeText(LoginHomeActivity.this,"您的设备未安装微信客户端",Toast.LENGTH_SHORT).show();
-        }else {
+            MyToast.makeText(LoginHomeActivity.this, "您的设备未安装微信客户端", Toast.LENGTH_SHORT).show();
+        } else {
             SendAuth.Req req = new SendAuth.Req();
             //此处中"snsapi_userinfo"不可以更改
-            req.scope="snsapi_userinfo";
+            req.scope = "snsapi_userinfo";
             //此处可随意编写
-            req.state="wx_cc";
+            req.state = "wx_cc";
             MyApplication.getApi().sendReq(req);
         }
     }

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

@@ -16,6 +16,7 @@ import com.yihucha.hbyhc.base.BaseFragment;
 import com.yihucha.hbyhc.config.Constants;
 import com.yihucha.hbyhc.databinding.FragmentMineBinding;
 import com.yihucha.hbyhc.presentation.integral.NewRedIntegralActivity;
+import com.yihucha.hbyhc.presentation.invitation.InviteFriendsActivity;
 import com.yihucha.hbyhc.presentation.invitation.MyInvitationActivity;
 import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel;
@@ -264,7 +265,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
             MyEvaluateActivity.launch(getActivity());
         } else if (view == binding.tvMineYq) {
             //我的邀请
-            MyInvitationActivity.launch(getActivity());
+            InviteFriendsActivity.launch(getActivity());
         } else if (view == binding.tvMineYj) {
             //点击我的佣金进入我的邀请
 //            MyInvitationActivity.launch(getActivity());

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

@@ -141,11 +141,11 @@ public class SettingUpActivity extends ViewBindingTitleBaseActivity<ActivitySett
         }else if (v ==mViewBinding.llPrivacyAgreement){
             //隐私协议
             WebViewTitleBaseActivity.launch(SettingUpActivity.this,getString(R.string.privacy_agreement),
-                    Constants.PROTOCOL+Constants.PRIVACY_AGREEMENT);
+                    Constants.PROTOCOL_YHC_YINSI);
         }else if (v ==mViewBinding.llServiceAgreement){
             //服务协议
             WebViewTitleBaseActivity.launch(SettingUpActivity.this,getString(R.string.service_agreement),
-                    Constants.PROTOCOL+Constants.SERVICE_AGREEMENT);
+                    Constants.PROTOCOL_YHC_REGIST);
         }else if (v ==mViewBinding.llLogOutOfAnAccount){
             AccountCancellationActivity.launch(context);
         }else if (v ==mViewBinding.llRealNameAuthentication){

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

@@ -262,12 +262,6 @@ public class OrderActivity extends BaseActivity implements View.OnClickListener
                 ApplyForRefundOptionPageActivity.launch(context, orderList.get(position));
             }
         });
-        orderListObligationAdapter.setOnTimeEnd(new OrderListObligationAdapter.OnTimeEnd() {
-            @Override
-            public void onTimeEnd() {
-                //倒计时结束
-            }
-        });
         orderListObligationAdapter.setOnClickListener(new OrderListObligationAdapter.OnClickListener() {
             @Override
             public void onItemClick(int position) {

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

@@ -10,6 +10,7 @@ import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.alibaba.fastjson.JSON;
+import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
@@ -22,6 +23,7 @@ import com.yihucha.hbyhc.presentation.order.view_model.OrderViewModel;
 import com.yihucha.hbyhc.presentation.pay.PayActivity;
 import com.yihucha.hbyhc.presentation.product.ProductDetailsActivity;
 import com.yihucha.hbyhc.utils.CopyUtils;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 import com.yihucha.hbyhc.utils.GlideUtils;
 import com.yihucha.hbyhc.utils.StringsUtil;
 
@@ -41,25 +43,48 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
     public static final String INTENT_ORDER_BEAN = "intentOrderBean";
     public static final String INTENT_ORDER_OBLIGATION_BEAN = "intentOrderObligationBean";
     public static final String INTENT_ORDER_STATUS = "intentOrderStatus";
+
+    public static final String ORDER_ID = "order_id";
+
+    private String orderId = null;
     private OrderListBean.ListBean orderBean;
     private OrderListObligationBean.ObligationBeanList obligationBeanList;
     private String status;
     private OrderViewModel mOrderViewModel;
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         orderBean = (OrderListBean.ListBean) getIntent().getSerializableExtra(INTENT_ORDER_BEAN);
         obligationBeanList = (OrderListObligationBean.ObligationBeanList) getIntent().getSerializableExtra(INTENT_ORDER_OBLIGATION_BEAN);
         status = getIntent().getStringExtra(INTENT_ORDER_STATUS);
+        orderId = getIntent().getStringExtra(ORDER_ID);
 
         mOrderViewModel =
                 new ViewModelProvider(this).get(OrderViewModel.class);
-        initView();
+        if (EmptyCheckUtils.isNotEmpty(orderId)) {
+            mOrderViewModel.getOrderDetail(orderId);
+        } else {
+            initView();
+        }
+
         initClick();
         initData();
     }
 
     private void initData() {
+        mOrderViewModel.orderDetail.observe(this, bean -> {
+            orderBean = bean;
+            obligationBeanList = GsonUtils.fromJson(GsonUtils.toJson(bean), OrderListObligationBean.ObligationBeanList.class);
+            status = "5".equals(bean.getStatus())?"99":bean.getStatus();
+            if ("5".equals(bean.getStatus())){
+                OrderDetailsDaifukuanActivity.launch(context, obligationBeanList, status);
+                finish();
+                return;
+            }
+            initView();
+        });
         //取消订单成功
         mOrderViewModel.cancelOrderSucceed.observe(this, new Observer<String>() {
             @Override
@@ -127,46 +152,32 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
 
             GlideUtils.loadImage(context, obligationBeanList.getMerchant().getMer_avatar(), mViewBinding.ivShopLogo);
             mViewBinding.btvMerName.setText(obligationBeanList.getMerchant().getMer_name());
-            if ("5".equals(obligationBeanList.getPay_type())){
-                mViewBinding.tvTotalPrice.setText("积分"+obligationBeanList.getTotal_price());
-            }else {
+            if ("5".equals(obligationBeanList.getPay_type())) {
+                mViewBinding.tvTotalPrice.setText("积分" + obligationBeanList.getTotal_price());
+            } else {
                 mViewBinding.tvTotalPrice.setText(obligationBeanList.getTotal_price());
             }
-            if ("5".equals(obligationBeanList.getPay_type())){
-                mViewBinding.tvCouponPrice.setText("积分"+obligationBeanList.getCoupon_price());
-            }else {
+            if ("5".equals(obligationBeanList.getPay_type())) {
+                mViewBinding.tvCouponPrice.setText("积分" + obligationBeanList.getCoupon_price());
+            } else {
                 mViewBinding.tvCouponPrice.setText(obligationBeanList.getCoupon_price());
             }
-            if ("5".equals(obligationBeanList.getPay_type())){
-                mViewBinding.tvPayPostage.setText("积分"+obligationBeanList.getPay_postage());
-            }else {
+            if ("5".equals(obligationBeanList.getPay_type())) {
+                mViewBinding.tvPayPostage.setText("积分" + obligationBeanList.getPay_postage());
+            } else {
                 mViewBinding.tvPayPostage.setText(obligationBeanList.getPay_postage());
             }
-            if ("5".equals(obligationBeanList.getPay_type())){
+            if ("5".equals(obligationBeanList.getPay_type())) {
                 mViewBinding.btvPayPrice.setText("积分" + obligationBeanList.getPay_price());
-            }else {
+            } else {
                 mViewBinding.btvPayPrice.setText("¥" + obligationBeanList.getPay_price());
             }
 
             mViewBinding.tvGroupOrderSn.setText(obligationBeanList.getGroup_order_sn());
-            //支付方式 0=余额 1=微信 2=小程序 3=h5 4=支付宝
-           /* if ("0".equals(obligationBeanList.getPay_type())) {
-                mViewBinding.tvPayType.setText("余额");
-            } else if ("1".equals(obligationBeanList.getPay_type())) {
-                mViewBinding.tvPayType.setText("微信");
-            } else if ("2".equals(obligationBeanList.getPay_type())) {
-                mViewBinding.tvPayType.setText("小程序");
-            } else if ("3".equals(obligationBeanList.getPay_type())) {
-                mViewBinding.tvPayType.setText("h5");
-            } else if ("4".equals(obligationBeanList.getPay_type())) {
-                mViewBinding.tvPayType.setText("支付宝");
-            }else if ("5".equals(obligationBeanList.getPay_type())){
-                mViewBinding.tvPayType.setText("积分兑换");
-            }*/
             if ("5".equals(obligationBeanList.getPay_type())) {
                 mViewBinding.tvPayType.setText("微信支付");
 
-            }else{
+            } else {
                 mViewBinding.tvPayType.setText("微信支付");
             }
             mViewBinding.tvCreateTime.setText(obligationBeanList.getCreate_time());
@@ -190,7 +201,7 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
 
             GlideUtils.loadImage(context, orderBean.getMerchant().getMer_avatar(), mViewBinding.ivShopLogo);
             mViewBinding.btvMerName.setText(orderBean.getMerchant().getMer_name());
-         //   订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付
+            //   订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付
 //            System.out.println(orderBean.getStatus());
             if ("0".equals(orderBean.getStatus())) {
                 mViewBinding.tvRemindTheDelivery.setVisibility(View.VISIBLE);
@@ -246,8 +257,7 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
 
                 setTitle(R.string.completed);
                 mViewBinding.llBottom.setVisibility(View.VISIBLE);
-            }
-            else if ("4".equals(orderBean.getStatus())) {
+            } else if ("4".equals(orderBean.getStatus())) {
                 mViewBinding.tvCheckTheLogistics.setVisibility(View.GONE);
                 mViewBinding.tvApplyForAfterSales.setVisibility(View.GONE);
                 mViewBinding.tvConfirmReceipt.setVisibility(View.GONE);
@@ -258,8 +268,7 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
                 mViewBinding.tvToEvaluate.setVisibility(View.GONE);
 
                 setTitle("已申请退款");
-            }
-            else if ("-1".equals(orderBean.getStatus())) {
+            } else if ("-1".equals(orderBean.getStatus())) {
                 mViewBinding.tvCheckTheLogistics.setVisibility(View.GONE);
                 mViewBinding.tvApplyForAfterSales.setVisibility(View.GONE);
                 mViewBinding.tvConfirmReceipt.setVisibility(View.GONE);
@@ -269,8 +278,7 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
                 mViewBinding.tvBuyAgain.setVisibility(View.GONE);
                 mViewBinding.tvToEvaluate.setVisibility(View.GONE);
                 setTitle("已退款");
-            }
-            else if ("5".equals(orderBean.getStatus())) {
+            } else if ("5".equals(orderBean.getStatus())) {
                 mViewBinding.tvCancellationOfOrder.setVisibility(View.VISIBLE);
                 mViewBinding.tvImmediatePayment.setVisibility(View.VISIBLE);
 
@@ -282,8 +290,7 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
                 mViewBinding.tvConfirmReceipt.setVisibility(View.GONE);
                 setTitle("待付款");
                 mViewBinding.llBottom.setVisibility(View.VISIBLE);
-            }
-            else {
+            } else {
                 mViewBinding.tvBuyAgain.setVisibility(View.VISIBLE);
                 mViewBinding.tvApplyForAfterSales.setVisibility(View.VISIBLE);
 
@@ -298,12 +305,12 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
                 mViewBinding.llBottom.setVisibility(View.GONE);
             }
 
-            if ("5".equals(orderBean.getPay_type())){
-                mViewBinding.tvTotalPrice.setText("积分"+orderBean.getTotal_price());
-                mViewBinding.tvCouponPrice.setText("积分"+orderBean.getCoupon_price());
-                mViewBinding.tvPayPostage.setText("积分"+orderBean.getPay_postage());
-                mViewBinding.btvPayPrice.setText("积分"+ orderBean.getPay_price());
-            }else {
+            if ("5".equals(orderBean.getPay_type())) {
+                mViewBinding.tvTotalPrice.setText("积分" + orderBean.getTotal_price());
+                mViewBinding.tvCouponPrice.setText("积分" + orderBean.getCoupon_price());
+                mViewBinding.tvPayPostage.setText("积分" + orderBean.getPay_postage());
+                mViewBinding.btvPayPrice.setText("积分" + orderBean.getPay_price());
+            } else {
                 mViewBinding.tvTotalPrice.setText(orderBean.getTotal_price());
                 mViewBinding.tvCouponPrice.setText(orderBean.getCoupon_price());
                 mViewBinding.tvPayPostage.setText(orderBean.getPay_postage());
@@ -314,7 +321,7 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
             if (StringUtil.isBlank(orderBean.getPay_time())) {
                 mViewBinding.layoutPaytime.setVisibility(View.GONE);
                 mViewBinding.tvPayType.setText("微信支付");
-            }else {
+            } else {
                 mViewBinding.tvTimeOfPayment.setText(orderBean.getPay_time());
                 mViewBinding.layoutPaytime.setVisibility(View.VISIBLE);
                 //支付方式 0=余额 1=微信 2=小程序 3=h5 4=支付宝
@@ -328,7 +335,7 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
                     mViewBinding.tvPayType.setText("h5");
                 } else if ("4".equals(orderBean.getPay_type())) {
                     mViewBinding.tvPayType.setText("支付宝");
-                }else if ("5".equals(orderBean.getPay_type())){
+                } else if ("5".equals(orderBean.getPay_type())) {
                     mViewBinding.tvPayType.setText("积分兑换");
                 }
             }
@@ -362,7 +369,7 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
 
         }
 
-        if (!StringsUtil.isEmpty(orderBean.getRefund_order_id())){
+        if (!StringsUtil.isEmpty(orderBean.getRefund_order_id())) {
 //            setTitle("已申请售后");
             mViewBinding.tvIsRefund.setVisibility(View.VISIBLE);
             mViewBinding.tvApplyForAfterSales.setVisibility(View.GONE);
@@ -376,81 +383,81 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
         if (v == mViewBinding.tvRemindTheDelivery) {
             ToastUtils.showLong("已告知商家尽快发货");
         } else if (v == mViewBinding.tvImmediatePayment) {
-            if (status.equals("-2")){
+            if (status.equals("-2")) {
                 //去支付
-                Map<String,Object> map=new HashMap<>();
-                map.put("cost",orderBean.getCost());
-                map.put("coupon_price",orderBean.getCoupon_price());
-                map.put("create_time",orderBean.getCreate_time());
+                Map<String, Object> map = new HashMap<>();
+                map.put("cost", orderBean.getCost());
+                map.put("coupon_price", orderBean.getCoupon_price());
+                map.put("create_time", orderBean.getCreate_time());
                 map.put("give_coupon_ids", Collections.emptyList());
-                map.put("group_order_id",orderBean.getGroup_order_id());
-                map.put("group_order_sn",orderBean.getGroup_order_sn());
-                map.put("pay_postage",orderBean.getPay_postage());
-                map.put("pay_price",orderBean.getPay_price());
-                map.put("pay_type",orderBean.getPay_type());
-                map.put("real_name",orderBean.getReal_name());
-                map.put("total_num",orderBean.getTotal_num());
-                map.put("total_postage",orderBean.getTotal_postage());
-                map.put("total_price",orderBean.getTotal_price());
-                map.put("uid",orderBean.getUid());
-                map.put("user_address",orderBean.getUser_address());
-                map.put("user_phone",orderBean.getUser_phone());
-                PayActivity.launch(context,"1", JSON.toJSONString(map), orderBean.getGroup_order_id(), orderBean.getPay_price());
-
-            }else {
+                map.put("group_order_id", orderBean.getGroup_order_id());
+                map.put("group_order_sn", orderBean.getGroup_order_sn());
+                map.put("pay_postage", orderBean.getPay_postage());
+                map.put("pay_price", orderBean.getPay_price());
+                map.put("pay_type", orderBean.getPay_type());
+                map.put("real_name", orderBean.getReal_name());
+                map.put("total_num", orderBean.getTotal_num());
+                map.put("total_postage", orderBean.getTotal_postage());
+                map.put("total_price", orderBean.getTotal_price());
+                map.put("uid", orderBean.getUid());
+                map.put("user_address", orderBean.getUser_address());
+                map.put("user_phone", orderBean.getUser_phone());
+                PayActivity.launch(context, "1", JSON.toJSONString(map), orderBean.getGroup_order_id(), orderBean.getPay_price());
+
+            } else {
                 //去支付
-                Map<String,Object> map=new HashMap<>();
-                map.put("cost",obligationBeanList.getCost());
-                map.put("coupon_price",obligationBeanList.getCoupon_price());
-                map.put("create_time",obligationBeanList.getCreate_time());
+                Map<String, Object> map = new HashMap<>();
+                map.put("cost", obligationBeanList.getCost());
+                map.put("coupon_price", obligationBeanList.getCoupon_price());
+                map.put("create_time", obligationBeanList.getCreate_time());
                 map.put("give_coupon_ids", Collections.emptyList());
-                map.put("group_order_id",obligationBeanList.getGroup_order_id());
-                map.put("group_order_sn",obligationBeanList.getGroup_order_sn());
-                map.put("pay_postage",obligationBeanList.getPay_postage());
-                map.put("pay_price",obligationBeanList.getPay_price());
-                map.put("pay_type",obligationBeanList.getPay_type());
-                map.put("real_name",obligationBeanList.getReal_name());
-                map.put("total_num",obligationBeanList.getTotal_num());
-                map.put("total_postage",obligationBeanList.getTotal_postage());
-                map.put("total_price",obligationBeanList.getTotal_price());
-                map.put("uid",obligationBeanList.getUid());
-                map.put("user_address",obligationBeanList.getUser_address());
-                map.put("user_phone",obligationBeanList.getUser_phone());
-                PayActivity.launch(context,"1", JSON.toJSONString(map), obligationBeanList.getGroup_order_id(), obligationBeanList.getPay_price());
+                map.put("group_order_id", obligationBeanList.getGroup_order_id());
+                map.put("group_order_sn", obligationBeanList.getGroup_order_sn());
+                map.put("pay_postage", obligationBeanList.getPay_postage());
+                map.put("pay_price", obligationBeanList.getPay_price());
+                map.put("pay_type", obligationBeanList.getPay_type());
+                map.put("real_name", obligationBeanList.getReal_name());
+                map.put("total_num", obligationBeanList.getTotal_num());
+                map.put("total_postage", obligationBeanList.getTotal_postage());
+                map.put("total_price", obligationBeanList.getTotal_price());
+                map.put("uid", obligationBeanList.getUid());
+                map.put("user_address", obligationBeanList.getUser_address());
+                map.put("user_phone", obligationBeanList.getUser_phone());
+                PayActivity.launch(context, "1", JSON.toJSONString(map), obligationBeanList.getGroup_order_id(), obligationBeanList.getPay_price());
             }
-        }else if (v == mViewBinding.tvCancellationOfOrder){
-            if (status.equals("-2")){
+        } else if (v == mViewBinding.tvCancellationOfOrder) {
+            if (status.equals("-2")) {
                 mOrderViewModel.getCancelOrder(orderBean.getGroup_order_id());
-            }else {
+            } else {
                 //取消订单
                 mOrderViewModel.getCancelOrder(obligationBeanList.getGroup_order_id());
             }
-        }else if (v ==mViewBinding.tvCopy){
-            if (status.equals("99")){
-                CopyUtils.copy(context,obligationBeanList.getGroup_order_sn());
+        } else if (v == mViewBinding.tvCopy) {
+            if (status.equals("99")) {
+                CopyUtils.copy(context, obligationBeanList.getGroup_order_sn());
                 ToastUtils.showLong("复制成功");
-            }else {
-                CopyUtils.copy(context,orderBean.getOrder_sn());
+            } else {
+                CopyUtils.copy(context, orderBean.getOrder_sn());
                 ToastUtils.showLong("复制成功");
             }
-        }else if (v ==mViewBinding.tvCheckTheLogistics){
+        } else if (v == mViewBinding.tvCheckTheLogistics) {
             //查看物流
-            LogisticsActivity.launch(context,orderBean);
-        }else if (v == mViewBinding.tvConfirmReceipt){
+            LogisticsActivity.launch(context, orderBean);
+        } else if (v == mViewBinding.tvConfirmReceipt) {
             //确认收货
             mOrderViewModel.getTakeDeliveryOfGoods(orderBean.getOrder_id());
-        }else if (v ==  mViewBinding.tvBuyAgain){
+        } else if (v == mViewBinding.tvBuyAgain) {
             //再次购买
-            ProductDetailsActivity.launch(context,orderBean.getOrderProduct().get(0).getCart_info().getProduct().getProduct_id());
-        }else if (v ==mViewBinding.tvToEvaluate){
+            ProductDetailsActivity.launch(context, orderBean.getOrderProduct().get(0).getCart_info().getProduct().getProduct_id());
+        } else if (v == mViewBinding.tvToEvaluate) {
             //去评价
-            EvaluateActivity.launch(context,orderBean);
-        }else if (v == mViewBinding.tvApplyForAfterSales){
+            EvaluateActivity.launch(context, orderBean);
+        } else if (v == mViewBinding.tvApplyForAfterSales) {
             //申请售后
             ApplyForRefundOptionPageActivity.launch(context, orderBean);
-        }else if (v == mViewBinding.tvIsRefund){
+        } else if (v == mViewBinding.tvIsRefund) {
             //售后详情
-            AfterSalesOrderDateilsActivity.launch(this,orderBean.getRefund_order_id());
+            AfterSalesOrderDateilsActivity.launch(this, orderBean.getRefund_order_id());
         }
 
     }
@@ -469,4 +476,10 @@ public class OrderDetailsActivity extends ViewBindingTitleBaseActivity<ActivityO
         intent.putExtra(INTENT_ORDER_STATUS, status);
         context.startActivity(intent);
     }
+
+    public static void launch(Context context, String orderId) {
+        Intent intent = new Intent(context, OrderDetailsActivity.class);
+        intent.putExtra(ORDER_ID, orderId);
+        context.startActivity(intent);
+    }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/order/view_model/OrderViewModel.java

@@ -270,12 +270,16 @@ public class OrderViewModel extends BaseViewModel {
      *               <p>
      *               2: 评价
      */
-    @SuppressLint("CheckResult")
     public void getOrderList(int page, String status) {
+        getOrderList(page, 10, status);
+    }
+
+    @SuppressLint("CheckResult")
+    public void getOrderList(int page, int limit, String status) {
         Map<String, Object> map = new HashMap<>();
         map.put("page", page);
         map.put("status", status);
-        map.put("limit", "10");
+        map.put("limit", limit);
         OrderService orderService = NetworkApi.createService(OrderService.class);
         orderService.getOrderlist(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<OrderListBean>>() {
             @Override
@@ -296,6 +300,28 @@ public class OrderViewModel extends BaseViewModel {
             }
         }));
     }
+    public MutableLiveData<OrderListBean.ListBean> orderDetail = new MutableLiveData<>();
+    /**
+     * 获取订单详情
+     */
+    @SuppressLint("CheckResult")
+    public void getOrderDetail(String orderId) {
+        OrderService service = NetworkApi.createService(OrderService.class);
+        service.getOrderDetail(orderId)
+                .compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<OrderListBean.ListBean>>() {
+            @Override
+            public void onSuccess(DataResponse<OrderListBean.ListBean> response) {
+                if (response.responseCode==200) {
+                    orderDetail.postValue(response.getData());
+                }
+            }
+
+            @Override
+            public void onFailure(Throwable e) {
+
+            }
+        }));
+    }
 
     /**
      * 待付款列表
@@ -359,22 +385,23 @@ public class OrderViewModel extends BaseViewModel {
         NetworkApi.createService(OrderService.class)
                 .getAfterSaleLogistics(orderId)
                 .compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<List<ExpressBean>>>() {
-            @Override
-            public void onSuccess(DataResponse<List<ExpressBean>> logisticsBeanDataResponse) {
-                if (logisticsBeanDataResponse.responseCode == 200) {
-                    logisticsBean.postValue(logisticsBeanDataResponse.getData());
-                } else {
-                    ToastUtils.showLong(logisticsBeanDataResponse.responseError);
-                }
+                    @Override
+                    public void onSuccess(DataResponse<List<ExpressBean>> logisticsBeanDataResponse) {
+                        if (logisticsBeanDataResponse.responseCode == 200) {
+                            logisticsBean.postValue(logisticsBeanDataResponse.getData());
+                        } else {
+                            ToastUtils.showLong(logisticsBeanDataResponse.responseError);
+                        }
+
+                        LogUtil.LogInfo("logisticsBean", JSON.toJSONString(logisticsBeanDataResponse));
+                    }
 
-                LogUtil.LogInfo("logisticsBean", JSON.toJSONString(logisticsBeanDataResponse));
-            }
-            @Override
-            public void onFailure(Throwable e) {
-                LogUtil.LogInfo("Throwable", e.getMessage());
+                    @Override
+                    public void onFailure(Throwable e) {
+                        LogUtil.LogInfo("Throwable", e.getMessage());
 
-            }
-        }));
+                    }
+                }));
 
     }
 

app/src/main/java/com/yihucha/hbyhc/utils/HtmlUtils.java

@@ -0,0 +1,45 @@
+package com.yihucha.hbyhc.utils;
+
+import java.util.regex.Pattern;
+
+public class HtmlUtils {
+    /**
+     * html格式文本，转换成普通字符串输出
+     * @param inputString
+     * @return
+     */
+    public static String html2Text(String inputString) {
+        String htmlStr = inputString; // 含html标签的字符串
+        String textStr = "";
+        Pattern p_script;
+        java.util.regex.Matcher m_script;
+        Pattern p_style;
+        java.util.regex.Matcher m_style;
+        Pattern p_html;
+        java.util.regex.Matcher m_html;
+        Pattern p_html1;
+        java.util.regex.Matcher m_html1;
+        try {
+            String regEx_script = "<[//s]*?script[^>]*?>[//s//S]*?<[//s]*?///[//s]*?script[//s]*?>"; // 定义script的正则表达式{或<script[^>]*?>[//s//S]*?<///script>
+            String regEx_style = "<[//s]*?style[^>]*?>[//s//S]*?<[//s]*?///[//s]*?style[//s]*?>"; // 定义style的正则表达式{或<style[^>]*?>[//s//S]*?<///style>
+            String regEx_html = "<[^>]+>"; // 定义HTML标签的正则表达式
+            String regEx_html1 = "<[^>]+";
+            p_script = Pattern.compile(regEx_script, Pattern.CASE_INSENSITIVE);
+            m_script = p_script.matcher(htmlStr);
+            htmlStr = m_script.replaceAll(""); // 过滤script标签
+            p_style = Pattern.compile(regEx_style, Pattern.CASE_INSENSITIVE);
+            m_style = p_style.matcher(htmlStr);
+            htmlStr = m_style.replaceAll(""); // 过滤style标签
+            p_html = Pattern.compile(regEx_html, Pattern.CASE_INSENSITIVE);
+            m_html = p_html.matcher(htmlStr);
+            htmlStr = m_html.replaceAll(""); // 过滤html标签
+            p_html1 = Pattern.compile(regEx_html1, Pattern.CASE_INSENSITIVE);
+            m_html1 = p_html1.matcher(htmlStr);
+            htmlStr = m_html1.replaceAll(""); // 过滤html标签
+            textStr = htmlStr;
+        } catch (Exception e) {
+            System.err.println("Html2Text: " + e.getMessage());
+        }
+        return textStr;// 返回文本字符串
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.yihucha.hbyhc.utils
+
+import android.view.Gravity
+import com.hjq.toast.ToastParams
+import com.hjq.toast.Toaster
+import com.hjq.toast.style.BlackToastStyle
+import com.yihucha.hbyhc.R
+
+/**
+ *  author : zhangbing
+ *  time   : 2024/2/27 11:09
+ *  com.yihucha.hbyhc.utils
+ */
+object ToasterUtils {
+    @JvmStatic
+    fun showBlack(msg:String){
+        val params = ToastParams()
+        params.text = msg
+        params.style = BlackToastStyle()
+        Toaster.show(params)
+    }
+    @JvmStatic
+    fun showCustomView(msg:String,id:Int){
+        Toaster.setView(id)
+        Toaster.setGravity(Gravity.CENTER)
+        Toaster.show(msg)
+    }
+}

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="180"
+        android:endColor="@color/black_333333"
+        android:startColor="@color/black_333333"
+        />
+
+    <corners android:radius="10dp" />
+</shape>

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/white_f8f8f8"
     android:orientation="vertical">
 
@@ -120,10 +121,11 @@
             android:id="@+id/ll_exchange_products"
             android:layout_marginTop="20dp"
             android:layout_width="match_parent"
-            android:visibility="visible"
+            android:visibility="gone"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            >
 
             <ImageView
                 android:layout_width="wrap_content"

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

@@ -50,7 +50,6 @@
                         android:id="@+id/tv_name_integral"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="30dp"
                         android:text="红积分"
                         android:textColor="@color/white"
                         android:textSize="14sp" />

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

@@ -124,10 +124,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:drawableTop="@mipmap/icon_mine_lvf"
+                        android:drawableTop="@mipmap/icon_mine_hjf"
                         android:drawablePadding="8dp"
                         android:gravity="center"
-                        android:text="我的绿积分"
+                        android:text="我的红积分"
                         android:textColor="@color/black_333333"
                         android:textSize="12sp" />
 

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

@@ -41,6 +41,9 @@
         android:text="这是公告内容这是公告内容这是公告这是公告内容这是公告内容这是公告这是公告内容…"
         android:textColor="@color/gray_999999"
         android:layout_marginTop="5dp"
-        android:textSize="13sp" />
+        android:textSize="13sp"
+        android:maxLines="1"
+        android:ellipsize="end"
+        />
 
 </RelativeLayout>

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

@@ -5,7 +5,9 @@
     android:layout_height="80dp"
     android:background="@color/white"
     android:orientation="horizontal"
-    android:padding="16dp">
+    android:padding="16dp"
+    android:id="@+id/parent_view"
+    >
 
     <TextView
         android:id="@+id/tv_integral"

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_gradient"
+    android:layout_gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingLeft="30dp"
+    android:paddingRight="30dp"
+    android:paddingTop="19dp"
+    android:paddingBottom="20dp"
+    android:alpha="0.5"
+    >
+    <ImageView
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:src="@mipmap/icon_add_card_success" />
+    <TextView
+        android:id="@android:id/message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:textColor="#FFFFFFFF"
+        android:layout_gravity="center_horizontal"
+        android:textSize="15sp" />
+</LinearLayout>