1.用户反馈连铸机详情

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改

app/src/main/java/com/wd/workoffice/bean/event/RefreshMachineEvent.java

+package com.wd.workoffice.bean.event;
+
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class RefreshMachineEvent {
+
+    public RefreshMachineEvent() {
+    }
+
+}

app/src/main/java/com/wd/workoffice/bean/mesBean/MachineBean.java

+package com.wd.workoffice.bean.mesBean;
+
+import java.util.List;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MachineBean {
+
+
+        /**
+         * id : 19
+         * createDateTime : 1585721647000
+         * updateDateTime : 1587460675000
+         * continuousCasterCode : lzj111
+         * continuousCasterName : 连铸机01
+         * steelmakingWorksCode : lgc1
+         * steelmakingWorksName : 炼钢厂1
+         * continuousCasterType : 铸机类型11
+         * fractureSurface : 断面1
+         * steelGrade : 钢种1
+         * castingSpeed : 拉速1
+         * ladleCode : zjb1
+         * ladleCoveringAgentCode : zjbfgj1
+         * mouldFluxesCode : jjbhz1
+         * productsCode : 7301050001B
+         * createUserId : 398c852b38e911ea8334fa163e1166bd
+         * createUserName : null
+         * updateUserId : 398c852b38e911ea8334fa163e1166bd
+         * updateUserName : hello
+         * remark : null
+         * delete : null
+         */
+
+        private String id;
+        private long createDateTime;
+        private long updateDateTime;
+        private String continuousCasterCode;
+        private String continuousCasterName;
+        private String steelmakingWorksCode;
+        private String steelmakingWorksName;
+        private String continuousCasterType;
+        private String fractureSurface;
+        private String steelGrade;
+        private String castingSpeed;
+        private String ladleCode;
+        private String ladleCoveringAgentCode;
+        private String mouldFluxesCode;
+        private String productsCode;
+        private String createUserId;
+        private Object createUserName;
+        private String updateUserId;
+        private String updateUserName;
+        private Object remark;
+        private Object delete;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public long getCreateDateTime() {
+            return createDateTime;
+        }
+
+        public void setCreateDateTime(long createDateTime) {
+            this.createDateTime = createDateTime;
+        }
+
+        public long getUpdateDateTime() {
+            return updateDateTime;
+        }
+
+        public void setUpdateDateTime(long updateDateTime) {
+            this.updateDateTime = updateDateTime;
+        }
+
+        public String getContinuousCasterCode() {
+            return continuousCasterCode;
+        }
+
+        public void setContinuousCasterCode(String continuousCasterCode) {
+            this.continuousCasterCode = continuousCasterCode;
+        }
+
+        public String getContinuousCasterName() {
+            return continuousCasterName;
+        }
+
+        public void setContinuousCasterName(String continuousCasterName) {
+            this.continuousCasterName = continuousCasterName;
+        }
+
+        public String getSteelmakingWorksCode() {
+            return steelmakingWorksCode;
+        }
+
+        public void setSteelmakingWorksCode(String steelmakingWorksCode) {
+            this.steelmakingWorksCode = steelmakingWorksCode;
+        }
+
+        public String getSteelmakingWorksName() {
+            return steelmakingWorksName;
+        }
+
+        public void setSteelmakingWorksName(String steelmakingWorksName) {
+            this.steelmakingWorksName = steelmakingWorksName;
+        }
+
+        public String getContinuousCasterType() {
+            return continuousCasterType;
+        }
+
+        public void setContinuousCasterType(String continuousCasterType) {
+            this.continuousCasterType = continuousCasterType;
+        }
+
+        public String getFractureSurface() {
+            return fractureSurface;
+        }
+
+        public void setFractureSurface(String fractureSurface) {
+            this.fractureSurface = fractureSurface;
+        }
+
+        public String getSteelGrade() {
+            return steelGrade;
+        }
+
+        public void setSteelGrade(String steelGrade) {
+            this.steelGrade = steelGrade;
+        }
+
+        public String getCastingSpeed() {
+            return castingSpeed;
+        }
+
+        public void setCastingSpeed(String castingSpeed) {
+            this.castingSpeed = castingSpeed;
+        }
+
+        public String getLadleCode() {
+            return ladleCode;
+        }
+
+        public void setLadleCode(String ladleCode) {
+            this.ladleCode = ladleCode;
+        }
+
+        public String getLadleCoveringAgentCode() {
+            return ladleCoveringAgentCode;
+        }
+
+        public void setLadleCoveringAgentCode(String ladleCoveringAgentCode) {
+            this.ladleCoveringAgentCode = ladleCoveringAgentCode;
+        }
+
+        public String getMouldFluxesCode() {
+            return mouldFluxesCode;
+        }
+
+        public void setMouldFluxesCode(String mouldFluxesCode) {
+            this.mouldFluxesCode = mouldFluxesCode;
+        }
+
+        public String getProductsCode() {
+            return productsCode;
+        }
+
+        public void setProductsCode(String productsCode) {
+            this.productsCode = productsCode;
+        }
+
+        public String getCreateUserId() {
+            return createUserId;
+        }
+
+        public void setCreateUserId(String createUserId) {
+            this.createUserId = createUserId;
+        }
+
+        public Object getCreateUserName() {
+            return createUserName;
+        }
+
+        public void setCreateUserName(Object createUserName) {
+            this.createUserName = createUserName;
+        }
+
+        public String getUpdateUserId() {
+            return updateUserId;
+        }
+
+        public void setUpdateUserId(String updateUserId) {
+            this.updateUserId = updateUserId;
+        }
+
+        public String getUpdateUserName() {
+            return updateUserName;
+        }
+
+        public void setUpdateUserName(String updateUserName) {
+            this.updateUserName = updateUserName;
+        }
+
+        public Object getRemark() {
+            return remark;
+        }
+
+        public void setRemark(Object remark) {
+            this.remark = remark;
+        }
+
+        public Object getDelete() {
+            return delete;
+        }
+
+        public void setDelete(Object delete) {
+            this.delete = delete;
+        }
+}

