Skip to content

R
RvApp
Commit 18693f23 authored by youjj's avatar youjj
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	RvHome/src/main/java/com/rv/home/rv/wxapi/WXEntryActivity.java
parents a7381a8d cab4d387
Hide whitespace changes
Inline Side-by-side
Showing with 852 additions and 150 deletions
RvClient/src/main/AndroidManifest.xml
View file @ 18693f23
......@@ -156,7 +156,8 @@
<activity
android:name="com.rv.home.rv.wxapi.WXPayEntryActivity"
android:exported="true"
android:launchMode="singleTop" />
android:launchMode="singleTop" >
</activity>
<!-- QQ callback -->
<activity
android:name="com.tencent.tauth.AuthActivity"
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalActivity.java
View file @ 18693f23
......@@ -607,7 +607,8 @@ public class CarRentalActivity extends BaseStatusActivity<CommonPresenter> {
for (ListsBean lsBean : cityBean.getLists()) {
if (starCity.equals(lsBean.getName())) {
dataBean.setStartCity(lsBean.getId());
} else if (endCity.equals(lsBean.getName())) {
}
if (endCity.equals(lsBean.getName())) {
dataBean.setEndCity(lsBean.getId());
}
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
View file @ 18693f23
......@@ -6,6 +6,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.v4.widget.PopupWindowCompat;
import android.text.Html;
import android.util.Log;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
......@@ -35,7 +36,9 @@ import com.rv.home.rv.module.ui.main.home.bean.OrderPriceBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderPriceDetailBean;
import com.rv.home.rv.module.ui.main.home.dialog.OrderPriceDetailPw;
import com.rv.home.rv.module.ui.main.home.dialog.PaymentTypeSelection;
import com.rv.home.rv.until.bus.PayEvent;
import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
import com.rv.home.rv.until.bus.PaymentFailedEvent;
import com.rv.home.rv.until.bus.PaymentSuccessfulEvent;
import com.rv.home.rv.until.bus.RxBus;
import com.tencent.mm.opensdk.modelpay.PayReq;
import com.tencent.mm.opensdk.openapi.IWXAPI;
......@@ -141,8 +144,6 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
.putExtra("endTime", endTime);
}
;
@Override
protected int setLayout() {
return R.layout.rv_act_confim_order;
......@@ -160,14 +161,27 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
@SuppressLint("CheckResult")
private void initRxBus() {
RxBus.tObservable(PayEvent.class)
RxBus.tObservable(PaymentSuccessfulEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new Consumer<PayEvent>() {
.subscribe(new Consumer<PaymentSuccessfulEvent>() {
@Override
public void accept(PayEvent payEvent) throws Exception {
public void accept(PaymentSuccessfulEvent payEvent) throws Exception {
finish();
}
});
RxBus.tObservable(PaymentFailedEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new Consumer<PaymentFailedEvent>() {
@Override
public void accept(PaymentFailedEvent payEvent) throws Exception {
showToast("333333");
if (mActivity.getClass().equals(ConfirmOrderActivity.class)) {
startActivity(OrderListActivity.getIntent(mActivity, 0));
finish();
}
}
});
}
@Override
......@@ -192,6 +206,10 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
case 2:
pay((OrderPayBean) result);
break;
case 3:
startActivity(OrderListActivity.getIntent(mActivity, 0));
finish();
break;
}
}
......@@ -239,7 +257,6 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
} else if (i == R.id.tv_confirm_order) {
confirmOrder();
} else if (i == R.id.tv_delete) {
drivingListBean = null;
llAddDriving.setVisibility(View.GONE);
......@@ -300,9 +317,11 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
helper.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
int i = v.getId();
if (i == R.id.ll_item_wechat) {
if (i ==R.id.iv_close){
dismiss();
createOrder(3);
}else if (i == R.id.ll_item_wechat) {
payType = 1;
helper.setChecked(R.id.rb_wechat, true);
helper.setChecked(R.id.rb_alipay, false);
......@@ -315,11 +334,11 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
} else if (i == R.id.tv_pay_immediately) {
dismiss();
createOrder();
createOrder(1);
}
}
}, R2.id.ll_item_wechat, R2.id.ll_item_alipay, R2.id.tv_pay_immediately);
},R.id.iv_close, R.id.ll_item_wechat, R.id.ll_item_alipay, R.id.tv_pay_immediately);
}
}.show();
}
......@@ -327,12 +346,12 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
/**
* 创建订单
*/
private void createOrder() {
private void createOrder(int payType) {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 1, ApiConfig.HTTP_URL_CONFIRM_ORDER, ConfirmOrderBean.class, dataBean, headMap, true);
Log.i("confirmorderactivity", "createOrder: " +dataBean.toString());
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, payType, ApiConfig.HTTP_URL_CONFIRM_ORDER, ConfirmOrderBean.class, dataBean, headMap, true);
}
/**
......@@ -444,6 +463,8 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
req.extData = "app data"; // optional
api.sendReq(req);
showToast("正常调起支付");
} catch (Exception e) {
showToast("异常");
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/HomePageFragment.java
View file @ 18693f23
......@@ -567,7 +567,9 @@ public class HomePageFragment extends BaseFragment<CommonPresenter> {
for (ListsBean lsBean : cityBean.getLists()) {
if (starCity.equals(lsBean.getName())) {
dataBean.setStartCity(lsBean.getId());
} else if (endCity.equals(lsBean.getName())) {
}
if (endCity.equals(lsBean.getName())) {
dataBean.setEndCity(lsBean.getId());
}
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/bean/OrderDataBean.java
View file @ 18693f23
......@@ -164,4 +164,23 @@ public class OrderDataBean implements Serializable{
}
@Override
public String toString() {
return "OrderDataBean{" +
"dayNum=" + dayNum +
", driverType=" + driverType +
", endAddr='" + endAddr + '\'' +
", endCity=" + endCity +
", endCityName='" + endCityName + '\'' +
", endCompanyId=" + endCompanyId +
", endTime=" + endTime +
", modelId=" + modelId +
", myDriverIds='" + myDriverIds + '\'' +
", startAddr='" + startAddr + '\'' +
", startCity=" + startCity +
", startCityName='" + startCityName + '\'' +
", startCompanyId=" + startCompanyId +
", startTime=" + startTime +
'}';
}
}
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/dialog/TipsDialog.java 0 → 100644
View file @ 18693f23
package com.rv.home.rv.module.ui.main.home.dialog;
import android.content.Context;
import android.support.annotation.NonNull;
import android.view.Gravity;
import android.view.ViewGroup;
import com.ruiwenliu.wrapper.dialog.BaseDialog;
import com.rv.home.R;
/**
* 温馨提示
*/
public class TipsDialog extends BaseDialog {
public TipsDialog(@NonNull Context context) {
super(context);
setDialogParams(ViewGroup.LayoutParams.WRAP_CONTENT,ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
}
@Override
public int getViewLayout() {
return R.layout.rv_dialog_tips;
}
}
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/AllOrderFragment.java
View file @ 18693f23
......@@ -71,9 +71,9 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
if (1 ==dataBean.getType()) {
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 1);
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX(),dataBean.getOrderAmount(),dataBean.getType()), 1);
}else if (2== dataBean.getType()){
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 2);
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX(),dataBean.getType()), 2);
}
}
});
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/CancelTheTripActivity.java
View file @ 18693f23
......@@ -11,12 +11,14 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.rv.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseStatusActivity;
import com.rv.home.rv.module.basic.presenter.PickerPresenter;
import com.rv.home.rv.module.ui.main.home.dialog.TipsDialog;
import com.rv.home.rv.module.ui.main.home.order.adapter.CancelTheTripAdapter;
import com.rv.home.rv.module.ui.main.home.order.bean.CancelTheTripBean;
import com.yuyife.okgo.OkGoUtil;
......@@ -38,7 +40,6 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
@BindView(R2.id.recyclerView)
RecyclerView mRecyclerView;
private CancelTheTripAdapter mAdapter;
private String cancelReason;
private String no;
public static Intent getIntent(Context context, String no) {
......@@ -74,33 +75,38 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
List<CancelTheTripBean> data = adapter.getData();
if (data != null) {
for (int i = 0; i < data.size(); i++) {
data.get(i).setCheck(false);
}
}
CancelTheTripBean item = (CancelTheTripBean) adapter.getItem(position);
item.setCheck(true);
cancelReason = item.getName();
mAdapter.notifyDataSetChanged();
mAdapter.setSelectPosition(position);
}
});
}
@OnClick(R2.id.tv_ok)
public void onViewClicked() {
if (TextUtils.isEmpty(cancelReason)) {
showToast("请选择取消原因！");
return;
}
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
// Map<String, Object> map = new LinkedHashMap<>();
// map.put("cancelReason",cancelReason);
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 0,
ApiConfig.HTTP_URL_BASEORDER_CANCEL + no, CancelTheTripBean.class, new cancelReasonBean(cancelReason), headMap, true);
new TipsDialog(mActivity){
@Override
public void helper(ViewHolder helper) {
super.helper(helper);
helper.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
int id = v.getId();
if (id ==R.id.tv_ok) {
if (TextUtils.isEmpty(mAdapter.getSelectName())) {
showToast("请选择取消原因！");
return;
}
Map<String, Object> mapHead = new LinkedHashMap<>();
mapHead.put("Authorization", OkGoUtil.getToken());
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_BASEORDER_CANCEL + no, CancelTheTripBean.class, new cancelReasonBean(mAdapter.getSelectName()), mapHead, true);
}else if (id ==R.id.tv_cancel ) {
dismiss();
}
}
},R.id.tv_ok, R.id.tv_cancel);
}
}.show();
}
private class cancelReasonBean {
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/CompletedFragment.java
View file @ 18693f23
......@@ -82,9 +82,9 @@ public class CompletedFragment extends BaseFragment<CommonPresenter>implements B
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
if (1 ==dataBean.getType()) {
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 1);
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX(),dataBean.getOrderAmount(),dataBean.getType()), 1);
}else if (2== dataBean.getType()){
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 2);
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX(),dataBean.getType()), 2);
}
}
});
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @ 18693f23
......@@ -13,14 +13,20 @@ import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.rv.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.bean.OrderPayBean;
import com.rv.home.rv.module.ui.main.home.dialog.PaymentTypeSelection;
import com.rv.home.rv.module.ui.main.home.order.adapter.ForPaymentAdapter;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
import com.tencent.mm.opensdk.modelpay.PayReq;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
......@@ -44,6 +50,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
ForPaymentAdapter mAdapter;
private int mPage;
private int countPage;
private IWXAPI api;
public static ForPaymentFragment getInstance(int type) {
Bundle bundl = new Bundle();
......@@ -60,6 +67,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
@Override
protected void initView(Bundle savedInstanceState) {
api = WXAPIFactory.createWXAPI(_mActivity, RvFrameConfig.APP_ID);
recyclerView.setLayoutManager(new LinearLayoutManager(_mActivity));
mAdapter = new ForPaymentAdapter(new ArrayList<MultiItemEntity>());
mAdapter.setOnLoadMoreListener(this, recyclerView);
......@@ -72,9 +80,23 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
if (1 ==dataBean.getType()) {
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 1);
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX(),dataBean.getOrderAmount(),dataBean.getType()), 1);
}else if (2== dataBean.getType()){
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 2);
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX(),dataBean.getType()), 2);
}
}
});
mAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
int id = view.getId();
if (id == R.id.tv_process){
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
payShowSelect(dataBean.getNo(),dataBean.getOrderAmount());
}else if (id == R.id.tv_camp_process){
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
payShowSelect(dataBean.getNo(),dataBean.getOrderAmount());
}
}
});
......@@ -91,6 +113,9 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
case 0:
processData((OrderListBean) result);
break;
case 1:
pay((OrderPayBean) result);
break;
}
}
......@@ -158,6 +183,100 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
}
}
/**
* 支付类型选择
*/
private void payShowSelect(final String no, final double orderAmount) {
PaymentTypeSelection dialog = new PaymentTypeSelection(_mActivity) {
@Override
public void helper(final ViewHolder helper) {
super.helper(helper);
helper.setText(R.id.tv_amount, String.format("￥%1$s", orderAmount));
helper.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
int id = v.getId();
if (id == R.id.iv_close){
dismiss();
}else if (id == R.id.ll_item_wechat){
helper.setChecked(R.id.rb_wechat, true);
helper.setChecked(R.id.rb_alipay, false);
}else if (id == R.id.ll_item_alipay){
showToast("该功能还没有开通！");
}else if (id == R.id.tv_pay_immediately){
dismiss();
createOrder(no, 1, 1);
}
}
},R.id.iv_close, R.id.ll_item_wechat, R.id.ll_item_alipay, R.id.tv_pay_immediately);
}
};
dialog.setCanceledOnTouchOutside(false);
dialog.show();
}
private void createOrder(String orderNo, int payWay, int type) {
Map<String, Object> headMap = new LinkedHashMap<>();
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 1, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderPayBean.class, new payBody(orderNo, payWay, type), headMap, true);
}
public class payBody {
private String orderNo;
private int payWay;
private int type;
public payBody(String orderNo, int payWay, int type) {
this.orderNo = orderNo;
this.payWay = payWay;
this.type = type;
}
public String getOrderNo() {
return orderNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public int getPayWay() {
return payWay;
}
public void setPayWay(int payWay) {
this.payWay = payWay;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
}
private void pay(OrderPayBean data) {
try {
PayReq req = new PayReq();
req.appId = data.getData().getAppid();
req.partnerId = data.getData().getPartnerid();
req.prepayId = data.getData().getPrepayid();
req.nonceStr = data.getData().getNoncestr();
req.timeStamp = data.getData().getTimestamp();
req.packageValue = data.getData().getPackageX();
req.sign = data.getData().getSign();
req.extData = "app data"; // optional
api.sendReq(req);
} catch (Exception e) {
showToast("异常");
}
}
}
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/HaveToTravelFragment.java
View file @ 18693f23
......@@ -69,9 +69,9 @@ public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implement
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
if (1 ==dataBean.getType()) {
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 1);
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX(),dataBean.getOrderAmount(),dataBean.getType()), 1);
}else if (2== dataBean.getType()){
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 2);
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX(),dataBean.getType()), 2);
}
}
});
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java
View file @ 18693f23
......@@ -12,9 +12,12 @@ import android.webkit.WebResourceRequest;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.frame.rv.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.R;
import com.rv.home.R2;
......@@ -22,9 +25,18 @@ import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseStatusActivity;
import com.rv.home.rv.module.basic.WebActivity;
import com.rv.home.rv.module.basic.presenter.PickerPresenter;
import com.rv.home.rv.module.ui.main.home.bean.OrderPayBean;
import com.rv.home.rv.module.ui.main.home.dialog.PaymentTypeSelection;
import com.tencent.mm.opensdk.modelpay.PayReq;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import com.yuyife.okgo.OkGoUtil;
import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
......@@ -50,14 +62,22 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
TextView tvCancelOrder;
@BindView(R2.id.tv_pick_up_the_car)
TextView tvPickUpTheCar;
@BindView(R2.id.ll_item_bottom)
LinearLayout llItemBottom;
private String webUrl;
private int type;
private int status;
private String no;
public static Intent getIntent(Context context, String orderId, int type) {
private final int TYPE_REQUEST_EVALUATION = 1;
private IWXAPI api;
private double orderAmount;
public static Intent getIntent(Context context, String orderId, int status, double orderAmount, int type) {
return new Intent(context, OrderDetailActivity.class)
.putExtra("orderId", orderId)
.putExtra("status", status)
.putExtra("orderAmount", orderAmount)
.putExtra("type", type);
}
......@@ -106,9 +126,11 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
type = intent.getIntExtra("type", 0);
api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
status = intent.getIntExtra("status", 0);
no = intent.getStringExtra("orderId");
switch (type) {
orderAmount = intent.getDoubleExtra("orderAmount", 0);
switch (status) {
case 3:
tvCancelOrder.setText(mActivity.getString(R.string.rv_cancel_order));
tvPickUpTheCar.setText(mActivity.getString(R.string.rv_pay_immediately));
......@@ -125,6 +147,11 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
tvCancelOrder.setText(mActivity.getString(R.string.deposit_information));
tvPickUpTheCar.setText(mActivity.getString(R.string.rv_to_evaluate));
break;
default:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.GONE);
llItemBottom.setVisibility(View.GONE);
break;
}
......@@ -134,7 +161,11 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
case 0:
pay((OrderPayBean) result);
break;
}
}
@Override
......@@ -157,11 +188,33 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
cancelOnclick();
} else if (i == R.id.tv_pick_up_the_car) {
okOnclick();
}
}
/**
* * 3–待付款
* * 4–待出行
* * 5–出行中（进行中）
* * 6–已完成
*/
private void okOnclick() {
switch (status) {
case 3:
payShowSelect(no, orderAmount);
break;
case 4:
break;
case 5:
break;
case 6:
startActivityForResult(EvaluationActivity.getIntent(mActivity), TYPE_REQUEST_EVALUATION);
break;
}
}
private void cancelOnclick() {
switch (type) {
switch (status) {
case 3:
case 4:
startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no), 1);
......@@ -174,6 +227,109 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
}
/**
* 支付类型选择
*/
private void payShowSelect(final String no, final double orderAmount) {
PaymentTypeSelection dialog = new PaymentTypeSelection(mActivity) {
@Override
public void helper(final ViewHolder helper) {
super.helper(helper);
helper.setText(R.id.tv_amount, String.format("￥%1$s", orderAmount));
helper.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
int id = v.getId();
if (id == R.id.iv_close) {
dismiss();
} else if (id == R.id.ll_item_wechat) {
helper.setChecked(R.id.rb_wechat, true);
helper.setChecked(R.id.rb_alipay, false);
} else if (id == R.id.ll_item_alipay) {
showToast("该功能还没有开通！");
} else if (id == R.id.tv_pay_immediately) {
dismiss();
createOrder(no, 1, 1);
}
}
}, R.id.iv_close, R.id.ll_item_wechat, R.id.ll_item_alipay, R.id.tv_pay_immediately);
}
};
dialog.setCanceledOnTouchOutside(false);
dialog.show();
}
private void createOrder(String orderNo, int payWay, int type) {
Map<String, Object> headMap = new LinkedHashMap<>();
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderPayBean.class, new payBody(orderNo, payWay, type), headMap, true);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
public class payBody {
private String orderNo;
private int payWay;
private int type;
public payBody(String orderNo, int payWay, int type) {
this.orderNo = orderNo;
this.payWay = payWay;
this.type = type;
}
public String getOrderNo() {
return orderNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public int getPayWay() {
return payWay;
}
public void setPayWay(int payWay) {
this.payWay = payWay;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
}
private void pay(OrderPayBean data) {
try {
PayReq req = new PayReq();
req.appId = data.getData().getAppid();
req.partnerId = data.getData().getPartnerid();
req.prepayId = data.getData().getPrepayid();
req.nonceStr = data.getData().getNoncestr();
req.timeStamp = data.getData().getTimestamp();
req.packageValue = data.getData().getPackageX();
req.sign = data.getData().getSign();
req.extData = "app data"; // optional
api.sendReq(req);
} catch (Exception e) {
showToast("异常");
}
}
private void initWeb() {
WebSettings webSettings = mWebView.getSettings();
if (webSettings == null) return;
......@@ -237,16 +393,23 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
}
@JavascriptInterface
public ClipboardManager getCopy(){
ClipboardManager clip = (ClipboardManager)mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
public ClipboardManager getCopy() {
ClipboardManager clip = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
clip.setText(no);
showToast("复制成功！");
return clip;
return clip;
}
@JavascriptInterface
public void onClick(){
public void onClick() {
startActivity(WebActivity.getIntent(mActivity, mActivity.getString(R.string.rv_charge_details), ApiConfig.HTTP_URL_CAR_TYPE_COSTDETAIL));
}
@JavascriptInterface
public void showMore() {
// startActivity(CarDetailActivity.getIntent(mActivity, 1));
showToast("再看看");
}
}
}
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/ToTravelFragment.java
View file @ 18693f23
......@@ -68,9 +68,9 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
if (1 ==dataBean.getType()) {
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 1);
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX(),dataBean.getOrderAmount(),dataBean.getType()), 1);
}else if (2== dataBean.getType()){
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX()), 2);
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo(), dataBean.getStatusX(),dataBean.getType()), 2);
}
}
});
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java
View file @ 18693f23
......@@ -5,7 +5,6 @@ import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.webkit.JavascriptInterface;
import android.webkit.WebChromeClient;
......@@ -13,19 +12,31 @@ import android.webkit.WebResourceRequest;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.frame.rv.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.presenter.PickerPresenter;
import com.rv.home.rv.module.ui.main.home.bean.OrderPayBean;
import com.rv.home.rv.module.ui.main.home.dialog.PaymentTypeSelection;
import com.tencent.mm.opensdk.modelpay.PayReq;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import com.yuyife.okgo.OkGoUtil;
import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
......@@ -41,15 +52,20 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
TextView tvCancelOrder;
@BindView(R2.id.tv_pick_up_the_car)
TextView tvPickUpTheCar;
@BindView(R2.id.ll_item_bottom)
LinearLayout llItemBottom;
private String webUrl;
private int status;
private int type;
private String no;
private IWXAPI api;
public static Intent getIntent(Context context, String orderId, int type) {
public static Intent getIntent(Context context, String orderId, int status, int type) {
return new Intent(context, TravelOrderDetailsActivity.class)
.putExtra("no", orderId)
.putExtra("status", status)
.putExtra("type", type);
}
......@@ -97,9 +113,23 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
type = intent.getIntExtra("type", 0);
api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
status = intent.getIntExtra("status", 0);
no = intent.getStringExtra("no");
switch (type) {
type = intent.getIntExtra("type", 0);
/**
*
(query)
订单状态
0–删除
1–创建订单
2–取消
3–待付款
4–待出行
5–出行中（进行中）
6–已完成
*/
switch (status) {
case 3:
tvCancelOrder.setVisibility(View.VISIBLE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
......@@ -119,11 +149,15 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
tvPickUpTheCar.setVisibility(View.VISIBLE);
tvPickUpTheCar.setText("去评价");
break;
default:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.GONE);
llItemBottom.setVisibility(View.GONE);
break;
}
webUrl = ApiConfig.HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL + "?no=" + no;
Log.i("travelorderdetailsactivi", "initView: " + webUrl);
initWeb();
}
......@@ -141,25 +175,47 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
}
}
// @OnClick({R2.id.iv_back, R2.id.iv_customer_service, R2.id.tv_cancel_order, R2.id.tv_pick_up_the_car})
// public void onViewClicked(View view) {
// int i = view.getId();
// if (i == R.id.iv_back) {
// finish();
//
// } else if (i == R.id.iv_customer_service) {
// } else if (i == R.id.tv_cancel_order) {
// cancelOnclick();
//
// } else if (i == R.id.tv_pick_up_the_car) {
// }
// }
@OnClick({R2.id.iv_back, R2.id.iv_customer_service, R2.id.tv_cancel_order, R2.id.tv_pick_up_the_car})
public void onViewClicked(View view) {
int i = view.getId();
if (i == R.id.iv_back) {
finish();
} else if (i == R.id.iv_customer_service) {
} else if (i == R.id.tv_cancel_order) {
cancelOnclick();
} else if (i == R.id.tv_pick_up_the_car) {
okOnclick();
}
}
/**
* * 3–待付款
* * 4–待出行
* * 5–出行中（进行中）
* * 6–已完成
*/
private void okOnclick() {
switch (status) {
case 3:
// payShowSelect(no, orderAmount);
break;
case 4:
break;
case 5:
break;
case 6:
// startActivityForResult(EvaluationActivity.getIntent(mActivity), TYPE_REQUEST_EVALUATION);
break;
}
}
private void cancelOnclick() {
switch (type) {
switch (status) {
case 3:
case 4:
startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no), 1);
break;
case 5:
break;
......@@ -169,6 +225,102 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
}
/**
* 支付类型选择
*/
private void payShowSelect(final String no, final double orderAmount) {
PaymentTypeSelection dialog = new PaymentTypeSelection(mActivity) {
@Override
public void helper(final ViewHolder helper) {
super.helper(helper);
helper.setText(R.id.tv_amount, String.format("￥%1$s", orderAmount));
helper.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
int id = v.getId();
if (id == R.id.iv_close) {
dismiss();
} else if (id == R.id.ll_item_wechat) {
helper.setChecked(R.id.rb_wechat, true);
helper.setChecked(R.id.rb_alipay, false);
} else if (id == R.id.ll_item_alipay) {
showToast("该功能还没有开通！");
} else if (id == R.id.tv_pay_immediately) {
dismiss();
createOrder(no, 1, 1);
}
}
}, R.id.iv_close, R.id.ll_item_wechat, R.id.ll_item_alipay, R.id.tv_pay_immediately);
}
};
dialog.setCanceledOnTouchOutside(false);
dialog.show();
}
private void createOrder(String orderNo, int payWay, int type) {
Map<String, Object> headMap = new LinkedHashMap<>();
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderPayBean.class, new payBody(orderNo, payWay, type), headMap, true);
}
public class payBody {
private String orderNo;
private int payWay;
private int type;
public payBody(String orderNo, int payWay, int type) {
this.orderNo = orderNo;
this.payWay = payWay;
this.type = type;
}
public String getOrderNo() {
return orderNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public int getPayWay() {
return payWay;
}
public void setPayWay(int payWay) {
this.payWay = payWay;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
}
private void pay(OrderPayBean data) {
try {
PayReq req = new PayReq();
req.appId = data.getData().getAppid();
req.partnerId = data.getData().getPartnerid();
req.prepayId = data.getData().getPrepayid();
req.nonceStr = data.getData().getNoncestr();
req.timeStamp = data.getData().getTimestamp();
req.packageValue = data.getData().getPackageX();
req.sign = data.getData().getSign();
req.extData = "app data"; // optional
api.sendReq(req);
} catch (Exception e) {
showToast("异常");
}
}
private void initWeb() {
WebSettings webSettings = mWebView.getSettings();
if (webSettings == null) return;
......@@ -245,6 +397,12 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
showToast("复制成功！");
return clip;
}
@JavascriptInterface
public void showMore() {
}
}
}
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/CancelTheTripAdapter.java
View file @ 18693f23
......@@ -17,9 +17,23 @@ public class CancelTheTripAdapter extends BaseQuickAdapter<CancelTheTripBean, Ba
super(R.layout.rv_item_cancel_the_trip);
}
private int selectPosition;
@Override
protected void convert(BaseViewHolder helper, CancelTheTripBean item) {
helper.setText(R.id.tv_content,item.getName());
helper.setChecked(R.id.rg_check,item.isCheck());
helper.setText(R.id.tv_content,item.getName());
if(selectPosition==mData.indexOf(item)){
helper.setChecked(R.id.rg_check,true);
}else {
helper.setChecked(R.id.rg_check,false);
}
}
public void setSelectPosition(int position){
this.selectPosition=position;
notifyDataSetChanged();
}
public String getSelectName(){
return mData.get(selectPosition).getName();
}
}
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/CompletedAdapter.java
View file @ 18693f23
......@@ -64,16 +64,15 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
helper.setText(R.id.tv_city, "东莞市");
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.setText(R.id.tv_city, dataBean2.getOrderTourDetail().getStartCityName());
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
helper.setText(R.id.tv_car_type, dataBean2.getName());
helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s%2$s", mContext.getString(R.string.rv_to_time), "6", mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price, String.format("￥%1$s", "3200000"));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_evaluation));
helper.addOnClickListener(R.id.tv_camp_process);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(dataBean2.getName()) ? false : true);
break;
}
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ForPaymentAdapter.java
View file @ 18693f23
......@@ -62,16 +62,15 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
helper.setText(R.id.tv_city, "东莞市");
helper.setText(R.id.tv_city, dataBean2.getOrderTourDetail().getStartCityName());
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
helper.setText(R.id.tv_car_type, dataBean2.getName());
helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s%2$s", mContext.getString(R.string.rv_to_time), "6", mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean2.getOrderAmount()));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
helper.addOnClickListener(R.id.tv_camp_process);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(dataBean2.getName()) ? false : true);
break;
}
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/HaveToTravelAdapter.java
View file @ 18693f23
......@@ -64,16 +64,17 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
helper.setText(R.id.tv_city, "东莞市");
helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_for_payment));
helper.setText(R.id.tv_city, dataBean2.getOrderTourDetail().getStartCityName());
helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_have_travel));
helper.loadRoundImage(mContext,dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods),50);
helper.setText(R.id.tv_car_type,dataBean2.getName());
helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person,String.format("%1$s%2$s%2$s",mContext.getString(R.string.rv_to_time),"6",mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean2.getOrderAmount()));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
helper.addOnClickListener(R.id.tv_camp_process);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(mContext.getString(R.string.rv_to_pay_for))?false:true);
helper.setVisible(R.id.tv_camp_process,false);
// helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
// helper.addOnClickListener(R.id.tv_camp_process);
// helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(mContext.getString(R.string.rv_to_pay_for))?false:true);
break;
}
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/OrderListAdapter.java
View file @ 18693f23
......@@ -36,48 +36,68 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
switch (helper.getItemViewType()) {
case TYPE_FOR_PAYMENT:
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean ==null){
if (dataBean == null) {
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
if (dataBean.getOrderRentVehicleDetail() !=null && dataBean.getOrderRentVehicleDetail().getStart_city_name()!=null) {
if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
}
helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
helper.setText(R.id.tv_car_type, dataBean.getName());
if (dataBean.getOrderRentVehicleDetail() !=null) {
if (dataBean.getOrderRentVehicleDetail() != null) {
helper.setText(R.id.tv_get_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getStart_time())));
helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
}
helper.setText(R.id.tv_price, String.format("￥%1$s", dataBean.getOrderAmount()));
String orderState = "";
String processName = "";
/**
*
(query)
订单状态
0–删除
1–创建订单
2–取消
3–待付款
4–待出行
5–出行中（进行中）
6–已完成
*/
switch (dataBean.getStatusX()) {
case 0:
helper.setText(R.id.tv_order_state, "删除");
helper.setVisible(R.id.tv_process, false);
break;
case 2:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.tv_cancelled));
helper.setVisible(R.id.tv_process, false);
break;
case 3:
orderState = mContext.getString(R.string.rv_order_for_payment);
processName = mContext.getString(R.string.rv_to_pay_for);
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_pay_for));
helper.setVisible(R.id.tv_process, true);
break;
case 4:
orderState = mContext.getString(R.string.rv_order_to_travel);
processName = mContext.getString(R.string.rv_to_get_car);
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_get_car));
helper.setVisible(R.id.tv_process, true);
break;
case 5:
orderState = mContext.getString(R.string.rv_order_have_travel);
processName = mContext.getString(R.string.rv_to_out_car);
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_have_travel));
helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_out_car));
helper.setVisible(R.id.tv_process, true);
break;
case 6:
orderState = mContext.getString(R.string.rv_order_completed);
processName = mContext.getString(R.string.rv_to_evaluation);
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_evaluation));
helper.setVisible(R.id.tv_process, true);
break;
default:
orderState = "待定";
processName = "待定";
break;
}
helper.setText(R.id.tv_order_state, orderState);
helper.setText(R.id.tv_process, processName);
helper.addOnClickListener(R.id.tv_process);
break;
case TYPE_TO_TRAVEL:
......@@ -85,20 +105,65 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
if (dataBean2 == null) {
return;
}
if (dataBean2.getOrderTourDetail() ==null ){
if (dataBean2.getOrderTourDetail() == null) {
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
helper.setText(R.id.tv_city, "东莞市");
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.setText(R.id.tv_city, dataBean2.getOrderTourDetail().getStartCityName());
helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
helper.setText(R.id.tv_car_type, dataBean2.getName());
helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s%2$s", mContext.getString(R.string.rv_to_time), "6", mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) + TimeManager.stampToDate2(String.valueOf(dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price, String.format("￥%1$s", "3200000"));
helper.setText(R.id.tv_camp_process,mContext.getString(R.string.rv_to_pay_for));
/**
*
(query)
订单状态
0–删除
1–创建订单
2–取消
3–待付款
4–待出行
5–出行中（进行中）
6–已完成
*/
switch (dataBean2.getStatusX()) {
case 0:
helper.setText(R.id.tv_order_state, "删除");
helper.setVisible(R.id.tv_camp_process, false);
break;
case 2:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.tv_cancelled));
helper.setVisible(R.id.tv_camp_process, false);
break;
case 3:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
helper.setVisible(R.id.tv_camp_process, true);
break;
case 4:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.tv_boarding));
helper.setVisible(R.id.tv_camp_process, true);
break;
case 5:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_have_travel));
helper.setVisible(R.id.tv_camp_process, false);
helper.setVisible(R.id.tv_camp_process, false);
break;
case 6:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_evaluation));
helper.setVisible(R.id.tv_camp_process, true);
break;
default:
break;
}
helper.addOnClickListener(R.id.tv_camp_process);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(mContext.getString(R.string.rv_to_pay_for)) ? false : true);
break;
}
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ToTravelAdapter.java
View file @ 18693f23
......@@ -64,16 +64,15 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
helper.setText(R.id.tv_city, "东莞市");
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.setText(R.id.tv_city, dataBean2.getOrderTourDetail().getStartCityName());
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
helper.setText(R.id.tv_car_type, dataBean2.getName());
helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s%2$s", mContext.getString(R.string.rv_to_time), "6", mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price, String.format("￥%1$s", "3200000"));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.tv_boarding));
helper.addOnClickListener(R.id.tv_camp_process);
helper.setGone(R.id.tv_camp_process, TextUtils.isEmpty(dataBean2.getName()) ? false : true);
break;
}
}
......
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/bean/CancelTheTripBean.java
View file @ 18693f23
......@@ -5,7 +5,6 @@ import com.ruiwenliu.wrapper.base.BaseBean;
public class CancelTheTripBean extends BaseBean {
private String name;
private boolean check;
public String getName() {
return name;
......@@ -14,12 +13,4 @@ public class CancelTheTripBean extends BaseBean {
public void setName(String name) {
this.name = name;
}
public boolean isCheck() {
return check;
}
public void setCheck(boolean check) {
this.check = check;
}
}
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/bean/OrderListBean.java
View file @ 18693f23
......@@ -591,6 +591,9 @@ public class OrderListBean extends BaseBean {
private String contactMan;//": "周2",
private String contactPhone;//": "13712398220",
private String contactEmail;//":
private int startCity;
private String startCityName;
private int totalNumber;
public String getId() {
......@@ -728,6 +731,30 @@ public class OrderListBean extends BaseBean {
public void setContactEmail(String contactEmail) {
this.contactEmail = contactEmail;
}
public int getStartCity() {
return startCity;
}
public void setStartCity(int startCity) {
this.startCity = startCity;
}
public String getStartCityName() {
return startCityName;
}
public void setStartCityName(String startCityName) {
this.startCityName = startCityName;
}
public int getTotalNumber() {
return totalNumber;
}
public void setTotalNumber(int totalNumber) {
this.totalNumber = totalNumber;
}
}
}
}
......
RvHome/src/main/java/com/rv/home/rv/until/bus/PayEvent.java → RvHome/src/main/java/com/rv/home/rv/until/bus/PaymentFailedEvent.java
View file @ 18693f23
package com.rv.home.rv.until.bus;
public class PayEvent extends Event {
public class PaymentFailedEvent extends Event {
}
RvHome/src/main/java/com/rv/home/rv/until/bus/PaymentSuccessfulEvent.java 0 → 100644
View file @ 18693f23
package com.rv.home.rv.until.bus;
public class PaymentSuccessfulEvent extends Event {
}
RvHome/src/main/java/com/rv/home/rv/wxapi/WXPayEntryActivity.java
View file @ 18693f23
......@@ -3,6 +3,7 @@ package com.rv.home.rv.wxapi;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.widget.TextView;
import com.frame.rv.RvFrameConfig;
......@@ -13,7 +14,8 @@ import com.rv.home.R2;
import com.rv.home.rv.module.basic.BaseStatusActivity;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
import com.rv.home.rv.until.bus.PayEvent;
import com.rv.home.rv.until.bus.PaymentFailedEvent;
import com.rv.home.rv.until.bus.PaymentSuccessfulEvent;
import com.rv.home.rv.until.bus.RxBus;
import com.tencent.mm.opensdk.constants.ConstantsAPI;
import com.tencent.mm.opensdk.modelbase.BaseReq;
......@@ -61,19 +63,18 @@ public class WXPayEntryActivity extends BaseStatusActivity<CommonPresenter> impl
@Override
public void onResp(BaseResp resp) {
// Log.d(TAG, "onPayFinish, errCode = " + resp.errCode);
Log.d("Wxpayentryactivity", "onPayFinish, errCode = " + resp.errCode);
showToast("onPayFinish, errCode = " + resp.errCode);
if (resp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) {
switch (resp.errCode) {
case 0:
RxBus.post(new PayEvent());
RxBus.post(new PaymentSuccessfulEvent());
break;
case -1:
finish();
break;
case -2:
startActivity(OrderListActivity.getIntent(mActivity, 0));
RxBus.post(new PayEvent());
RxBus.post(new PaymentFailedEvent());
finish();
break;
}
......
RvHome/src/main/res/layout/activity_order_to_travel.xml
View file @ 18693f23
......@@ -55,6 +55,7 @@
<include layout="@layout/common_line"/>
<LinearLayout
android:id="@+id/ll_item_bottom"
android:layout_width="match_parent"
android:layout_height="@dimen/size_70"
android:paddingLeft="@dimen/size_12"
......
RvHome/src/main/res/layout/activity_travel_order_details.xml
View file @ 18693f23
......@@ -55,6 +55,7 @@
<include layout="@layout/common_line"/>
<LinearLayout
android:id="@+id/ll_item_bottom"
android:layout_width="match_parent"
android:layout_height="@dimen/size_70"
android:paddingLeft="@dimen/size_12"
......
RvHome/src/main/res/layout/rv_dialog_paymant_type_selection.xml
View file @ 18693f23
......@@ -5,13 +5,27 @@
android:background="@color/colorWrite"
android:layout_height="wrap_content">
<TextView
<RelativeLayout
android:paddingRight="@dimen/size_15"
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:gravity="center"
android:textSize="@dimen/text_16"
android:textColor="@color/textMain"
android:text="@string/rv_payment_type_title"/>
android:layout_height="@dimen/size_60">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:textSize="@dimen/text_16"
android:textColor="@color/textMain"
android:text="@string/rv_payment_type_title"/>
<ImageView
android:id="@+id/iv_close"
android:layout_width="@dimen/size_30"
android:layout_height="@dimen/size_30"
android:padding="@dimen/size_5"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/common_btn_close"/>
</RelativeLayout>
<include layout="@layout/common_line"/>
......
RvHome/src/main/res/layout/rv_dialog_tips.xml 0 → 100644
View file @ 18693f23
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_marginLeft="@dimen/size_40"
android:layout_marginRight="@dimen/size_40"
android:background="@color/colorWrite"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_18"
android:textColor="@color/colorMain"
android:text="温馨提示"/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:textSize="@dimen/size_16"
android:layout_marginBottom="@dimen/size_26"
android:textColor="@color/textGray"
android:text="取消将从您的押金里扣除20元手续费，确认要取消吗？"/>
<include layout="@layout/common_line"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_ok"
android:layout_width="0dp"
android:layout_weight="1"
android:gravity="center"
android:layout_height="match_parent"
android:text="确认取消"/>
<View
android:layout_marginTop="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:background="@color/colorLine"
android:layout_width="@dimen/size_half"
android:layout_height="match_parent"/>
<TextView
android:id="@+id/tv_cancel"
android:layout_width="0dp"
android:layout_weight="1"
android:gravity="center"
android:layout_height="match_parent"
android:text="暂不取消"/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
RvHome/src/main/res/values/strings.xml
View file @ 18693f23
......@@ -125,7 +125,7 @@
<string name="rv_order_time">下单时间：</string>
<string name="rv_order_for_payment">待支付</string>
<string name="rv_order_to_travel">待出行</string>
<string name="rv_order_have_travel">已出行</string>
<string name="rv_order_have_travel">出行中</string>
<string name="rv_order_completed">已完成</string>
<string name="rv_order_all_order">全部</string>
<string name="rv_to_pay_for">立即支付</string>
......@@ -167,5 +167,7 @@
<string name="deposit_information">押金信息</string>
<string name="order_details_title">订单详情</string>
<string name="rv_charge_details">费用明细</string>
<string name="tv_boarding">立即上车</string>
<string name="tv_cancelled">已取消</string>
<!--=================================================房车结束========================================-->
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment