feat: 挂失挂起接口添加

app/src/main/AndroidManifest.xml

@@ -75,7 +75,7 @@
         tools:ignore="AllowBackup,LockedOrientationActivity"
         tools:replace="android:allowBackup,android:supportsRtl,android:label"
         tools:targetApi="n">
-       <!-- 表示当前已经适配了分区存储 -->
+        <!-- 表示当前已经适配了分区存储 -->
         <meta-data
             android:name="ScopedStorage"
             android:value="true" /> <!-- 适配 Android 7.0 文件意图 -->
@@ -232,15 +232,15 @@
             android:screenOrientation="portrait" /> <!-- 车辆信息填写 -->
         <activity
             android:name=".project.ui.activity.evaluate.YwblEvaluateActivity"
+            android:exported="false"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:exported="false"> <!-- 业务满意度评价 -->
+            android:screenOrientation="portrait"> <!-- 业务满意度评价 -->
         </activity>
         <activity
             android:name=".project.ui.activity.evaluate.YWYServicePJActivity"
+            android:exported="false"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:exported="false"> <!-- 业务员服务评价 -->
+            android:screenOrientation="portrait"> <!-- 业务员服务评价 -->
         </activity>
         <activity
             android:name=".project.ui.activity.evaluate.UserEvaluateActivity"
@@ -342,9 +342,14 @@
             android:name=".project.ui.activity.mail.InfoTabActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
-        <!-- 审核 -->
+        <!-- 审核第一步 -->
         <activity
-            android:name=".project.ui.activity.order.AuditingActivity"
+            android:name=".project.ui.activity.order.AuditingStep1Activity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <!-- 审核第2步 -->
+        <activity
+            android:name=".project.ui.activity.order.AuditingStep2Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <!-- 充值记录 -->
@@ -393,30 +398,38 @@
             android:name=".project.ui.activity.order.ApplyExGoodsStep2Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+
+        <!-- 申请退货第1步 -->
         <activity
             android:name=".project.ui.activity.order.ApplyReturnGoodsStep1Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <!-- 申请退货第2步 -->
         <activity
             android:name=".project.ui.activity.order.ApplyReturnGoodsStep2Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <!-- 取消订单第1步 -->
         <activity
             android:name=".project.ui.activity.order.CancelOrderStep1Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <!-- 取消订单第2步 -->
         <activity
             android:name=".project.ui.activity.order.CancelOrderStep2Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <!-- 确认收货第1步 -->
         <activity
             android:name=".project.ui.activity.order.ConfirmReceiveGoodsStep1Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <!-- 确认收货第2步 -->
         <activity
             android:name=".project.ui.activity.order.ConfirmReceiveGoodsStep2Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <!-- 查看物流 -->
         <activity
             android:name=".project.ui.activity.order.OrderLogisticsActivity"
             android:launchMode="singleTop"

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

@@ -1,9 +1,7 @@
 package com.huntersun.vkyes.etcopencard.project.ui.activity.after;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.annotation.SuppressLint;
-import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 
 import com.google.gson.Gson;