app/src/main/java/com/wd/workoffice/bean/mesBean/UserDataBean.java

@@ -111,9 +111,18 @@ public class UserDataBean extends BaseMesPageBean {
             private String annualOutput;
             private String steelGrade;
             private String continuousCasterName;
+            private String continuousCasterCode;
             private String continuousCasterType;
             private Object delete;
 
+            public String getContinuousCasterCode() {
+                return continuousCasterCode;
+            }
+
+            public void setContinuousCasterCode(String continuousCasterCode) {
+                this.continuousCasterCode = continuousCasterCode;
+            }
+
             public String getId() {
                 return id;
             }

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

@@ -172,4 +172,28 @@ public interface MesApiService {
      */
     @POST("/himes/api/msSteelmakingWorks/show/getBySteel.json")
     Observable<BaseMesBean> factoryDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
+    /**
+     * 连铸机列表查询
+     *
+     * @return
+     */
+    @POST("/himes/api/msContinuousCasterInfo/show/list.json")
+    Observable<BaseMesBean> machineList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+    /**
+     * 连铸机详情
+     *
+     * @return
+     */
+    @POST("/himes/api/msContinuousCasterInfo/show/getByCaster.json")
+    Observable<BaseMesBean> machineDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
+    /**
+     * 连铸机详情
+     *
+     * @return
+     */
+    @POST("/himes/api/msContinuousProducts/save.json")
+    Observable<BaseMesBean> threeAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryActivity.java

@@ -115,6 +115,8 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 data.setSteelmakingWorksName(clientList.get(position).getSteelmakingWorksName());
                 data.setSteelmakingWorksCode(clientList.get(position).getSteelmakingWorksCode());
+                data.setAnnualOutput(clientList.get(position).getAnnualOutput());
+                data.setSteelGrade(clientList.get(position).getSteelGrade());
                 startActivity(MesUserDataAdd3Activity.class,
                         "data", JSON.toJSONString(data)
                 );

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineActivity.java

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.content.Intent;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -12,11 +11,16 @@ import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.ClientBean;
 import com.wd.workoffice.bean.event.AddFactoryEvent;
+import com.wd.workoffice.bean.mesBean.FactoryBean;
+import com.wd.workoffice.bean.mesBean.MachineBean;
+import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.UserDataChooseMachineAdapter;
 import com.wd.workoffice.ui.adapter.UserDataClientAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -50,10 +54,9 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
     @BindView(R.id.rv_client)
     RecyclerView rvClient;
     private Map<String, Object> param;
-    private List<ClientBean.RecordsBean> clientList;
-    private UserDataClientAdapter clientAdapter;
-    private int page = 1;
-
+    private List<MachineBean> clientList;
+    private UserDataChooseMachineAdapter clientAdapter;
+    private UserDataBean.ListBean data;
     @Override
     protected void initView() {
         ButterKnife.bind(this);
@@ -62,25 +65,18 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
+        data = JSON.parseObject(getIntent().getStringExtra("data"), UserDataBean.ListBean.class);
         clientList = new ArrayList<>();
-        clientList.add(null);
-        clientList.add(null);
-        clientList.add(null);
-        clientAdapter = new UserDataClientAdapter(R.layout.item_store_client, clientList);
+        clientAdapter = new UserDataChooseMachineAdapter(R.layout.item_store_client, clientList);
         clientAdapter.bindToRecyclerView(rvClient);
         clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
-        param = WorkUtils.pageKey();
-//        getData();
+        param = WorkUtils.simpleParam();
+        param.put("steelmakingWorksCode",data.getSteelmakingWorksCode());
+        getData();
     }
 
     private void getData() {
-        Observable<BaseBean> observable;
-        if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-            observable = RtfUtils.getRtf().getClient(param);
-        } else {
-            observable = RtfUtils.getRtf().getClientOut(param);
-        }
-        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getMesRtf().machineList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -92,41 +88,16 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
             }
 
             @Override
-            public void onSuccess(BaseBean data) {
+            public void onSuccess(BaseMesBean data) {
                 hideLoading();
-                if (data.getCode() != 0) {
-                    toast(data.getMessage());
+                if (!data.isSuccess()) {
+                    toast(data.getMsg());
                     return;
                 }
-                List<ClientBean.RecordsBean> dataList = new ArrayList<>();
-                if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-                    ClientBean clientBean = JSON.parseObject(data.getData().toString(), ClientBean.class);
-                    dataList.addAll(clientBean.getRecords());
-                    if (page == 1) {
-                        clientList.clear();
-                        clientList.addAll(dataList);
-                        clientAdapter.notifyDataSetChanged();
-                        clientAdapter.loadMoreComplete();
-                    } else {
-                        clientAdapter.loadMoreComplete();
-                        clientList.addAll(dataList);
-                        clientAdapter.notifyDataSetChanged();
-                    }
-                    if (dataList.size() == 0) {
-                        clientAdapter.loadMoreEnd();
-                    } else {
-                        page++;
-                    }
-                } else {
-                    dataList.addAll(JSON.parseArray(data.getData().toString(), ClientBean.RecordsBean.class));
-                    clientAdapter.loadMoreEnd();
+                List<MachineBean> getList = JSON.parseArray(data.getData().toString(), MachineBean.class);
                 clientList.clear();
-                    clientList.addAll(dataList);
+                clientList.addAll(getList);
                 clientAdapter.notifyDataSetChanged();
-                }
-                if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-
-                }
                 toast("搜索成功");
             }
         });
