feat: 1、所有时间显示格式化 2、数据为空列表改为可刷新 3、订单向往增加刷新

app/src/main/java/com/huntersun/vkyes/etcopencard/project/tool/DateUtils.java

@@ -1,5 +1,7 @@
 package com.huntersun.vkyes.etcopencard.project.tool;
 
+import android.text.TextUtils;
+
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -732,6 +734,18 @@ public class DateUtils {
         return date2Str(beforeTime.getTime(), format);
     }
 
+    /*
+     * 获取时间 把yyyy-MM-dd T hh:mm:ss 格式转为 yyyy-MM-dd hh:mm:ss
+     * @param date
+     * @return
+     */
+    public static String getTimeFromTimeT(String date) {
+        if (TextUtils.isEmpty(date) || !date.contains("T")){
+            return date;
+        }
+        return date2Str(str2Date(date, yyyymmddThhmmss), datetimeFormat);
+    }
+
     /*
      * 给某个时间加上多少天
      *
@@ -787,7 +801,7 @@ public class DateUtils {
         return dateFormat.format(cal.getTime());
     }
 
-    /**
+    /*
      * 计算两个日期相差多少天
      *
      * @param date1str

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/BusinessDetectionActivity.java

@@ -25,6 +25,7 @@ import com.huntersun.vkyes.etcopencard.project.api.Result;
 import com.huntersun.vkyes.etcopencard.project.api.bean.EnumBean;
 import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
+import com.huntersun.vkyes.etcopencard.project.tool.DateUtils;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.order.OrderDetailsActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.order.OrderUtils;
 import com.huntersun.vkyes.etcopencard.project.utils.Constants;
@@ -162,7 +163,7 @@ public class BusinessDetectionActivity extends AppActivity
         @SuppressLint("LogNotTimber")
         @Override
         protected void convert(BaseViewHolder helper, ResultBean.BizContent item) {
-            helper.setText(R.id.text, item.getInsertTime());
+            helper.setText(R.id.text, DateUtils.getTimeFromTimeT(item.getInsertTime()));
             helper.setText(R.id.text1, item.getOrderStatus().equals(String.valueOf(Constants.ORDER_STATUS_CANCEL)) ? "已取消" : EnumBean.backValue(item.getOrderStep(), EnumBean.OrderStage));
             helper.setText(R.id.text2, item.getVehiclePlate());
             helper.setText(R.id.text3, EnumBean.backValue(item.getVehiclePlateColor(), EnumBean.VehicleColorArray));

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/order/OrderDetailsActivity.java

@@ -16,6 +16,7 @@ import com.huntersun.vkyes.etcopencard.project.api.Result;
 import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
 import com.huntersun.vkyes.etcopencard.project.api.bean.SendTheVerificationCodeBean;
+import com.huntersun.vkyes.etcopencard.project.tool.DateUtils;
 import com.huntersun.vkyes.etcopencard.project.utils.Constants;
 import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
 import com.huntersun.vkyes.etcopencard.src.action.StatusAction;
@@ -23,7 +24,12 @@ import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 import com.huntersun.vkyes.etcopencard.src.ui.adapter.AddViewHolder;
 import com.huntersun.vkyes.etcopencard.src.widget.StatusLayout;
 import com.jeremyliao.liveeventbus.LiveEventBus;
+import com.scwang.smart.refresh.layout.api.RefreshLayout;
+import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 
+import org.jetbrains.annotations.NotNull;
+
+import androidx.annotation.NonNull;
 import retrofit2.Response;
 
 /**
@@ -31,7 +37,7 @@ import retrofit2.Response;
  *
  * @author ht
  */
