Merge branch 'master' of http://192.168.40.220/dmc/jz_app into master

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "versionCode": 11,
-      "versionName": "1.0.9",
-      "outputFile": "KyushuETC1.0_v1.0.9_release_1008.apk"
+      "versionName": "1.1.0",
+      "outputFile": "jz_app_v1.1.0_release_1010.apk"
     }
   ]
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/EnumBean.java

@@ -35,9 +35,9 @@ public class EnumBean {
     public static EnumBean[] ORDER_STEP = {
             Add("1", "完成填写基本信息"),
             Add("2", "完成个人/单位信息上传"),
-            Add("3", "完成车辆信息上传"),
-            Add("4", "完成签约。待支付"),
-            Add("5", "完成订单支付。已支付"),
+            Add("3", "已支付，待签约"),
+            Add("4", "完成车辆信息上传,待支付"),
+            Add("5", "完成签约"),
             Add("6", "待审核"),
             Add("7", "审核不通过"),
             Add("8", "待发货"),

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/IFCode.java

@@ -213,5 +213,6 @@ public class IFCode {
     public static final String IFCODE_CZKQC_DETAIL = "cc907ba2683e481d92398bf6c4d74c57";//储值卡圈存详情
     public static final String IFCODE_TABLE_OUT = "f0698712ee9b4003975d77a6a1ece582";//业绩导出
     public static final String IFCODE_AUTHENTICATION = "b8134842bc16404b85de01c947e27dcb";//实名认证
+    public static final String IFCODE_AGREEMENT = "32a9d99a781a4bf2af29a46d903702bd";//获取产品协议
 
 }

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

@@ -63,8 +63,8 @@ public class AddPurchaseChooseActivity extends AppActivity {
                     intent.putExtra("purchase", JSON.toJSONString(list));
                 }
                 intent.putExtra("start", getIntent().getStringExtra("start"));
-//                intent.setClass(AddPurchaseChooseActivity.this,ETCHandleSonActivity.class);
-                intent.setClass(AddPurchaseChooseActivity.this,PaymentList.class);
+                intent.setClass(AddPurchaseChooseActivity.this,ETCHandleSonActivity.class);
+//                intent.setClass(AddPurchaseChooseActivity.this,PaymentList.class);
                 AddPurchaseChooseActivity.this.startActivity(intent);
                 finish();
             }

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

@@ -165,7 +165,7 @@ public class BusinessDetectionActivity extends AppActivity
                     helper.getView(R.id.btnUserInfoUpload),
                     helper.getView(R.id.btnCarInfoUpload),
                     helper.getView(R.id.btnConfirmInfo),
-                    helper.getView(R.id.btnPay));
+                    helper.getView(R.id.btnPay),helper.getView(R.id.btnSign));
 
             //更据订单状态显示按钮状态
             if (!item.getOrderStatus().equals(String.valueOf(Constants.ORDER_STATUS_CANCEL)) &&

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

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.widget.CompoundButton;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
@@ -51,6 +52,7 @@ public class ETCHandleSonActivity extends AppActivity {
     private ArrayList<String> equityList = new ArrayList<>();
     private long totalAmountFee = 0;//产品总金额
     private long equityAllFee = 0;//权益总金额
+    private boolean isChooseAgreement = false;
 
 
     @Override
@@ -69,6 +71,12 @@ public class ETCHandleSonActivity extends AppActivity {
         } else {
             binding.tvAddPurchase.setVisibility(View.VISIBLE);
         }
+        binding.cbAgreement.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                isChooseAgreement = b;
+            }
+        });
         binding.rrelative.getHelper().setBackgroundColorNormalArray(this.getResources().getIntArray(R.array.green_bg_arr));
 
         ResultBean.BizContent biz =
@@ -79,28 +87,28 @@ public class ETCHandleSonActivity extends AppActivity {
         } else {//1签约
             binding.lyQiany.setVisibility(View.VISIBLE);
         }