@@ -17,16 +15,24 @@ 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.Utils;
+import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+import com.parkingwang.keyboard.PopupKeyboard;
+
+import retrofit2.Response;
 
 /**
+ * 设备挂起
  * @author admin
  */
 public class DevicePendingActivity extends AppActivity {
     private ActivityDevicePendingBinding binding;
-    private int licensePlateColor = 0;
+    private PopupKeyboard mPopupKeyboard;
+
+    private int licensePlateColor = 0; //默认蓝色
+    //private String opeartion = "1"; //操作  1-卡挂起， 2-牵挂起， 3-卡签挂起， 4-卡解挂 ，5-签解挂
+    private String provider = "2"; //挂起类型 2-有卡挂起，3-无卡挂起
 
     @Override
     protected View getLayoutView() {
@@ -43,9 +49,37 @@ public class DevicePendingActivity extends AppActivity {
         binding.buttomFour.setOnClickListener(this);
         binding.buttomFive.setOnClickListener(this);
         binding.buttomSex.setOnClickListener(this);
-        Choice(binding.choice1);
-        Choice(binding.choice2);
-        Choice(binding.choice3);
+
+      /*  binding.choice1.setOnClickListener(this::Choice);
+        binding.son1.setOnClickListener(this::Choice);
+        binding.choice2.setOnClickListener(this::Choice);
+        binding.son2.setOnClickListener(this::Choice);
+        binding.choice3.setOnClickListener(this::Choice);
+        binding.son3.setOnClickListener(this::Choice);*/
+
+        binding.choiceType1.setOnClickListener(this::ChoiceType);
+        binding.sonType1.setOnClickListener(this::ChoiceType);
+        binding.choiceType2.setOnClickListener(this::ChoiceType);
+        binding.sonType2.setOnClickListener(this::ChoiceType);
+
+        mPopupKeyboard = new PopupKeyboard(this, getActivity());
+        mPopupKeyboard.attach(binding.inputView, this);
+        binding.inputView.set8thVisibility(true);
+        binding.inputView.addOnFieldViewSelectedListener(index -> {
+            if (index == 7) {
+                if (binding.quote.getVisibility() == View.VISIBLE) {
+                    binding.quote.setVisibility(View.GONE);
+                } else {
+                    binding.quote.setVisibility(View.VISIBLE);
+                    post(() -> {
+                        mPopupKeyboard.dismiss(getActivity());
+                        if (!TextUtils.isEmpty(binding.inputView.getEndText())) {
+                            binding.inputView.removeLastCharOfNumber();
+                        }
+                    });
+                }
+            }
+        });
     }
 
     @Override
@@ -54,36 +88,99 @@ public class DevicePendingActivity extends AppActivity {
             @Override
             @SingleClick
             public void onClick(View v) {
-                SendTheVerificationCodeBean bean = new SendTheVerificationCodeBean();
-                bean.setCardId(""); //卡号
-                bean.setObuId(""); //签号
-                bean.setProvider(""); //挂起类型 2-有卡挂起，3-无卡挂起
-                bean.setOperation(""); //操作 1-卡挂起， 2-牵挂起， 3-卡签挂起， 4-卡解挂 ，5-签解挂
-                RequestParameters parameters1 = new RequestParameters(IFCode.IFCODE81,
-                        new Gson().toJson(bean));
-                new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>() {
+                getOrderInfoByVehiclePlate();
+            }
+        });
+    }
+
+    /**
+     * 根据车牌获取订单信息
+     */
+    private void getOrderInfoByVehiclePlate(){
+        if(FunHelper.isEmpty(binding.inputView.getNumber())){
+            toast("请输入想要挂起的车牌号！");
+            return;
+        }
+
+        showDialog("挂起中...");
+        SendTheVerificationCodeBean bean = new SendTheVerificationCodeBean();
+        bean.setVehicleId(binding.inputView.getNumber() + "_" + licensePlateColor);
+        RequestParameters parameters = new RequestParameters(IFCode.IFCODE171, new Gson().toJson(bean));
+        new MyRetrofit().getRetrofit().create(Api.class).message2(parameters)
+                .enqueue(new Converter<Result>(getContext(), "请稍后...") {
                     @Override
                     protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-                        toast(resultBean.getErrorMsg());
-                        finish();
+                        cardReportTheLoss(bizContent);
+                    }
+
+                    @Override
+                    public void onError(String err, Response<Result> resp) {
+                        super.onError(err, resp);
+                        hideDialog();
                     }
                 });
+    }
+
+    /**
+     * 挂起
+     * @param bizContent
+     */
+    private void cardReportTheLoss(ResultBean.BizContent bizContent){
+        SendTheVerificationCodeBean bean = new SendTheVerificationCodeBean();
+        bean.setCardId(bizContent.getCardId()); //卡号
+        bean.setObuId(bizContent.getObuId()); //签号
+        bean.setOrderId(bizContent.getOrderId()); //订单id
+        //bean.setOperation(String.valueOf(opeartion)); //1-卡挂失， 2-牵挂失， 3-卡签挂失， 4-卡解挂 ，5-签解挂
+        bean.setProvider(String.valueOf(provider));
+        bean.setReason(FunHelper.getText(binding.etReason));
+        RequestParameters parameters1 = new RequestParameters(IFCode.IFCODE81, new Gson().toJson(bean));
+        new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>() {
+            @Override
+            protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                hideDialog();
+                toast("设备已挂起");
+                finish();
+            }
+            @Override
+            public void onError(String err, Response<Result> resp) {
+                super.onError(err, resp);
+                hideDialog();
             }
         });
     }
 
