d

app/src/main/AndroidManifest.xml

@@ -45,7 +45,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".main.my.activity.MainsdfdsfActivity"></activity>
+        <activity android:name=".main.my.activity.ListActivity"></activity>
+        <activity android:name=".main.my.activity.MainsdfdsfActivity" />
         <activity android:name=".main.my.activity.DemoActivity" />
         <activity android:name=".main.kehu.activity.FpOrderInfoActivity" />
         <activity android:name=".main.kehu.activity.MoActivity" />

app/src/main/assets/yunweixin.json

@@ -0,0 +1,27 @@
+{
+  "result": {
+    "data": {
+      "image": [
+        {
+          "order_img": "http://localhost/file.php?img=order__2020__09__23__2020092317123855002746__2020092317534044856.jpg",
+          "order_img_cloud": ""
+        }
+      ],
+      "order": {
+        "address": "陕西省西安市雁塔区科技二路清华科技园",
+        "contractnum": "",
+        "custorname": "demo",
+        "custorphone": "13575542727",
+        "ordernum": "2020092317123855002746",
+        "ordertype": "4",
+        "recudesum": "100000.00",
+        "remark": "出彩出差错错错",
+        "systemtime": "2020-09-23 17:53:40",
+        "user_name": "王总"
+      }
+    },
+    "msg": "获取成功",
+    "success": 0
+  },
+  "status": 0
+}

app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java

@@ -15,6 +15,7 @@ import com.fenghoo.seven.dialog.BaseTipsDialog;
 import com.fenghoo.seven.dialog.HomeShopDialog;
 import com.fenghoo.seven.main.activity.LoginPasswordActivity;
 import com.fenghoo.seven.main.activity.Main2Activity;
+import com.fenghoo.seven.main.my.activity.ListActivity;
 import com.fenghoo.seven.main.my.activity.MainsdfdsfActivity;
 import com.fenghoo.seven.main.my.activity.PersonalProfileActivity;
 import com.fenghoo.seven.main.my.entity.loginInfoBean;
@@ -105,7 +106,8 @@ public class MyFragment
             @Override
             public void onClick(View v) {
           //      JumpUtils.gotoActivity(getActivity(), DemoActivity.class, false, "", "");
-                JumpUtils.gotoActivity(getActivity(), MainsdfdsfActivity.class, false, "", "");
+            //    JumpUtils.gotoActivity(getActivity(), MainsdfdsfActivity.class, false, "", "");
+                JumpUtils.gotoActivity(getActivity(), ListActivity.class, false, "", "");
 //                new BaseTipsDialog().showDownloadDialog(getActivity(), "确认要退出登录吗？", "确定", new BaseTipsDialog.ClickListener() {
 //                    @Override
 //                    public void confirm() {

app/src/main/java/com/fenghoo/seven/main/my/activity/ListActivity.java

@@ -0,0 +1,94 @@
+package com.fenghoo.seven.main.my.activity;
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.fenghoo.seven.R;
+import com.fenghoo.seven.base.BaseActivity;
+import com.fenghoo.seven.databinding.ActivityListBinding;
+import com.fenghoo.seven.main.my.adapter.EmtemsAdapter;
+import com.fenghoo.seven.main.my.entity.FastOrderDetailBean;
+import com.fenghoo.seven.utils.GetJsonDataUtil;
+import com.fenghoo.seven.utils.ToastUtils;
+import com.google.gson.Gson;
+
+import androidx.databinding.DataBindingUtil;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+public class ListActivity  extends BaseActivity {
+    ActivityListBinding mBinding;
+    private EmtemsAdapter emtemsAdapter;
+
+    public class Presenter {
+//        public void onClickAddItem(View view){
+//            emtemsAdapter.add(new Emtems("HAHA","1",false));
+//        }
+//        public void onClickRemoveItem(View view){
+//            emtemsAdapter.remove();
+//        }
+        /**
+         * @description  提交审核
+         * @param
+         * @return
+         */
+        public void onClickshenhe(View view){
+            ToastUtils.showToast(ListActivity.this, "提交审核");
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mBinding = DataBindingUtil.setContentView(this, R.layout.activity_list);
+        mBinding.setPresenter(new Presenter());
+        mBinding.layTopLeftTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mBinding.layTopTitle.setText("快速单");
+        mBinding.right.setText("历史订单");
+        mBinding.right.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ToastUtils.showToast(ListActivity.this, "历史订单点击了");
+            }
+        });
+        Thickening(mBinding.layTopTitle);
+        mBinding.recyclerView.setLayoutManager(new LinearLayoutManager(this));
+        emtemsAdapter = new EmtemsAdapter(this);
+        mBinding.recyclerView.setAdapter(emtemsAdapter);
+        emtemsAdapter.setmListener(new EmtemsAdapter.OnItemClickListener() {
+            @Override
+            public void onEmployeeClick(FastOrderDetailBean.ResultBean.DataBean.ImageBean emtems) {
+                ToastUtils.showToast(ListActivity.this, emtems.getOrder_img());
+            }
+        });
+        requestDatad();
+    }
+
+    public void requestDatad() {
+//        final HttpParams paramsPost = new HttpParams();
+//        paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
+//        paramsPost.put("ordernum", ordernum);
+//        new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppDouyin_comment).subscribe(new Observer<Response>() {
+//            @Override
+//            public void onNext(Response response) {
+//                String body = (String) response.body();
+//                FastOrderDetailBean fastOrderDetailBean = JsonUtils.fromJson(body, FastOrderDetailBean.class);
+//                emtemsAdapter.addAll(fastOrderDetailBean);
+//            }
+//            @Override
+//            public void onError(Exception e) {
+//                e.printStackTrace();
+//            }
+//        });
+
+        //拿到json字符串，假数据
+        String JsonData = new GetJsonDataUtil().getJson(ListActivity.this, "yunweixin.json");//获取assets目录下的json文件数据
+        Gson gson = new Gson();
+        FastOrderDetailBean fastOrderDetailBean = gson.fromJson(JsonData, FastOrderDetailBean.class);
+        emtemsAdapter.addAll(fastOrderDetailBean);
+    }
+}