+        getAgreement();
+        Map<String, String> params = new HashMap<>();
+        params.put("id", biz.getId() + "");
+        MyRetrofit.newInstance(IFCode.IFCODE9, params, new MyRetrofit.ReturnResult() {
+            @Override
+            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+//        binding.text2.setText("基础服务");
+                totalAmountFee += bizContent.product.fee;
+                totalAmountFee += equityAllFee;
+                binding.text1.setText(bizContent.getProductName());
+                binding.text3.setText(bizContent.product.productMsg);
+                binding.text4.setText(bizContent.product.fee * 0.01 + "");
+                binding.tvMoneyJg.setText("￥" +equityAllFee*0.01);
+                binding.text6.setText("￥" + totalAmountFee * 0.01);
+                binding.text5.setText("￥" + bizContent.product.fee * 0.01);
+            }
 
-//        Map<String, String> params = new HashMap<>();
-//        params.put("id", biz.getId() + "");
-//        MyRetrofit.newInstance(IFCode.IFCODE9, params, new MyRetrofit.ReturnResult() {
-//            @Override
-//            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-////        binding.text2.setText("基础服务");
-//                totalAmountFee += bizContent.product.fee;
-//                totalAmountFee += equityAllFee;
-//                binding.text1.setText(bizContent.getProductName());
-//                binding.text3.setText(bizContent.product.productMsg);
-//                binding.text4.setText(bizContent.product.fee * 0.01 + "");
-//                binding.tvMoneyJg.setText("￥" +equityAllFee*0.01);
-//                binding.text6.setText("￥" + totalAmountFee * 0.01);
-//                binding.text5.setText("￥" + bizContent.product.fee * 0.01);
-//            }
-//
-//            @Override
-//            public void onError() {
-//                MyRetrofit.ReturnResult.super.onError();
-//            }
-//        });
+            @Override
+            public void onError() {
+                MyRetrofit.ReturnResult.super.onError();
+            }
+        });
 
         binding.tvAddPurchase.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -122,61 +130,67 @@ public class ETCHandleSonActivity extends AppActivity {
             @SingleClick
             public void onClick(View v) {
                 if (equityList.size() > 0) {
-                    HashMap<String, String> params = new HashMap<>();
-                    params.put("orderId", getIntent().getStringExtra("orderId"));
-                    params.put("openId", (String) MyShared.getInstance().get(MyShared.OPENID, ""));
-                    params.put("equityId", TextUtils.join(",", equityList));
-                    params.put("totalAmount", totalAmountFee + "");
-                    params.put("isRepeatPurchase", "0");
-                    MyRetrofit.newInstance(ETCHandleSonActivity.this,IFCode.IFCODE_JGOUCHOOSE, params, new MyRetrofit.ReturnResult() {
-                        @Override
-                        public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-                            if ("1".equals(getIntent().getStringExtra("isPay"))) {
-                                Intent intent = new Intent();
-                                intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
-                                intent.putExtra("id", biz.getId() + "");
-                                intent.putExtra("isValueCard", getIntent().getStringExtra("isValueCard"));
-                                intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
-                                startActivity(intent);
-                                ETCHandleSonActivity.this.finish();
-                            }else {
-                                new MessageDialog.Builder(getActivity())
+//                    HashMap<String, String> params = new HashMap<>();
+//                    params.put("orderId", getIntent().getStringExtra("orderId"));
+//                    params.put("openId", (String) MyShared.getInstance().get(MyShared.OPENID, ""));
+//                    params.put("equityId", TextUtils.join(",", equityList));
+//                    params.put("totalAmount", totalAmountFee + "");
+//                    params.put("isRepeatPurchase", "0");
+//                    MyRetrofit.newInstance(ETCHandleSonActivity.this,IFCode.IFCODE_JGOUCHOOSE, params, new MyRetrofit.ReturnResult() {
+//                        @Override
+//                        public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                            if (!isChooseAgreement){
+                                toast("请先勾选");
+                                return;
+                            }
+//                            if ("1".equals(getIntent().getStringExtra("isPay"))) {
+//                                Intent intent = new Intent();
+//                                intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
+//                                intent.putExtra("id", biz.getId() + "");
+//                                intent.putExtra("isValueCard", getIntent().getStringExtra("isValueCard"));
+//                                intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
+//                                startActivity(intent);
+//                                ETCHandleSonActivity.this.finish();
+//                            }else {
+//                                new MessageDialog.Builder(getActivity())
                                         // 标题可以不用填写
-                                        .setTitle("提示")
+//                                        .setTitle("提示")
                                         // 内容必须要填写
-                                        .setMessage("是否确认提交信息，生成支付二维码")
-                                        .setListener(new MessageDialog.OnListener() {
-                                            @Override
-                                            public void onConfirm(BaseDialog dialog) {
+//                                        .setMessage("是否确认提交信息，生成支付二维码")
+//                                        .setListener(new MessageDialog.OnListener() {
+//                                            @Override
+//                                            public void onConfirm(BaseDialog dialog) {
                                                 Intent intent = new Intent();
                                                 intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
                                                 intent.putExtra("id", biz.getId() + "");
                                                 intent.putExtra("isValueCard", getIntent().getStringExtra("isValueCard"));
-                                                intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
+                                                intent.setClass(ETCHandleSonActivity.this, PaymentList.class);
+//                                                intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
                                                 startActivity(intent);
                                                 ETCHandleSonActivity.this.finish();
-                                            }
+//                                            }
 
-                                            @Override
-                                            public void onCancel(BaseDialog dialog) {
-                                            }
-                                        })
-                                        .show();
-                            }
+//                                            @Override
+//                                            public void onCancel(BaseDialog dialog) {
+//                                            }
+//                                        })
+//                                        .show();
+//                            }
 
-                        }
-
-                        @Override
-                        public void onError(Response<Result> resp) {
-                            MyRetrofit.ReturnResult.super.onError(resp);
-                        }
-                    });
+//                        }
+//
+//                        @Override
+//                        public void onError(Response<Result> resp) {
+//                            MyRetrofit.ReturnResult.super.onError(resp);
+//                        }
+//                    });
                 } else {
                     Intent intent = new Intent();
                     intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
                     intent.putExtra("id", biz.getId() + "");
                     intent.putExtra("isValueCard", getIntent().getStringExtra("isValueCard"));
-                    intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
+//                    intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
+                    intent.setClass(ETCHandleSonActivity.this, PaymentList.class);
                     startActivity(intent);
                     ETCHandleSonActivity.this.finish();
                 }
