处理工单页改版

orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderContract.java

@@ -30,7 +30,9 @@ public interface MultiProcessOrderContract {
 
         List<String> getImages();
 
-        List<String> getSnImages();
+        String getSnNumbers();
+        void setSnNumbers(String snStrs);
+        void showSnView(boolean show);
     }
 
     abstract class Presenter extends BasePresenter<View> {

orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java

@@ -43,11 +43,11 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
     private Spu mSpu;
     private ArrayList<String> mImages = new ArrayList<>();
     private ArrayList<String> mHttpUrl = new ArrayList<>();
-    private ArrayList<String> mSnHttpUrl = new ArrayList<>();
+//    private ArrayList<String> mSnHttpUrl = new ArrayList<>();
     public ObservableField<Spu> mDetail = new ObservableField<>();
     public ObservableField<String> mInfo = new ObservableField<>();
     public ObservableField<String> mBrandName = new ObservableField<>();
-    public ObservableField<String> mSn = new ObservableField<>();
+//    public ObservableField<String> mSn = new ObservableField<>();
     public ObservableField<Boolean> mSpuState = new ObservableField<>();
     public ObservableField<Boolean> mIsShowSn = new ObservableField<>(false);
     public ObservableField<Boolean> mIsShowPhone = new ObservableField<>(false);
@@ -70,7 +70,8 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
         mId = mSpu.getId();
         mDetail.set(mSpu);
         mBrandName.set(mSpu.getBrandName());
-        mSn.set(mSpu.getSn());
+        mView.setSnNumbers(mSpu.getSn());
+//        mSn.set(mSpu.getSn());
         mView.initAddIv();
         mView.initPhotoView(mImages);
         if (mSpus.size() >= 2 || (mSpus.size() == 1 && mSpu.getStatus() == 2)) {
@@ -89,21 +90,13 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
         PictureFileUtils.deleteCacheDirFile(BaseApplication.getContext());
     }
 
-    private MultipartBody.Part[] packPhoto(List<String> imageUrl, String type) {
+    private MultipartBody.Part[] packPhoto(List<String> imageUrl) {
         ArrayList<File> files = new ArrayList<>();
-        if (type.equals("sn")) {
-            mSnHttpUrl.clear();
-        } else {
         mHttpUrl.clear();
-        }
         if (imageUrl != null && imageUrl.size() > 0) {
             for (int i = 0; i < imageUrl.size(); i++) {
                 if (imageUrl.get(i).contains("http")) {
-                    if (type.equals("sn")) {
-                        mSnHttpUrl.add(imageUrl.get(i));
-                    } else {
                     mHttpUrl.add(imageUrl.get(i));
-                    }
                 } else {
                     files.add(new File(imageUrl.get(i)));
                 }
@@ -126,7 +119,7 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
         params.put("customerCheckComment", info);
         params.put("id", id);
         params.put("brandName", mBrandName.get());
-        params.put("sn", mSn.get());
+        params.put("sn", mView.getSnNumbers());
         //照片上传
         if (imageUrl != null) {
             StringBuilder str = new StringBuilder();
@@ -195,60 +188,27 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
 
     @Override
     public void commitPhoto() {
-        if (mIsShowSn.get() && (TextUtils.isEmpty(mSn.get()) || mView.getSnImages().size() == 0)) {
-            ToastUtils.showShortToast(R.string.sn_photo_not_null);
+        if (mIsShowSn.get() && (TextUtils.isEmpty(mView.getSnNumbers()))) {
+            ToastUtils.showShortToast(R.string.sn_not_null);
             return;
         }
         mView.showDialog();
         MultipartBody.Part[] parts;
         List<String> imageUrl = mView.getImages();
         if (imageUrl != null && imageUrl.size() > 0) {
-            parts = packPhoto(imageUrl, "");
+            parts = packPhoto(imageUrl);
             if (parts.length == 0) {
-                if (mIsShowSn.get()) {
-                    List<String> images = mView.getSnImages();
-                    MultipartBody.Part[] snParts = packPhoto(images, "sn");
-                    if (mSnHttpUrl.size() == 1) {
-                        commitOrder(mHttpUrl, mSnHttpUrl);
-                    } else {
-                        BaseApiFactory.uploadPhoto(snParts).subscribe(baseObserver(
-                                list -> commitOrder(mHttpUrl, list)));
-                    }
-                } else {
                 commitOrder(mHttpUrl, null);
-                }
             } else {
                 BaseApiFactory.uploadPhoto(parts).subscribe(baseObserver(list -> {
                     list.addAll(0, mHttpUrl);
-                    if (mIsShowSn.get()) {
-                        List<String> images = mView.getSnImages();
-                        MultipartBody.Part[] snParts = packPhoto(images, "sn");
-                        if (mSnHttpUrl.size() == 1) {
-                            commitOrder(list, mSnHttpUrl);
-                        } else {
-                            BaseApiFactory.uploadPhoto(snParts).subscribe(baseObserver(
-                                    list1 -> commitOrder(list, list1)));
-                        }
-                    } else {
                     commitOrder(list, null);
-                    }
                 }));
             }
         } else {
-            if (mIsShowSn.get()) {
-                List<String> images = mView.getSnImages();
-                MultipartBody.Part[] snParts = packPhoto(images, "sn");
-                if (mSnHttpUrl.size() == 1) {
-                    commitOrder(null, mSnHttpUrl);
-                } else {
-                    BaseApiFactory.uploadPhoto(snParts).subscribe(baseObserver(
-                            list -> commitOrder(null, list)));
-                }
-            } else {
             commitOrder(null, null);
         }
     }
-    }
 
 
     @Override
@@ -276,7 +236,8 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
         OrderApiFactory.getMultiProcessInfo(mId).subscribe(baseObserver(spu -> {
             mDetail.set(spu);
             mBrandName.set(spu.getBrandName());
-            mSn.set(spu.getSn());
+            mView.setSnNumbers(spu.getSn());
+//            mSn.set(spu.getSn());
             mInfo.set(spu.getCustomerCheckComment());
             List<Pic> pics = spu.getListPic();
             ArrayList<String> imges = new ArrayList<>();
@@ -289,6 +250,7 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
             }
             if (spu.getNeedSerialNumPic() != null && spu.getNeedSerialNumPic() == 1) {
                 mIsShowSn.set(true);
+                mView.showSnView(true);
             }
         }));
     }

orderCenter/src/main/java/com/dayu/order/ui/activity/MultiProcessOrderActivity.java

 package com.dayu.order.ui.activity;
 
 import android.content.Intent;
-import android.os.Environment;
 import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.view.View;
+import android.widget.EditText;
 
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
 import com.dayu.base.ui.activity.BaseActivity;
 import com.dayu.base.ui.adapter.PhotoViewAdapter;
 import com.dayu.base.ui.adapter.SpacesItemDecoration;
-import com.dayu.common.Constants;
 import com.dayu.order.R;
 import com.dayu.order.databinding.ActivityMultiProcessOrderBinding;
 import com.dayu.order.presenter.multiprocessorder.MultiProcessOrderContract;
 import com.dayu.order.presenter.multiprocessorder.MultiProcessOrderPresenter;
-import com.dayu.utils.GlideImageLoader;
+import com.dayu.utils.CommonUtils;
+import com.dayu.utils.LogUtils;
 import com.dayu.utils.ToastUtils;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
-import com.luck.picture.lib.PictureSelectionModel;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
-import com.luck.picture.lib.config.PictureMimeType;
 import com.luck.picture.lib.entity.LocalMedia;
-import com.umeng.analytics.MobclickAgent;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Created by luofan
  * on 2018/5/23.
+ * 工单处理
  */
 
 public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPresenter, ActivityMultiProcessOrderBinding>
         implements MultiProcessOrderContract.View {
     private ArrayList<String> mImages = new ArrayList<>();
     private ArrayList<String> mSnImages = new ArrayList<>();
-    private int mPhotoState;//1.服务照片2.sn照片
+    private ArrayList<Integer> mSnItems = new ArrayList<>();
+    private ArrayList<String> mSnNumbers = new ArrayList<>();
+    private BaseQuickAdapter<Integer, BaseViewHolder> snAdapter;
+    private int scanSnPos;
+
     private PhotoViewAdapter mAdapter;
 
     @Override
@@ -49,21 +55,56 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
 
     @Override
     public void initView() {
-        mBind.ivSn.setOnClickListener(v -> {
-            if (mSnImages.size() > 0) {
-                dumpPic(mSnImages);
+        showSnView(false);
+    }
+
+    private void setSnAdapter() {
+//        if (snAdapter == null) {
+        snAdapter = new BaseQuickAdapter<Integer, BaseViewHolder>(R.layout.item_scan_sn, mSnItems) {
+            @Override
+            protected void convert(BaseViewHolder helper, Integer item) {
+                int pos = mSnItems.indexOf(item);
+                EditText edtNum = helper.getView(R.id.et_serial_num);
+                if (mSnNumbers.size() > pos) {
+                    edtNum.setText(mSnNumbers.get(pos));
                 } else {
-                mPhotoState = 2;
-                showPicDialog();
+                    edtNum.setText("");
+                }
+                helper.getView(R.id.scan).setOnClickListener(v -> toScan(pos));
+                edtNum.addTextChangedListener(new TextWatcher() {
+                    @Override
+                    public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+                    }
+
+                    @Override
+                    public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+                    }
+
+                    @Override
+                    public void afterTextChanged(Editable editable) {
+                        if (mSnNumbers.size() > pos) {
+                            mSnNumbers.set(pos, editable.toString().trim());
+                        } else {
+                            if (!TextUtils.isEmpty(editable.toString().trim()))
+                                mSnNumbers.add(editable.toString().trim());
+                        }
                     }
                 });
-        mBind.ivDelete.setOnClickListener(v -> {
-            mBind.ivSn.setImageResource(R.drawable.icon_sn);
-            mBind.ivDelete.setVisibility(View.GONE);
-            mSnImages.clear();
-        });
-        mBind.scan.setOnClickListener(v ->
-                new IntentIntegrator(this).setOrientationLocked(false).setCaptureActivity(CustomScannerActivity.class).initiateScan());
+            }
+        };
+        mBind.rvSn.setAdapter(snAdapter);
+//        } else {
+//            snAdapter.notifyDataSetChanged();
+//        }
+    }
+
+    //跳转到扫描页面
+    private void toScan(int pos) {
+        scanSnPos = pos;
+        new IntentIntegrator(this)
+                .setOrientationLocked(false)
+                .setCaptureActivity(CustomScannerActivity.class)
+                .initiateScan();
     }
 
     @Override
@@ -84,43 +125,6 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
         mAdapter.setData(mImages);
     }
 
-    public void showPicDialog() {
-        int size = 1 - mSnImages.size();
-        PictureSelectionModel selector = PictureSelector.create(mActivity)
-                .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
-                .maxSelectNum(size)// 最大图片选择数量 int
-                .imageSpanCount(4)// 每行显示个数 int
-                .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
-                .previewImage(true)// 是否可预览图片 true or false
-                .isCamera(true)// 是否显示拍照按钮 true or false
-                .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
-//                .recordVideoSecond(10) //视频秒数录制 默认60s int
-//                .videoMaxSecond(15)// 显示多少秒以内的视频or音频也可适用 int
-                .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
-                .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
-                .compress(true)// 是否压缩 true or false
-                .glideOverride(300, 500)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
-                .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
-                .compressSavePath(getPath())//压缩图片保存地址
-                .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
-//                .minimumCompressSize(100)// 小于100kb的图片不压缩
-                .synOrAsy(true);//同步true或异步false 压缩 默认同步、
-//                .enableCrop(true)//是否裁剪
-//                .freeStyleCropEnabled(true)
-        selector.forResult(PictureConfig.CHOOSE_REQUEST);
-        MobclickAgent.onEvent(mActivity, "add_server_pic");
-    }
-
-
-    private String getPath() {
-        String path = Environment.getExternalStorageDirectory() + "/dayu/image/";
-        File file = new File(path);
-        if (file.mkdirs()) {
-            return path;
-        }
-        return path;
-    }
-
 
     /**
      * 图片列表显示.
@@ -131,7 +135,7 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
             initPhotoView();
         }
         mImages = list;
-        if (mImages.size() < 10) {
+        if (mImages.size() < 5) {
             mImages.add("add");
         }
         mAdapter.setData(mImages);
@@ -139,18 +143,9 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
 
     @Override
     public void initSnPic(String url) {
-        GlideImageLoader.load(mActivity, url, mBind.ivSn);
-        mBind.ivDelete.setVisibility(View.VISIBLE);
         mSnImages.add(url);
     }
 
-    private void dumpPic(ArrayList<String> list) {
-        Intent intent = new Intent(this, PreviewActivty.class);
-        intent.putStringArrayListExtra(Constants.BUNDLE_KEY_ID, list);
-        int DELETECODE = 0;
-        startActivityForResult(intent, DELETECODE);
-    }
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -159,7 +154,12 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
             if (result.getContents() == null) {
 //                toast = "Cancelled from fragment";
             } else {
-                mBind.etSerialNum.setText(result.getContents());
+                if (mSnNumbers.size() > scanSnPos) {
+                    mSnNumbers.set(scanSnPos, result.getContents());
+                } else {
+                    mSnNumbers.add(result.getContents());
+                }
+                setSnAdapter();
             }
             return;
         }
@@ -168,37 +168,23 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
                 case PictureConfig.CHOOSE_REQUEST:
                     List<LocalMedia> selectList = PictureSelector.obtainMultipleResult(data);
                     if (selectList != null && selectList.size() > 0) {
-                        if (mPhotoState == 0) {
                         mImages.remove("add");
                         for (int a = 0; a < selectList.size(); a++) {
 //                                mImages.add(selectList.get(a).getCompressPath());
-                                if (!TextUtils.isEmpty(selectList.get(a).getCompressPath())){
+                            if (!TextUtils.isEmpty(selectList.get(a).getCompressPath())) {
                                 mImages.add(selectList.get(a).getCompressPath());
-                                }else{
+                            } else {
                                 mImages.add(selectList.get(a).getPath());
                             }
                         }
-                            if (mImages.size() < 10) {
+                        if (mImages.size() < 5) {
                             mImages.add("add");
                         }
                         mAdapter.setData(mImages);
-                        } else {
-                            for (int a = 0; a < selectList.size(); a++) {
-//                                mSnImages.add(selectList.get(a).getCompressPath());
-                                if (!TextUtils.isEmpty(selectList.get(a).getCompressPath())){
-                                    mSnImages.add(selectList.get(a).getCompressPath());
-                                }else{
-                                    mSnImages.add(selectList.get(a).getPath());
-                                }
-                            }
-                            GlideImageLoader.load(mActivity, mSnImages.get(0), mBind.ivSn);
-                            mBind.ivDelete.setVisibility(View.VISIBLE);
-                        }
                     }
                     break;
             }
         }
-        mPhotoState = 0;
     }
 
     @Override
@@ -207,8 +193,54 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
         return mImages;
     }
 
+
+    @Override
+    public String getSnNumbers() {
+        return CommonUtils.list2String(mSnNumbers);
+    }
+
     @Override
-    public List<String> getSnImages() {
-        return mSnImages;
+    public void setSnNumbers(String snStrs) {
+        mSnNumbers = (ArrayList<String>) CommonUtils.string2ListF(snStrs);
+        for (int i = mSnItems.size(); i < mSnNumbers.size(); i++) {
+            mSnItems.add(mSnItems.size() + 1);
+            setSnAdapter();
+        }
+        LogUtils.e("SnNumbers_set: " + mSnNumbers.size()+" "+mSnItems.size());
+    }
+
+    @Override
+    public void showSnView(boolean show) {
+        if (show) {
+            mBind.tvProductTitle.setVisibility(View.VISIBLE);
+            mBind.rvSn.setVisibility(View.VISIBLE);
+            mBind.tvAddSn.setVisibility(View.VISIBLE);
+            mBind.rvSn.setLayoutManager(new LinearLayoutManager(this));
+            if (snAdapter == null){
+                mSnItems.add(1);
+                setSnAdapter();
+            }
+            mBind.tvAddSn.setOnClickListener(v -> {
+                if (mSnItems.size() > mSnNumbers.size() || contiansEmpty(mSnNumbers)) {
+                    ToastUtils.showShortToast(R.string.pls_fill_pre_sn);
+                } else {
+                    mSnItems.add(mSnItems.size() + 1);
+                    setSnAdapter();
+                }
+            });
+        } else {
+            mBind.tvProductTitle.setVisibility(View.GONE);
+            mBind.rvSn.setVisibility(View.GONE);
+            mBind.tvAddSn.setVisibility(View.GONE);
+        }
+    }
+
+    //是否包含空数据
+    private boolean contiansEmpty(ArrayList<String> mSnNumbers) {
+        for (String s : mSnNumbers){
+            if (TextUtils.isEmpty(s))
+                return true;
+        }
+        return false;
     }
 }

orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java

@@ -46,6 +46,7 @@ import java.util.List;
 /**
  * Created by luofan
  * on 2018/5/21.
+ * 提交验收
  */
 
 public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresenter, ActivityMultipleProcessBinding> implements MultipleProcessContract.View {

orderCenter/src/main/release/AndroidManifest.xml

@@ -42,7 +42,7 @@
             android:name=".ui.activity.QrCodeActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.activity.OrderDetailsActivity"
+            android:name="com.dayu.order.ui.activity.OrderDetailsActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="portrait" />

orderCenter/src/main/res/layout/activity_multi_process_order.xml

@@ -80,7 +80,7 @@
                     android:background="@color/tv_bg"
                     android:paddingLeft="@dimen/dp_15"
                     android:paddingTop="18dp"
-                    android:text="@string/prodcut_info"
+                    android:text="@string/collect_device_info"
                     android:textColor="@color/tv_cl"
                     android:textSize="14sp" />
 
@@ -95,10 +95,11 @@
                         android:id="@+id/rl_product"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/dp_54"
-                        android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
+                        android:layout_alignParentLeft="true"
                         android:layout_alignParentTop="true"
-                        android:background="@color/cl_white">
+                        android:background="@color/cl_white"
+                        android:visibility="gone">
 
                         <TextView
                             android:id="@+id/text_one_text"
@@ -127,14 +128,16 @@
                     <ImageView
                         android:id="@+id/image_lin"
                         style="@style/line"
-                        android:layout_below="@id/rl_product" />
+                        android:layout_below="@id/rl_product"
+                        android:visibility="gone" />
 
                     <RelativeLayout
                         android:id="@+id/text_two"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/dp_54"
                         android:layout_below="@id/image_lin"
-                        android:background="@color/cl_white">
+                        android:background="@color/cl_white"
+                        android:visibility="gone">
 
                         <TextView
                             android:id="@+id/text_two_text"
@@ -165,14 +168,16 @@
                     <ImageView
                         android:id="@+id/line_brand"
                         style="@style/line"
-                        android:layout_below="@id/text_two" />
+                        android:layout_below="@id/text_two"
+                        android:visibility="gone" />
 
                     <RelativeLayout
                         android:id="@+id/rl_verion"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/dp_54"
                         android:layout_below="@id/line_brand"
-                        android:background="@color/cl_white">
+                        android:background="@color/cl_white"
+                        android:visibility="gone">
 
                         <TextView
                             android:id="@+id/tv_version"
@@ -201,104 +206,46 @@
                         style="@style/line"
                         android:layout_below="@id/rl_verion" />
 
-                    <LinearLayout
-                        android:id="@+id/rl_serial_num"
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_sn"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_54"
+                        android:layout_height="wrap_content"
                         android:layout_below="@id/line_version"
-                        android:background="@color/cl_white"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
+                        android:overScrollMode="never"
+                        android:scrollbars="none" />
 
-                        <TextView
-                            android:id="@+id/tv_serial_num"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="@dimen/dp_13"
-                            android:text="@string/order_serail"
-                            android:textColor="@color/cl_home_title_text_color"
-                            android:textSize="@dimen/sp_15" />
 
                     <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="*"
-                            android:textColor="#F74848"
-                            android:textSize="@dimen/sp_15"
-                            android:visibility="@{presenter.mIsShowSn?View.VISIBLE:View.GONE}" />
-
-                        <EditText
-                            android:id="@+id/et_serial_num"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="76dp"
-                            android:layout_weight="1"
-                            android:background="@null"
-                            android:hint="@string/order_serail_hint"
-                            android:maxEms="50"
-                            android:text="@={presenter.mSn}"
-                            android:textColor="@color/default_text_color"
-                            android:textSize="@dimen/sp_15" />
-
-                        <ImageView
-                            android:id="@+id/scan"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginRight="15dp"
-                            android:src="@drawable/icon_scan" />
-                    </LinearLayout>
-
-                    <ImageView
-                        android:id="@+id/line_serial"
-                        style="@style/line"
-                        android:layout_below="@id/rl_serial_num" />
-
-                    <RelativeLayout
-                        android:id="@+id/ll_sn"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/line_serial"
-                        android:orientation="horizontal"
-                        android:visibility="@{presenter.mIsShowSn?View.VISIBLE:View.GONE}">
-
-                        <ImageView
-                            android:id="@+id/iv_sn"
-                            android:layout_width="100dp"
-                            android:layout_height="100dp"
-                            android:layout_marginBottom="@dimen/dp_15"
-                            android:layout_marginLeft="@dimen/dp_15"
-                            android:layout_marginTop="@dimen/dp_15"
-                            android:src="@drawable/icon_sn" />
-
-                        <ImageView
-                            android:id="@+id/iv_delete"
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:layout_marginLeft="95dp"
-                            android:layout_marginTop="@dimen/dp_15"
-                            android:src="@drawable/img_photo_delete"
-                            android:visibility="gone" />
-                    </RelativeLayout>
+                        android:id="@+id/tv_add_sn"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_below="@id/rv_sn"
+                        android:layout_margin="10dp"
+                        android:background="#f5f5f5"
+                        android:gravity="center"
+                        android:text="+"
+                        android:textColor="#999"
+                        android:textSize="50sp" />
 
                     <TextView
                         android:id="@+id/tv_server_info"
                         android:layout_width="match_parent"
                         android:layout_height="43dp"
-                        android:layout_below="@+id/ll_sn"
+                        android:layout_below="@+id/tv_add_sn"
                         android:background="@color/tv_bg"
                         android:paddingLeft="@dimen/dp_15"
                         android:paddingTop="18dp"
-                        android:text="@string/server_info"
+                        android:text="@string/record_service_result"
                         android:textColor="@color/tv_cl"
                         android:textSize="14sp" />
 
                     <RelativeLayout
                         android:id="@+id/time_Three"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_183"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
+                        android:layout_height="wrap_content"
                         android:layout_below="@+id/tv_server_info"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentLeft="true"
                         android:background="@color/cl_white">
 
                         <TextView
@@ -309,38 +256,34 @@
                             android:layout_marginTop="@dimen/dp_27"
                             android:text="@string/tv_work_order_five"
                             android:textColor="@color/cl_home_title_text_color"
-                            android:textSize="@dimen/sp_15" />
+                            android:textSize="@dimen/sp_15"
+                            android:visibility="gone" />
 
                         <EditText
                             android:id="@+id/et_serve_info"
-                            android:layout_width="@dimen/dp_267"
+                            android:layout_width="match_parent"
                             android:layout_height="@dimen/dp_147"
                             android:layout_marginLeft="@dimen/dp_8"
                             android:layout_marginTop="@dimen/dp_17"
+                            android:layout_marginRight="@dimen/dp_8"
                             android:layout_toRightOf="@id/time_subscribe_remark"
                             android:background="@drawable/subscribe_time_shape"
                             android:gravity="top"
                             android:hint="@string/order_hint"
                             android:maxEms="200"
-                            android:paddingLeft="@dimen/dp_13"
-                            android:paddingTop="@dimen/dp_11"
+                            android:padding="10dp"
                             android:text="@={presenter.mInfo}"
                             android:textColor="@color/cl_home_title_text_color"
                             android:textColorHint="@color/cl_selector_hui"
                             android:textSize="@dimen/sp_13.3" />
                     </RelativeLayout>
 
-                    <ImageView
-                        android:id="@+id/image_seven_lin"
-                        style="@style/line"
-                        android:layout_below="@id/time_Three" />
 
                     <RelativeLayout
                         android:id="@+id/photo_view"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/time_Three"
-                        android:layout_marginTop="@dimen/dp_20">
+                        android:layout_below="@id/time_Three">
 
                         <TextView
                             android:id="@+id/photo_text_title"
@@ -350,17 +293,18 @@
                             android:layout_marginTop="@dimen/dp_17"
                             android:text="@string/order_photo_text"
                             android:textColor="@color/cl_home_title_text_color"
-                            android:textSize="@dimen/sp_15" />
+                            android:textSize="@dimen/sp_15"
+                            android:visibility="gone" />
 
                         <android.support.v7.widget.RecyclerView
                             android:id="@+id/photo"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_below="@id/photo_text_title"
-                            android:layout_marginBottom="15dp"
                             android:layout_marginLeft="13dp"
+                            android:layout_marginTop="@dimen/dp_10"
                             android:layout_marginRight="15dp"
-                            android:layout_marginTop="@dimen/dp_10" />
+                            android:layout_marginBottom="15dp" />
 
                     </RelativeLayout>
 
@@ -368,12 +312,12 @@
                         android:id="@+id/tv_process"
                         android:layout_width="match_parent"
                         android:layout_height="47dp"
-                        android:layout_alignParentBottom="true"
-                        android:layout_alignParentRight="true"
                         android:layout_below="@id/photo_view"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentBottom="true"
                         android:layout_marginLeft="@dimen/dp_15"
-                        android:layout_marginRight="@dimen/dp_15"
                         android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginRight="@dimen/dp_15"
                         android:background='@drawable/tab_blue_react'
                         android:gravity="center"
                         android:onClick="@{()->presenter.commitPhoto()}"
@@ -384,17 +328,17 @@
         </ScrollView>
 
         <LinearLayout
-            android:visibility="gone"
             android:id="@+id/ll_server_instruction"
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_alignParentRight="true"
-            android:layout_marginRight="10dp"
             android:layout_marginTop="350dp"
+            android:layout_marginRight="10dp"
             android:background="@drawable/tab_blue_react"
             android:gravity="center"
             android:onClick="@{()->presenter.dumpToServerInstruction()}"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <ImageView
                 android:layout_width="wrap_content"

orderCenter/src/main/res/layout/item_scan_sn.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:orientation="vertical"
+    >
+    <LinearLayout
+        android:id="@+id/rl_serial_num"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_54"
+        android:layout_below="@id/line_version"
+        android:background="@color/cl_white"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/tv_serial_num"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_13"
+            android:text="@string/order_serail"
+            android:textColor="@color/cl_home_title_text_color"
+            android:textSize="@dimen/sp_15" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="*"
+            android:textColor="#F74848"
+            android:textSize="@dimen/sp_15" />
+
+        <EditText
+            android:id="@+id/et_serial_num"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="76dp"
+            android:layout_weight="1"
+            android:background="@null"
+            android:hint="@string/order_serail_hint"
+            android:maxEms="50"
+            android:textColor="@color/default_text_color"
+            android:textSize="@dimen/sp_15" />
+
+        <ImageView
+            android:id="@+id/scan"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="15dp"
+            android:src="@drawable/icon_scan" />
+    </LinearLayout>
+    <ImageView
+        android:id="@+id/line_serial"
+        style="@style/line"
+        />
+</LinearLayout>
+
+

orderCenter/src/main/res/values/strings.xml

@@ -23,4 +23,7 @@
     <string name="write_remark">写备注</string>
     <string name="no_str">否</string>
     <string name="yes_str">是</string>
+    <string name="collect_device_info">收集设备信息</string>
+    <string name="record_service_result">记录服务结果</string>
+    <string name="pls_fill_pre_sn">请先补全上面的序列号</string>
 </resources>