app/src/main/java/com/fenghoo/seven/main/my/activity/ListoneHolder.java

@@ -0,0 +1,43 @@
+package com.fenghoo.seven.main.my.activity;
+
+import android.content.Context;
+
+import com.fenghoo.seven.main.my.adapter.BindingViewHolder;
+import com.fenghoo.seven.main.my.adapter.EmtemsAdapter;
+import com.fenghoo.seven.main.my.entity.FastOrderDetailBean;
+
+import androidx.databinding.ViewDataBinding;
+
+//头部 ViewHolder
+public class ListoneHolder extends BindingViewHolder {
+
+
+
+    public ListoneHolder(ViewDataBinding binding) {
+        super(binding);
+//        iv_fporder_head = (CircleImageView) itemView.findViewById(R.id.iv_fporder_head);
+//        marking_fragment_title = (TextView) itemView.findViewById(R.id.marking_fragment_title);
+//        tv_dra_user_name = (TextView) itemView.findViewById(R.id.tv_dra_user_name);
+//        tv_dar_user_phone = (TextView) itemView.findViewById(R.id.tv_dar_user_phone);
+    }
+
+    public void bindHolder(Context mContext, final int position, final FastOrderDetailBean.ResultBean.DataBean.OrderBean order, final EmtemsAdapter.OnItemClickListener mviewListener) {
+
+//        String image = markquestionsone.getHeadimg();
+//        GlideTools.init(mContext).displaypic(iv_fporder_head, image, R.mipmap.icon_default_head);
+//
+//        WidgetTools.setTextfive(tv_dra_user_name, "", markquestionsone.getWechat());
+//        WidgetTools.setTextfive(tv_dar_user_phone, "", markquestionsone.getAddress());
+//
+//
+//        marking_fragment_title.setText(markquestionsone.getIndustry());
+//        marking_fragment_title.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                if (mviewListener != null) {
+//                    mviewListener.industry(marking_fragment_title, position, markquestionsone);
+//                }
+//            }
+//        });
+    }
+}

app/src/main/java/com/fenghoo/seven/main/my/activity/ListtwoHolder.java

@@ -0,0 +1,46 @@
+package com.fenghoo.seven.main.my.activity;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.fenghoo.seven.R;
+import com.fenghoo.seven.main.my.adapter.BindingViewHolder;
+import com.fenghoo.seven.main.my.adapter.EmtemsAdapter;
+import com.fenghoo.seven.main.my.entity.FastOrderDetailBean;
+import com.fenghoo.seven.utils.GlideTools;
+
+import androidx.databinding.ViewDataBinding;
+
+public class ListtwoHolder extends BindingViewHolder {
+
+    private final ImageView fiv;
+
+    public ListtwoHolder(ViewDataBinding binding) {
+        super(binding);
+        fiv = binding.getRoot().findViewById(R.id.fiv);
+        //     iv_fporder_head = (CircleImageView) itemView.findViewById(R.id.iv_fporder_head);
+//        marking_fragment_title = (TextView) itemView.findViewById(R.id.marking_fragment_title);
+//        tv_dra_user_name = (TextView) itemView.findViewById(R.id.tv_dra_user_name);
+//        tv_dar_user_phone = (TextView) itemView.findViewById(R.id.tv_dar_user_phone);
+    }
+
+    public void bindHolder(final FastOrderDetailBean.ResultBean.DataBean.ImageBean dataBean, int position, Context mContext, final EmtemsAdapter.OnItemClickListener mviewListener) {
+        GlideTools.init(mContext).displaypic(fiv, dataBean.getOrder_img(), R.mipmap.icon_default_head);
+//        String image = markquestionsone.getHeadimg();
+//        GlideTools.init(mContext).displaypic(iv_fporder_head, image, R.mipmap.icon_default_head);
+//        WidgetTools.setTextfive(tv_dra_user_name, "", markquestionsone.getWechat());
+//        WidgetTools.setTextfive(tv_dar_user_phone, "", markquestionsone.getAddress());
+//
+//
+//        marking_fragment_title.setText(markquestionsone.getIndustry());
+//        marking_fragment_title.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                if (mviewListener != null) {
+//                    mviewListener.industry(marking_fragment_title, position, markquestionsone);
+//                }
+//            }
+//        });
+    }
+}