-    public void Choice(View view) {
+    /**
+     * 挂起类型选择
+     *
+     * @param view
+     */
+    public void ChoiceType(View view) {
+        binding.sonType1.setChecked(false);
+        binding.sonType2.setChecked(false);
+        if (view == binding.choiceType1 || view == binding.sonType1) {
+            binding.sonType1.setChecked(true);
+            provider = "2";
+        } else if (view == binding.choiceType2  || view == binding.sonType2) {
+            binding.sonType2.setChecked(true);
+            provider = "3";
+        }
+    }
+
+    /*public void Choice(View view) {
         binding.son1.setChecked(false);
         binding.son2.setChecked(false);
         binding.son3.setChecked(false);
-        if (view == binding.choice1) {
-            binding.son1.setChecked(true);
-        } else if (view == binding.choice2) {
-            binding.son1.setChecked(true);
-        } else if (view == binding.choice3) {
+        if (view == binding.choice1 || view == binding.son1) {
             binding.son1.setChecked(true);
+            opeartion = "1";
+        } else if (view == binding.choice2  || view == binding.son2) {
+            binding.son2.setChecked(true);
+            opeartion = "2";
+        } else if (view == binding.choice3  || view == binding.son3) {
+            binding.son3.setChecked(true);
+            opeartion = "3";
         }
-    }
+    }*/
 
     @SuppressLint("UseCompatLoadingForDrawables")
     @Override

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

@@ -1,16 +1,11 @@
 package com.huntersun.vkyes.etcopencard.project.ui.activity.after;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.annotation.SuppressLint;
-import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 
 import com.google.gson.Gson;
 import com.huntersun.vkyes.etcopencard.R;
-import com.huntersun.vkyes.etcopencard.databinding.ActivityDevicePendingBinding;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityEquipmentLossReportBinding;
 import com.huntersun.vkyes.etcopencard.project.api.Api;
 import com.huntersun.vkyes.etcopencard.project.api.Converter;
@@ -20,19 +15,22 @@ 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.Utils;
-import com.huntersun.vkyes.etcopencard.project.ui.activity.FillOutMessage;
+import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 import com.parkingwang.keyboard.PopupKeyboard;
 
+import retrofit2.Response;
+
 /**
+ * 设备挂失
  * @author admin
  */
 public class EquipmentLossReportActivity extends AppActivity {
     private ActivityEquipmentLossReportBinding binding;
     private int licensePlateColor = 0; //默认蓝色
     private PopupKeyboard mPopupKeyboard;
+    private String opeartion = "1"; //操作  1-卡挂失， 2-牵挂失， 3-卡签挂失， 4-卡解挂 ，5-签解挂
 
     @Override
     protected View getLayoutView() {
@@ -51,36 +49,24 @@ public class EquipmentLossReportActivity extends AppActivity {
         binding.buttomFive.setOnClickListener(this);
         binding.buttomSex.setOnClickListener(this);
         binding.choice1.setOnClickListener(this::Choice);
+        binding.son1.setOnClickListener(this::Choice);
         binding.choice2.setOnClickListener(this::Choice);
+        binding.son2.setOnClickListener(this::Choice);
         binding.choice3.setOnClickListener(this::Choice);
-        binding.son1.setEnabled(false);
+        binding.son3.setOnClickListener(this::Choice);
+      /*  binding.son1.setEnabled(false);
         binding.son2.setEnabled(false);
-        binding.son3.setEnabled(false);
+        binding.son3.setEnabled(false);*/
         binding.nextStep.setOnClickListener(new View.OnClickListener() {
             @Override
             @SingleClick
             public void onClick(View v) {
-                SendTheVerificationCodeBean bean = new SendTheVerificationCodeBean();
-                bean.setCardId(""); //卡号
-                bean.setCardId(""); //签号
-                bean.setOperation(""); //1-卡挂失， 2-牵挂失， 3-卡签挂失， 4-卡解挂 ，5-签解挂
-                RequestParameters parameters1 = new RequestParameters(IFCode.IFCODE82,
-                        new Gson().toJson(bean));
-                new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>() {
-                    @Override
-                    protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-                        toast(resultBean.getErrorMsg());
-                        finish();
-                    }
-                });
+               getOrderInfoByVehiclePlate();
             }
         });
-        // 创建弹出键盘
         mPopupKeyboard = new PopupKeyboard(this, getActivity());
-        // 弹出键盘内部包含一个KeyboardView，在此绑定输入两者关联。
         mPopupKeyboard.attach(binding.inputView, this);
         binding.inputView.set8thVisibility(true);
-        //点击按钮监听
         binding.inputView.addOnFieldViewSelectedListener(index -> {
             if (index == 7) {
                 if (binding.quote.getVisibility() == View.VISIBLE) {
@@ -89,7 +75,6 @@ public class EquipmentLossReportActivity extends AppActivity {
                     binding.quote.setVisibility(View.VISIBLE);
                     post(() -> {
                         mPopupKeyboard.dismiss(getActivity());
-                        //删除最后一位字符
                         if (!TextUtils.isEmpty(binding.inputView.getEndText())) {
                             binding.inputView.removeLastCharOfNumber();
                         }
@@ -99,6 +84,61 @@ public class EquipmentLossReportActivity extends AppActivity {
         });
     }
 
+    /**
+     * 根据车牌获取订单信息
+     */
+    private void getOrderInfoByVehiclePlate(){
+        if(FunHelper.isEmpty(binding.inputView.getNumber())){
+            toast("请输入想要挂失的车牌号！");
+            return;
+        }
+
+        showDialog("挂失中...");
+        SendTheVerificationCodeBean bean = new SendTheVerificationCodeBean();
+        bean.setVehicleId(binding.inputView.getNumber() + "_" + licensePlateColor);
+        RequestParameters parameters = new RequestParameters(IFCode.IFCODE171, new Gson().toJson(bean));
+        new MyRetrofit().getRetrofit().create(Api.class).message2(parameters)
+                .enqueue(new Converter<Result>(getContext(), "请稍后...") {
+                    @Override
+                    protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                        cardReportTheLoss(bizContent);
+                    }
+
+                    @Override
+                    public void onError(String err, Response<Result> resp) {
+                        super.onError(err, resp);
+                        hideDialog();
+                    }
+                });
+    }
+
+    /**
+     * 挂失
+     * @param bizContent
+     */
+    private void cardReportTheLoss(ResultBean.BizContent bizContent){
+        SendTheVerificationCodeBean bean = new SendTheVerificationCodeBean();
+        bean.setCardId(bizContent.getCardId()); //卡号
+        bean.setObuId(bizContent.getObuId()); //签号
+        bean.setOrderId(bizContent.getOrderId()); //订单id
+        bean.setOperation(String.valueOf(opeartion)); //1-卡挂失， 2-牵挂失， 3-卡签挂失， 4-卡解挂 ，5-签解挂
+        RequestParameters parameters1 = new RequestParameters(IFCode.IFCODE82, new Gson().toJson(bean));
+        new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>() {
+            @Override
+            protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                hideDialog();
+                toast("设备已挂失！");
+                finish();
+            }
+
+            @Override
+            public void onError(String err, Response<Result> resp) {
+                super.onError(err, resp);
+                hideDialog();
+            }
+        });
+    }
+
     @Override
     protected void initData() {
 
@@ -108,12 +148,15 @@ public class EquipmentLossReportActivity extends AppActivity {
         binding.son1.setChecked(false);
         binding.son2.setChecked(false);
         binding.son3.setChecked(false);
-        if (view == binding.choice1) {
+        if (view == binding.choice1 || view == binding.son1) {
             binding.son1.setChecked(true);
-        } else if (view == binding.choice2) {
+            opeartion = "1";
+        } else if (view == binding.choice2  || view == binding.son2) {
             binding.son2.setChecked(true);
-        } else if (view == binding.choice3) {
+            opeartion = "2";
+        } else if (view == binding.choice3  || view == binding.son3) {
             binding.son3.setChecked(true);
+            opeartion = "3";
         }
     }
 

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

@@ -1,31 +0,0 @@
-package com.huntersun.vkyes.etcopencard.project.ui.activity.order;
-
-import android.view.View;
-
-import com.huntersun.vkyes.etcopencard.databinding.ActivityAuditingBinding;
-import com.huntersun.vkyes.etcopencard.databinding.ActivityContractBinding;
-import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
-
-/**
- * Date ：2023-03-13
- * Description：审核（未完成）
- */
-public class AuditingActivity extends AppActivity {
-    private ActivityAuditingBinding binding;
-
-    @Override
-    protected View getLayoutView() {
-        binding = ActivityAuditingBinding.inflate(getLayoutInflater());
-        return binding.getRoot();
-    }
-
-    @Override
-    protected void initView() {
-
-    }
-
-    @Override
-    protected void initData() {
-
-    }
-}

app/src/main/res/drawable-v1/bg_card_radius.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:topLeftRadius="@dimen/dp_5"
+        android:topRightRadius="@dimen/dp_5"/>
+    <solid android:color="#F7FAFD"/>
+</shape>

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

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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"
-    style="@style/MatchMatch.Vertical.Common">
-
-    <com.hjq.bar.TitleBar
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/transparent"
-        app:leftIcon="@mipmap/back_black"
-        app:lineVisible="false"
-        app:title="审核"
-        app:titleColor="@color/black" />
-
-    <androidx.core.widget.NestedScrollView
-        style="@style/MatchWrap">
-        <LinearLayout
-           style="@style/MatchWrap.Vertical">
-            <TextView
-                style="@style/WrapWrap"
-                android:text="详情"
-                android:textSize="@dimen/sp_16"
-                android:textStyle="bold"
-                android:paddingTop="@dimen/dp_28"
-                android:paddingLeft="@dimen/dp_15"
-                android:paddingBottom="@dimen/dp_10"
-                android:textColor="@color/common_text_color"/>
-
-            <LinearLayout
-                style="MatchWrap.Vertical"
-                android:background="@drawable/home_search_bar_gray_bg2"
-                android:paddingHorizontal="@dimen/dp_15"
-                android:paddingBottom="@dimen/dp_15">
-
-            </LinearLayout>
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
-    <Button
-        android:id="@+id/btn_next"
-        style="@style/BtnShortStyle"
-        android:layout_gravity="center_vertical|center_horizontal"
-        android:layout_marginLeft="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_30"
-        android:layout_marginRight="@dimen/dp_30"
-        android:text="下一步"
-        android:textSize="@dimen/sp_16" />
-</LinearLayout>

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

@@ -247,19 +247,74 @@
                                 tools:ignore="ButtonStyle" />
 
                         </LinearLayout>
-
                     </LinearLayout>
-
                 </LinearLayout>
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_17"
-                    android:text="请选择挂失设备"
+                    android:text="请选择挂起类型"
                     android:textColor="#333333"
                     android:textSize="@dimen/sp_12" />
 
+                    <LinearLayout
+                       style="@style/MatchWrap.Horizontal"
+                        android:layout_marginTop="@dimen/dp_12"
+                        android:layout_marginBottom="@dimen/dp_17">
+
+                        <LinearLayout
+                            android:id="@+id/choiceType1"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:orientation="horizontal">
+
+                            <androidx.appcompat.widget.AppCompatCheckBox
+                                android:id="@+id/sonType1"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:background="@null"
+                                android:checked="true"
+                                app:buttonCompat="@drawable/checkbox_selector" />
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/dp_12"
+                                android:text="有卡挂起" />
+                        </LinearLayout>
+                        <LinearLayout
+                            android:id="@+id/choiceType2"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:orientation="horizontal">
+
+                            <androidx.appcompat.widget.AppCompatCheckBox
+                                android:id="@+id/sonType2"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:background="@null"
+                                android:checked="false"
+                                app:buttonCompat="@drawable/checkbox_selector" />
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/dp_12"
+                                android:text="无卡挂起" />
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+               <!-- <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_17"
+                    android:text="请选择挂起设备"
+                    android:textColor="#333333"
+                    android:textSize="@dimen/sp_12" />-->
+
+<!--
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -330,12 +385,37 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/dp_12"
                             android:text="卡和OBU" />
-
                     </LinearLayout>
+                </LinearLayout>
+-->
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="请输入挂起原因"
+                    android:textColor="#333333"
+                    android:textSize="@dimen/sp_12" />
 
-                </LinearLayout>
+                <RelativeLayout
+                    style="@style/MatchWrap"
+                    android:layout_marginTop="@dimen/dp_15"
+                    android:layout_marginBottom="@dimen/dp_15"
+                    android:orientation="horizontal">
 
+                    <EditText
+                        android:id="@+id/etReason"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/border_grey_white_radius"
+                        android:paddingTop="@dimen/dp_15"
+                        android:paddingLeft="@dimen/dp_7"
+                        android:gravity="left"
+                        android:maxLength="50"
+                        android:hint="请输入挂起原因"
+                        android:textColorHint="@color/text98"
+                        android:minHeight="@dimen/dp_100"
+                        style="@style/black02TextStyle14"/>
+                </RelativeLayout>
             </LinearLayout>
 
             <Button