@@ -134,17 +105,13 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
 
     @Override
     protected void initEvent() {
-        clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
-            @Override
-            public void onLoadMoreRequested() {
-                param.put("current", page);
-//                getData();
-            }
-        }, rvClient);
         clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(MesChooseMachineDetailActivity.class);
+                data.setContinuousCasterName(clientList.get(position).getContinuousCasterName());
+                data.setContinuousCasterType(clientList.get(position).getContinuousCasterType());
+                data.setContinuousCasterCode(clientList.get(position).getContinuousCasterCode());
+                startActivity(MesChooseMachineDetailActivity.class,"data",JSON.toJSONString(data));
             }
         });
     }
@@ -157,10 +124,8 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
 
     @OnClick(R.id.btn_search)
     public void onViewClicked() {
-        param.put("name", etKey.getText().toString());
-        param.put("current", 1);
-        page = 1;
-//        getData();
+        param.put("continuousCasterName", etKey.getText().toString());
+        getData();
     }
 
     @Override

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesThreeAddActivity.java

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
 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.BaseBean;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.ClientBean;
 import com.wd.workoffice.bean.event.AddFactoryEvent;
+import com.wd.workoffice.bean.event.RefreshMachineEvent;
+import com.wd.workoffice.bean.mesBean.MchineDetailBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.UserDataClientAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
-import io.reactivex.Observable;
+import flexible.xd.android_base.utils.TimeUtils;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -50,6 +41,7 @@ public class MesThreeAddActivity extends WorkToolBarActivity {
     RelativeLayout rlFactory;
     @BindView(R.id.et_content)
     EditText etContent;
+    private Map<String, Object> param;
 
     @Override
     protected void initView() {
@@ -58,8 +50,35 @@ public class MesThreeAddActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
+        param = WorkUtils.simpleParam();
+        param.put("continuousCasterCode", getIntent().getStringExtra("continuousCasterCode"));
     }
 
+    private void submit() {
+        RtfUtils.getMesRtf().threeAdd("1", "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.getMsg());
+                    return;
+                }
+                finish();
+                toast("添加成功");
+                EventBus.getDefault().post(new RefreshMachineEvent());
+            }
+        });
+    }
 
     @Override
     protected void initEvent() {
@@ -87,20 +106,4 @@ public class MesThreeAddActivity extends WorkToolBarActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        EventBus.getDefault().register(this);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        EventBus.getDefault().unregister(this);
-    }
-
-    @Subscribe
-    public void refresh(AddFactoryEvent event) {
-    }
-
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAdd3Activity.java