app/src/main/java/com/fenghoo/seven/main/my/activity/MainsdfdsfActivity.java

@@ -17,7 +17,7 @@ import com.fenghoo.seven.utils.ToastUtils;
  * @return
  */
 public class MainsdfdsfActivity extends AppCompatActivity {
-    Emtems emtems = new Emtems("firstname", "lastname");
+    Emtems emtems = new Emtems("firstname", "lastname",false);
     private ActivityMainsdfdsfBinding binding;
 
     @Override

app/src/main/java/com/fenghoo/seven/main/my/adapter/BindingViewHolder.java

@@ -0,0 +1,20 @@
+package com.fenghoo.seven.main.my.adapter;
+
+import androidx.databinding.ViewDataBinding;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * Time:  2020/9/24
+ * Author:  jianbo
+ * Description:
+ */
+public class BindingViewHolder<T extends ViewDataBinding> extends RecyclerView.ViewHolder {
+    private  T mBinding;
+    public  BindingViewHolder(T binding){
+        super(binding.getRoot());
+        mBinding=binding;
+    }
+    public T getBinding(){
+        return mBinding;
+    }
+}

app/src/main/java/com/fenghoo/seven/main/my/adapter/EmtemsAdapter.java

@@ -0,0 +1,148 @@
+package com.fenghoo.seven.main.my.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.fenghoo.seven.BR;
+import com.fenghoo.seven.R;
+import com.fenghoo.seven.main.my.activity.ListoneHolder;
+import com.fenghoo.seven.main.my.activity.ListtwoHolder;
+import com.fenghoo.seven.main.my.entity.FastOrderDetailBean;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import androidx.annotation.NonNull;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * Time:  2020/9/24
+ * Author:  jianbo
+ * Description:
+ */
+public class EmtemsAdapter extends RecyclerView.Adapter<BindingViewHolder> {
+
+    private static final int ITEM_VIEW_ON = 1;
+    private static final int ITEM_VIEW_OFF = 2;
+    Context context;
+    private OnItemClickListener mListener;
+    private List<FastOrderDetailBean.ResultBean.DataBean.ImageBean> mEmtemslist;
+
+    private final LayoutInflater mLayoutInflater;
+    private FastOrderDetailBean.ResultBean.DataBean.OrderBean order;
+
+    public void setmListener(OnItemClickListener mListener) {
+        this.mListener = mListener;
+    }
+
+    public void addAll(FastOrderDetailBean fastOrderDetailBean) {
+        mEmtemslist.addAll(fastOrderDetailBean.getResult().getData().getImage());
+        order = fastOrderDetailBean.getResult().getData().getOrder();
+    }
+
+    Random mRandom = new Random(System.currentTimeMillis());
+
+    public void add(FastOrderDetailBean.ResultBean.DataBean.ImageBean emtems) {
+        int position = mRandom.nextInt(mEmtemslist.size() + 1);
+        mEmtemslist.add(position, emtems);
+        notifyItemInserted(position);
+    }
+
+    public void remove() {
+        if (mEmtemslist.size() == 0) {
+            return;
+        }
+        int position = mRandom.nextInt(mEmtemslist.size());
+        mEmtemslist.remove(position);
+        notifyItemRemoved(position);
+    }
+
+    public interface OnItemClickListener {
+        void onEmployeeClick(FastOrderDetailBean.ResultBean.DataBean.ImageBean emtems);
+    }
+
+    public EmtemsAdapter(Context context) {
+        super();
+        this.context = context;
+        mLayoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        mEmtemslist = new ArrayList<>();
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (position == 0) {
+            return ITEM_VIEW_ON;
+        } else {
+            return ITEM_VIEW_OFF;
+        }
+    }
+
+    @NonNull
+    @Override
+    public BindingViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        ViewDataBinding binding;
+        if (viewType == ITEM_VIEW_ON) {
+            binding = DataBindingUtil.inflate(mLayoutInflater, R.layout.item_emtem, parent, false);
+            return new ListoneHolder(binding);
+        } else {
+            binding = DataBindingUtil.inflate(mLayoutInflater, R.layout.item_emtem_off, parent, false);
+            return new ListtwoHolder(binding);
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull BindingViewHolder holder, int position) {
+        if (holder instanceof ListoneHolder) {
+        //    ((ListoneHolder) holder).bindHolder(context, position, order, mListener);
+
+            ((ListoneHolder) holder).getBinding().setVariable(BR.orderbean, order);
+            ((ListoneHolder) holder).getBinding().executePendingBindings();
+            ((ListoneHolder) holder).itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (mListener != null) {
+                    //    mListener.onEmployeeClick(emtems);
+                    }
+                }
+            });
+        } else {
+         //   ((ListtwoHolder) holder).bindHolder(mEmtemslist.get(position - 1), position, context, mListener);
+            final FastOrderDetailBean.ResultBean.DataBean.ImageBean emtems = mEmtemslist.get(position-1);
+            ((ListtwoHolder) holder).getBinding().setVariable(BR.imagebean, emtems);
+            ((ListtwoHolder) holder).getBinding().executePendingBindings();
+            ((ListtwoHolder) holder).itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (mListener != null) {
+                        mListener.onEmployeeClick(emtems);
+                    }
+                }
+            });
+        }
+    }
+
+//    @Override
+//    public void onBindViewHolder(@NonNull BindingViewHolder holder, int position) {
+//        final  Emtems emtems=mEmtemslist.get(position);
+//        holder.getBinding().setVariable(BR.item,emtems);
+//        holder.getBinding().executePendingBindings();
+//        holder.itemView.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                if(mListener!=null){
+//                    mListener.onEmployeeClick(emtems);
+//                }
+//            }
+//        });
+//    }
+
+    @Override
+    public int getItemCount() {
+        return mEmtemslist.size()+1;
+    }
+}

