Skip to content

R
RvApp
Commit 7fc2e0dc authored by jianglx's avatar jianglx
Browse files
Options

修改百度地图定位的appid，为会员订单添加详情界面

parent 1799436d
Hide whitespace changes
Inline Side-by-side
Showing with 377 additions and 49 deletions
RvClient/src/main/AndroidManifest.xml
View file @ 7fc2e0dc
......@@ -119,7 +119,7 @@
<meta-data
android:name="com.baidu.lbsapi.API_KEY"
android:value="NrMH6EqS8HZLtcYzqIUXQFsw7rZUK9S8" /> <!-- <meta-data -->
android:value="QaN98C5rV8hawNLVix0FAPLSsz7uh2q1" /> <!-- <meta-data -->
<!-- android:name="android.max_aspect" -->
<!-- android:value="2.1" /> -->
<!-- autoSize布局最大分辨率 -->
......
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ 7fc2e0dc
......@@ -39,6 +39,7 @@ public class ApiConfig {
public static String HTTP_URL_PAY_THE_CALLBACK = RvFrameConfig.VEHICLE_ORDER + "baseOrder/pay";//订单支付
public static String HTTP_URL_CAR_TYPE_DETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/detail.html";//租车类型详情页
public static String HTTP_URL_CAR_TYPE_ORDERDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/orderDetail.html";//订单详情页
public static String HTTP_URL_VIP_ORDERDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/vipOrderDetail.html?no=%s";
public static String HTTP_URL_BASEORDER_CANCEL = RvFrameConfig.VEHICLE_ORDER + "baseOrder/cancel/";//重置密码
public static String HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/travelOrderDetail.html";//旅游订单详情页
public static String HTTP_URL_CAR_TYPE_COSTDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/costDetail.html";//费用明细
......@@ -68,5 +69,5 @@ public class ApiConfig {
public static String HTTP_URL_FIND_BANNERLIST = RvFrameConfig.HOST + "/api/app/banner/app/unauth/findBannerlist"; // banner图接口
public static String HTTP_URL_EFFECTIVE_TIME = RvFrameConfig.VEHICLE_ORDER + "/baseOrder/app/unauth/getOrderParam" ; // 获取订单失效时间
public static String HTTP_URL_EFFECTIVE_TIME = RvFrameConfig.VEHICLE_ORDER + "/baseOrder/app/unauth/getOrderParam"; // 获取订单失效时间
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/AllOrderFragment.java
View file @ 7fc2e0dc
......@@ -82,7 +82,7 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
} else if (2 == dataBean.getType()) {
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
} else if (3 == dataBean.getType()) {
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean),3);
startActivityForResult(MemberOrderDetailsActivity.getIntent(_mActivity, dataBean),3);
}
}
});
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/CompletedFragment.java
View file @ 7fc2e0dc
......@@ -88,7 +88,7 @@ public class CompletedFragment extends BaseFragment<CommonPresenter> implements
} else if (2 == dataBean.getType()) {
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
} else if (3 == dataBean.getType()) {
startActivity(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean));
startActivity(MemberOrderDetailsActivity.getIntent(_mActivity, dataBean));
}
}
});
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @ 7fc2e0dc
......@@ -9,18 +9,12 @@ import android.os.Message;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.base.bus.CancelOrderEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.PaymentFailedEvent;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
......@@ -32,7 +26,6 @@ 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.ConfirmOrderActivity;
import com.rv.home.rv.module.ui.main.home.bean.EffectiveTimeBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderPayBean;
import com.rv.home.rv.module.ui.main.home.order.adapter.ForPaymentAdapter;
......@@ -47,7 +40,6 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
......@@ -113,7 +105,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
} else if (2 == dataBean.getType()) {
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
} else if (3 == dataBean.getType()) {
startActivityForResult(MemberOrderDetailsActivity.getIntent(_mActivity, dataBean), 3);
}
}
});
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/MemberOrderDetailsActivity.java
View file @ 7fc2e0dc
package com.rv.home.rv.module.ui.main.home.order;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.webkit.JavascriptInterface;
import android.webkit.WebChromeClient;
import android.webkit.WebResourceRequest;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.frame.base.bus.CancelOrderEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.PaymentFailedEvent;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
import com.frame.base.url.Constance;
import com.frame.rv.config.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.component.dialog.PaymentTypeSelection;
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.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.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
/**
* 会员订单详情
* 会员
*/
public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresenter> {
@BindView(R2.id.tv_center)
TextView tvCenter;
@BindView(R2.id.lay_title)
RelativeLayout layTitle;
private static final int TYPE_REQUEST_EVALUATION = 102;
@BindView(R2.id.webView)
WebView mWebView;
@BindView(R2.id.tv_cancel_order)
TextView tvCancelOrder;
@BindView(R2.id.tv_pick_up_the_car)
TextView tvPickUpTheCar;
@BindView(R2.id.ll_item_bottom)
LinearLayout llItemBottom;
@Override
protected int setLayout() {
return R.layout.activity_member_order_details;
}
private String webUrl;
private int status;
private String no;
private IWXAPI api;
private double orderAmount;
private OrderListBean.DataBeanX.DataBean dataBean;
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
// webUrl = ApiConfig.HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL + "?no=" + no;
public static Intent getIntent(Context context, OrderListBean.DataBeanX.DataBean dataBean) {
return new Intent(context, MemberOrderDetailsActivity.class)
.putExtra("dataBean", dataBean);
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
@OnClick({R2.id.iv_back, R2.id.iv_customer_service, R2.id.tv_cancel_order, R2.id.tv_pay})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.iv_back){
finish();
}else if (id == R.id.iv_customer_service){
}else if (id == R.id.tv_cancel_order){
}else if (id == R.id.tv_pay){
}
protected int setLayout() {
return R.layout.activity_travel_order_details;
}
@Override
protected void onStart() {
super.onStart();
......@@ -98,5 +118,320 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
// mWebView.addJavascriptInterface(new AndroidJs(),"AndroidJs");
mWebView.destroy();// 生命周期销毁
if (disposableSuc != null && !disposableSuc.isDisposed()) {
disposableSuc.dispose();
}
if (disposableFail != null && !disposableFail.isDisposed()) {
disposableFail.dispose();
}
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
initRxBus();
api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
if (dataBean != null) {
status = dataBean.getStatusX();
no = dataBean.getNo();
orderAmount = dataBean.getOrderAmount();
}
/**
*
(query)
订单状态
0–删除
1–创建订单
2–取消
3–待付款
4–待出行
5–出行中（进行中）
6–已完成
*/
switch (status) {
case 3:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
break;
case 6:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
tvPickUpTheCar.setText("去评价");
break;
default:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.GONE);
llItemBottom.setVisibility(View.GONE);
break;
}
webUrl = String.format(ApiConfig.HTTP_URL_VIP_ORDERDETAIL, no);
initWeb();
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
case 0:
pay((OrderPayBean) result);
break;
}
}
private Disposable disposableSuc;
private Disposable disposableFail;
@SuppressLint("CheckResult")
private void initRxBus() {
disposableSuc = RxBus.tObservable(PaymentSuccessfulEvent.class)
.observeOn(Schedulers.io())
.subscribe(new Consumer<PaymentSuccessfulEvent>() {
@Override
public void accept(PaymentSuccessfulEvent payEvent) throws Exception {
finish();
}
});
disposableFail = RxBus.tObservable(PaymentFailedEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new Consumer<PaymentFailedEvent>() {
@Override
public void accept(PaymentFailedEvent payEvent) throws Exception {
finish();
}
});
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 1 && resultCode == RESULT_OK) {
setResult(RESULT_OK);
finish();
}
}
@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 6:
startActivityForResult(EvaluationActivity.getIntent(mActivity, dataBean), TYPE_REQUEST_EVALUATION);
break;
}
}
private void cancelOnclick() {
switch (status) {
case 3:
case 4:
break;
case 5:
break;
case 6:
break;
}
}
/**
* 支付类型选择
*/
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;
// 支持 Js 使用
webSettings.setJavaScriptEnabled(true);
// 开启DOM缓存,默认状态下是不支持LocalStorage的
webSettings.setDomStorageEnabled(true);
// 开启数据库缓存
webSettings.setDatabaseEnabled(true);
// 支持自动加载图片
webSettings.setLoadsImagesAutomatically(hasKitkat());
// 设置 WebView 的缓存模式
webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
// 支持启用缓存模式
webSettings.setAppCacheEnabled(true);
// 设置 AppCache 最大缓存值(现在官方已经不提倡使用，已废弃)
// webSettings.setAppCacheMaxSize(8 * 1024 * 1024);
// Android 私有缓存存储，如果你不调用setAppCachePath方法，WebView将不会产生这个目录
webSettings.setAppCachePath(getCacheDir().getAbsolutePath());
// 数据库路径
// if (!hasKitkat()) {
// webSettings.setDatabasePath(getDatabasePath("html").getPath());
// }
// 关闭密码保存提醒功能
// webSettings.setSavePassword(false);
// 支持缩放
webSettings.setSupportZoom(true);
// 设置 UserAgent 属性
webSettings.setUserAgentString("");
// 允许加载本地 html 文件/false
webSettings.setAllowFileAccess(true);
// 允许通过 file url 加载的 Javascript 读取其他的本地文件,Android 4.1 之前默认是true，在 Android 4.1 及以后默认是false,也就是禁止
webSettings.setAllowFileAccessFromFileURLs(true);
// 允许通过 file url 加载的 Javascript 可以访问其他的源，包括其他的文件和 http，https 等其他的源，
// Android 4.1 之前默认是true，在 Android 4.1 及以后默认是false,也就是禁止
// 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
webSettings.setAllowUniversalAccessFromFileURLs(true);
mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
mWebView.loadUrl(webUrl);
mWebView.setWebViewClient(new WebViewClient() {
@Override
public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
return super.shouldOverrideUrlLoading(view, request);
}
});
mWebView.setWebChromeClient(new WebChromeClient() {
@Override
public void onProgressChanged(WebView view, int newProgress) {
super.onProgressChanged(view, newProgress);
if (newProgress == 85) {
onHideLoading();
}
}
});
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ButterKnife.bind(this);
}
public class AndroidJs {
@JavascriptInterface
public String getToken() {
return OkGoUtil.getToken();
}
@JavascriptInterface
public void getCopy() {
}
@JavascriptInterface
public void showMore() {
}
}
}
plugin_version/src/main/res/xml/update_file_paths.xml
View file @ 7fc2e0dc
<?xml version="1.0" encoding="utf-8"?>
<paths>
<files-path name="name" path="" />
<files-path name="files-path" path="" />
 
<cache-path name="name" path="" />
<cache-path name="cache-path" path="" />
 
<external-path name="name" path="" />
<external-path name="external-path" path="photo" />
 
<external-files-path name="name" path="" />
<external-files-path name="external-files-path" path="" />
 
<external-cache-path name="name" path="" />
<external-cache-path name="external-cache-path" path="" />
</paths>
......
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