From 2442ab8a7000caefdbd647da08b8c5e5c298a51c Mon Sep 17 00:00:00 2001
From: jinyuer <454386664@qq.com>
Date: Thu, 27 Aug 2020 15:34:03 +0800
Subject: [PATCH] 1
---
.idea/codeStyles/Project.xml | 18 +
app/build.gradle | 2 +-
app/src/main/AndroidManifest.xml | 4 +
.../com/sl/house_property/Main4Fragment.java | 55 +++
.../cart/AddAddressActivity.java | 156 +++++++
.../cart/AddressListActivity.java | 25 +-
.../house_property/order/OrderActivity.java | 383 ++++++++++++++++++
.../order/OrderDetailActivity.java | 280 +++++++++++++
.../house_property/order/SettleActivity.java | 21 +
app/src/main/java/entity/OrderListBean.java | 180 ++++++++
app/src/main/res/drawable/shape_btn_grey.xml | 11 +
.../main/res/layout/activity_add_address.xml | 223 ++++++++++
.../res/layout/activity_add_discovery.xml | 1 -
.../main/res/layout/activity_address_list.xml | 15 +-
.../activity_image_preview_and_delete.xml | 3 +-
app/src/main/res/layout/activity_order.xml | 55 +++
.../main/res/layout/activity_order_detail.xml | 303 ++++++++++++++
app/src/main/res/layout/activity_settle.xml | 11 +
app/src/main/res/layout/fragment_cart.xml | 1 -
.../main/res/layout/fragment_discovery.xml | 1 -
app/src/main/res/layout/fragment_main4.xml | 6 +
app/src/main/res/layout/item_order.xml | 108 +++++
app/src/main/res/layout/item_order_item.xml | 65 +++
app/src/main/res/mipmap-xhdpi/dw.png | Bin 0 -> 1310 bytes
app/src/main/res/values/styles.xml | 1 +
25 files changed, 1918 insertions(+), 10 deletions(-)
create mode 100644 app/src/main/java/com/sl/house_property/cart/AddAddressActivity.java
create mode 100644 app/src/main/java/com/sl/house_property/order/OrderActivity.java
create mode 100644 app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java
create mode 100644 app/src/main/java/com/sl/house_property/order/SettleActivity.java
create mode 100644 app/src/main/java/entity/OrderListBean.java
create mode 100644 app/src/main/res/drawable/shape_btn_grey.xml
create mode 100644 app/src/main/res/layout/activity_add_address.xml
create mode 100644 app/src/main/res/layout/activity_order.xml
create mode 100644 app/src/main/res/layout/activity_order_detail.xml
create mode 100644 app/src/main/res/layout/activity_settle.xml
create mode 100644 app/src/main/res/layout/item_order.xml
create mode 100644 app/src/main/res/layout/item_order_item.xml
create mode 100644 app/src/main/res/mipmap-xhdpi/dw.png
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 554ffcd..90c1e34 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -24,6 +24,24 @@
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 6c8a927..f179afb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -137,7 +137,7 @@ android {
implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //1.0.5及以前版本的老用户升级需谨慎，API改动过大
// 基础依赖包，必须要依赖
implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
-
+ implementation 'liji.library.dev:citypickerview:5.2.2'
// implementation 'com.zhihu.android:matisse:0.5.3-beta3'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f886bb7..4e072e9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -284,6 +284,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/sl/house_property/Main4Fragment.java b/app/src/main/java/com/sl/house_property/Main4Fragment.java
index 8ec00b3..4698579 100644
--- a/app/src/main/java/com/sl/house_property/Main4Fragment.java
+++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java
@@ -17,6 +17,7 @@ import com.cutil.StringUtils;
import com.sl.house_property.cart.AddressListActivity;
import com.sl.house_property.databinding.FragmentMain4Binding;
import com.sl.house_property.f1.UserdlistActivity;
+import com.sl.house_property.order.OrderActivity;
import com.sl.house_property.user.MyAuthorizedFamilyHistory;
import com.sl.house_property.user.MyBillHistory;
import com.sl.house_property.user.MyGuaranteeHistory;
@@ -190,6 +191,60 @@ public class Main4Fragment extends BaseFragment {
startActivityForResult(intent, 0);
}
});
+ mDataBinding.tvOrder1.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(getActivity(), OrderActivity.class);
+ intent.putExtra("type", 1);
+ intent.putExtra("orderType", 1);
+ startActivityForResult(intent, 0);
+ }
+ });
+ mDataBinding.tvOrder2.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(getActivity(), OrderActivity.class);
+ intent.putExtra("type", 1);
+ intent.putExtra("orderType", 2);
+ startActivityForResult(intent, 0);
+ }
+ });
+ mDataBinding.tvOrder3.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(getActivity(), OrderActivity.class);
+ intent.putExtra("type", 1);
+ intent.putExtra("orderType", 3);
+ startActivityForResult(intent, 0);
+ }
+ });
+ mDataBinding.tvOrder4.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(getActivity(), OrderActivity.class);
+ intent.putExtra("type", 2);
+ intent.putExtra("orderType", 1);
+ startActivityForResult(intent, 0);
+ }
+ });
+ mDataBinding.tvOrder5.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(getActivity(), OrderActivity.class);
+ intent.putExtra("type", 2);
+ intent.putExtra("orderType", 2);
+ startActivityForResult(intent, 0);
+ }
+ });
+ mDataBinding.tvOrder6.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(getActivity(), OrderActivity.class);
+ intent.putExtra("type", 2);
+ intent.putExtra("orderType", 3);
+ startActivityForResult(intent, 0);
+ }
+ });
}
// private void initMyReycyView() {
diff --git a/app/src/main/java/com/sl/house_property/cart/AddAddressActivity.java b/app/src/main/java/com/sl/house_property/cart/AddAddressActivity.java
new file mode 100644
index 0000000..b63add0
--- /dev/null
+++ b/app/src/main/java/com/sl/house_property/cart/AddAddressActivity.java
@@ -0,0 +1,156 @@
+package com.sl.house_property.cart;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Toast;
+
+import com.gyf.immersionbar.ImmersionBar;
+import com.lljjcoder.Interface.OnCityItemClickListener;
+import com.lljjcoder.bean.CityBean;
+import com.lljjcoder.bean.DistrictBean;
+import com.lljjcoder.bean.ProvinceBean;
+import com.lljjcoder.style.cityjd.JDCityConfig;
+import com.lljjcoder.style.cityjd.JDCityPicker;
+import com.sl.house_property.BaseActivity;
+import com.sl.house_property.R;
+import com.sl.house_property.databinding.ActivityAddAddressBinding;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import entity.RegisterUser;
+import http.ApiConfig;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import rx.functions.Action1;
+import tools.Config;
+import utils.Md5;
+
+public class AddAddressActivity extends BaseActivity {
+ private ProgressDialog progressDialog;
+ private Context context;
+ private String area = "";
+
+ @Override
+ protected int getLayoutResId() {
+ return R.layout.activity_add_address;
+ }
+
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ ImmersionBar.with(this)
+ .keyboardEnable(true) //解决软键盘与底部输入框冲突问题
+ // .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
+ // | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出
+ //.barColor(R.color.colorPrimary)
+ .init();
+ context = this;
+ mDataBinding.left.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+ progressDialog = new ProgressDialog(this);
+ mDataBinding.tvArea.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ select();
+ }
+ });
+ mDataBinding.btnSubmit.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ submit();
+ }
+ });
+ }
+
+ Loader loader = new Loader();
+
+ private void submit() {
+ String name = mDataBinding.etName.getText().toString().trim();
+ if (TextUtils.isEmpty(name)) {
+ setToast(1, "请输入收货人姓名");
+ return;
+ }
+ String phone = mDataBinding.etPhone.getText().toString().trim();
+
+ if (TextUtils.isEmpty(phone)) {
+ setToast(1, "请输入手机号码");
+ return;
+ }
+ if (TextUtils.isEmpty(area)) {
+ setToast(1, "请选择地区");
+ return;
+ }
+ String detail = mDataBinding.etDetail.getText().toString().trim();
+ if (TextUtils.isEmpty(detail)) {
+ setToast(1, "请输入详细地址");
+ return;
+ }
+ progressDialog.setMessage("提交中");
+ progressDialog.show();
+ RegisterUser user =
+ Config.getInstance(context).getUser();
+ Map map = new HashMap<>();
+ if (user != null) {
+ map.put("userid", user.getUserid());
+ } else {
+ map.put("userid", 0 + "");
+ }
+ map.put("app", "Order");
+ map.put("class", "UserAddressAdd");
+ map.put("name", name);
+ map.put("mobile", phone);
+ map.put("address", area + detail);
+ map.put("sign", Md5.md5("Order" + "UserAddressAdd" + Md5.secret));
+
+ loader.getMovie(ApiConfig.BASE_URL, map)
+ .subscribe(new Action1() {
+ @Override
+ public void call(Resultcode resultcode) {
+ progressDialog.dismiss();
+ if (resultcode.status == 0) {
+ Toast.makeText(context, "提交成功", Toast.LENGTH_SHORT).show();
+ setResult(200);
+ finish();
+ }
+ }
+ }, new Action1() {
+ @Override
+ public void call(Throwable throwable) {
+ progressDialog.dismiss();
+ throwable.fillInStackTrace();
+ Toast.makeText(context, "提交失败", Toast.LENGTH_SHORT).show();
+ }
+ });
+ }
+
+ private void select() {
+ JDCityPicker cityPicker = new JDCityPicker();
+ JDCityConfig jdCityConfig = new JDCityConfig.Builder().build();
+
+ jdCityConfig.setShowType(JDCityConfig.ShowType.PRO_CITY_DIS);
+ cityPicker.init(this);
+ cityPicker.setConfig(jdCityConfig);
+ cityPicker.setOnCityItemClickListener(new OnCityItemClickListener() {
+ @Override
+ public void onSelected(ProvinceBean province, CityBean city, DistrictBean district) {
+ area = province.getName() + city.getName() + district.getName();
+ mDataBinding.tvArea.setText(area);
+ }
+
+ @Override
+ public void onCancel() {
+ }
+ });
+ cityPicker.showCityPicker();
+ }
+}
diff --git a/app/src/main/java/com/sl/house_property/cart/AddressListActivity.java b/app/src/main/java/com/sl/house_property/cart/AddressListActivity.java
index 272900e..c2341af 100644
--- a/app/src/main/java/com/sl/house_property/cart/AddressListActivity.java
+++ b/app/src/main/java/com/sl/house_property/cart/AddressListActivity.java
@@ -2,6 +2,7 @@ package com.sl.house_property.cart;
import android.app.ProgressDialog;
import android.content.Context;
+import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -60,6 +61,12 @@ public class AddressListActivity extends BaseActivity {
+ @Override
+ protected int getLayoutResId() {
+ return R.layout.activity_order;
+ }
+
+ private int type = -1;
+ private int page = 1;
+ private int orderType = -1;
+ private Context context;
+ private ProgressDialog progressDialog;
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ ImmersionBar.with(this)
+ .keyboardEnable(true) //解决软键盘与底部输入框冲突问题
+ // .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
+ // | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出
+ .init();
+ context = this;
+ progressDialog = new ProgressDialog(this);
+ mDataBinding.left.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+
+ type = getIntent().getIntExtra("type", -1);
+ orderType = getIntent().getIntExtra("orderType", -1);
+ initRec();
+
+
+ mDataBinding.dw.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
+ @Override
+ public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
+
+ getList();
+ }
+
+ @Override
+ public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+ page = 1;
+ getList();
+ }
+ });
+ mDataBinding.dw.autoRefresh();
+ if (orderType == 1) {
+ mDataBinding.tvTitle.setText("待付款");
+ } else if (orderType == 2) {
+ mDataBinding.tvTitle.setText("待发货");
+ } else if (orderType == 3) {
+ mDataBinding.tvTitle.setText("待收货");
+ } else if (orderType == 4) {
+ mDataBinding.tvTitle.setText("待评价");
+ }
+
+ }
+
+ private void initRec() {
+ BaseRecycleViewAdapter adapter = new BaseRecycleViewAdapter<>(context, R.layout.item_order);
+ adapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
+
+ @Override
+ public void onBindViewHolder(final ItemOrderBinding b, int position) {
+ final OrderListBean orderListBean = list.get(position);
+ if (type == 1) {
+ if (orderType == 1) {
+ //待付款
+ b.btnFk.setVisibility(View.VISIBLE);
+ b.btnFk.setText("付款");
+ b.btnCancel.setVisibility(View.VISIBLE);
+ b.btnCancel.setText("取消订单");
+ b.tvInfo.setVisibility(View.VISIBLE);
+ } else if (orderType == 2) {
+ //待发货
+ b.btnFk.setVisibility(View.VISIBLE);
+ b.btnFk.setText("取消订单");
+ b.btnCancel.setVisibility(View.GONE);
+ b.tvInfo.setVisibility(View.GONE);
+ } else if (orderType == 3) {
+ //待收货
+ b.btnFk.setVisibility(View.VISIBLE);
+ b.btnFk.setText("确认收货");
+ b.btnCancel.setVisibility(View.GONE);
+ b.tvInfo.setVisibility(View.GONE);
+ } else if (orderType == 4) {
+ //待评价
+ b.btnFk.setVisibility(View.VISIBLE);
+ b.btnFk.setText("删除订单");
+ b.btnCancel.setVisibility(View.GONE);
+ b.tvInfo.setVisibility(View.GONE);
+ }
+ } else if (type == 2) {
+ b.tvInfo.setVisibility(View.GONE);
+ if (orderType == 2) {
+ b.btnFk.setVisibility(View.VISIBLE);
+ b.btnFk.setText("确认发货");
+ } else {
+ b.btnFk.setVisibility(View.GONE);
+ }
+ b.btnCancel.setVisibility(View.GONE);
+ }
+
+ b.tvAmount.setText("¥" + orderListBean.getOrder_money());
+ RequestOptions requestOptions = new RequestOptions();
+ requestOptions.placeholder(R.mipmap.head);
+ requestOptions.error(R.mipmap.head);
+
+ Glide.with(context).load(orderListBean.getAvatar())
+ .apply(requestOptions)
+ .into(b.ivHead);
+ b.tvUsername.setText(orderListBean.getNickname());
+ b.rv.setLayoutManager(new LinearLayoutManager(context));
+ BaseRecycleViewAdapter itemAdapter = new BaseRecycleViewAdapter<>(context, R.layout.item_order_item);
+ itemAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
+
+ @Override
+ public void onBindViewHolder(ItemOrderItemBinding b, int position) {
+ if (!(position >= orderListBean.getContent_info().size())) {
+ OrderListBean.Content_info content_info = orderListBean.getContent_info().get(position);
+ b.tvGoodsName.setText(content_info.getName());
+ b.tvInfo2.setText(content_info.getProperty());
+ b.tvPrice.setText("¥" + content_info.getSale_price());
+ b.tvNum.setText("x" + content_info.getGoods_num());
+ RequestOptions requestOptions = new RequestOptions();
+ requestOptions.placeholder(R.mipmap.icon_default_rectangle);
+ requestOptions.error(R.mipmap.icon_default_rectangle);
+
+ Glide.with(context).load(content_info.getImg())
+ .apply(requestOptions)
+ .into(b.ivGoods);
+ }
+ }
+ });
+ itemAdapter.setData(orderListBean.getContent_info());
+ b.rv.setAdapter(itemAdapter);
+ b.rv.setLayoutManager(new LinearLayoutManager(context));
+ b.btnCancel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ //取消订单
+ new XPopup.Builder(context).asConfirm("", "确定要取消订单吗？", new OnConfirmListener() {
+ @Override
+ public void onConfirm() {
+ orderAction(1, orderListBean.getOrder_id(), "");
+ }
+ }).show();
+ }
+ });
+ b.btnFk.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (b.btnFk.getText().equals("付款")) {
+ //付款
+
+ } else if (b.btnFk.getText().equals("取消订单")) {
+ new XPopup.Builder(context).asConfirm("", "确定要取消订单吗？", new OnConfirmListener() {
+ @Override
+ public void onConfirm() {
+ orderAction(1, orderListBean.getOrder_id(), "");
+ }
+ }).show();
+ } else if (b.btnFk.getText().equals("确认收货")) {
+ new XPopup.Builder(context).asConfirm("", "真的要确认收货吗？", new OnConfirmListener() {
+ @Override
+ public void onConfirm() {
+ orderAction(2, orderListBean.getOrder_id(), "");
+ }
+ }).show();
+ } else if (b.btnFk.getText().equals("删除订单")) {
+ new XPopup.Builder(context).asConfirm("", "确定要删除订单吗？", new OnConfirmListener() {
+ @Override
+ public void onConfirm() {
+ orderAction(3, orderListBean.getOrder_id(), "");
+ }
+ }).show();
+ } else if (b.btnFk.getText().equals("确认发货")) {
+ new XPopup.Builder(context).asInputConfirm("确认发货", "", "", "请输入物流编号", new OnInputConfirmListener() {
+ @Override
+ public void onConfirm(String text) {
+ orderAction(4, orderListBean.getOrder_id(), text);
+ }
+ }).show();
+ }
+ }
+ });
+ }
+ });
+ mDataBinding.rec.setLayoutManager(new LinearLayoutManager(context));
+ mDataBinding.rec.setAdapter(adapter);
+ adapter.setOnItemClickListener(new BaseRecycleViewAdapter.OnItemClickListener() {
+ @Override
+ public void onItemClick(View itemView, int position) {
+ Intent intent = new Intent(context, OrderDetailActivity.class);
+ intent.putExtra("type", type);
+ intent.putExtra("orderType", orderType);
+ intent.putExtra("orderId", list.get(position).getOrder_id());
+ startActivityForResult(intent, 15);
+ }
+ });
+ }
+
+ Loader loader = new Loader();
+ private ArrayList list = new ArrayList<>();
+
+ private void orderAction(int action, String order_id, String info) {
+ progressDialog.setMessage("提交中");
+ progressDialog.show();
+ RegisterUser user =
+ Config.getInstance(context).getUser();
+ Map map = new HashMap<>();
+ if (user != null) {
+ map.put("userid", user.getUserid());
+ } else {
+ map.put("userid", 0 + "");
+ }
+ map.put("app", "Order");
+ if (action == 4) {
+ map.put("class", "StoreOrderAction");
+ map.put("logistics_no", info);
+ } else {
+ map.put("class", "OrderAction");
+
+ }
+ map.put("action", action + "");
+ map.put("order_id", order_id);
+ if (action == 4) {
+ map.put("sign", Md5.md5("Order" + "StoreOrderAction" + Md5.secret));
+ } else {
+ map.put("sign", Md5.md5("Order" + "OrderAction" + Md5.secret));
+
+ }
+ loader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1() {
+ @Override
+ public void call(Resultcode resultcode) {
+ progressDialog.dismiss();
+ if (resultcode.status == 0) {
+ setToast(resultcode.msg);
+ page = 1;
+ getList();
+ } else {
+ setToast(resultcode.msg);
+ }
+ }
+ }, new Action1() {
+ @Override
+ public void call(Throwable throwable) {
+ progressDialog.dismiss();
+ setToast("操作失败");
+ }
+ });
+ }
+
+ private void getList() {
+
+ RegisterUser user =
+ Config.getInstance(context).getUser();
+ Map map = new HashMap<>();
+ if (user != null) {
+ map.put("userid", user.getUserid());
+ map.put("goods_user_id", user.getUserid());
+ } else {
+ map.put("userid", 0 + "");
+ map.put("goods_user_id", 0 + "");
+ }
+ map.put("app", "Order");
+ if (type == 1) {
+ map.put("class", "OrderLists");
+ map.put("sign", Md5.md5("Order" + "OrderLists" + Md5.secret));
+ } else if (type == 2) {
+ map.put("class", "StoreOrderLists");
+ map.put("sign", Md5.md5("Order" + "StoreOrderLists" + Md5.secret));
+ }
+ map.put("type", orderType + "");
+ map.put("page", page + "");
+ loader.getMovie(ApiConfig.BASE_URL, map)
+ .subscribe(new Action1() {
+ @Override
+ public void call(Resultcode resultcode) {
+ mDataBinding.dw.finishLoadMore();
+ mDataBinding.dw.finishRefresh();
+ progressDialog.dismiss();
+ if (resultcode.status != 0) {
+ setToast(resultcode.msg);
+ return;
+ }
+ Gson gs = new Gson();
+ LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+ String s = gs.toJson(adta);
+ try {
+ JSONObject jsonObject = new JSONObject(s);
+ org.json.JSONArray array = jsonObject.getJSONArray("info");
+
+ //买家订单
+ Type type = new TypeToken>() {
+ }.getType();
+ ArrayList newList = gs.fromJson(array.toString(), type);
+ int count = jsonObject.getInt("count");
+
+ if (page == 1) {
+ list.clear();
+ }
+ list.addAll(newList);
+ if (list.size() == count || newList.isEmpty()) {
+ mDataBinding.dw.finishLoadMoreWithNoMoreData();
+ } else {
+ page++;
+ }
+ BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.rec.getAdapter();
+ baseRecycleViewAdapter.setData(list);
+ } catch (Exception e) {
+ e.fillInStackTrace();
+ }
+ }
+ }, new Action1() {
+ @Override
+ public void call(Throwable throwable) {
+ mDataBinding.dw.finishLoadMore();
+ mDataBinding.dw.finishRefresh();
+ progressDialog.dismiss();
+ throwable.fillInStackTrace();
+
+ }
+ });
+ }
+
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == 15 && resultCode == 200) {
+ page = 1;
+ getList();
+ }
+ }
+}
diff --git a/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java b/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java
new file mode 100644
index 0000000..0f5249b
--- /dev/null
+++ b/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java
@@ -0,0 +1,280 @@
+package com.sl.house_property.order;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
+import com.gyf.immersionbar.ImmersionBar;
+import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.interfaces.OnConfirmListener;
+import com.lxj.xpopup.interfaces.OnInputConfirmListener;
+import com.sl.house_property.BaseActivity;
+import com.sl.house_property.R;
+import com.sl.house_property.databinding.ActivityOrderDetailBinding;
+import com.sl.house_property.databinding.ItemOrderItemBinding;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import adapter.BaseRecycleViewAdapter;
+import entity.OrderListBean;
+import entity.RegisterUser;
+import http.ApiConfig;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import rx.functions.Action1;
+import tools.Config;
+import utils.Md5;
+
+public class OrderDetailActivity extends BaseActivity {
+ private Context context;
+ private ProgressDialog progressDialog;
+ private int orderType = -1;
+ private int type = -1;
+ private String orderId;
+
+
+ @Override
+ protected int getLayoutResId() {
+ return R.layout.activity_order_detail;
+ }
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ context = this;
+ progressDialog = new ProgressDialog(this);
+ ImmersionBar.with(this)
+ .keyboardEnable(true) //解决软键盘与底部输入框冲突问题
+ // .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
+ // | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出
+ .init();
+ context = this;
+ progressDialog = new ProgressDialog(this);
+ type = getIntent().getIntExtra("type", -1);
+ orderType = getIntent().getIntExtra("orderType", -1);
+ orderId = getIntent().getStringExtra("orderId");
+ mDataBinding.left.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+ mDataBinding.tvTitle.setText("订单详情");
+ getData();
+ }
+
+ Loader loader = new Loader();
+
+ private void getData() {
+ RegisterUser user =
+ Config.getInstance(context).getUser();
+ Map map = new HashMap<>();
+ if (user != null) {
+ map.put("userid", user.getUserid());
+ } else {
+ map.put("userid", 0 + "");
+ }
+ map.put("app", "Order");
+ map.put("class", "OrderInfo");
+ map.put("order_id", orderId);
+ map.put("sign", Md5.md5("Order" + "OrderInfo" + Md5.secret));
+ loader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1() {
+ @Override
+ public void call(Resultcode resultcode) {
+ if (resultcode.status == 0) {
+ LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+ String s = new Gson().toJson(adta);
+ OrderListBean orderListBean = new Gson().fromJson(s, OrderListBean.class);
+ setViewData(orderListBean);
+ }
+ }
+ }, new Action1() {
+ @Override
+ public void call(Throwable throwable) {
+
+ }
+ });
+ }
+
+ private void setViewData(final OrderListBean orderListBean) {
+ BaseRecycleViewAdapter itemAdapter = new BaseRecycleViewAdapter<>(context, R.layout.item_order_item);
+ itemAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
+
+ @Override
+ public void onBindViewHolder(ItemOrderItemBinding b, int position) {
+ if (!(position >= orderListBean.getContent_info().size())) {
+ OrderListBean.Content_info content_info = orderListBean.getContent_info().get(position);
+ b.tvGoodsName.setText(content_info.getName());
+ b.tvInfo2.setText(content_info.getProperty());
+ b.tvPrice.setText("¥" + content_info.getSale_price());
+ b.tvNum.setText("x" + content_info.getGoods_num());
+ RequestOptions requestOptions = new RequestOptions();
+ requestOptions.placeholder(R.mipmap.icon_default_rectangle);
+ requestOptions.error(R.mipmap.icon_default_rectangle);
+
+ Glide.with(context).load(content_info.getImg())
+ .apply(requestOptions)
+ .into(b.ivGoods);
+ }
+ }
+ });
+ itemAdapter.setData(orderListBean.getContent_info());
+ mDataBinding.rv.setLayoutManager(new LinearLayoutManager(context));
+ mDataBinding.rv.setAdapter(itemAdapter);
+ mDataBinding.tvAmount.setText("¥" + orderListBean.getOrder_money());
+ mDataBinding.tv2.setText("¥" + orderListBean.getOrder_money());
+ mDataBinding.tvOrderId.setText(orderListBean.getOrder_number());
+ mDataBinding.tvOrderTime.setText(orderListBean.getCtime());
+ if (orderListBean.getOrder_status().equals("0")) {
+ mDataBinding.tvState.setText("等待买家付款");
+ } else if (orderListBean.getOrder_status().equals("1")) {
+ mDataBinding.tvState.setText("等待卖家发货");
+ } else if (orderListBean.getOrder_status().equals("2")) {
+ mDataBinding.tvState.setText("等待买家收货");
+ } else if (orderListBean.getOrder_status().equals("3")) {
+ mDataBinding.tvState.setText("订单已完成");
+ }
+ if (type == 1) {
+ if (orderType == 1) {
+ //待付款
+ mDataBinding.btnFk.setVisibility(View.VISIBLE);
+ mDataBinding.btnFk.setText("付款");
+ mDataBinding.btnCancel.setVisibility(View.VISIBLE);
+ mDataBinding.btnCancel.setText("取消订单");
+
+ } else if (orderType == 2) {
+ //待发货
+ mDataBinding.btnFk.setVisibility(View.VISIBLE);
+ mDataBinding.btnFk.setText("取消订单");
+ mDataBinding.btnCancel.setVisibility(View.GONE);
+
+ } else if (orderType == 3) {
+ //待收货
+ mDataBinding.btnFk.setVisibility(View.VISIBLE);
+ mDataBinding.btnFk.setText("确认收货");
+ mDataBinding.btnCancel.setVisibility(View.GONE);
+ } else if (orderType == 4) {
+ //待评价
+ mDataBinding.btnFk.setVisibility(View.VISIBLE);
+ mDataBinding.btnFk.setText("删除订单");
+ mDataBinding.btnCancel.setVisibility(View.GONE);
+
+ }
+ } else if (type == 2) {
+
+ if (orderType == 2) {
+ mDataBinding.btnFk.setVisibility(View.VISIBLE);
+ mDataBinding.btnFk.setText("确认发货");
+ } else {
+ mDataBinding.btnFk.setVisibility(View.GONE);
+ }
+ mDataBinding.btnCancel.setVisibility(View.GONE);
+ }
+ mDataBinding.btnCancel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ //取消订单
+ new XPopup.Builder(context).asConfirm("", "确定要取消订单吗？", new OnConfirmListener() {
+ @Override
+ public void onConfirm() {
+ orderAction(1, orderListBean.getOrder_id(), "");
+ }
+ }).show();
+ }
+ });
+ mDataBinding.btnFk.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (mDataBinding.btnFk.getText().equals("付款")) {
+ //付款
+
+ } else if (mDataBinding.btnFk.getText().equals("取消订单")) {
+ new XPopup.Builder(context).asConfirm("", "确定要取消订单吗？", new OnConfirmListener() {
+ @Override
+ public void onConfirm() {
+ orderAction(1, orderListBean.getOrder_id(), "");
+ }
+ }).show();
+ } else if (mDataBinding.btnFk.getText().equals("确认收货")) {
+ new XPopup.Builder(context).asConfirm("", "真的要确认收货吗？", new OnConfirmListener() {
+ @Override
+ public void onConfirm() {
+ orderAction(2, orderListBean.getOrder_id(), "");
+ }
+ }).show();
+ } else if (mDataBinding.btnFk.getText().equals("删除订单")) {
+ new XPopup.Builder(context).asConfirm("", "确定要删除订单吗？", new OnConfirmListener() {
+ @Override
+ public void onConfirm() {
+ orderAction(3, orderListBean.getOrder_id(), "");
+ }
+ }).show();
+ } else if (mDataBinding.btnFk.getText().equals("确认发货")) {
+ new XPopup.Builder(context).asInputConfirm("确认发货", "", "", "请输入物流编号", new OnInputConfirmListener() {
+ @Override
+ public void onConfirm(String text) {
+ orderAction(4, orderListBean.getOrder_id(), text);
+ }
+ }).show();
+ }
+ }
+ });
+ }
+
+ private void orderAction(int action, String order_id, String info) {
+ progressDialog.setMessage("提交中");
+ progressDialog.show();
+ RegisterUser user =
+ Config.getInstance(context).getUser();
+ Map map = new HashMap<>();
+ if (user != null) {
+ map.put("userid", user.getUserid());
+ } else {
+ map.put("userid", 0 + "");
+ }
+ map.put("app", "Order");
+ if (action == 4) {
+ map.put("class", "StoreOrderAction");
+ map.put("logistics_no", info);
+ } else {
+ map.put("class", "OrderAction");
+
+ }
+ map.put("action", action + "");
+ map.put("order_id", order_id);
+ if (action == 4) {
+ map.put("sign", Md5.md5("Order" + "StoreOrderAction" + Md5.secret));
+ } else {
+ map.put("sign", Md5.md5("Order" + "OrderAction" + Md5.secret));
+
+ }
+ loader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1() {
+ @Override
+ public void call(Resultcode resultcode) {
+ progressDialog.dismiss();
+ if (resultcode.status == 0) {
+ setToast(resultcode.msg);
+ page = 1;
+ setResult(200);
+ finish();
+ } else {
+ setToast(resultcode.msg);
+ }
+ }
+ }, new Action1() {
+ @Override
+ public void call(Throwable throwable) {
+ progressDialog.dismiss();
+ setToast("操作失败");
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/sl/house_property/order/SettleActivity.java b/app/src/main/java/com/sl/house_property/order/SettleActivity.java
new file mode 100644
index 0000000..0daf72e
--- /dev/null
+++ b/app/src/main/java/com/sl/house_property/order/SettleActivity.java
@@ -0,0 +1,21 @@
+package com.sl.house_property.order;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+import com.sl.house_property.BaseActivity;
+import com.sl.house_property.R;
+import com.sl.house_property.databinding.ActivitySettleBinding;
+
+public class SettleActivity extends BaseActivity {
+ @Override
+ protected int getLayoutResId() {
+ return R.layout.activity_settle;
+ }
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ }
+}
diff --git a/app/src/main/java/entity/OrderListBean.java b/app/src/main/java/entity/OrderListBean.java
new file mode 100644
index 0000000..d486946
--- /dev/null
+++ b/app/src/main/java/entity/OrderListBean.java
@@ -0,0 +1,180 @@
+package entity;
+
+import java.util.ArrayList;
+
+public class OrderListBean {
+ private String order_id;
+ private String pay_way;
+ private String order_number;
+ private String order_money;
+ private String order_status;
+ private String pay_status;
+ private String ctime;
+ private String goods_user_id;
+ private String nickname;
+ private String avatar;
+ private ArrayList content_info;
+ private String store_phone;
+
+ public String getStore_phone() {
+ return store_phone;
+ }
+
+ public void setStore_phone(String store_phone) {
+ this.store_phone = store_phone;
+ }
+
+ public String getOrder_id() {
+ return order_id;
+ }
+
+ public void setOrder_id(String order_id) {
+ this.order_id = order_id;
+ }
+
+ public String getPay_way() {
+ return pay_way;
+ }
+
+ public void setPay_way(String pay_way) {
+ this.pay_way = pay_way;
+ }
+
+ public String getOrder_number() {
+ return order_number;
+ }
+
+ public void setOrder_number(String order_number) {
+ this.order_number = order_number;
+ }
+
+ public String getOrder_money() {
+ return order_money;
+ }
+
+ public void setOrder_money(String order_money) {
+ this.order_money = order_money;
+ }
+
+ public String getOrder_status() {
+ return order_status;
+ }
+
+ public void setOrder_status(String order_status) {
+ this.order_status = order_status;
+ }
+
+ public String getPay_status() {
+ return pay_status;
+ }
+
+ public void setPay_status(String pay_status) {
+ this.pay_status = pay_status;
+ }
+
+ public String getCtime() {
+ return ctime;
+ }
+
+ public void setCtime(String ctime) {
+ this.ctime = ctime;
+ }
+
+ public String getGoods_user_id() {
+ return goods_user_id;
+ }
+
+ public void setGoods_user_id(String goods_user_id) {
+ this.goods_user_id = goods_user_id;
+ }
+
+ public String getNickname() {
+ return nickname;
+ }
+
+ public void setNickname(String nickname) {
+ this.nickname = nickname;
+ }
+
+ public String getAvatar() {
+ return avatar;
+ }
+
+ public void setAvatar(String avatar) {
+ this.avatar = avatar;
+ }
+
+ public ArrayList getContent_info() {
+ return content_info;
+ }
+
+ public void setContent_info(ArrayList content_info) {
+ this.content_info = content_info;
+ }
+
+ public static class Content_info {
+ private String img;
+ private String property;
+ private String name;
+ private String sale_price;
+ private String goods_num;
+ private String product_code;
+ private String goods_id;
+
+ public String getImg() {
+ return img;
+ }
+
+ public void setImg(String img) {
+ this.img = img;
+ }
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSale_price() {
+ return sale_price;
+ }
+
+ public void setSale_price(String sale_price) {
+ this.sale_price = sale_price;
+ }
+
+ public String getGoods_num() {
+ return goods_num;
+ }
+
+ public void setGoods_num(String goods_num) {
+ this.goods_num = goods_num;
+ }
+
+ public String getProduct_code() {
+ return product_code;
+ }
+
+ public void setProduct_code(String product_code) {
+ this.product_code = product_code;
+ }
+
+ public String getGoods_id() {
+ return goods_id;
+ }
+
+ public void setGoods_id(String goods_id) {
+ this.goods_id = goods_id;
+ }
+ }
+}
diff --git a/app/src/main/res/drawable/shape_btn_grey.xml b/app/src/main/res/drawable/shape_btn_grey.xml
new file mode 100644
index 0000000..be0082d
--- /dev/null
+++ b/app/src/main/res/drawable/shape_btn_grey.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_address.xml b/app/src/main/res/layout/activity_add_address.xml
new file mode 100644
index 0000000..d4804af
--- /dev/null
+++ b/app/src/main/res/layout/activity_add_address.xml
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_discovery.xml b/app/src/main/res/layout/activity_add_discovery.xml
index ca1cf76..8c46884 100644
--- a/app/src/main/res/layout/activity_add_discovery.xml
+++ b/app/src/main/res/layout/activity_add_discovery.xml
@@ -22,7 +22,6 @@
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="@dimen/mystatusbar"
- android:background="@color/backcolorAccent"
android:orientation="horizontal">
+
+
diff --git a/app/src/main/res/layout/activity_order.xml b/app/src/main/res/layout/activity_order.xml
new file mode 100644
index 0000000..a326852
--- /dev/null
+++ b/app/src/main/res/layout/activity_order.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_order_detail.xml b/app/src/main/res/layout/activity_order_detail.xml
new file mode 100644
index 0000000..e737adb
--- /dev/null
+++ b/app/src/main/res/layout/activity_order_detail.xml
@@ -0,0 +1,303 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settle.xml b/app/src/main/res/layout/activity_settle.xml
new file mode 100644
index 0000000..87f78db
--- /dev/null
+++ b/app/src/main/res/layout/activity_settle.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_cart.xml b/app/src/main/res/layout/fragment_cart.xml
index 89432f1..a0f1e74 100644
--- a/app/src/main/res/layout/fragment_cart.xml
+++ b/app/src/main/res/layout/fragment_cart.xml
@@ -14,7 +14,6 @@
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="@dimen/mystatusbar"
- android:background="@color/backcolorAccent"
android:orientation="horizontal">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_order_item.xml b/app/src/main/res/layout/item_order_item.xml
new file mode 100644
index 0000000..474e921
--- /dev/null
+++ b/app/src/main/res/layout/item_order_item.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xhdpi/dw.png b/app/src/main/res/mipmap-xhdpi/dw.png
new file mode 100644
index 0000000000000000000000000000000000000000..b017f5820d881c2d9d200878cc407cfb994100f9
GIT binary patch
literal 1310
zcmV+(1>yRMP)HGQwTNPxw9&%A2QNXT)~wTN-a=GAw|=m
z7brp3J+r>75NY&6Mr%}GcJ4)@)FMcT`p}0`cW3TD=I+coJ9B4ecRQbkbDrmae)oBv
zbIvow7=~KiCL}aVVj9q7fOieL>oUOKNo7&sS$6w&pj>R
z>5{;YgxYC?Peu}y=gbqh2f+PBI|65D{kipg>H^4f_6b~D%5jge!NNx2tXvO0=On-d
zgAm$J8?1}-j|EWLSt0VnqC*HROxmDlESr~Y^PaQ7fF~meX(hA4N7Xtt0P>oq2;n&Z
zcM#Y_>+c%R=4BswZij$30sKLjX4<|>m3lD%?j8Z_37n$!qY(bzA>R+fh
zRo7jVaaT(?D55jbu8
zMAqL{EmZK_4i4rM1YbmA;0&0&f&n}Z;(&lV2`r}dkJtF7-EAbc0yu80zc@Yup4%rN
z6+&Lp2H9$n&~q*UyjRkOL^dd%^`W7*re=j<@nX6_=t0_`zj8hAIcWo00y$d0sa^#B
z1aK>%`)Gq=Eewr;v^zUNd;#D~WBn)N!W??;c>oVEfqU5L|27QJbEXUY3BX^*`nS~s
zxCUSXuTH#)r+)Z%8~{bY*$gq0-TwE(0OrrQQIoFy1EAkne_|bg!4T&|%$!gqP!WME
zoMdk2p}wNn^%O)K^nVTLAr=agdF=e<%Ju$M_u-_$cYuB|HkeW`0^a~=A+UnhKU7--
zZt<&T#1&~_sL1r0vB6W-zVh7V0*W_bud)7Pu>fTe5bd-$|Fd00_rJOKAP0u@Ig!0pRiwdW7UHA<#3BFPy#M*!f@M?cFvZirBZt
z2F;Z=H30dHv($)(30%Aua?Ygg+{HN2(av3MO--F>^r?WUA+;>o6&x86U@%;z8xc5~
zu>O+KZWd=(@Z3%UZPhnmY!Q|xOOMiN0MiI=rOmxQ9te4<*92{kZbyT;m5qcPzGXm|j{@#%wgV8CGUPxwx2&g>rX=jxo-;E%NHHnI*V<58S$R&tro=c}_;CS5=}5bqSvuzuwj{=QPmDVS!;WYs^=cIQuG|}qLS1kDKjya`
UKWsjxrT_o{07*qoM6N<$g5d{ivj6}9
literal 0
HcmV?d00001
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index be895a6..615e7f2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -30,6 +30,7 @@