app/src/main/java/com/fenghoo/seven/main/my/entity/Emtems.java

@@ -16,6 +16,16 @@ import androidx.databinding.ObservableBoolean;
 public class Emtems extends BaseObservable {
     String firstname;
     String lastname;
+
+    public boolean isIsfired() {
+        return isfired;
+    }
+
+    public void setIsfired(boolean isfired) {
+        this.isfired = isfired;
+    }
+
+    boolean isfired;
     public ObservableBoolean isFired=new ObservableBoolean();
     public ObservableArrayMap<String, String> user = new ObservableArrayMap<>();
 
@@ -44,9 +54,10 @@ public class Emtems extends BaseObservable {
         isFired.set(fired);
     }
 
-    public Emtems(String firstname,String lastname){
+    public Emtems(String firstname,String lastname,boolean isfired){
         this.firstname=firstname;
         this.lastname=lastname;
+        this.isfired=isfired;
         isFired.set(false);
         user.put("hello","word");
         user.put("hi","hi");

app/src/main/java/com/fenghoo/seven/main/my/entity/FastOrderDetailBean.java

@@ -0,0 +1,231 @@
+package com.fenghoo.seven.main.my.entity;
+
+import com.fenghoo.seven.base.BaseModel;
+
+import java.util.List;
+
+/**
+ * Time:  2020/9/24
+ * Author:  jianbo
+ * Description:
+ */
+public  class FastOrderDetailBean extends BaseModel {
+
+    /**
+     * result : {"msg":"获取成功","data":{"image":[{"order_img_cloud":"","order_img":"http://localhost/file.php?img=order__2020__09__23__2020092317123855002746__2020092317534044856.jpg"}],"order":{"address":"陕西省西安市雁塔区科技二路清华科技园","recudesum":"100000.00","user_name":"王总","custorphone":"13575542727","ordernum":"2020092317123855002746","custorname":"demo","remark":"出彩出差错错错","contractnum":"","systemtime":"2020-09-23 17:53:40","ordertype":"4"}},"success":0}
+     * status : 0
+     */
+
+    private ResultBean result;
+    private int status;
+
+    public ResultBean getResult() {
+        return result;
+    }
+
+    public void setResult(ResultBean result) {
+        this.result = result;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public static class ResultBean {
+        /**
+         * msg : 获取成功
+         * data : {"image":[{"order_img_cloud":"","order_img":"http://localhost/file.php?img=order__2020__09__23__2020092317123855002746__2020092317534044856.jpg"}],"order":{"address":"陕西省西安市雁塔区科技二路清华科技园","recudesum":"100000.00","user_name":"王总","custorphone":"13575542727","ordernum":"2020092317123855002746","custorname":"demo","remark":"出彩出差错错错","contractnum":"","systemtime":"2020-09-23 17:53:40","ordertype":"4"}}
+         * success : 0
+         */
+
+        private String msg;
+        private DataBean data;
+        private int success;
+
+        public String getMsg() {
+            return msg;
+        }
+
+        public void setMsg(String msg) {
+            this.msg = msg;
+        }
+
+        public DataBean getData() {
+            return data;
+        }
+
+        public void setData(DataBean data) {
+            this.data = data;
+        }
+
+        public int getSuccess() {
+            return success;
+        }
+
+        public void setSuccess(int success) {
+            this.success = success;
+        }
+
+        public static class DataBean {
+            /**
+             * image : [{"order_img_cloud":"","order_img":"http://localhost/file.php?img=order__2020__09__23__2020092317123855002746__2020092317534044856.jpg"}]
+             * order : {"address":"陕西省西安市雁塔区科技二路清华科技园","recudesum":"100000.00","user_name":"王总","custorphone":"13575542727","ordernum":"2020092317123855002746","custorname":"demo","remark":"出彩出差错错错","contractnum":"","systemtime":"2020-09-23 17:53:40","ordertype":"4"}
+             */
+
+            private OrderBean order;
+            private List<ImageBean> image;
+
+            public OrderBean getOrder() {
+                return order;
+            }
+
+            public void setOrder(OrderBean order) {
+                this.order = order;
+            }
+
+            public List<ImageBean> getImage() {
+                return image;
+            }
+
+            public void setImage(List<ImageBean> image) {
+                this.image = image;
+            }
+
+            public static class OrderBean {
+                /**
+                 * address : 陕西省西安市雁塔区科技二路清华科技园
+                 * recudesum : 100000.00
+                 * user_name : 王总
+                 * custorphone : 13575542727
+                 * ordernum : 2020092317123855002746
+                 * custorname : demo
+                 * remark : 出彩出差错错错
+                 * contractnum :
+                 * systemtime : 2020-09-23 17:53:40
+                 * ordertype : 4
+                 */
+
+                private String address;
+                private String recudesum;
+                private String user_name;
+                private String custorphone;
+                private String ordernum;
+                private String custorname;
+                private String remark;
+                private String contractnum;
+                private String systemtime;
+                private String ordertype;
+
+                public String getAddress() {
+                    return address;
+                }
+
+                public void setAddress(String address) {
+                    this.address = address;
+                }
+
+                public String getRecudesum() {
+                    return recudesum;
+                }
+
+                public void setRecudesum(String recudesum) {
+                    this.recudesum = recudesum;
+                }
+
+                public String getUser_name() {
+                    return user_name;
+                }
+
+                public void setUser_name(String user_name) {
+                    this.user_name = user_name;
+                }
+
+                public String getCustorphone() {
+                    return custorphone;
+                }
+
+                public void setCustorphone(String custorphone) {
+                    this.custorphone = custorphone;
+                }
+
+                public String getOrdernum() {
+                    return ordernum;
+                }
+
+                public void setOrdernum(String ordernum) {
+                    this.ordernum = ordernum;
+                }
+
+                public String getCustorname() {
+                    return custorname;
+                }
+
+                public void setCustorname(String custorname) {
+                    this.custorname = custorname;
+                }
+
+                public String getRemark() {
+                    return remark;
+                }
+
+                public void setRemark(String remark) {
+                    this.remark = remark;
+                }
+
+                public String getContractnum() {
+                    return contractnum;
+                }
+
+                public void setContractnum(String contractnum) {
+                    this.contractnum = contractnum;
+                }
+
+                public String getSystemtime() {
+                    return systemtime;
+                }
+
+                public void setSystemtime(String systemtime) {
+                    this.systemtime = systemtime;
+                }
+
+                public String getOrdertype() {
+                    return ordertype;
+                }
+
+                public void setOrdertype(String ordertype) {
+                    this.ordertype = ordertype;
+                }
+            }
+
+            public static class ImageBean {
+                /**
+                 * order_img_cloud :
+                 * order_img : http://localhost/file.php?img=order__2020__09__23__2020092317123855002746__2020092317534044856.jpg
+                 */
+
+                private String order_img_cloud;
+                private String order_img;
+
+                public String getOrder_img_cloud() {
+                    return order_img_cloud;
+                }
+
+                public void setOrder_img_cloud(String order_img_cloud) {
+                    this.order_img_cloud = order_img_cloud;
+                }
+
+                public String getOrder_img() {
+                    return order_img;
+                }
+
+                public void setOrder_img(String order_img) {
+                    this.order_img = order_img;
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="presenter"
+            type="com.fenghoo.seven.main.my.activity.ListActivity.Presenter" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:background="#ffffff"
+           >
+
+
+            <RelativeLayout
+                android:id="@+id/layTop_left_tv"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_alignParentLeft="true"
+                android:layout_centerInParent="true"
+                android:layout_marginLeft="12dp"
+                android:gravity="center">
+
+                <ImageView
+                    android:layout_width="21dp"
+                    android:layout_height="21dp"
+                    android:background="@mipmap/icon_back"
+                    android:textColor="#000000" />
+
+            </RelativeLayout>
+
+
+            <TextView
+                android:id="@+id/layTop_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text=""
+                android:textColor="#000000"
+                android:textSize="17sp" />
+
+            <TextView
+                android:id="@+id/right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:textColor="#ff333333"
+                android:textSize="14sp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="13dp"/>
+
+        </RelativeLayout>
+        <ScrollView
+            android:id="@+id/scrollview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+
+                <!--        <Button-->
+                <!--            android:layout_width="match_parent"-->
+                <!--            android:layout_height="wrap_content"-->
+                <!--            android:text="demo_list_add_item"-->
+                <!--            android:onClick="@{presenter.onClickAddItem}"-->
+                <!--            />-->
+                <!--        <Button-->
+                <!--            android:layout_width="match_parent"-->
+                <!--            android:layout_height="wrap_content"-->
+                <!--            android:text="demo_list_remove_item"-->
+                <!--            android:onClick="@{presenter.onClickRemoveItem}"-->
+                <!--            />-->
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
+                <LinearLayout
+                    android:id="@+id/save_order_ll"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/marking_20_dp"
+                    android:orientation="horizontal">
+
+
+                    <Button
+                        android:id="@+id/btn_save"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="#ffd700"
+                        android:gravity="center"
+                        android:paddingTop="@dimen/marking_10_dp"
+                        android:paddingBottom="@dimen/marking_10_dp"
+                        android:text="@string/ordery_save"
+                        android:textSize="@dimen/marking_13_sp"
+                        android:visibility="gone" />
+
+                    <View
+                        android:id="@+id/view_save"
+                        android:layout_width="2dp"
+                        android:layout_height="wrap_content"
+                        android:background="#cc292929" />
+
+
+                    <Button
+                        android:id="@+id/btn_commit"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="#ffd700"
+                        android:onClick="@{presenter.onClickshenhe}"
+                        android:paddingTop="@dimen/marking_10_dp"
+                        android:paddingBottom="@dimen/marking_10_dp"
+                        android:text="@string/ordery_commit"
+                        android:textSize="@dimen/marking_13_sp" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_order_tb"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
+                    <Button
+                        android:id="@+id/btn_bohui"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/marking_5_dp"
+                        android:layout_marginTop="@dimen/marking_20_dp"
+                        android:layout_weight="1"
+                        android:background="#ffffff"
+                        android:gravity="center"
+                        android:paddingTop="@dimen/marking_10_dp"
+                        android:paddingBottom="@dimen/marking_10_dp"
+                        android:text="@string/ordery_bohui"
+                        android:textSize="@dimen/marking_13_sp" />
+
+                    <Button
+                        android:id="@+id/btn_tongguo"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/marking_20_dp"
+                        android:layout_weight="1"
+                        android:background="#ffd700"
+                        android:gravity="center"
+                        android:paddingTop="@dimen/marking_10_dp"
+                        android:paddingBottom="@dimen/marking_10_dp"
+                        android:text="@string/ordery_tongguo"
+                        android:textSize="@dimen/marking_13_sp" />
+
+
+                </LinearLayout>
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+</layout>

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:bind="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="orderbean"
+            type="com.fenghoo.seven.main.my.entity.FastOrderDetailBean.ResultBean.DataBean.OrderBean" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        >
+        <include
+        layout="@layout/order_info_contenttwo"
+        bind:orderbean="@{orderbean}"
+        />
+    </LinearLayout>
+</layout>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="imagebean"
+            type="com.fenghoo.seven.main.my.entity.FastOrderDetailBean.ResultBean.DataBean.ImageBean" />
+    </data>
+
+<!--    <LinearLayout-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:orientation="horizontal"-->
+<!--        android:background="#00ff00"-->
+<!--        >-->
+<!--        <ImageView-->
+<!--            android:layout_width="50dp"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:gravity="left"-->
+<!--            android:text="@{imagebean.order_img}"-->
+<!--            />-->
+<!--    </LinearLayout>-->
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+       >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:layout_centerInParent="true">
+
+            <ImageView
+                android:id="@+id/fiv"
+                android:layout_width="match_parent"
+                android:layout_height="150dp"
+                android:contentDescription="@null"
+                android:src="@mipmap/order_camers" />
+
+            <LinearLayout
+                android:id="@+id/ll_del"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:orientation="vertical"
+                android:gravity="end">
+
+                <ImageView
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:scaleType="fitXY"
+                    android:contentDescription="@null"
+                    android:src="@mipmap/order_pic_delete" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+</layout>

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

@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="orderbean"
+            type="com.fenghoo.seven.main.my.entity.FastOrderDetailBean.ResultBean.DataBean.OrderBean" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/marking_20_dp"
+            android:layout_marginTop="@dimen/marking_10_dp"
+            android:layout_marginRight="@dimen/marking_20_dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="@dimen/marking_100_dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="@string/order_number"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+                <EditText
+                    android:id="@+id/et_number"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_marking_username_edittext"
+                    android:paddingLeft="@dimen/marking_5_dp"
+                    android:paddingTop="@dimen/marking_5_dp"
+                    android:paddingBottom="@dimen/marking_5_dp"
+                    android:text="@{orderbean.address}"
+
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/marking_10_dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="@dimen/marking_100_dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="@string/order_contract_number"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+                <EditText
+                    android:id="@+id/et_contract_number"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_marking_username_edittext"
+                    android:hint="@string/entry_contract_number"
+                    android:paddingLeft="@dimen/marking_5_dp"
+                    android:paddingTop="@dimen/marking_5_dp"
+                    android:paddingBottom="@dimen/marking_5_dp"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/marking_10_dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="@dimen/marking_100_dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="@string/order_dianyuan"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+                <EditText
+                    android:id="@+id/et_dianyuan"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_marking_username_edittext"
+                    android:paddingLeft="@dimen/marking_5_dp"
+                    android:paddingTop="@dimen/marking_5_dp"
+                    android:paddingBottom="@dimen/marking_5_dp"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.2dp"
+                android:layout_marginTop="@dimen/marking_10_dp"
+                android:background="#999999" />
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/marking_10_dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/marking_20_dp"
+                android:layout_marginRight="@dimen/marking_20_dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="@dimen/marking_100_dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="@string/ordery_khxm"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+                <EditText
+                    android:id="@+id/et_curname"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_marking_username_edittext"
+                    android:paddingLeft="@dimen/marking_5_dp"
+                    android:paddingTop="@dimen/marking_5_dp"
+                    android:paddingBottom="@dimen/marking_5_dp"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/marking_20_dp"
+                android:layout_marginTop="@dimen/marking_10_dp"
+                android:layout_marginRight="@dimen/marking_20_dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="@dimen/marking_100_dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="@string/order_phone"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+                <EditText
+                    android:id="@+id/et_phone"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_marking_username_edittext"
+                    android:paddingLeft="@dimen/marking_5_dp"
+                    android:paddingTop="@dimen/marking_5_dp"
+                    android:paddingBottom="@dimen/marking_5_dp"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+            </LinearLayout>
+
+            <RelativeLayout
+                android:id="@+id/ll_address"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/marking_10_dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/marking_20_dp"
+                    android:layout_marginRight="@dimen/marking_20_dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="@dimen/marking_100_dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center_vertical"
+                        android:text="@string/ordery_receive_address_collect"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/marking_13_sp" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/et_receive_collect"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="9.5"
+                            android:background="@drawable/bg_marking_username_edittext"
+                            android:hint="@string/ordery_receive_hint"
+                            android:paddingLeft="@dimen/marking_5_dp"
+                            android:paddingTop="@dimen/marking_5_dp"
+                            android:paddingBottom="@dimen/marking_5_dp"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/marking_13_sp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.2dp"
+                android:layout_marginTop="@dimen/marking_10_dp"
+                android:background="#999999" />
+
+
+            <RelativeLayout
+                android:id="@+id/ll_detail_address"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/ll_address"
+                android:layout_marginTop="@dimen/marking_10_dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/marking_20_dp"
+                    android:layout_marginTop="@dimen/marking_10_dp"
+                    android:layout_marginRight="@dimen/marking_20_dp"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="@dimen/marking_100_dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:text="订单状态:"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/marking_13_sp" />
+
+                    <RelativeLayout
+                        android:id="@+id/rl_dingdan_type"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/bg_marking_username_edittext">
+
+                        <RelativeLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true">
+
+                            <TextView
+                                android:id="@+id/tv_dingdan_type"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentLeft="true"
+                                android:layout_marginLeft="@dimen/marking_10_dp"
+                                android:hint="请选择"
+                                android:paddingTop="@dimen/marking_8_dp"
+                                android:paddingBottom="@dimen/marking_8_dp"
+                                android:text="定金"
+                                android:textColor="@color/colorBlack"
+                                android:textSize="@dimen/marking_13_sp" />
+
+                        </RelativeLayout>
+
+
+                        <ImageView
+                            android:layout_width="@dimen/marking_15_dp"
+                            android:layout_height="@dimen/marking_15_dp"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:layout_marginRight="@dimen/marking_10_dp"
+                            android:src="@drawable/marking_zhaikai" />
+
+                    </RelativeLayout>
+
+
+                </LinearLayout>
+
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/marking_20_dp"
+                android:layout_marginTop="@dimen/marking_10_dp"
+                android:layout_marginRight="@dimen/marking_20_dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="@dimen/marking_100_dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="收款金额："
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_marking_username_edittext"
+                    android:digits="1234567890"
+                    android:focusable="false"
+                    android:hint="0.00"
+                    android:inputType="number"
+                    android:maxLength="10"
+                    android:paddingLeft="@dimen/marking_5_dp"
+                    android:paddingTop="@dimen/marking_5_dp"
+                    android:paddingBottom="@dimen/marking_5_dp"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/marking_20_dp"
+                android:layout_marginTop="@dimen/marking_10_dp"
+                android:layout_marginRight="@dimen/marking_20_dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="@dimen/marking_100_dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="备注："
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+                <EditText
+                    android:id="@+id/et_yjjhq"
+                    android:layout_width="match_parent"
+                    android:layout_height="70dp"
+                    android:background="@drawable/bg_marking_username_edittext"
+                    android:digits="1234567890"
+                    android:focusable="false"
+                    android:gravity="left"
+                    android:hint="请输入备注"
+                    android:inputType="number"
+                    android:maxLength="10"
+                    android:paddingLeft="@dimen/marking_5_dp"
+                    android:paddingTop="@dimen/marking_5_dp"
+                    android:paddingBottom="@dimen/marking_5_dp"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/marking_13_sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.2dp"
+            android:layout_marginTop="@dimen/marking_10_dp"
+            android:layout_marginBottom="@dimen/marking_10_dp"
+            android:background="#999999" />
+
+        <TextView
+            android:layout_width="84dp"
+            android:layout_height="17dp"
+            android:text="请上传款项凭证"
+            android:textColor="#FF3131"
+            android:layout_marginLeft="10dp"
+            android:textSize="12sp" />
+    </LinearLayout>
+</layout>

app/src/main/res/values/dimens.xml

@@ -46,4 +46,45 @@
     <dimen name="design_size">14sp</dimen>
     <dimen name="spacing_10">10dp</dimen>
 
+
+    <!-- 打标详细-->
+    <dimen name="marking_40_px">40px</dimen>
+    <dimen name="marking_10_dp">10dp</dimen>
+    <dimen name="marking_18_dp">18dp</dimen>
+    <dimen name="marking_20_dp">20dp</dimen>
+    <dimen name="marking_30_dp">30dp</dimen>
+    <dimen name="marking_35_dp">35dp</dimen>
+    <dimen name="marking_53_dp">53dp</dimen>
+    <dimen name="marking_40_dp">40dp</dimen>
+    <dimen name="marking_5_dp">5dp</dimen>
+    <dimen name="marking_3_dp">3dp</dimen>
+    <dimen name="marking_15_dp">15dp</dimen>
+    <dimen name="marking_50_dp">50dp</dimen>
+    <dimen name="marking_45_dp">45dp</dimen>
+    <dimen name="marking_25_dp">25dp</dimen>
+    <dimen name="marking_24_dp">24dp</dimen>
+
+    <dimen name="marking_6_dp">6dp</dimen>
+    <dimen name="marking_12_dp">12dp</dimen>
+    <dimen name="marking_41_dp">41dp</dimen>
+    <dimen name="marking_46_dp">46dp</dimen>
+
+
+    <dimen name="marking_70_dp">70dp</dimen>
+    <dimen name="marking_130_dp">130dp</dimen>
+    <dimen name="marking_13_dp">13dp</dimen>
+    <dimen name="marking_150_dp">150dp</dimen>
+    <dimen name="marking_180_dp">180dp</dimen>
+    <dimen name="marking_100_dp">100dp</dimen>
+
+    <dimen name="big_measure">35sp</dimen>
+    <dimen name="big_measure_14">14sp</dimen>
+    <dimen name="big_measure_20">20sp</dimen>
+    <dimen name="marking_60_dp">60dp</dimen>
+    <dimen name="marking_80_dp">90dp</dimen>
+    <dimen name="marking_16_sp">16sp</dimen>
+    <dimen name="marking_12_sp">12sp</dimen>
+    <dimen name="marking_14_sp">14sp</dimen>
+    <dimen name="marking_11_sp">11sp</dimen>
+    <dimen name="marking_8_dp">8dp</dimen>
 </resources>

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

@@ -96,4 +96,61 @@
     <string name="sms_send_fail">服务器异常，验证码未发送成功</string>
     <string name="token_invalid">登录过期</string>
 
+
+
+
+
+
+
+    <!-- 新建意向单模块 -->
+    <string name="order_number">单据号:</string>
+    <string name="order_contract_number">合同号:</string>
+    <string name="entry_contract_number">请输入合同号</string>
+    <string name="order_dianpu">店铺：</string>
+    <string name="order_dianyuan">店员：</string>
+    <string name="order_phone">联系方式：</string>
+    <string name="ordery_jxse">预计销售额：</string>
+    <string name="entry_jxse">请输入预计销售额</string>
+    <string name="ordery_cjglgz">成交概率估值：</string>
+    <string name="ordery_khxm">客户姓名：</string>
+    <string name="ordery_weixin">微信号：</string>
+    <string name="entry_weixin">请输入微信号</string>
+    <string name="ordery_receive_address_collect">收货地址：</string>
+    <string name="ordery_receive_hint">请选择省市区</string>
+    <string name="ordery_detail_address">请输入详细地址</string>
+    <string name="ordery_detail_area">请输入小区名称</string>
+    <string name="ordery_yjjhq">预计交货期：</string>
+    <string name="ordery_add_goods">添加商品</string>
+    <string name="ordery_look">查看商品</string>
+    <string name="ordery_pzh">请上传付款凭证(最多上传5张)</string>
+    <string name="ordery_commit">提交审核</string>
+    <string name="ordery_save">保存编辑</string>
+    <string name="ordery_tongguo">审核通过</string>
+    <string name="ordery_bohui">审核驳回</string>
+    <string name="order_qudao">来源渠道：</string>
+    <string name="order_already_all">已付款：</string>
+    <string name="order_this_all">本次付款：</string>
+    <string name="order_sur_all">剩余尾款：</string>
+    <!--<string name="order_his_pic">历史凭证</string>-->
+    <string name="ordery_turn_other">转为其他单据</string>
+
+    <string name="ordery_edit">修改商品</string>
+
+
+    <string name="liu_mode_amount">收款金额：</string>
+    <string name="liu_mode_receive">收款方：</string>
+    <string name="liu_mode">收款方式：</string>
+    <string name="liu_card_type">卡类型：</string>
+    <string name="liu_money_location">缴款位置：</string>
+
+    <string name="ordery_add_entry">添加录入</string>
+    <string name="ordery_liu_mode">确认</string>
+    <string name="ordery_store_select">请选择</string>
+
+    <string name="liu_money_et">请输入收款金额</string>
+
+
+    <string name="ordery_share">请选择分享平台</string>
+    <string name="ordery_share_cancel">取消分享</string>
+
 </resources>