diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f12f68a..774580f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -45,7 +45,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
-
+
+
diff --git a/app/src/main/assets/yunweixin.json b/app/src/main/assets/yunweixin.json
new file mode 100644
index 0000000..8e54875
--- /dev/null
+++ b/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
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java b/app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java
index 440dbc7..5000ac6 100644
--- a/app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java
+++ b/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() {
diff --git a/app/src/main/java/com/fenghoo/seven/main/my/activity/ListActivity.java b/app/src/main/java/com/fenghoo/seven/main/my/activity/ListActivity.java
new file mode 100644
index 0000000..22199ab
--- /dev/null
+++ b/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() {
+// @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);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/fenghoo/seven/main/my/activity/ListoneHolder.java b/app/src/main/java/com/fenghoo/seven/main/my/activity/ListoneHolder.java
new file mode 100644
index 0000000..0f6f9a7
--- /dev/null
+++ b/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);
+// }
+// }
+// });
+ }
+}
diff --git a/app/src/main/java/com/fenghoo/seven/main/my/activity/ListtwoHolder.java b/app/src/main/java/com/fenghoo/seven/main/my/activity/ListtwoHolder.java
new file mode 100644
index 0000000..856bff8
--- /dev/null
+++ b/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);
+// }
+// }
+// });
+ }
+}
diff --git a/app/src/main/java/com/fenghoo/seven/main/my/activity/MainsdfdsfActivity.java b/app/src/main/java/com/fenghoo/seven/main/my/activity/MainsdfdsfActivity.java
index ba15013..d1ecba0 100644
--- a/app/src/main/java/com/fenghoo/seven/main/my/activity/MainsdfdsfActivity.java
+++ b/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
diff --git a/app/src/main/java/com/fenghoo/seven/main/my/adapter/BindingViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/my/adapter/BindingViewHolder.java
new file mode 100644
index 0000000..7c7e0fb
--- /dev/null
+++ b/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 extends RecyclerView.ViewHolder {
+ private T mBinding;
+ public BindingViewHolder(T binding){
+ super(binding.getRoot());
+ mBinding=binding;
+ }
+ public T getBinding(){
+ return mBinding;
+ }
+}
diff --git a/app/src/main/java/com/fenghoo/seven/main/my/adapter/EmtemsAdapter.java b/app/src/main/java/com/fenghoo/seven/main/my/adapter/EmtemsAdapter.java
new file mode 100644
index 0000000..a341925
--- /dev/null
+++ b/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 {
+
+ private static final int ITEM_VIEW_ON = 1;
+ private static final int ITEM_VIEW_OFF = 2;
+ Context context;
+ private OnItemClickListener mListener;
+ private List 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;
+ }
+}
diff --git a/app/src/main/java/com/fenghoo/seven/main/my/entity/Emtems.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/Emtems.java
index b1b1fff..fc71b75 100644
--- a/app/src/main/java/com/fenghoo/seven/main/my/entity/Emtems.java
+++ b/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 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");
diff --git a/app/src/main/java/com/fenghoo/seven/main/my/entity/FastOrderDetailBean.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/FastOrderDetailBean.java
new file mode 100644
index 0000000..16e2b58
--- /dev/null
+++ b/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 image;
+
+ public OrderBean getOrder() {
+ return order;
+ }
+
+ public void setOrder(OrderBean order) {
+ this.order = order;
+ }
+
+ public List getImage() {
+ return image;
+ }
+
+ public void setImage(List 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;
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/res/drawable-xhdpi/buybuybuy.png b/app/src/main/res/drawable-xhdpi/buybuybuy.png
new file mode 100644
index 0000000..440cbb3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/buybuybuy.png differ
diff --git a/app/src/main/res/drawable-xhdpi/video_icon.png b/app/src/main/res/drawable-xhdpi/video_icon.png
new file mode 100644
index 0000000..86e6d48
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/video_icon.png differ
diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml
new file mode 100644
index 0000000..b122897
--- /dev/null
+++ b/app/src/main/res/layout/activity_list.xml
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_emtem.xml b/app/src/main/res/layout/item_emtem.xml
new file mode 100644
index 0000000..4633789
--- /dev/null
+++ b/app/src/main/res/layout/item_emtem.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_emtem_off.xml b/app/src/main/res/layout/item_emtem_off.xml
new file mode 100644
index 0000000..8903366
--- /dev/null
+++ b/app/src/main/res/layout/item_emtem_off.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/order_info_contenttwo.xml b/app/src/main/res/layout/order_info_contenttwo.xml
new file mode 100644
index 0000000..1bf79fd
--- /dev/null
+++ b/app/src/main/res/layout/order_info_contenttwo.xml
@@ -0,0 +1,387 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xxhdpi/order_camers.png b/app/src/main/res/mipmap-xxhdpi/order_camers.png
new file mode 100644
index 0000000..7353788
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/order_camers.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/order_pic_delete.png b/app/src/main/res/mipmap-xxhdpi/order_pic_delete.png
new file mode 100644
index 0000000..5891ea2
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/order_pic_delete.png differ
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9dfb05c..c0784d5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -46,4 +46,45 @@
14sp
10dp
+
+
+ 40px
+ 10dp
+ 18dp
+ 20dp
+ 30dp
+ 35dp
+ 53dp
+ 40dp
+ 5dp
+ 3dp
+ 15dp
+ 50dp
+ 45dp
+ 25dp
+ 24dp
+
+ 6dp
+ 12dp
+ 41dp
+ 46dp
+
+
+ 70dp
+ 130dp
+ 13dp
+ 150dp
+ 180dp
+ 100dp
+
+ 35sp
+ 14sp
+ 20sp
+ 60dp
+ 90dp
+ 16sp
+ 12sp
+ 14sp
+ 11sp
+ 8dp
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2eb970a..82ec835 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -96,4 +96,61 @@
服务器异常,验证码未发送成功
登录过期
+
+
+
+
+
+
+
+ 单据号:
+ 合同号:
+ 请输入合同号
+ 店铺:
+ 店员:
+ 联系方式:
+ 预计销售额:
+ 请输入预计销售额
+ 成交概率估值:
+ 客户姓名:
+ 微信号:
+ 请输入微信号
+ 收货地址:
+ 请选择省市区
+ 请输入详细地址
+ 请输入小区名称
+ 预计交货期:
+ 添加商品
+ 查看商品
+ 请上传付款凭证(最多上传5张)
+ 提交审核
+ 保存编辑
+ 审核通过
+ 审核驳回
+ 来源渠道:
+ 已付款:
+ 本次付款:
+ 剩余尾款:
+
+ 转为其他单据
+
+ 修改商品
+
+
+ 收款金额:
+ 收款方:
+ 收款方式:
+ 卡类型:
+ 缴款位置:
+
+ 添加录入
+ 确认
+ 请选择
+
+ 请输入收款金额
+
+
+ 请选择分享平台
+ 取消分享
+