@@ -173,7 +173,7 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
 
     @OnClick(R.id.rl_machine)
     public void onViewClicked() {
-        startActivityForResult(MesChooseMachineActivity.class, 10001);
+        startActivity(MesChooseMachineActivity.class,"data",JSON.toJSONString(data));
     }
 
 }

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

+package com.wd.workoffice.ui.adapter;
+
+
+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.MachineBean;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class UserDataChooseMachineAdapter extends BaseQuickAdapter<MachineBean, BaseViewHolder> {
+
+    public UserDataChooseMachineAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, MachineBean item) {
+        helper.setText(R.id.tv_name,item.getContinuousCasterName());
+    }
+}
+

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

@@ -13,7 +13,7 @@ import java.util.List;
  * Created by flexible on 2018/8/13.
  */
 
-public class UserDataMachineAdapter extends BaseQuickAdapter<Object, BaseViewHolder> {
+public class UserDataMachineAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
 
     public UserDataMachineAdapter(int layoutResId, List data) {
         super(layoutResId, data);
@@ -21,7 +21,8 @@ public class UserDataMachineAdapter extends BaseQuickAdapter<Object, BaseViewHol
 
 
     @Override
-    protected void convert(BaseViewHolder helper, Object item) {
+    protected void convert(BaseViewHolder helper, String item) {
+        helper.setText(R.id.tv_name, item);
     }
 }
 

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

@@ -9,7 +9,7 @@
         android:orientation="vertical">
 
         <RelativeLayout
-            android:id="@+id/rl_factory"
+            android:id="@+id/rl_pro"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10mm"
@@ -31,7 +31,7 @@
                 android:gravity="center_vertical">
 
                 <TextView
-                    android:id="@+id/tv_factory"
+                    android:id="@+id/tv_pro"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
@@ -65,6 +65,7 @@
 
 
             <EditText
+                android:id="@+id/et_img_code"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -91,6 +92,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -117,6 +119,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_spec"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -143,6 +146,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_material"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -169,6 +173,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_requirements"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -195,6 +200,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_years"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -221,6 +227,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_position"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -247,6 +254,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_baking_method"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -269,10 +277,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
-                android:text="烘烤方式"
+                android:text="烘烤温度"
                 android:textSize="14sp" />
 
+
             <EditText
+                android:id="@+id/et_baking_temperature"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -299,6 +309,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_baking_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -313,7 +324,6 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/white"
             android:paddingVertical="15mm"
             android:paddingLeft="18mm"
             android:text="使用问题反馈（侵蚀、冲刷、断裂等）"
@@ -329,18 +339,38 @@
             android:background="@drawable/shape_input_white"
             android:gravity="top"
             android:minLines="3"
+            android:hint="请输入"
             android:padding="5mm"
             android:textSize="14sp" />
 
-        <androidx.recyclerview.widget.RecyclerView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10mm" />
+            android:paddingHorizontal="20mm">
+
+            <ImageView
+                android:id="@+id/iv_img1"
+                android:layout_width="100mm"
+                android:layout_height="100mm"
+                android:src="@mipmap/img_add" />
+
+            <ImageView
+                android:id="@+id/iv_img2"
+                android:layout_width="100mm"
+                android:layout_height="100mm"
+                android:layout_marginHorizontal="15mm"
+                android:src="@mipmap/img_add" />
+
+            <ImageView
+                android:id="@+id/iv_img3"
+                android:layout_width="100mm"
+                android:layout_height="100mm"
+                android:src="@mipmap/img_add" />
+        </LinearLayout>
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/white"
             android:paddingVertical="15mm"
             android:paddingLeft="18mm"
             android:text="备注"
@@ -355,6 +385,8 @@
             android:background="@drawable/shape_input_white"
             android:gravity="top"
             android:minLines="3"
+            android:hint="请输入"
+            android:layout_marginBottom="100mm"
             android:padding="5mm"
             android:textSize="14sp" />
     </LinearLayout>