-public class OrderDetailsActivity extends AppActivity implements StatusAction {
+public class OrderDetailsActivity extends AppActivity implements StatusAction , OnRefreshListener {
     private ActivityOrderDetailsBinding binding;
 
     //订单id
@@ -48,6 +54,8 @@ public class OrderDetailsActivity extends AppActivity implements StatusAction {
     @Override
     protected void initView() {
         id = getIntent().getStringExtra("id");
+        binding.mRefresh.setEnableLoadMore(false);
+        binding.mRefresh.setOnRefreshListener(this);
 
         //监听信息
         LiveEventBus.get("credentialsUpdateData", String.class).observe(this, s -> {
@@ -57,10 +65,7 @@ public class OrderDetailsActivity extends AppActivity implements StatusAction {
 
     @Override
     protected void initData() {
-        if (FunHelper.isEmpty(id)) {
-            toast("订单id不能为空！");
-            return;
-        }
+
         getOrderDetails();
     }
 
@@ -113,11 +118,11 @@ public class OrderDetailsActivity extends AppActivity implements StatusAction {
         addItemView(binding.LLBaseInfoContent, "订单状态", FunHelper.getOrderStatusName(Integer.parseInt(FunHelper.isEmpty(orderData.getOrderStep()) ? "" : orderData.getOrderStep())), 1, false);
         //addItemView(binding.LLBaseInfoContent,"设备型号",orderData.getProductName(),1,true);
 
-        addItemView(binding.LLBaseInfoContent, "创建时间", FunHelper.isEmpty(orderData.getInsertTime()) ? "" : orderData.getInsertTime(), 1, false);
-        addItemView(binding.LLBaseInfoContent, "付款时间", FunHelper.isEmpty(orderData.orderInfoExt.payTime) ? "" : orderData.orderInfoExt.payTime, 1, true);
+        addItemView(binding.LLBaseInfoContent, "创建时间", FunHelper.isEmpty(orderData.getInsertTime()) ? "" : DateUtils.getTimeFromTimeT(orderData.getInsertTime()), 1, false);
+        addItemView(binding.LLBaseInfoContent, "付款时间", FunHelper.isEmpty(orderData.orderInfoExt.payTime) ? "" :DateUtils.getTimeFromTimeT( orderData.orderInfoExt.payTime), 1, true);
 
         if (orderData.getOrderStatus().equals(Constants.ORDER_STATUS_CANCEL + "")) {//已取消
-            addItemView(binding.LLBaseInfoContent, "取消时间", FunHelper.isEmpty(orderData.orderInfoExt.cancelTime) ? "" : orderData.orderInfoExt.cancelTime, 1, false);
+            addItemView(binding.LLBaseInfoContent, "取消时间", FunHelper.isEmpty(orderData.orderInfoExt.cancelTime) ? "" : DateUtils.getTimeFromTimeT(orderData.orderInfoExt.cancelTime), 1, false);
             addItemView(binding.LLBaseInfoContent, "取消原因", FunHelper.isEmpty(orderData.orderInfoExt.cancelReason) ? "" : orderData.orderInfoExt.cancelReason, 1, true);
             addItemView(binding.LLBaseInfoContent, "业务员", FunHelper.isEmpty(orderData.staffName) ? "" : orderData.staffName, 1, false);
         } else {
@@ -129,45 +134,45 @@ public class OrderDetailsActivity extends AppActivity implements StatusAction {
                     addItemView(binding.LLBaseInfoContent, "业务员", FunHelper.isEmpty(orderData.staffName) ? "" : orderData.staffName, 1, false);
                     break;
                 case Constants.ORDER_STATUS_WAIT_TAKE_DELIVERY://待收货
-                    addItemView(binding.LLBaseInfoContent, "发货时间", FunHelper.isEmpty(orderData.orderInfoExt.deliveryTime) ? "" : orderData.orderInfoExt.deliveryTime, 1, false);
+                    addItemView(binding.LLBaseInfoContent, "发货时间", FunHelper.isEmpty(orderData.orderInfoExt.deliveryTime) ? "" : DateUtils.getTimeFromTimeT(orderData.orderInfoExt.deliveryTime), 1, false);
                     addItemView(binding.LLBaseInfoContent, "物流单号", FunHelper.isEmpty(orderData.trackingNumber) ? "" : orderData.trackingNumber, 1, false);
                     addItemView(binding.LLBaseInfoContent, "物流公司", FunHelper.isEmpty(orderData.courierCompany) ? "" : orderData.courierCompany, 1, true);
                     addItemView(binding.LLBaseInfoContent, "业务员", FunHelper.isEmpty(orderData.staffName) ? "" : orderData.staffName, 1, false);
                     break;
                 case Constants.ORDER_STATUS_WAIT_ACTIVE://待激活
-                    addItemView(binding.LLBaseInfoContent, "发货时间", FunHelper.isEmpty(orderData.orderInfoExt.deliveryTime) ? "" : orderData.orderInfoExt.deliveryTime, 1, false);
-                    addItemView(binding.LLBaseInfoContent, "收货时间", FunHelper.isEmpty(orderData.orderInfoExt.receivingTime) ? "" : orderData.orderInfoExt.receivingTime, 1, false);
+                    addItemView(binding.LLBaseInfoContent, "发货时间", FunHelper.isEmpty(orderData.orderInfoExt.deliveryTime) ? "" : DateUtils.getTimeFromTimeT(orderData.orderInfoExt.deliveryTime), 1, false);
+                    addItemView(binding.LLBaseInfoContent, "收货时间", FunHelper.isEmpty(orderData.orderInfoExt.receivingTime) ? "" : DateUtils.getTimeFromTimeT(orderData.orderInfoExt.receivingTime), 1, false);
                     addItemView(binding.LLBaseInfoContent, "物流单号", FunHelper.isEmpty(orderData.trackingNumber) ? "" : orderData.trackingNumber, 1, false);
                     addItemView(binding.LLBaseInfoContent, "物流公司", FunHelper.isEmpty(orderData.courierCompany) ? "" : orderData.courierCompany, 1, true);
                     addItemView(binding.LLBaseInfoContent, "业务员", FunHelper.isEmpty(orderData.staffName) ? "" : orderData.staffName, 1, false);
                     break;
                 case Constants.ORDER_STATUS_EX_GOODS://换货
-                    addItemView(binding.LLBaseInfoContent, "发货时间", FunHelper.isEmpty(orderData.orderInfoExt.deliveryTime) ? "" : orderData.orderInfoExt.deliveryTime, 1, false);
+                    addItemView(binding.LLBaseInfoContent, "发货时间", FunHelper.isEmpty(orderData.orderInfoExt.deliveryTime) ? "" : DateUtils.getTimeFromTimeT(orderData.orderInfoExt.deliveryTime), 1, false);
                     addItemView(binding.LLBaseInfoContent, "物流单号", FunHelper.isEmpty(orderData.trackingNumber) ? "" : orderData.trackingNumber, 1, false);
                     addItemView(binding.LLBaseInfoContent, "物流公司", FunHelper.isEmpty(orderData.courierCompany) ? "" : orderData.courierCompany, 1, true);
                     addItemView(binding.LLBaseInfoContent, "业务员", FunHelper.isEmpty(orderData.staffName) ? "" : orderData.staffName, 1, false);
                     break;
                 case Constants.ORDER_STATUS_RETURN_GOODS://退货
-                    addItemView(binding.LLBaseInfoContent, "发货时间", FunHelper.isEmpty(orderData.orderInfoExt.deliveryTime) ? "" : orderData.orderInfoExt.deliveryTime, 1, false);
+                    addItemView(binding.LLBaseInfoContent, "发货时间", FunHelper.isEmpty(orderData.orderInfoExt.deliveryTime) ? "" : DateUtils.getTimeFromTimeT(orderData.orderInfoExt.deliveryTime), 1, false);
                     addItemView(binding.LLBaseInfoContent, "物流单号", FunHelper.isEmpty(orderData.trackingNumber) ? "" : orderData.trackingNumber, 1, false);
                     addItemView(binding.LLBaseInfoContent, "物流公司", FunHelper.isEmpty(orderData.courierCompany) ? "" : orderData.courierCompany, 1, true);
                     addItemView(binding.LLBaseInfoContent, "业务员", FunHelper.isEmpty(orderData.staffName) ? "" : orderData.staffName, 1, false);
                     break;
                 case Constants.ORDER_STATUS_FINISH://已结束
-                    addItemView(binding.LLBaseInfoContent, "发货时间", FunHelper.isEmpty(orderData.orderInfoExt.deliveryTime) ? "" : orderData.orderInfoExt.deliveryTime, 1, false);
-                    addItemView(binding.LLBaseInfoContent, "收货时间", FunHelper.isEmpty(orderData.orderInfoExt.receivingTime) ? "" : orderData.orderInfoExt.receivingTime, 1, false);
-                    addItemView(binding.LLBaseInfoContent, "订单结束时间", FunHelper.isEmpty(orderData.orderInfoExt.finishTime) ? "" : orderData.orderInfoExt.finishTime, 1, false);
+                    addItemView(binding.LLBaseInfoContent, "发货时间", FunHelper.isEmpty(orderData.orderInfoExt.deliveryTime) ? "" : DateUtils.getTimeFromTimeT(orderData.orderInfoExt.deliveryTime), 1, false);
+                    addItemView(binding.LLBaseInfoContent, "收货时间", FunHelper.isEmpty(orderData.orderInfoExt.receivingTime) ? "" : DateUtils.getTimeFromTimeT(orderData.orderInfoExt.receivingTime), 1, false);
+                    addItemView(binding.LLBaseInfoContent, "订单结束时间", FunHelper.isEmpty(orderData.orderInfoExt.finishTime) ? "" : DateUtils.getTimeFromTimeT(orderData.orderInfoExt.finishTime), 1, false);
                     addItemView(binding.LLBaseInfoContent, "物流单号", FunHelper.isEmpty(orderData.trackingNumber) ? "" : orderData.trackingNumber, 1, false);
                     addItemView(binding.LLBaseInfoContent, "物流公司", FunHelper.isEmpty(orderData.courierCompany) ? "" : orderData.courierCompany, 1, true);
                     addItemView(binding.LLBaseInfoContent, "业务员", FunHelper.isEmpty(orderData.staffName) ? "" : orderData.staffName, 1, false);
                     break;
                 case Constants.ORDER_STATUS_COMPLETE://已完成
-                    addItemView(binding.LLBaseInfoContent, "发货时间", FunHelper.isEmpty(orderData.orderInfoExt.deliveryTime) ? "" : orderData.orderInfoExt.deliveryTime, 1, false);
-                    addItemView(binding.LLBaseInfoContent, "收货时间", FunHelper.isEmpty(orderData.orderInfoExt.receivingTime) ? "" : orderData.orderInfoExt.receivingTime, 1, false);
+                    addItemView(binding.LLBaseInfoContent, "发货时间", FunHelper.isEmpty(orderData.orderInfoExt.deliveryTime) ? "" : DateUtils.getTimeFromTimeT(orderData.orderInfoExt.deliveryTime), 1, false);
+                    addItemView(binding.LLBaseInfoContent, "收货时间", FunHelper.isEmpty(orderData.orderInfoExt.receivingTime) ? "" : DateUtils.getTimeFromTimeT(orderData.orderInfoExt.receivingTime), 1, false);
                     addItemView(binding.LLBaseInfoContent, "物流单号", FunHelper.isEmpty(orderData.trackingNumber) ? "" : orderData.trackingNumber, 1, false);
                     addItemView(binding.LLBaseInfoContent, "物流公司", FunHelper.isEmpty(orderData.courierCompany) ? "" : orderData.courierCompany, 1, true);
 
-                    addItemView(binding.LLBaseInfoContent, "激活时间", FunHelper.isEmpty(orderData.cardEnableTime) ? "" : orderData.cardEnableTime, 1, false);
+                    addItemView(binding.LLBaseInfoContent, "激活时间", FunHelper.isEmpty(orderData.cardEnableTime) ? "" : DateUtils.getTimeFromTimeT(orderData.cardEnableTime), 1, false);
                     addItemView(binding.LLBaseInfoContent, "卡号", FunHelper.isEmpty(orderData.getCardId()) ? "" : orderData.getCardId(), 1, false);
                     addItemView(binding.LLBaseInfoContent, "卡状态", FunHelper.getETCStatusName(Integer.parseInt(FunHelper.isEmpty(orderData.getCardStatus()) ? "0" : orderData.getCardStatus())), 2, false);
                     addItemView(binding.LLBaseInfoContent, "OBU号", FunHelper.isEmpty(orderData.getObuId()) ? "" : orderData.getObuId(), 1, false);
@@ -256,6 +261,11 @@ public class OrderDetailsActivity extends AppActivity implements StatusAction {
      * 获取订单详情信息
      */
     private void getOrderDetails() {
+        if (FunHelper.isEmpty(id)) {
+            toast("订单id不能为空！");
+            return;
+        }
+
         showLoading();
         FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
         fatherBean.bizContent = new SendTheVerificationCodeBean();
@@ -291,4 +301,14 @@ public class OrderDetailsActivity extends AppActivity implements StatusAction {
     public StatusLayout getStatusLayout() {
         return binding.hlStatusHint;
     }
+
+    /**
+     * 刷新
+     * @param refreshLayout
+     */
+    @Override
+    public void onRefresh(@NonNull @NotNull RefreshLayout refreshLayout) {
+        getOrderDetails();
+        binding.mRefresh.finishRefresh();
+    }
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/adapter/ExtraCreditAdapter.java

@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
+import com.huntersun.vkyes.etcopencard.project.tool.DateUtils;
 import com.huntersun.vkyes.etcopencard.project.utils.Constants;
 import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
 
@@ -32,7 +33,7 @@ public class ExtraCreditAdapter extends BaseQuickAdapter<ResultBean.BizContent,
         if (FunHelper.isEmpty(bizContent.refundType)) bizContent.refundType = "";
 
         holder.setText(R.id.tvOrderId, FunHelper.isEmpty(bizContent.getId()) ? "" : bizContent.getId());
-        holder.setText(R.id.tvTime,bizContent.getInsertTime());
+        holder.setText(R.id.tvTime, DateUtils.getTimeFromTimeT(bizContent.getInsertTime()));
         holder.setText(R.id.tvOldMoney,"¥" + (FunHelper.isEmpty(bizContent.cardBalance) ? "0.00" : FunHelper.changeF2Y(Long.parseLong(bizContent.cardBalance))));
         holder.setText(R.id.tvStatus,FunHelper.getReturnTypeByReturnStatus(bizContent.refundType));
 

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/adapter/PayTheArrearsAdapter.java

@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
+import com.huntersun.vkyes.etcopencard.project.tool.DateUtils;
 import com.huntersun.vkyes.etcopencard.project.utils.Constants;
 import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
 
@@ -70,7 +71,7 @@ public class PayTheArrearsAdapter extends BaseQuickAdapter<ResultBean.BizContent
         holder.setText(R.id.tvOrderId, FunHelper.isEmpty(bizContent.listNo) ? "" : bizContent.listNo);
         holder.setText(R.id.tvVehiclePlate, FunHelper.isEmpty(bizContent.getVehiclePlate()) ? "" : bizContent.getVehiclePlate());
         holder.setText(R.id.tvBJId, FunHelper.isEmpty(bizContent.suppleNo) ? "" : bizContent.suppleNo);
-        holder.setText(R.id.tvInsertTime, FunHelper.isEmpty(bizContent.insertTime) ? "" : bizContent.insertTime);
+        holder.setText(R.id.tvInsertTime, FunHelper.isEmpty(bizContent.insertTime) ? "" : DateUtils.getTimeFromTimeT(bizContent.insertTime));
         holder.setText(R.id.tvAmount, "¥" + (FunHelper.changeF2Y(bizContent.fee)));
         holder.setText(R.id.tvServiceAmount, "¥" + (FunHelper.changeF2Y(bizContent.serviceFee)));
         holder.setText(R.id.tvTotalAmount, (FunHelper.changeF2Y(Long.parseLong(bizContent.totalFee))));
@@ -114,7 +115,7 @@ public class PayTheArrearsAdapter extends BaseQuickAdapter<ResultBean.BizContent
         holder.setText(R.id.tvOrderId, FunHelper.isEmpty(bizContent.listNo) ? "" : bizContent.listNo);
         holder.setText(R.id.tvVehiclePlate, FunHelper.isEmpty(bizContent.getVehiclePlate()) ? "" : bizContent.getVehiclePlate());
         holder.setText(R.id.tvBJId, FunHelper.isEmpty(bizContent.suppleNo) ? "" : bizContent.suppleNo);
-        holder.setText(R.id.tvInsertTime, FunHelper.isEmpty(bizContent.insertTime) ? "" : bizContent.insertTime);
+        holder.setText(R.id.tvInsertTime, FunHelper.isEmpty(bizContent.insertTime) ? "" : DateUtils.getTimeFromTimeT(bizContent.insertTime));
         holder.setText(R.id.tvTotalAmount, (FunHelper.changeF2Y(Long.parseLong(bizContent.totalFee))));
 
         if (!FunHelper.isEmpty(bizContent.suppleStatus)){

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentSonOne.java

@@ -24,6 +24,7 @@ import com.huntersun.vkyes.etcopencard.project.api.Result;
 import com.huntersun.vkyes.etcopencard.project.api.bean.EnumBean;
 import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
+import com.huntersun.vkyes.etcopencard.project.tool.DateUtils;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.order.OrderDetailsActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.MainActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.order.OrderUtils;
@@ -199,7 +200,7 @@ public class FragmentSonOne extends TitleBarFragment<MainActivity>
         @SuppressLint("LogNotTimber")
         @Override
         protected void convert(BaseViewHolder helper, ResultBean.BizContent item) {
-            helper.setText(R.id.text, item.getInsertTime());
+            helper.setText(R.id.text, DateUtils.getTimeFromTimeT(item.getInsertTime()));
             helper.setText(R.id.text1, item.getOrderStatus().equals(String.valueOf(Constants.ORDER_STATUS_CANCEL)) ? "已取消" : EnumBean.backValue(item.getOrderStep(), EnumBean.OrderStage));
             helper.setText(R.id.text2, item.getVehiclePlate());
             helper.setText(R.id.text3, EnumBean.backValue(item.getVehiclePlateColor(), EnumBean.VehicleColorArray));

app/src/main/res/layout-v1/activity_extra_credit_step2.xml

@@ -20,10 +20,10 @@
         android:id="@+id/LLSearch"
         style="@style/MatchWrap.Horizontal"
         android:layout_below="@+id/titleBar"
-        android:visibility="gone"
         android:layout_marginVertical="@dimen/dp_15"
         android:layout_marginRight="@dimen/dp_15"
-        android:gravity="center">
+        android:gravity="center"
+        android:visibility="gone">
 
         <LinearLayout
             style="@style/AutoWrap.Horizontal"
@@ -63,17 +63,17 @@
             android:textSize="@dimen/sp_12" />
     </LinearLayout>
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_status_hint"
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/rl_status_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/LLSearch">
+        android:layout_below="@+id/LLSearch"
+        app:srlEnablePreviewInEditMode="false">
 
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/rl_status_refresh"
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_status_hint"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:srlEnablePreviewInEditMode="false">
+            android:layout_height="match_parent">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/mRecycleView"
@@ -83,6 +83,7 @@
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:listCount="10"
                 tools:listitem="@layout/item_extra_credit" />
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
 </LinearLayout>

app/src/main/res/layout-v2/activity_pay_the_arrears_step0.xml

@@ -11,7 +11,7 @@
         android:background="@color/white"
         app:leftIcon="@mipmap/back_black"
         app:lineVisible="false"
-        app:title="余额补领"
+        app:title="欠费补缴"
         app:titleColor="@color/black" />
 
     <androidx.core.widget.NestedScrollView

app/src/main/res/layout-v2/fragment_home_three.xml

@@ -113,16 +113,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-            android:id="@+id/hl_status_hint"
+        <com.scwang.smart.refresh.layout.SmartRefreshLayout
+            android:id="@+id/rl_status_refresh"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            app:srlEnablePreviewInEditMode="false">
 
-            <com.scwang.smart.refresh.layout.SmartRefreshLayout
-                android:id="@+id/rl_status_refresh"
+            <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+                android:id="@+id/hl_status_hint"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:srlEnablePreviewInEditMode="false">
+                android:layout_height="match_parent">
+
 
                 <com.hjq.widget.layout.WrapRecyclerView
                     android:id="@+id/rv_status_list"
@@ -133,10 +134,8 @@
                     tools:listCount="10"
                     tools:listitem="@layout/item_list_content" />
 
-            </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-
-        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
-
+            </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
     </LinearLayout>
 
 </LinearLayout>

app/src/main/res/layout-v2/fragment_son_one.xml

@@ -16,16 +16,16 @@
         app:spanCount="5"
         tools:listitem="@layout/item_screen" />
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_status_hint"
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/rl_status_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:srlEnablePreviewInEditMode="false">
 
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/rl_status_refresh"
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_status_hint"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:srlEnablePreviewInEditMode="false">
+            android:layout_height="match_parent">
 
             <com.hjq.widget.layout.WrapRecyclerView
                 android:id="@+id/rv_status_list"
@@ -34,10 +34,6 @@
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:listCount="10"
                 tools:listitem="@layout/item_list_content" />
-
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-
-
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
-
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 </LinearLayout>

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

@@ -20,10 +20,10 @@
         android:id="@+id/LLSearch"
         style="@style/MatchWrap.Horizontal"
         android:layout_below="@+id/titleBar"
-        android:visibility="gone"
         android:layout_marginVertical="@dimen/dp_15"
         android:layout_marginRight="@dimen/dp_15"
-        android:gravity="center">
+        android:gravity="center"
+        android:visibility="gone">
 
         <LinearLayout
             style="@style/AutoWrap.Horizontal"
@@ -63,17 +63,17 @@
             android:textSize="@dimen/sp_12" />
     </LinearLayout>
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_status_hint"
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/rl_status_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/LLSearch">
+        android:layout_below="@+id/LLSearch"
+        app:srlEnablePreviewInEditMode="false">
 
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/rl_status_refresh"
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_status_hint"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:srlEnablePreviewInEditMode="false">
+            android:layout_height="match_parent">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/mRecycleView"
@@ -83,6 +83,6 @@
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:listCount="10"
                 tools:listitem="@layout/item_balance_replacement" />
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 </LinearLayout>

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

@@ -17,16 +17,16 @@
 
     <include layout="@layout/layout_vehicleplate" />
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_status_hint"
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/rl_status_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:srlEnablePreviewInEditMode="false">
 
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/rl_status_refresh"
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_status_hint"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:srlEnablePreviewInEditMode="false">
+            android:layout_height="match_parent">
 
             <com.hjq.widget.layout.WrapRecyclerView
                 android:id="@+id/rv_status_list"
@@ -36,10 +36,6 @@
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:listCount="10"
                 tools:listitem="@layout/item_list_content" />
-
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-
-
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
-
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 </LinearLayout>

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

@@ -17,27 +17,28 @@
 
     <include layout="@layout/layout_vehicleplate" />
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_status_hint"
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/rl_status_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/LLSearch">
+        android:layout_below="@+id/LLSearch"
+        app:srlEnablePreviewInEditMode="false">
 
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/rl_status_refresh"
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_status_hint"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:srlEnablePreviewInEditMode="false">
+            android:layout_height="match_parent">
+
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/mRecycleView"
-                tools:listCount="10"
-                tools:listitem="@layout/layout_check_running_water_card_item"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingTop="@dimen/dp_15"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listCount="10"
+                tools:listitem="@layout/layout_check_running_water_card_item" />
 
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 </LinearLayout>

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

@@ -18,10 +18,10 @@
     <LinearLayout
         style="@style/MatchWrap.Horizontal"
         android:layout_below="@+id/title"
-        android:visibility="gone"
         android:layout_marginHorizontal="@dimen/dp_15"
         android:layout_marginVertical="@dimen/dp_15"
-        android:gravity="center">
+        android:gravity="center"
+        android:visibility="gone">
 
         <LinearLayout
             style="@style/AutoWrap.Horizontal"
@@ -151,49 +151,53 @@
             android:text="金额合计：0"
             android:textColor="@color/color_666666"
             android:textSize="@dimen/sp_13" />
+
         <TextView
             android:id="@+id/tvTotalPassNum"
             style="@style/AutoWrap"
-            android:text="通行次数：0"
             android:gravity="center"
+            android:text="通行次数：0"
             android:textColor="@color/color_666666"
             android:textSize="@dimen/sp_13" />
+
         <TextView
             android:id="@+id/tvStopNum"
             style="@style/AutoWrap"
-            android:text="停车次数：0"
             android:gravity="right"
+            android:text="停车次数：0"
             android:textColor="@color/color_666666"
             android:textSize="@dimen/sp_13" />
     </LinearLayout>
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_status_hint"
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/rl_status_refresh"
         android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_below="@+id/LLCount"
-        android:layout_height="match_parent">
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/rl_status_refresh"
-            android:layout_marginBottom="@dimen/dp_65"
+        android:layout_marginBottom="@dimen/dp_65"
+        app:srlEnablePreviewInEditMode="false">
+
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_status_hint"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:srlEnablePreviewInEditMode="false">
+            android:layout_height="match_parent">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler"
                 style="@style/MatchMatch"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:listitem="@layout/item_check_running_water" />
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
     <LinearLayout
-       style="@style/MatchWrap.Vertical"
+        style="@style/MatchWrap.Vertical"
         android:layout_alignParentBottom="true"
-        android:paddingVertical="@dimen/dp_12"
-        android:paddingHorizontal="@dimen/dp_40"
         android:background="@color/background_color"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:paddingHorizontal="@dimen/dp_40"
+        android:paddingVertical="@dimen/dp_12">
+
         <Button
             android:id="@+id/btnDownload"
             style="@style/BtnShortStyle"

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

@@ -221,7 +221,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right|bottom"
                             android:src="@mipmap/complete"
-                            android:visibility="gone"/>
+                            android:visibility="gone" />
                     </FrameLayout>
 
                     <View
@@ -297,16 +297,16 @@
         android:textColor="#333333"
         android:textSize="@dimen/sp_16" />
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_status_hint"
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/rl_status_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:srlEnablePreviewInEditMode="false">
 
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/rl_status_refresh"
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_status_hint"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:srlEnablePreviewInEditMode="false">
+            android:layout_height="match_parent">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler"
@@ -316,9 +316,7 @@
                 tools:itemCount="2"
                 tools:listitem="@layout/item_product" />
 
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
-
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
 </LinearLayout>

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

@@ -4,27 +4,30 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/background_color"
     android:orientation="vertical"
     tools:context=".project.ui.activity.SubscribeListActivity">
 
     <com.hjq.bar.TitleBar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/video_ball_bg12"
-        app:leftIcon="@mipmap/back_three"
+        android:background="@color/white"
+        app:leftIcon="@mipmap/back_black"
         app:lineVisible="false"
-        app:titleColor="#FFFFFF" />
+        app:title="发货管理"
+        app:titleColor="@color/black" />
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_status_hint"
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/rl_status_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:srlEnablePreviewInEditMode="false">
 
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/rl_status_refresh"
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_status_hint"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:srlEnablePreviewInEditMode="false">
+            android:layout_height="match_parent">
+
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler"
@@ -34,10 +37,7 @@
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:itemCount="2"
                 tools:listitem="@layout/item_list_delivery" />
-
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
-
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
 </LinearLayout>

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

@@ -1,204 +1,208 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/background_color">
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_status_hint"
-        style="@style/MatchWrap">
-        <androidx.core.widget.NestedScrollView style="@style/MatchWrap">
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/mRefresh"
+        style="@style/MatchWrap"
+        app:srlEnablePreviewInEditMode="false">
 
-            <LinearLayout
-                style="@style/MatchWrap.Vertical"
-                android:paddingBottom="@dimen/dp_80">
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_status_hint"
+            style="@style/MatchWrap">
 
-                <!--top信息-->
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+            <androidx.core.widget.NestedScrollView style="@style/MatchWrap">
 
-                    <ImageView
-                        android:id="@+id/img_top_bg"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_180"
-                        android:background="@mipmap/order_detail_top_bg" />
+                <LinearLayout
+                    style="@style/MatchWrap.Vertical"
+                    android:paddingBottom="@dimen/dp_80">
 
-                    <TextView
-                        android:id="@+id/tvOrderStep"
-                        style="@style/greenTextStyleBold20"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignTop="@+id/img_green_card"
-                        android:layout_marginLeft="@dimen/dp_40"
-                        android:layout_marginTop="@dimen/dp_22"
-                        android:text="待审核" />
-
-                    <ImageView
-                        android:id="@+id/img_green_card"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignBottom="@+id/img_top_bg"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginRight="@dimen/dp_47"
-                        android:layout_marginBottom="@dimen/dp_29"
-                        android:src="@mipmap/ic_order_detail_green_card" />
-                </RelativeLayout>
-
-                <!--基本信息-->
-                <com.ruffian.library.widget.RLinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/img_green_card"
-                    android:layout_marginLeft="@dimen/dp_15"
-                    android:layout_marginTop="-24dp"
-                    android:layout_marginRight="@dimen/dp_15"
-                    android:orientation="vertical"
-                    android:padding="@dimen/dp_10"
-                    app:background_normal="@color/white"
-                    app:corner_radius="@dimen/dp_10">
-
-                    <!--地址信息-->
+                    <!--top信息-->
                     <RelativeLayout
-                        android:id="@+id/rlAddrInfo"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/dp_5"
-                        android:visibility="visible">
+                        android:layout_height="match_parent">
 
                         <ImageView
-                            android:id="@+id/img_green_edit"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@mipmap/ic_order_detail_green_edit" />
+                            android:id="@+id/img_top_bg"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/dp_180"
+                            android:background="@mipmap/order_detail_top_bg" />
 
                         <TextView
-                            android:id="@+id/tvConsignee"
-                            style="@style/blackTextStyle14"
+                            android:id="@+id/tvOrderStep"
+                            style="@style/greenTextStyleBold20"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="8.5dp"
-                            android:layout_toRightOf="@+id/img_green_edit"
-                             />
+                            android:layout_alignTop="@+id/img_green_card"
+                            android:layout_marginLeft="@dimen/dp_40"
+                            android:layout_marginTop="@dimen/dp_22"
+                            android:text="待审核" />
 
-                        <TextView
-                            android:id="@+id/tvAddress"
-                            style="@style/black02TextStyle14"
+                        <ImageView
+                            android:id="@+id/img_green_card"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_below="@+id/tvConsignee"
-                            android:layout_alignLeft="@+id/tvConsignee"
-                            android:layout_marginTop="@dimen/dp_12"
-                           />
-
-                        <TextView
-                            style="@style/MatchOne.HorLine"
-                            android:layout_below="@+id/tvAddress"
-                            android:layout_marginTop="@dimen/dp_10" />
+                            android:layout_alignBottom="@+id/img_top_bg"
+                            android:layout_alignParentRight="true"
+                            android:layout_marginRight="@dimen/dp_47"
+                            android:layout_marginBottom="@dimen/dp_29"
+                            android:src="@mipmap/ic_order_detail_green_card" />
                     </RelativeLayout>
 
-                    <!-- 产品基本信息-->
-                    <LinearLayout
-                        android:id="@+id/LLBaseInfoContent"
-                        style="@style/MatchWrap.Vertical">
-                    </LinearLayout>
-                </com.ruffian.library.widget.RLinearLayout>
-
-                <!--售后信息-->
-                <LinearLayout
-                    android:id="@+id/LLAfterSaleInfo"
-                    android:visibility="gone"
-                    style="@style/MatchWrap.Vertical">
-
-                    <TextView
-                        android:id="@+id/tvAfterSaleTitle"
-                        style="@style/blackTextStyleBold16"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/rlinear_ddxx"
-                        android:layout_marginLeft="@dimen/dp_15"
-                        android:layout_marginTop="@dimen/dp_15"
-                        android:layout_marginBottom="@dimen/dp_12"
-                        android:text="用户换货信息" />
-
+                    <!--基本信息-->
                     <com.ruffian.library.widget.RLinearLayout
-                        android:id="@+id/LLAfterSaleInfoContent"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="@dimen/dp_15"
+                        android:layout_below="@+id/img_green_card"
+                        android:layout_marginLeft="@dimen/dp_15"
+                        android:layout_marginTop="-24dp"
+                        android:layout_marginRight="@dimen/dp_15"
                         android:orientation="vertical"
-                        android:paddingLeft="@dimen/dp_10"
-                        android:paddingTop="@dimen/dp_5"
-                        android:paddingRight="@dimen/dp_10"
-                        android:paddingBottom="@dimen/dp_15"
+                        android:padding="@dimen/dp_10"
                         app:background_normal="@color/white"
                         app:corner_radius="@dimen/dp_10">
 
+                        <!--地址信息-->
+                        <RelativeLayout
+                            android:id="@+id/rlAddrInfo"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:padding="@dimen/dp_5"
+                            android:visibility="visible">
+
+                            <ImageView
+                                android:id="@+id/img_green_edit"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:src="@mipmap/ic_order_detail_green_edit" />
+
+                            <TextView
+                                android:id="@+id/tvConsignee"
+                                style="@style/blackTextStyle14"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="8.5dp"
+                                android:layout_toRightOf="@+id/img_green_edit" />
+
+                            <TextView
+                                android:id="@+id/tvAddress"
+                                style="@style/black02TextStyle14"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_below="@+id/tvConsignee"
+                                android:layout_alignLeft="@+id/tvConsignee"
+                                android:layout_marginTop="@dimen/dp_12" />
+
+                            <TextView
+                                style="@style/MatchOne.HorLine"
+                                android:layout_below="@+id/tvAddress"
+                                android:layout_marginTop="@dimen/dp_10" />
+                        </RelativeLayout>
+
+                        <!-- 产品基本信息-->
                         <LinearLayout
-                            android:id="@+id/LLAfterSaleContent"
-                            style="@style/MatchWrap.Vertical">
-
-                        </LinearLayout>
+                            android:id="@+id/LLBaseInfoContent"
+                            style="@style/MatchWrap.Vertical"></LinearLayout>
                     </com.ruffian.library.widget.RLinearLayout>
-                </LinearLayout>
 
-                <!--业务员信息-->
-                <LinearLayout
-                    android:id="@+id/LLStaffInfo"
-                    android:visibility="gone"
-                    style="@style/MatchWrap.Vertical">
-
-                    <TextView
-                        android:id="@+id/tvStaffTitle"
-                        style="@style/blackTextStyleBold16"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/rlinear_ddxx"
-                        android:layout_marginLeft="@dimen/dp_15"
-                        android:layout_marginTop="@dimen/dp_15"
-                        android:layout_marginBottom="@dimen/dp_12"
-                        android:text="业务员发起换货" />
+                    <!--售后信息-->
+                    <LinearLayout
+                        android:id="@+id/LLAfterSaleInfo"
+                        style="@style/MatchWrap.Vertical"
+                        android:visibility="gone">
 
-                    <com.ruffian.library.widget.RLinearLayout
-                        android:id="@+id/LLStaffInfoContent"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="@dimen/dp_15"
-                        android:orientation="vertical"
-                        android:paddingLeft="@dimen/dp_10"
-                        android:paddingTop="@dimen/dp_5"
-                        android:paddingRight="@dimen/dp_10"
-                        android:paddingBottom="@dimen/dp_15"
-                        app:background_normal="@color/white"
-                        app:corner_radius="@dimen/dp_10">
+                        <TextView
+                            android:id="@+id/tvAfterSaleTitle"
+                            style="@style/blackTextStyleBold16"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@+id/rlinear_ddxx"
+                            android:layout_marginLeft="@dimen/dp_15"
+                            android:layout_marginTop="@dimen/dp_15"
+                            android:layout_marginBottom="@dimen/dp_12"
+                            android:text="用户换货信息" />
+
+                        <com.ruffian.library.widget.RLinearLayout
+                            android:id="@+id/LLAfterSaleInfoContent"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginHorizontal="@dimen/dp_15"
+                            android:orientation="vertical"
+                            android:paddingLeft="@dimen/dp_10"
+                            android:paddingTop="@dimen/dp_5"
+                            android:paddingRight="@dimen/dp_10"
+                            android:paddingBottom="@dimen/dp_15"
+                            app:background_normal="@color/white"
+                            app:corner_radius="@dimen/dp_10">
+
+                            <LinearLayout
+                                android:id="@+id/LLAfterSaleContent"
+                                style="@style/MatchWrap.Vertical">
+
+                            </LinearLayout>
+                        </com.ruffian.library.widget.RLinearLayout>
+                    </LinearLayout>
 
-                        <LinearLayout
-                            android:id="@+id/LLStaffContent"
-                            style="@style/MatchWrap.Vertical">
+                    <!--业务员信息-->
+                    <LinearLayout
+                        android:id="@+id/LLStaffInfo"
+                        style="@style/MatchWrap.Vertical"
+                        android:visibility="gone">
 
-                            <include layout="@layout/layout_order_details_item" />
+                        <TextView
+                            android:id="@+id/tvStaffTitle"
+                            style="@style/blackTextStyleBold16"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@+id/rlinear_ddxx"
+                            android:layout_marginLeft="@dimen/dp_15"
+                            android:layout_marginTop="@dimen/dp_15"
+                            android:layout_marginBottom="@dimen/dp_12"
+                            android:text="业务员发起换货" />
+
+                        <com.ruffian.library.widget.RLinearLayout
+                            android:id="@+id/LLStaffInfoContent"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginHorizontal="@dimen/dp_15"
+                            android:orientation="vertical"
+                            android:paddingLeft="@dimen/dp_10"
+                            android:paddingTop="@dimen/dp_5"
+                            android:paddingRight="@dimen/dp_10"
+                            android:paddingBottom="@dimen/dp_15"
+                            app:background_normal="@color/white"
+                            app:corner_radius="@dimen/dp_10">
+
+                            <LinearLayout
+                                android:id="@+id/LLStaffContent"
+                                style="@style/MatchWrap.Vertical">
+
+                                <include layout="@layout/layout_order_details_item" />
+
+                                <include layout="@layout/layout_order_details_item" />
+                            </LinearLayout>
+                        </com.ruffian.library.widget.RLinearLayout>
+                    </LinearLayout>
 
-                            <include layout="@layout/layout_order_details_item" />
-                        </LinearLayout>
-                    </com.ruffian.library.widget.RLinearLayout>
                 </LinearLayout>
-
-            </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+            </androidx.core.widget.NestedScrollView>
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
     <LinearLayout
         android:id="@+id/complete"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
         android:background="@color/white"
+        android:elevation="@dimen/dp_10"
         android:gravity="center_vertical|right"
         android:orientation="vertical"
-        android:elevation="@dimen/dp_10"
         android:padding="@dimen/dp_10"
-        android:layout_alignParentBottom="true"
         android:visibility="gone">
 
         <LinearLayout
@@ -303,72 +307,79 @@
     <LinearLayout
         android:id="@+id/LLBtns"
         style="@style/MatchWrap.Horizontal"
-        android:padding="@dimen/dp_10"
-        android:background="@color/white"
-        android:gravity="center_vertical|right"
         android:layout_height="@dimen/dp_45"
         android:layout_alignParentBottom="true"
+        android:background="@color/white"
+        android:gravity="center_vertical|right"
+        android:padding="@dimen/dp_10"
         android:visibility="gone">
+
         <Button
             android:id="@+id/btnFinish"
             android:layout_width="@dimen/dp_67"
             android:layout_height="@dimen/dp_25"
+            android:layout_marginLeft="@dimen/dp_10"
             android:background="@drawable/border_dark_grey_radius"
             android:text="结束订单"
-            android:visibility="gone"
-            android:layout_marginLeft="@dimen/dp_10"
             android:textColor="@color/color_666666"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnLogistics"
             android:layout_width="@dimen/dp_67"
             android:layout_height="@dimen/dp_25"
+            android:layout_marginLeft="@dimen/dp_10"
             android:background="@drawable/border_dark_grey_radius"
             android:text="查看物流"
-            android:visibility="gone"
-            android:layout_marginLeft="@dimen/dp_10"
             android:textColor="@color/color_666666"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnReturnGoods"
             android:layout_width="@dimen/dp_67"
             android:layout_height="@dimen/dp_25"
+            android:layout_marginLeft="@dimen/dp_10"
             android:background="@drawable/border_dark_grey_radius"
             android:text="申请退货"
-            android:visibility="gone"
             android:textColor="#B3B3B3"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnExGoods"
             android:layout_width="@dimen/dp_67"
             android:layout_height="@dimen/dp_25"
+            android:layout_marginLeft="@dimen/dp_10"
             android:background="@drawable/border_dark_grey_radius"
             android:text="申请换货"
-            android:visibility="gone"
             android:textColor="#B3B3B3"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnCancelOrder"
             android:layout_width="@dimen/dp_67"
             android:layout_height="@dimen/dp_25"
+            android:layout_marginLeft="@dimen/dp_10"
             android:background="@drawable/border_dark_grey_radius"
             android:text="取消订单"
-            android:visibility="gone"
-            android:layout_marginLeft="@dimen/dp_10"
             android:textColor="#B3B3B3"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnEditAddr"
             android:layout_width="@dimen/dp_67"
             android:layout_height="@dimen/dp_25"
+            android:layout_marginLeft="@dimen/dp_10"
             android:background="@drawable/button_status1"
             android:text="修改地址"
-            android:visibility="gone"
-            android:layout_marginLeft="@dimen/dp_10"
             android:textColor="#00B38B"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnAudit"
             style="@style/BtnShortStyle"
@@ -377,8 +388,9 @@
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginLeft="@dimen/dp_10"
             android:text="审核"
-            android:visibility="gone"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnDeliver"
             style="@style/BtnShortStyle"
@@ -387,8 +399,9 @@
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginLeft="@dimen/dp_10"
             android:text="发货"
-            android:visibility="gone"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnActive"
             style="@style/BtnShortStyle"
@@ -397,8 +410,9 @@
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginLeft="@dimen/dp_10"
             android:text="去激活"
-            android:visibility="gone"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnAgainActive"
             style="@style/BtnShortStyle"
@@ -407,8 +421,9 @@
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginLeft="@dimen/dp_10"
             android:text="再次唤起"
-            android:visibility="gone"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnReceiveGoods"
             style="@style/BtnShortStyle"
@@ -417,8 +432,9 @@
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginLeft="@dimen/dp_10"
             android:text="确认完成"
-            android:visibility="gone"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnUserInfoUpload"
             style="@style/BtnShortStyle"
@@ -427,8 +443,9 @@
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginLeft="@dimen/dp_10"
             android:text="身份证信息上传"
-            android:visibility="gone"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnCarInfoUpload"
             style="@style/BtnShortStyle"
@@ -437,8 +454,9 @@
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginLeft="@dimen/dp_10"
             android:text="车辆信息上传"
-            android:visibility="gone"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnConfirmInfo"
             style="@style/BtnShortStyle"
@@ -447,8 +465,9 @@
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginLeft="@dimen/dp_10"
             android:text="信息确认"
-            android:visibility="gone"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
+
         <Button
             android:id="@+id/btnPay"
             style="@style/BtnShortStyle"
@@ -457,8 +476,8 @@
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginLeft="@dimen/dp_10"
             android:text="支付"
-            android:visibility="gone"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
     </LinearLayout>
 
     <com.hjq.bar.TitleBar

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

@@ -20,10 +20,10 @@
         android:id="@+id/LLSearch"
         style="@style/MatchWrap.Horizontal"
         android:layout_below="@+id/titleBar"
-        android:visibility="gone"
         android:layout_marginVertical="@dimen/dp_15"
         android:layout_marginRight="@dimen/dp_15"
-        android:gravity="center">
+        android:gravity="center"
+        android:visibility="gone">
 
         <LinearLayout
             style="@style/AutoWrap.Horizontal"
@@ -63,29 +63,30 @@
             android:textSize="@dimen/sp_12" />
     </LinearLayout>
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_status_hint"
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/rl_status_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/LLSearch"
-        android:layout_marginBottom="@dimen/dp_45">
+        android:layout_marginBottom="@dimen/dp_45"
+        app:srlEnablePreviewInEditMode="false">
 
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/rl_status_refresh"
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_status_hint"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:srlEnablePreviewInEditMode="false">
+            android:layout_height="match_parent">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/mRecycleView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/dp_15"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:listCount="10"
-                android:layout_marginBottom="@dimen/dp_15"
                 tools:listitem="@layout/item_list_pay_the_arrears" />
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
     <LinearLayout
         style="@style/MatchWrap.Horizontal"
@@ -128,9 +129,9 @@
         <TextView
             style="@style/WrapWrap"
             android:text="¥"
-            android:textStyle="bold"
             android:textColor="#FF8000"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_12"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/tvTotalAmount"

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

@@ -16,16 +16,16 @@
         app:title="预约列表"
         app:titleColor="#FFFFFF" />
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_status_hint"
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/rl_status_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:srlEnablePreviewInEditMode="false">
 
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/rl_status_refresh"
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_status_hint"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:srlEnablePreviewInEditMode="false">
+            android:layout_height="match_parent">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler"
@@ -35,9 +35,7 @@
                 tools:itemCount="2"
                 tools:listitem="@layout/item_subscribe" />
 
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
-
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
 </LinearLayout>

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

@@ -21,27 +21,26 @@
         android:progressDrawable="@drawable/progress_gradient_bg"
         android:visibility="gone" />
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_browser_hint"
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/sl_browser_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/sl_browser_refresh"
+        android:layout_height="match_parent"
+        app:srlEnableHeaderTranslationContent="false"
+        app:srlEnableLoadMore="false"
+        app:srlEnablePreviewInEditMode="false"
+        app:srlPrimaryColor="#444444">
+
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_browser_hint"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:srlEnableHeaderTranslationContent="false"
-            app:srlEnableLoadMore="false"
-            app:srlEnablePreviewInEditMode="false"
-            app:srlPrimaryColor="#444444">
+            android:layout_height="match_parent">
+
 
             <com.huntersun.vkyes.etcopencard.src.widget.BrowserView
                 android:id="@+id/wv_browser_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
 
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
-
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 </LinearLayout>

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

@@ -6,22 +6,23 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
-        android:id="@+id/hl_status_hint"
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/rl_status_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/rl_status_refresh"
+        android:layout_height="match_parent"
+        app:srlEnablePreviewInEditMode="false">
+
+        <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+            android:id="@+id/hl_status_hint"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:srlEnablePreviewInEditMode="false">
+            android:layout_height="match_parent">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler"
                 style="@style/MatchMatch"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:listitem="@layout/item_recharge_record" />
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
 
+        </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 </LinearLayout>