@@ -184,6 +198,18 @@ public class ETCHandleSonActivity extends AppActivity {
         });
     }
 
+    private void getAgreement() {
+        HashMap<String,String> params = new HashMap<>();
+        params.put("orderId",getIntent().getStringExtra("orderId"));
+        MyRetrofit.newInstance(this,IFCode.IFCODE_AGREEMENT, params, new MyRetrofit.ReturnResult() {
+            @Override
+            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                Log.e("11111111111222222222",JSONObject.toJSONString(resultBean));
+            }
+        });
+
+    }
+
     @Override
     protected void onResume() {
         super.onResume();

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

@@ -65,8 +65,8 @@ public class SignUpActivity extends AppActivity {
         list.add(item2);
         list.add(item3);
         adapter.replaceData(list);
-        ResultBean.BizContent bizContent =
-                JSON.parseObject(getIntent().getStringExtra("bizContent"), ResultBean.BizContent.class);
+//        ResultBean.BizContent bizContent =
+//                JSON.parseObject(getIntent().getStringExtra("bizContent"), ResultBean.BizContent.class);
         adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
             @Override
             public void onItemChildClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {

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

@@ -232,7 +232,7 @@ public class OrderDetailsActivity extends AppActivity implements StatusAction ,
                 binding.btnLogistics, binding.btnReturnGoods, binding.btnExGoods,
                 binding.btnCancelOrder, binding.btnEditAddr, binding.btnAudit,
                 binding.btnDeliver, binding.btnActive, binding.btnAgainActive, binding.btnReceiveGoods,
-                binding.btnUserInfoUpload, binding.btnCarInfoUpload, binding.btnConfirmInfo, binding.btnPay);
+                binding.btnUserInfoUpload, binding.btnCarInfoUpload, binding.btnConfirmInfo, binding.btnPay,binding.btnSign);
     }
 
     /**

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

@@ -30,6 +30,7 @@ import com.huntersun.vkyes.etcopencard.project.ui.activity.FillOutMessage;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.IdentityInformationUploadActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.InformationConfirmedActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.PaymentList;
+import com.huntersun.vkyes.etcopencard.project.ui.activity.SignUpActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.VehicleInformationActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.CardUnlockPinActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.EquipmentLossReportActivity;
@@ -70,6 +71,8 @@ public class OrderUtils {
     private Button btnCarInfoUpload;
     private Button btnConfirmInfo;
     private Button btnPay;
+    private Button btnSign;//去签约
+
 
     //数据
     private ResultBean.BizContent orderData; //订单数据
@@ -79,7 +82,7 @@ public class OrderUtils {
                       Button btnLogistics, Button btnReturnGoods, Button btnExGoods,
                       Button btnCancelOrder, Button btnEditAddr, Button btnAudit, Button btnDeliver,
                       Button btnActive, Button btnAgainActive, Button btnReceiveGoods,
-                      Button btnUserInfoUpload, Button btnCarInfoUpload, Button btnConfirmInfo, Button btnPay) {
+                      Button btnUserInfoUpload, Button btnCarInfoUpload, Button btnConfirmInfo, Button btnPay,Button btnSign) {
         this.context = context;
         this.orderData = orderData;
         this.isFromList = isFromList;
@@ -99,6 +102,7 @@ public class OrderUtils {
         this.btnCarInfoUpload = btnCarInfoUpload;
         this.btnConfirmInfo = btnConfirmInfo;
         this.btnPay = btnPay;
+        this.btnSign = btnSign;
 
         initBtnClick();
         setBtnViewVisibleOrHide();
@@ -124,6 +128,7 @@ public class OrderUtils {
         btnCarInfoUpload.setVisibility(View.GONE);
         btnConfirmInfo.setVisibility(View.GONE);
         btnPay.setVisibility(View.GONE);
+        btnSign.setVisibility(View.GONE);
 
         if (FunHelper.isEmpty(orderData.getOrderStep())) {
             orderData.setOrderStep("0");
@@ -146,7 +151,11 @@ public class OrderUtils {
                     btnCancelOrder.setVisibility(View.VISIBLE);
                     btnConfirmInfo.setVisibility(View.VISIBLE);
                     break;
-                case Constants.ORDER_STATUS_WAIT_PAY://完成签约。待支付
+                case Constants.ORDER_STATUS_WAIT_PAY://已支付，待签约
+                    LLBtns.setVisibility(View.VISIBLE);
+                    btnSign.setVisibility(View.VISIBLE);
+                    btnCancelOrder.setVisibility(View.VISIBLE);
+                    break;
                 case Constants.ORDER_STATUS_ALREADYJGQY_CODE://完成加购。待支付
 //                    LLBtns.setVisibility(View.VISIBLE);
 //                    btnPay.setVisibility(View.VISIBLE);
@@ -290,7 +299,16 @@ public class OrderUtils {
 //                startActivity(InformationConfirmedActivity.class);
             }
         });
-
+        //签约
+        btnSign.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent();
+                intent.putExtra("orderId", orderData.getOrderId());
+                intent.setClass(context, SignUpActivity.class);
+                context.startActivity(intent);
+            }
+        });
         //支付
         btnPay.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -221,7 +221,7 @@ public class FragmentSonOne extends TitleBarFragment<MainActivity>
                     helper.getView(R.id.btnUserInfoUpload),
                     helper.getView(R.id.btnCarInfoUpload),
                     helper.getView(R.id.btnConfirmInfo),
-                    helper.getView(R.id.btnPay));
+                    helper.getView(R.id.btnPay),helper.getView(R.id.btnSign));
 
             //更据订单状态显示按钮状态
             if (!item.getOrderStatus().equals(String.valueOf(Constants.ORDER_STATUS_CANCEL)) &&

app/src/main/java/com/huntersun/vkyes/etcopencard/project/utils/Constants.java

@@ -21,9 +21,9 @@ public class Constants {
     public static final int ORDER_STATUS_CANCEL = -1; //已取消
     public static final int ORDER_STATUS_BASE = 1; //完成填写基本信息
     public static final int ORDER_STATUS_INFO = 2; //完成个人/单位信息上传
-    public static final int ORDER_STATUS_CAR = 3; //完成车辆信息上传
-    public static final int ORDER_STATUS_WAIT_PAY = 4; //待支付
-    public static final int ORDER_STATUS_PAY = 5; //已支付
+    public static final int ORDER_STATUS_WAIT_PAY = 3; //已支付，待签约
+    public static final int ORDER_STATUS_CAR = 4; //完成车辆信息上传,待支付
+    public static final int ORDER_STATUS_PAY = 5; //完成签约
     public static final int ORDER_STATUS_WAIT_AUDIT = 6; //待审核
     public static final int ORDER_STATUS_NO_AUDIT = 7; //审核不通过
     public static final int ORDER_STATUS_WAIT_DELIVERY = 8; //待发货

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

@@ -197,7 +197,6 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:id="@+id/ly_qiany"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
 
@@ -220,7 +219,7 @@
                         <ImageView
                             android:layout_width="@dimen/dp_30"
                             android:layout_height="30dp"
-                            android:src="@mipmap/flow_off4" />
+                            android:src="@mipmap/flow5" />
 
                         <ImageView
                             android:layout_width="wrap_content"
@@ -241,7 +240,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:text="签约"
+                    android:text="订单支付"
                     android:textColor="@color/white"
                     android:textSize="11sp" />
 
@@ -252,6 +251,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:id="@+id/ly_qiany"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
 
@@ -270,7 +270,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:src="@mipmap/flow5" />
+                        android:src="@mipmap/flow_off4" />
 
                     <View
                         android:layout_width="0dp"
@@ -283,7 +283,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:text="订单支付"
+                    android:text="签约"
                     android:textColor="@color/white"
                     android:textSize="11sp" />
 

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

@@ -193,7 +193,6 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:id="@+id/ly_qiany"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
 
@@ -216,7 +215,7 @@
                         <ImageView
                             android:layout_width="@dimen/dp_30"
                             android:layout_height="30dp"
-                            android:src="@mipmap/flow_off4" />
+                            android:src="@mipmap/flow5" />
 
                         <ImageView
                             android:layout_width="wrap_content"
@@ -237,7 +236,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:text="签约"
+                    android:text="订单支付"
                     android:textColor="@color/white"
                     android:textSize="11sp" />
 
@@ -248,6 +247,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:id="@+id/ly_qiany"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
 
@@ -266,7 +266,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:src="@mipmap/flow5" />
+                        android:src="@mipmap/flow_off4" />
 
                     <View
                         android:layout_width="0dp"
@@ -279,7 +279,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:text="订单支付"
+                    android:text="签约"
                     android:textColor="@color/white"
                     android:textSize="11sp" />
 
@@ -621,6 +621,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_44"
+                    android:visibility="gone"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -651,6 +652,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_44"
+                    android:visibility="gone"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -711,7 +713,41 @@
                         android:textSize="14sp" />
 
                 </LinearLayout>
-
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="@dimen/dp_15"
+                    android:paddingBottom="@dimen/dp_15"
+                    android:orientation="horizontal">
+                    <CheckBox
+                        android:id="@+id/cb_agreement"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/tv2"
+                        android:layout_marginRight="@dimen/dp_9"
+                        android:drawablePadding="@dimen/dp_5"
+                        android:background="@color/white"
+                        android:text="我已阅读并同意"
+                        android:button="@null"
+                        android:drawableLeft="@drawable/radio_btn_1"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/blue02"
+                        android:text="etc用户协议"
+                        android:id="@+id/tv_agreement1"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="和"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/blue02"
+                        android:text="etc用户协议"
+                        android:id="@+id/tv_agreement2"/>
+                </LinearLayout>
             </LinearLayout>
 
             <Button

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

@@ -157,7 +157,6 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:id="@+id/ly_qiany"
                 android:gravity="center"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
@@ -177,7 +176,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:src="@mipmap/flow_off4" />
+                        android:src="@mipmap/flow_off5" />
 
                     <View
                         android:layout_width="0dp"
@@ -191,7 +190,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:text="签约"
+                    android:text="订单支付"
                     android:textColor="@color/white"
                     android:textSize="11sp" />
 
@@ -202,6 +201,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:id="@+id/ly_qiany"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
 
@@ -220,7 +220,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:src="@mipmap/flow_off5" />
+                        android:src="@mipmap/flow_off4" />
 
                     <View
                         android:layout_width="0dp"
@@ -233,7 +233,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:text="订单支付"
+                    android:text="签约"
                     android:textColor="@color/white"
                     android:textSize="11sp" />
 

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

@@ -165,7 +165,6 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/ly_qiany"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -188,7 +187,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:src="@mipmap/flow_off4" />
+                        android:src="@mipmap/flow_off5" />
 
                     <View
                         android:layout_width="0dp"
@@ -202,7 +201,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:text="签约"
+                    android:text="订单支付"
                     android:textColor="@color/white"
                     android:textSize="11sp" />
 
@@ -213,6 +212,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:id="@+id/ly_qiany"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
 
@@ -231,7 +231,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:src="@mipmap/flow_off5" />
+                        android:src="@mipmap/flow_off4" />
 
                     <View
                         android:layout_width="0dp"
@@ -244,7 +244,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:text="订单支付"
+                    android:text="签约"
                     android:textColor="@color/white"
                     android:textSize="11sp" />
 

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

@@ -478,6 +478,16 @@
             android:text="支付"
             android:textSize="@dimen/sp_12"
             android:visibility="gone" />
+        <Button
+            android:id="@+id/btnSign"
+            style="@style/BtnShortStyle"
+            android:layout_width="@dimen/dp_67"
+            android:layout_height="@dimen/dp_25"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:text="签约"
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
     </LinearLayout>
 
     <com.hjq.bar.TitleBar

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

@@ -189,7 +189,6 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/ly_qiany"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -216,7 +215,7 @@
                         <ImageView
                             android:layout_width="@dimen/dp_30"
                             android:layout_height="30dp"
-                            android:src="@mipmap/flow_off4" />
+                            android:src="@mipmap/flow_off5" />
 
                         <ImageView
                             android:layout_width="wrap_content"
@@ -237,7 +236,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:text="签约"
+                    android:text="订单支付"
                     android:textColor="@color/white"
                     android:textSize="11sp" />
 
@@ -248,6 +247,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:id="@+id/ly_qiany"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
 
@@ -266,7 +266,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:src="@mipmap/flow5" />
+                        android:src="@mipmap/flow4" />
 
                     <View
                         android:layout_width="0dp"
@@ -279,7 +279,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:text="订单支付"
+                    android:text="签约"
                     android:textColor="@color/white"
                     android:textSize="11sp" />
 

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

@@ -180,7 +180,6 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:id="@+id/ly_qiany"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
 
@@ -199,7 +198,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:src="@mipmap/flow_off4" />
+                        android:src="@mipmap/flow_off5" />
 
                     <View
                         android:layout_width="0dp"
@@ -213,7 +212,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:text="签约"
+                    android:text="订单支付"
                     android:textColor="@color/white"
                     android:textSize="11sp" />
 
@@ -224,6 +223,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:id="@+id/ly_qiany"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
 
@@ -242,7 +242,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:src="@mipmap/flow_off5" />
+                        android:src="@mipmap/flow_off4" />
 
                     <View
                         android:layout_width="0dp"
@@ -255,7 +255,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:text="订单支付"
+                    android:text="签约"
                     android:textColor="@color/white"
                     android:textSize="11sp" />
 

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

@@ -287,7 +287,16 @@
             android:textSize="@dimen/sp_12"
             android:visibility="gone" />
 
-
+        <Button
+            android:id="@+id/btnSign"
+            style="@style/BtnShortStyle"
+            android:layout_width="@dimen/dp_67"
+            android:layout_height="@dimen/dp_25"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:text="签约"
+            android:textSize="@dimen/sp_12"
+            android:visibility="gone" />
     </LinearLayout>
 
 </LinearLayout>