1.点维修详情

2.TODO 点维修详情测试+单独菜单

app/src/main/AndroidManifest.xml

@@ -1736,13 +1736,30 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.mes.MesServiceActivity"
+            android:name=".ui.activity.mes.repair.MesServiceActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="检维修记录"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.mes.repair.ServiceStandardActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="点检标准"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.mes.repair.ServiceStandardDetailActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="点检标准"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+
         <activity
             android:name=".ui.activity.WorkOrderActivity"
             android:configChanges="keyboardHidden|orientation"
@@ -2238,7 +2255,7 @@
             android:windowSoftInputMode="adjustPan" />
 
         <activity
-            android:name=".ui.activity.mes.ServiceCheckDetailActivity"
+            android:name=".ui.activity.mes.repair.ServiceCheckDetailActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="点检详情"
             android:launchMode="singleTop"
@@ -2246,7 +2263,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.mes.ServiceDetailActivity"
+            android:name=".ui.activity.mes.repair.ServiceDetailActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="检修详情"
             android:launchMode="singleTop"

app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java

@@ -581,6 +581,13 @@ public interface MesApiService {
     @POST("/himes/api/spotCheckBill/show/page.json")
     Observable<BaseMesBean> spotCheckBillList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+    /**
+     * @return
+     */
+    @POST("/himes/api/spotCheckBill/show/spotCheckBillStandard.json")
+    Observable<BaseMesBean> spotCheckStandardList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
+
     /**
      * @return
      */

app/src/main/java/com/wd/workoffice/ui/activity/mes/MesServiceActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/MesServiceActivity.java

-package com.wd.workoffice.ui.activity.mes;
+package com.wd.workoffice.ui.activity.mes.repair;
 
 import android.os.Bundle;
 

app/src/main/java/com/wd/workoffice/ui/activity/mes/ServiceCheckDetailActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceCheckDetailActivity.java

-package com.wd.workoffice.ui.activity.mes;
+package com.wd.workoffice.ui.activity.mes.repair;
 
+import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.Config;
@@ -27,6 +29,8 @@ import flexible.xd.android_base.network.rtfhttp.Transformer;
 import io.reactivex.disposables.Disposable;
 
 /**
+ *
+ * 点检详情
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -102,7 +106,7 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
 
     private void changeView() {
         tvNo.setText(info.getBillNum());
-        tvStatus.setText(info.getStatus() + "");
+        tvStatus.setText(info.getStatus() == 1 ? "已点检" : "未点检");
         tvPerson.setText(info.getSpotCheckPersonName());
         tvNewPerson.setText(info.getCreateUserName());
         tvNewTime.setText(info.getCreateDateTime());
@@ -189,6 +193,12 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
             param.put("pageNum", page);
             getData();
         }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
+                startActivity(ServiceStandardActivity.class,"id",JSON.toJSONString(dataList.get(i).getId()));
+            }
+        });
     }
 
 

app/src/main/java/com/wd/workoffice/ui/activity/mes/ServiceDetailActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceDetailActivity.java

-package com.wd.workoffice.ui.activity.mes;
+package com.wd.workoffice.ui.activity.mes.repair;
 
+import android.text.TextUtils;
+import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.Config;
@@ -85,7 +88,7 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
-        info = JSON.parseObject(getIntent().getStringExtra("info"),ServiceBean.ListBean.class);
+        info = JSON.parseObject(getIntent().getStringExtra("info"), ServiceBean.ListBean.class);
         changeView();
         dataList = new ArrayList<>();
         dataAdapter = new MesServiceDetailAdapter(R.layout.item_mes_service, dataList);
@@ -100,7 +103,7 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
 
     private void changeView() {
         tvNo.setText(info.getInspoCode());
-        tvStatus.setText(info.getStatus() + "");
+        tvStatus.setText(info.getStatus() == 1 ? "未维修" : "已检修");
         tvPerson.setText(info.getPrincipalName());
         tvPlan.setText(info.getPlanDesc());
         tvLocation.setText(info.getLocationName());
@@ -117,7 +120,6 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
     }
 
 
-
     private void getData() {
         RtfUtils.getMesRtf().modinspoproject("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
@@ -163,6 +165,12 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
             param.put("pageNum", page);
             getData();
         }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
+                startActivity(ServiceStandardActivity.class, "id", JSON.toJSONString(dataList.get(i).getId()));
+            }
+        });
     }
 
 

app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceStandardActivity.java

+package com.wd.workoffice.ui.activity.mes.repair;
+
+import android.view.View;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.mesBean.ServiceStandardBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.MesServiceStandardAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * 点检标准
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class ServiceStandardActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    private Map<String, Object> param;
+    private List<ServiceStandardBean.ListBean> dataList;
+    private MesServiceStandardAdapter dataAdapter;
+    private int page = 1;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+    }
+
+
+    @Override
+    protected void initData() {
+        dataList = new ArrayList<>();
+        dataAdapter = new MesServiceStandardAdapter(R.layout.item_mes_service_standard, dataList);
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
+        param = WorkUtils.simpleParam();
+        param.put("projectId", getIntent().getStringExtra("id"));
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getMesRtf().spotCheckStandardList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<ServiceStandardBean.ListBean> getList = JSON.parseObject(data.getData().toString(), ServiceStandardBean.class).getList();
+                if (page == 1) {
+                    dataList.clear();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                    dataAdapter.loadMoreComplete();
+                    srlRefresh.finishRefresh();
+                } else {
+                    dataAdapter.loadMoreComplete();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    dataAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+            }
+        });
+    }
+
+
+    @Override
+    protected void initEvent() {
+        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                page = 1;
+                param.put("pageNum", 1);
+                getData();
+            }
+        });
+
+        dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("pageNum", page);
+                getData();
+            }
+        }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
+                startActivity(ServiceStandardDetailActivity.class, "info", JSON.toJSONString(dataList.get(i)));
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_pro_price;
+    }
+
+}

app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceStandardDetailActivity.java

+package com.wd.workoffice.ui.activity.mes.repair;
+
+import android.text.TextUtils;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.mesBean.ServiceStandardBean;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class ServiceStandardDetailActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.tv_process_standard)
+    TextView tvProcessStandard;
+    @BindView(R.id.tv_num_a)
+    TextView tvNumA;
+    @BindView(R.id.tv_num_b)
+    TextView tvNumB;
+    @BindView(R.id.tv_num_c)
+    TextView tvNumC;
+    @BindView(R.id.tv_measurement_unit)
+    TextView tvMeasurementUnit;
+    @BindView(R.id.tv_status)
+    TextView tvStatus;
+    @BindView(R.id.tv_failure_code)
+    TextView tvFailureCode;
+    @BindView(R.id.tv_desc)
+    TextView tvDesc;
+    @BindView(R.id.tv_remark)
+    TextView tvRemark;
+    private ServiceStandardBean.ListBean info;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+        info = JSON.parseObject(getIntent().getStringExtra("info"), ServiceStandardBean.ListBean.class);
+        changeView();
+
+    }
+
+    private void changeView() {
+        tvDesc.setText(info.getDescription());
+        tvFailureCode.setText(info.getFailureCode());
+        tvMeasurementUnit.setText(info.getMeasurementUnit());
+        tvNumA.setText(info.getNumA());
+        tvNumB.setText(info.getNumB());
+        tvNumC.setText(info.getNumC());
+        tvProcessStandard.setText(info.getProcessStandard());
+        tvStatus.setText(TextUtils.equals(info.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
+        tvRemark.setText(info.getRemarks());
+
+    }
+
+
+    @Override
+    protected void initEvent() {
+    }
+
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_service_standard_detail;
+    }
+}

app/src/main/java/com/wd/workoffice/ui/adapter/MesServiceStandardAdapter.java

+package com.wd.workoffice.ui.adapter;
+
+
+import android.text.TextUtils;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.mesBean.LogBean;
+import com.wd.workoffice.bean.mesBean.ServiceStandardBean;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class MesServiceStandardAdapter extends BaseQuickAdapter<ServiceStandardBean.ListBean, BaseViewHolder> {
+    public MesServiceStandardAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, ServiceStandardBean.ListBean item) {
+        helper.setText(R.id.tv_name, String.format("检查项目:%s",item.getCheckProject()));
+        helper.setText(R.id.tv_status, TextUtils.equals(item.getStatus(),"1")?"异常":"正常");//1 异常 0正常
+        helper.setText(R.id.tv_content1, item.getProcessStandard());
+        helper.setText(R.id.tv_content2, item.getMeasurementUnit());
+        helper.setText(R.id.tv_content3, item.getFailureCode());
+    }
+}
+

app/src/main/java/com/wd/workoffice/ui/fg/MesCheckFragment.java

@@ -15,7 +15,7 @@ import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.bean.mesBean.ServiceCheckBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ServiceCheckDetailActivity;
+import com.wd.workoffice.ui.activity.mes.repair.ServiceCheckDetailActivity;
 import com.wd.workoffice.ui.adapter.MesCheckAdapter;
 import com.wd.workoffice.util.PickTimeUtils;
 import com.wd.workoffice.util.WorkUtils;
@@ -39,6 +39,7 @@ import io.reactivex.disposables.Disposable;
 
 
 /**
+ * 点检
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd

app/src/main/java/com/wd/workoffice/ui/fg/MesFragment.java

@@ -7,13 +7,9 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.bean.vo.BatLayoutVo;
-import com.wd.workoffice.ui.activity.mes.MesFeedbackActivity;
-import com.wd.workoffice.ui.activity.mes.MesScrappedActivity;
-import com.wd.workoffice.ui.activity.mes.MesServiceActivity;
+import com.wd.workoffice.ui.activity.mes.repair.MesServiceActivity;
 import com.wd.workoffice.ui.activity.mes.QualityTraceabilityActivity;
 import com.wd.workoffice.ui.activity.mes.analysis.MesAnalysisActivity;
-import com.wd.workoffice.ui.activity.mes.order.MesOrderActivity;
-import com.wd.workoffice.ui.activity.mes.MesProcessActivity;
 import com.wd.workoffice.ui.activity.mes.order.MesOrderProcessActivity;
 import com.wd.workoffice.ui.activity.mes.report.MesReportActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketActivity;

app/src/main/java/com/wd/workoffice/ui/fg/MesServiceFragment.java

@@ -15,8 +15,7 @@ import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.bean.mesBean.ServiceBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ServiceCheckDetailActivity;
-import com.wd.workoffice.ui.activity.mes.ServiceDetailActivity;
+import com.wd.workoffice.ui.activity.mes.repair.ServiceDetailActivity;
 import com.wd.workoffice.ui.adapter.MesServiceAdapter;
 import com.wd.workoffice.util.PickTimeUtils;
 import com.wd.workoffice.util.WorkUtils;
@@ -40,6 +39,7 @@ import io.reactivex.disposables.Disposable;
 
 
 /**
+ * 维修
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd

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

@@ -6,9 +6,9 @@
     android:layout_margin="8mm"
     android:background="@color/white"
     android:orientation="vertical"
-    android:paddingHorizontal="20mm"
-    android:paddingTop="10mm"
-    android:paddingBottom="10mm">
+    android:paddingHorizontal="10mm"
+    android:paddingVertical="10mm"
+   >
 
 
 
@@ -17,11 +17,11 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="10mm"
         android:background="#FCFCFD"
-        android:orientation="vertical"
         android:paddingVertical="10mm">
 
         <RelativeLayout
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:paddingHorizontal="10mm">
 
@@ -43,5 +43,11 @@
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="13sp" />
         </RelativeLayout>
+
+        <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:src="@mipmap/arrow_right_gray" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

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

@@ -6,10 +6,8 @@
     android:layout_margin="8mm"
     android:background="@color/white"
     android:orientation="vertical"
-    android:paddingHorizontal="20mm"
-    android:paddingTop="10mm"
-    android:paddingBottom="10mm">
-
+    android:paddingHorizontal="10mm"
+    android:paddingVertical="10mm">
 
 
     <LinearLayout
@@ -17,9 +15,15 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="10mm"
         android:background="#FCFCFD"
-        android:orientation="vertical"
         android:paddingVertical="10mm">
 
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -43,6 +47,7 @@
                     android:textColor="@color/flexible_text_gray"
                     android:textSize="13sp" />
             </RelativeLayout>
+
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -67,6 +72,7 @@
                     android:textColor="@color/flexible_text_gray"
                     android:textSize="13sp" />
             </RelativeLayout>
+
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -92,4 +98,11 @@
                     android:textSize="13sp" />
             </RelativeLayout>
         </LinearLayout>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:src="@mipmap/arrow_right_gray" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_centerHorizontal="true"
+    android:layout_margin="8mm"
+    android:background="@color/white"
+    android:orientation="vertical"
+    android:paddingHorizontal="10mm"
+    android:paddingVertical="10mm">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:text="设备"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/tv_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:textColor="@color/orange"
+            android:textSize="13sp" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10mm"
+        android:background="#FCFCFD"
+        android:orientation="vertical"
+        android:paddingVertical="10mm">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10mm"
+                android:text="工艺标准"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/tv_content1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="13sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm"
+            android:paddingHorizontal="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10mm"
+                android:text="计量单位"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/tv_content2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="13sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm"
+            android:paddingHorizontal="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10mm"
+                android:text="缺陷或故障编码"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/tv_content3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="13sp" />
+        </RelativeLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file