Skip to content

R
RvApp
Commit fa2aeac0 authored by linfeng's avatar linfeng
Browse files
Options

消息通知优化

parent 59406bfb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1568 additions and 182 deletions
RvClient/src/main/java/com/xxfc/rv/other/MyReceiver.java
View file @ fa2aeac0
......@@ -8,7 +8,11 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import com.rv.home.rv.module.ui.main.home.order.EvaluationActivity;
import com.rv.home.rv.module.ui.main.home.order.MemberOrderDetailsActivity;
import com.rv.home.rv.module.ui.main.home.order.OrderDetailActivity;
import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
import com.rv.home.rv.module.ui.main.home.order.TravelOrderDetailsActivity;
import com.rv.rvmine.traveler.CollectionActivity;
import com.rv.share.ShareActivity;
import com.xxfc.rv.MainActivity;
......@@ -57,19 +61,44 @@ public class MyReceiver extends BroadcastReceiver {
String extra = bundle.getString(JPushInterface.EXTRA_EXTRA);
JSONObject jsonObject = new JSONObject(extra);
String onclickType = jsonObject.getString("onclickType");
String orderId = "";
if (jsonObject.has("orderId")) {
orderId = jsonObject.getString("orderId");
}
if (isAppRunning(context, "com.xxfc.rv")) { //判断App是否在运行
Intent intent2 = new Intent();
intent2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
switch (onclickType) {
case "1":
//租车订单详情
intent2.putExtra("no", orderId);
intent2.setClass(context, OrderDetailActivity.class);
context.startActivity(intent2);
break;
case "2":
//旅游订单详情
intent2.putExtra("no", orderId);
intent2.setClass(context, TravelOrderDetailsActivity.class);
context.startActivity(intent2);
break;
case "3":
//租车订单评价
intent2.putExtra("no", orderId);
intent2.setClass(context, EvaluationActivity.class);
context.startActivity(intent2);
break;
case "4":
//旅游订单评价
intent2.putExtra("no", orderId);
intent2.setClass(context, EvaluationActivity.class);
context.startActivity(intent2);
break;
case "5":
//会员订单详情
intent2.putExtra("no", orderId);
intent2.setClass(context, MemberOrderDetailsActivity.class);
context.startActivity(intent2);
break;
default:
intent2.setClass(context, MainActivity.class);
......@@ -77,27 +106,45 @@ public class MyReceiver extends BroadcastReceiver {
break;
}
} else {
Intent intent3 = new Intent();
intent3.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
switch (onclickType) {
case "1":
intent3.setClass(context, OrderListActivity.class);
//租车订单详情
context.startActivity(MainActivity.getIntent(context));
intent3.putExtra("no", orderId);
intent3.setClass(context, OrderDetailActivity.class);
context.startActivity(intent3);
break;
case "2":
intent3.setClass(context, CollectionActivity.class);
//旅游订单详情
context.startActivity(MainActivity.getIntent(context));
intent3.putExtra("no", orderId);
intent3.setClass(context, TravelOrderDetailsActivity.class);
context.startActivity(intent3);
break;
case "3":
intent3.setClass(context, ShareActivity.class);
//租车订单评价
context.startActivity(MainActivity.getIntent(context));
intent3.putExtra("no", orderId);
intent3.setClass(context, EvaluationActivity.class);
context.startActivity(intent3);
break;
case "4":
//旅游订单评价
context.startActivity(MainActivity.getIntent(context));
intent3.putExtra("no", orderId);
intent3.setClass(context, EvaluationActivity.class);
context.startActivity(intent3);
break;
case "5":
//会员订单详情
context.startActivity(MainActivity.getIntent(context));
intent3.putExtra("no", orderId);
intent3.setClass(context, MemberOrderDetailsActivity.class);
context.startActivity(intent3);
break;
default:
intent3.setClass(context, MainActivity.class);
......
build.gradle
View file @ fa2aeac0
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.2.51'
repositories {
google()
jcenter()
......@@ -15,6 +15,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-rc1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
//classpath 'com.mob.sdk:MobSDK:+'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
......
component_camera/build.gradle 0 → 100644
View file @ fa2aeac0
apply plugin: 'com.android.library'
android {
compileSdkVersion 28
defaultConfig {
minSdkVersion 19
targetSdkVersion 28
versionCode 1
versionName "1.0"
flavorDimensions "default"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
productFlavors {
//开发环境
dev {
}
sit {
}
pro {
}
}
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
}
component_camera/proguard-rules.pro 0 → 100644
View file @ fa2aeac0
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
component_camera/src/main/AndroidManifest.xml 0 → 100644
View file @ fa2aeac0
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.xxfc.component.camera" />
component_camera/src/main/res/drawable/btn_record_play.xml 0 → 100644
View file @ fa2aeac0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@drawable/btn_record_play_n"/>
<item android:state_pressed="true" android:drawable="@drawable/btn_record_play_p"/>
</selector>
\ No newline at end of file
component_camera/src/main/res/layout/activity_video_record.xml 0 → 100644
View file @ fa2aeac0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#000000">
<SurfaceView
android:id="@+id/mSurfaceview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<Button
android:id="@+id/mBtnPlay"
android:layout_width="70dp"
android:layout_height="70dp"
android:visibility="invisible"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:background="@drawable/btn_record_play"
app:layout_constraintBottom_toBottomOf="@+id/mSurfaceview"
app:layout_constraintEnd_toEndOf="@+id/mSurfaceview"
app:layout_constraintStart_toStartOf="@+id/mSurfaceview"
app:layout_constraintTop_toTopOf="@+id/mSurfaceview" />
<LinearLayout
android:id="@+id/mLlRecordBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical"
android:layout_marginBottom="80dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<TextView
android:id="@+id/mTvRecordTip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:text=""
android:textColor="#ffffffff"
android:textSize="13sp" />
<Button
android:id="@+id/mBtnRecord"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
/>
<!--android:background="@drawable/btn_video_record"-->
</LinearLayout>
<!--<me.zhanghai.android.materialprogressbar.MaterialProgressBar-->
<!--android:id="@+id/mProgress"-->
<!--android:layout_width="92dp"-->
<!--android:layout_height="92dp"-->
<!--android:layout_gravity="start|bottom"-->
<!--android:indeterminate="false"-->
<!--style="@style/Widget.MaterialProgressBar.ProgressBar.Small.NoPadding"-->
<!--android:layout_marginBottom="74dp"-->
<!--app:layout_constraintBottom_toBottomOf="parent"-->
<!--app:layout_constraintEnd_toEndOf="parent"-->
<!--app:layout_constraintStart_toStartOf="parent"-->
<!--android:visibility="invisible"/>-->
<LinearLayout
android:id="@+id/mLlRecordOp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"
android:gravity="center"
android:orientation="horizontal"
android:layout_marginBottom="80dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<Button
android:id="@+id/mBtnCancle"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginRight="60dp"
android:background="@drawable/btn_record_cancle"/>
<Button
android:id="@+id/mBtnSubmit"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginLeft="60dp"
android:background="@drawable/btn_record_sumbit"/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
component_camera/src/main/res/values/strings.xml 0 → 100644
View file @ fa2aeac0
<resources>
<string name="app_name">component_camera</string>
</resources>
component_camera/src/main/res/xml/paths.xml 0 → 100644
View file @ fa2aeac0
<?xml version="1.0" encoding="utf-8"?>
<paths>
<external-path
name="external_storage_root"
path="." />
<cache-path
name = "cache_root"
path = "."/>
</paths>
\ No newline at end of file
module_discovery/build.gradle
View file @ fa2aeac0
apply plugin: 'com.android.library'
apply plugin: 'com.jakewharton.butterknife'
android {
compileSdkVersion 28
......@@ -64,6 +65,5 @@ dependencies {
api project(':component_control')
api project(':plugin_imcamera')
api project(':plugin_video')
// implementation project(':component_camera')
}
module_discovery/src/main/java/com/xxfc/discovery/DiscoveryFragment.java
View file @ fa2aeac0
......@@ -202,7 +202,6 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
if (id == R.id.iv_discovery_content_add) {
//添加
showPopupWindow(ivDiscoveryContentAdd);
//判断是否已经登录
// if (TextUtils.isEmpty(OkGoUtil.getToken())) {
// ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
......
module_discovery/src/main/java/com/xxfc/discovery/other/SendVideoActivity.java
View file @ fa2aeac0
......@@ -3,8 +3,10 @@ package com.xxfc.discovery.other;
import android.Manifest;
import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.MediaStore;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
......
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ fa2aeac0
......@@ -147,4 +147,9 @@ public class ApiConfig {
* 获取新的token
*/
public static String HTTP_URL_GET_TOKEN_REFRESH = RvFrameConfig.HOST + "/api/auth/jwt/refresh";
/**
* 订单详情
*/
public static String HTTP_URL_PRICE_BASEORDER = RvFrameConfig.HOST + "/api/order/baseOrder/";
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/AllOrderFragment.java
View file @ fa2aeac0
......@@ -92,11 +92,11 @@ 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), 1);
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo()), 1);
} else if (2 == dataBean.getType()) {
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo()), 2);
} else if (3 == dataBean.getType()) {
startActivityForResult(MemberOrderDetailsActivity.getIntent(_mActivity, dataBean),3);
startActivityForResult(MemberOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo()),3);
}
}
});
......@@ -120,16 +120,16 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
break;
case 4:
if (id == R.id.tv_process) {
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity, dataBean));
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity,dataBean.getNo()));
} else if (id == R.id.tv_camp_process) {
startActivity(GetOnTheCarQRCodeActivity.getIntent(_mActivity, dataBean));
startActivity(GetOnTheCarQRCodeActivity.getIntent(_mActivity, dataBean.getNo()));
}
break;
case 5:
if (id == R.id.tv_process) {
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity, dataBean));
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity, dataBean.getNo()));
} else if (id == R.id.tv_camp_process) {
startActivity(GetOnTheCarQRCodeActivity.getIntent(_mActivity, dataBean));
startActivity(GetOnTheCarQRCodeActivity.getIntent(_mActivity, dataBean.getNo()));
}
break;
case 6:
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/CompletedFragment.java
View file @ fa2aeac0
......@@ -77,9 +77,9 @@ public class CompletedFragment extends BaseFragment<CommonPresenter> implements
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
int i = view.getId();
if (i == R.id.tv_process) {
startActivityForResult(EvaluationActivity.getIntent(_mActivity, dataBean), TYPE_REQUEST_EVALUATION);
startActivityForResult(EvaluationActivity.getIntent(_mActivity, dataBean.getNo()), TYPE_REQUEST_EVALUATION);
} else if (i == R.id.tv_camp_process) {
startActivityForResult(EvaluationActivity.getIntent(_mActivity, dataBean), TYPE_REQUEST_EVALUATION);
startActivityForResult(EvaluationActivity.getIntent(_mActivity, dataBean.getNo()), TYPE_REQUEST_EVALUATION);
}
}
});
......@@ -89,11 +89,11 @@ public class CompletedFragment 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), 1);
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo()), 1);
} else if (2 == dataBean.getType()) {
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo()), 2);
} else if (3 == dataBean.getType()) {
startActivity(MemberOrderDetailsActivity.getIntent(_mActivity, dataBean));
startActivity(MemberOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo()));
}
}
});
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/EvaluationActivity.java
View file @ fa2aeac0
......@@ -32,6 +32,7 @@ import com.rv.component.dialog.PickerDialog;
import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
import com.rv.home.rv.module.ui.main.home.bean.ImageUploadBean;
import com.rv.home.rv.module.ui.main.home.order.adapter.EvaluationAdapter;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderDetailBean;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
import com.rv.home.rv.module.ui.main.home.order.bean.ScoreBean;
import com.yuyife.okgo.OkGoUtil;
......@@ -84,20 +85,31 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
private EvaluationAdapter mAdapter;
private List<String> listImg;
private OrderListBean.DataBeanX.DataBean dataBean;
private OrderDetailBean.DataBeanX dataBean;
private String mark1;
private String mark2;
private String mark3;
public static Intent getIntent(Context context, OrderListBean.DataBeanX.DataBean dataBean) {
private String no;
public static Intent getIntent(Context context, String no) {
return new Intent(context, EvaluationActivity.class)
.putExtra("dataBean", dataBean);
.putExtra("no", no);
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
loadDetailData();
}
private void loadDetailData() {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null) {
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 1, ApiConfig.HTTP_URL_PRICE_BASEORDER + no, OrderDetailBean.class, headMap, false);
}
}
@Override
......@@ -108,32 +120,9 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle(getString(R.string.rv_to_appointment_evaluation));
dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
// dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
no = intent.getStringExtra("no");
if (dataBean != null) {
tvName.setText(dataBean.getName());
String icon ="";
if (!TextUtils.isEmpty(dataBean.getCoverPic())){
icon = dataBean.getCoverPic();
}else {
icon = dataBean.getIcon();
}
GlideManager.getInstance(mActivity).loadImage(icon, ivCar);
if (dataBean.getType() == 1) {
if (dataBean.getOrderRentVehicleDetail() != null && !TextUtils.isEmpty(dataBean.getOrderRentVehicleDetail().getCost_detail())) {
tvContent.setText("");
}
} else if (dataBean.getType() == 2) {
if (dataBean.getOrderTourDetail() != null && !TextUtils.isEmpty(dataBean.getOrderTourDetail().getCostDetail())) {
// tvContent.setText(dataBean.getOrderTourDetail().getCostDetail());
tvContent.setText("");
}
} else if (dataBean.getType() == 3) {
if (dataBean.getOrderMemberDetail() != null) {
tvContent.setText("永久" + (dataBean.getOrderMemberDetail().getRebate() / 10) + "折租车, 免费用车" + dataBean.getOrderMemberDetail().getRentFreeNum() + "天");
}
}
}
intiEt();
listImg = new ArrayList<>();
mAdapter = new EvaluationAdapter();
......@@ -208,6 +197,38 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
showToast("评价成功！");
finish();
break;
case 1:
setOrderDetail((OrderDetailBean) result);
break;
}
}
private void setOrderDetail(OrderDetailBean result) {
dataBean = result.getData();
if (dataBean != null) {
tvName.setText(dataBean.getName());
String icon ="";
if (!TextUtils.isEmpty(dataBean.getCoverPic())){
icon = dataBean.getCoverPic();
}else {
icon = dataBean.getIcon();
}
GlideManager.getInstance(mActivity).loadImage(icon, ivCar);
if (dataBean.getType() == 1) {
if (dataBean.getOrderRentVehicleDetail() != null && !TextUtils.isEmpty(dataBean.getOrderRentVehicleDetail().getCostDetail())) {
tvContent.setText("");
}
} else if (dataBean.getType() == 2) {
if (dataBean.getOrderTourDetail() != null && !TextUtils.isEmpty(dataBean.getOrderTourDetail().getCostDetail())) {
// tvContent.setText(dataBean.getOrderTourDetail().getCostDetail());
tvContent.setText("");
}
} else if (dataBean.getType() == 3) {
if (dataBean.getOrderMemberDetail() != null) {
tvContent.setText("永久" + (dataBean.getOrderMemberDetail().getRebate() / 10) + "折租车, 免费用车" + dataBean.getOrderMemberDetail().getRentFreeNum() + "天");
}
}
}
}
......@@ -276,12 +297,12 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
scores.add(scoreBean3);
String id = null;
if (1 == dataBean.getType()) {
OrderListBean.DataBeanX.DataBean.OrderRentVehicleDetail orderRentVehicleDetail = dataBean.getOrderRentVehicleDetail();
OrderDetailBean.DataBeanX.OrderRentVehicleDetail orderRentVehicleDetail = dataBean.getOrderRentVehicleDetail();
if (orderRentVehicleDetail != null) {
id = String.valueOf(orderRentVehicleDetail.getId());
}
} else if (2 == dataBean.getType()) {
OrderListBean.DataBeanX.DataBean.OrderTourDetail orderTourDetail = dataBean.getOrderTourDetail();
OrderDetailBean.DataBeanX.OrderTourDetail orderTourDetail = dataBean.getOrderTourDetail();
if (orderTourDetail != null) {
id = orderTourDetail.getId();
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @ fa2aeac0
......@@ -110,11 +110,11 @@ 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), 1);
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo()), 1);
} else if (2 == dataBean.getType()) {
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo()), 2);
} else if (3 == dataBean.getType()) {
startActivityForResult(MemberOrderDetailsActivity.getIntent(_mActivity, dataBean), 3);
startActivityForResult(MemberOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo()), 3);
}
}
});
......@@ -155,10 +155,10 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
mAdapter.notifyDataSetChanged();
}
}
if (mListener != null && payBean !=null) {
if (payBean.getType() ==3){ //订单类型 1–租车；2–旅游 3-会员
if (mListener != null && payBean != null) {
if (payBean.getType() == 3) { //订单类型 1–租车；2–旅游 3-会员
mListener.switchTab(3);
}else {
} else {
mListener.switchTab(1);
}
}
......@@ -315,7 +315,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
headMap.put("Authorization", OkGoUtil.getToken());
if (payType == 1) {
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 1, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderPayBean.class, new payBody(orderNo, payType, 1), headMap, true);
}else {
} else {
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 2, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderAliPayBean.class, new payBody(orderNo, payType, 1), headMap, true);
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/GetOnTheCarQRCodeActivity.java
View file @ fa2aeac0
......@@ -11,6 +11,7 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.frame.rv.config.RvFrameConfig;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.WriterException;
......@@ -27,9 +28,13 @@ import com.rv.component.utils.ZxingUtils;
import com.rv.home.R;
import com.rv.home.R2;
import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderDetailBean;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
import com.yuyife.okgo.OkGoUtil;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
......@@ -59,12 +64,13 @@ public class GetOnTheCarQRCodeActivity extends BaseStatusActivity<PickerPresente
@BindView(R2.id.tv_get_address)
TextView tvGetAddress;
private String no;
private OrderListBean.DataBeanX.DataBean dataBean;
private OrderDetailBean.DataBeanX dataBean;
public static Intent getIntent(Context context, OrderListBean.DataBeanX.DataBean dataBean) {
public static Intent getIntent(Context context, String no) {
return new Intent(context, GetOnTheCarQRCodeActivity.class)
.putExtra("dataBean", dataBean);
.putExtra("no", no);
}
@Override
......@@ -77,11 +83,41 @@ public class GetOnTheCarQRCodeActivity extends BaseStatusActivity<PickerPresente
showTitle(false);
dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
// dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
no = intent.getStringExtra("no");
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
loadDetailData();
}
private void loadDetailData() {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null) {
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 1, ApiConfig.HTTP_URL_PRICE_BASEORDER + no, OrderDetailBean.class, headMap, false);
}
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType){
case 1:
setData((OrderDetailBean)result);
break;
}
}
private void setData(OrderDetailBean result) {
dataBean = result.getData();
if (dataBean != null) {
tvCarType.setText(dataBean.getName());
OrderListBean.DataBeanX.DataBean.OrderTourDetail detail = dataBean.getOrderTourDetail();
OrderDetailBean.DataBeanX.OrderTourDetail detail = dataBean.getOrderTourDetail();
if (detail != null) {
tvGetTime.setText(TimeManager.stampToDate(String.valueOf(detail.getStartTime())) + "-" + TimeManager.stampToDate(String.valueOf(detail.getEndTime())));
tvGetAddress.setText(detail.getStartAddr());
......@@ -96,11 +132,6 @@ public class GetOnTheCarQRCodeActivity extends BaseStatusActivity<PickerPresente
}
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
@OnClick({R2.id.iv_back, R2.id.iv_customer_service})
public void onViewClicked(View view) {
int id = view.getId();
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/HaveToTravelFragment.java
View file @ fa2aeac0
......@@ -74,9 +74,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), 1);
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo()), 1);
}else if (2== dataBean.getType()){
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo()), 2);
}
}
});
......@@ -87,7 +87,7 @@ public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implement
int id = view.getId();
if (id == R.id.tv_process){
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity,dataBean));
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity,dataBean.getNo()));
}
}
});
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/MemberOrderDetailsActivity.java
View file @ fa2aeac0
......@@ -32,6 +32,7 @@ import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
import com.rv.home.rv.module.ui.main.home.bean.OrderPayBean;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderDetailBean;
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;
......@@ -71,12 +72,12 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
private String no;
private IWXAPI api;
private double orderAmount;
private OrderListBean.DataBeanX.DataBean dataBean;
private OrderDetailBean.DataBeanX dataBean;
public static Intent getIntent(Context context, OrderListBean.DataBeanX.DataBean dataBean) {
public static Intent getIntent(Context context, String no) {
return new Intent(context, MemberOrderDetailsActivity.class)
.putExtra("dataBean", dataBean);
.putExtra("no", no);
}
@Override
protected int setLayout() {
......@@ -88,6 +89,20 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
super.onStart();
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
loadDetailData();
}
private void loadDetailData() {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null) {
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 1, ApiConfig.HTTP_URL_PRICE_BASEORDER + no, OrderDetailBean.class, headMap, false);
}
}
@Override
public void onResume() {
super.onResume();
......@@ -131,10 +146,30 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
showTitle(false);
initRxBus();
api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
no = intent.getStringExtra("no");
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;
case 1:
setData((OrderDetailBean)result);
break;
}
}
private void setData(OrderDetailBean result) {
dataBean = result.getData();
if (dataBean != null) {
status = dataBean.getStatusX();
no = dataBean.getNo();
status = dataBean.getStatus();
orderAmount = dataBean.getOrderAmount();
}
/**
......@@ -165,19 +200,6 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
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;
......@@ -243,7 +265,7 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
payShowSelect(no, orderAmount);
break;
case 6:
startActivityForResult(EvaluationActivity.getIntent(mActivity, dataBean), TYPE_REQUEST_EVALUATION);
startActivityForResult(EvaluationActivity.getIntent(mActivity, dataBean.getNo()), TYPE_REQUEST_EVALUATION);
break;
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java
View file @ fa2aeac0
......@@ -44,6 +44,8 @@ import com.rv.home.rv.module.basic.WebActivity;
import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
import com.rv.home.rv.module.ui.main.home.bean.OrderAliPayBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderPayBean;
import com.rv.home.rv.module.ui.main.home.order.bean.CancelTheTripDataBean;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderDetailBean;
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;
......@@ -98,11 +100,12 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
private final int TYPE_REQUEST_EVALUATION = 1;
private IWXAPI api;
private double orderAmount;
private OrderListBean.DataBeanX.DataBean dataBean;
// private OrderListBean.DataBeanX.DataBean dataBean;
private OrderDetailBean.DataBeanX dataBean;
public static Intent getIntent(Context context, OrderListBean.DataBeanX.DataBean dataBean) {
public static Intent getIntent(Context context, String no) {
return new Intent(context, OrderDetailActivity.class)
.putExtra("dataBean", dataBean);
.putExtra("no", no);
}
@Override
......@@ -110,6 +113,19 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
return R.layout.activity_order_to_travel;
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
loadDetailData();
}
private void loadDetailData() {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null) {
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 2, ApiConfig.HTTP_URL_PRICE_BASEORDER + no, OrderDetailBean.class, headMap, false);
}
}
@Override
protected void onStart() {
......@@ -156,10 +172,30 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
showTitle(false);
initRxBus();
api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
no = intent.getStringExtra("no");
webUrl = ApiConfig.HTTP_URL_CAR_TYPE_ORDERDETAIL + "?orderId=" + this.no;
initWeb();
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
case 0:
pay((OrderPayBean) result);
break;
case 1:
aliPayData((OrderAliPayBean) result);
break;
case 2:
setDetailData((OrderDetailBean) result);
break;
}
}
private void setDetailData(OrderDetailBean result) {
dataBean = result.getData();
if (dataBean != null) {
status = dataBean.getStatusX();
no = dataBean.getNo();
status = dataBean.getStatus();
orderAmount = dataBean.getRealAmount();
}
......@@ -190,22 +226,6 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
llItemBottom.setVisibility(View.GONE);
break;
}
webUrl = ApiConfig.HTTP_URL_CAR_TYPE_ORDERDETAIL + "?orderId=" + no;
initWeb();
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
case 0:
pay((OrderPayBean) result);
break;
case 1:
aliPayData((OrderAliPayBean) result);
break;
}
}
......@@ -275,14 +295,14 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
payShowSelect(no, orderAmount);
break;
case 4:
startActivity(PickUpTheCarQRCodeActivity.getIntent(mActivity, dataBean));
startActivity(PickUpTheCarQRCodeActivity.getIntent(mActivity, dataBean.getNo()));
break;
case 5:
startActivity(PickUpTheCarQRCodeActivity.getIntent(mActivity, dataBean));
startActivity(PickUpTheCarQRCodeActivity.getIntent(mActivity, dataBean.getNo()));
break;
case 6:
case -1:
startActivityForResult(EvaluationActivity.getIntent(mActivity, dataBean), TYPE_REQUEST_EVALUATION);
startActivityForResult(EvaluationActivity.getIntent(mActivity, no), TYPE_REQUEST_EVALUATION);
break;
}
}
......@@ -291,7 +311,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
switch (status) {
case 3:
case 4:
startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no,"8"), 1);
startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no, "8"), 1);
break;
case 5:
Intent intent = new Intent(Intent.ACTION_DIAL);
......@@ -301,7 +321,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
break;
case 6:
case -1:
startActivity(DepositefundProgressDetailsActivity.getIntent(mActivity,no));
startActivity(DepositefundProgressDetailsActivity.getIntent(mActivity, no));
break;
}
}
......@@ -348,7 +368,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
headMap.put("Authorization", OkGoUtil.getToken());
if (payType == 1) {
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderPayBean.class, new payBody(orderNo, payType, 1), headMap, true);
}else {
} else {
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 1, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderAliPayBean.class, new payBody(orderNo, payType, 1), headMap, true);
}
}
......@@ -357,7 +377,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
ButterKnife.bind(this);
}
......@@ -518,10 +538,9 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
mWebView.setWebChromeClient(new WebChromeClient() {
@Override
public void onProgressChanged(WebView view, int newProgress) {
if(newProgress==100){
if (newProgress == 100) {
pbProgress.setVisibility(View.GONE);//加载完网页进度条消失
}
else{
} else {
pbProgress.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
pbProgress.setProgress(newProgress);//设置进度值
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/PickUpTheCarQRCodeActivity.java
View file @ fa2aeac0
......@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.util.TimeManager;
......@@ -22,7 +23,13 @@ import com.rv.component.utils.ZxingUtils;
import com.rv.home.R;
import com.rv.home.R2;
import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderDetailBean;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
import com.yuyife.okgo.OkGoUtil;
import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
......@@ -58,12 +65,12 @@ public class PickUpTheCarQRCodeActivity extends BaseStatusActivity<PickerPresent
@BindView(R2.id.iv_zxing)
ImageView ivZxing;
private OrderListBean.DataBeanX.DataBean dataBean;
private OrderDetailBean.DataBeanX dataBean;
private String no;
public static Intent getIntent(Context context, OrderListBean.DataBeanX.DataBean dataBean) {
public static Intent getIntent(Context context, String no) {
return new Intent(context, PickUpTheCarQRCodeActivity.class)
.putExtra("dataBean", dataBean);
.putExtra("no", no);
}
@Override
......@@ -71,24 +78,50 @@ public class PickUpTheCarQRCodeActivity extends BaseStatusActivity<PickerPresent
return R.layout.activity_pick_up_the_car_qrcode;
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
loadDetailData();
}
private void loadDetailData() {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null) {
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 1, ApiConfig.HTTP_URL_PRICE_BASEORDER + no, OrderDetailBean.class, headMap, false);
}
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
no = intent.getStringExtra("no");
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType){
case 1:
setData((OrderDetailBean)result);
break;
}
}
private void setData(OrderDetailBean result) {
dataBean = result.getData();
if (dataBean != null) {
if (4 == dataBean.getStatusX()) {
if (4 == dataBean.getStatus()) {
tvCenter.setText("出示取车二维码");
} else if (5 == dataBean.getStatusX()) {
} else if (5 == dataBean.getStatus()) {
tvCenter.setText("出示还车二维码");
}
tvCarType.setText(dataBean.getName());
OrderListBean.DataBeanX.DataBean.OrderRentVehicleDetail detail = dataBean.getOrderRentVehicleDetail();
OrderDetailBean.DataBeanX.OrderRentVehicleDetail detail = dataBean.getOrderRentVehicleDetail();
if (detail != null) {
tvGetAddress.setText(detail.getStart_addr());
tvGetTime.setText(TimeManager.stampToDate(String.valueOf(detail.getStart_time())));
tvOutAddress.setText(detail.getEnd_addr());
tvOutTime.setText(TimeManager.stampToDate(String.valueOf(detail.getEnd_time())));
tvGetAddress.setText(detail.getStartAddr());
tvGetTime.setText(TimeManager.stampToDate(String.valueOf(detail.getStartTime())));
tvOutAddress.setText(detail.getEndAddr());
tvOutTime.setText(TimeManager.stampToDate(String.valueOf(detail.getEndTime())));
tvPrice.setText(String.format("¥%1$s", dataBean.getRealAmount()));
String icon = "";
......@@ -106,17 +139,6 @@ public class PickUpTheCarQRCodeActivity extends BaseStatusActivity<PickerPresent
}
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
@OnClick({R2.id.iv_back, R2.id.iv_customer_service})
public void onViewClicked(View view) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ToTravelFragment.java
View file @ fa2aeac0
......@@ -77,9 +77,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), 1);
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo()), 1);
} else if (2 == dataBean.getType()) {
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo()), 2);
}
}
});
......@@ -90,10 +90,10 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
int id = view.getId();
if (id == R.id.tv_process) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity, dataBean));
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity, dataBean.getNo()));
} else if (id == R.id.tv_camp_process) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(GetOnTheCarQRCodeActivity.getIntent(_mActivity, dataBean));
startActivity(GetOnTheCarQRCodeActivity.getIntent(_mActivity, dataBean.getNo()));
}
}
});
......@@ -116,7 +116,6 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
});
RxBus.tObservable(PaymentSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<PaymentSuccessfulEvent>(disposable) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java
View file @ fa2aeac0
......@@ -42,6 +42,7 @@ import com.rv.home.rv.module.basic.WebActivity;
import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
import com.rv.home.rv.module.ui.main.home.bean.OrderAliPayBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderPayBean;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderDetailBean;
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;
......@@ -81,13 +82,13 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
private String no;
private IWXAPI api;
private double orderAmount;
private OrderListBean.DataBeanX.DataBean dataBean;
private OrderDetailBean.DataBeanX dataBean;
private int payType = 1;//选择支付类型
public static Intent getIntent(Context context, OrderListBean.DataBeanX.DataBean dataBean) {
public static Intent getIntent(Context context, String no) {
return new Intent(context, TravelOrderDetailsActivity.class)
.putExtra("dataBean", dataBean);
.putExtra("no", no);
}
@Override
......@@ -100,6 +101,20 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
super.onStart();
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
loadDetailData();
}
private void loadDetailData() {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null) {
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 2, ApiConfig.HTTP_URL_PRICE_BASEORDER + no, OrderDetailBean.class, headMap, false);
}
}
@Override
public void onResume() {
super.onResume();
......@@ -135,11 +150,34 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
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.getRealAmount();
no = intent.getStringExtra("no");
webUrl = ApiConfig.HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL + "?no=" + this.no;
initWeb();
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
case 0:
pay((OrderPayBean) result);
break;
case 1:
aliPayData((OrderAliPayBean) result);
break;
case 2:
setDetailsData((OrderDetailBean) result);
break;
}
}
private void setDetailsData(OrderDetailBean result) {
dataBean = result.getData();
if (this.dataBean != null) {
status = this.dataBean.getStatus();
orderAmount = this.dataBean.getRealAmount();
}
/**
*
......@@ -179,22 +217,6 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
llItemBottom.setVisibility(View.GONE);
break;
}
webUrl = ApiConfig.HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL + "?no=" + no;
initWeb();
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
case 0:
pay((OrderPayBean) result);
break;
case 1:
aliPayData((OrderAliPayBean) result);
break;
}
}
......@@ -251,12 +273,12 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
payShowSelect(no, orderAmount);
break;
case 4:
startActivity(GetOnTheCarQRCodeActivity.getIntent(mActivity, dataBean));
startActivity(GetOnTheCarQRCodeActivity.getIntent(mActivity, dataBean.getNo()));
break;
case 5:
break;
case 6:
startActivityForResult(EvaluationActivity.getIntent(mActivity, dataBean), TYPE_REQUEST_EVALUATION);
startActivityForResult(EvaluationActivity.getIntent(mActivity, dataBean.getNo()), TYPE_REQUEST_EVALUATION);
break;
}
}
......@@ -265,7 +287,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
switch (status) {
case 3:
case 4:
startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no,"3"), 1);
startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no, "3"), 1);
break;
case 5:
break;
......@@ -317,7 +339,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
headMap.put("Authorization", OkGoUtil.getToken());
if (payType == 1) {
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderPayBean.class, new payBody(orderNo, payType, 1), headMap, true);
}else {
} else {
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 1, ApiConfig.HTTP_URL_PAY_THE_CALLBACK, OrderAliPayBean.class, new payBody(orderNo, payType, 1), headMap, true);
}
}
......
plugin_member/src/main/java/com/rv.member/ConsumeRecordActivity.java
View file @ fa2aeac0
......@@ -112,7 +112,7 @@ public class ConsumeRecordActivity extends BaseStatusActivity<CommonPresenter> i
@Override
public void click(OrderListBean.DataBeanX.DataBean bean) {
if (bean != null) {
startActivity(OrderDetailActivity.getIntent(ConsumeRecordActivity.this, bean));
startActivity(OrderDetailActivity.getIntent(ConsumeRecordActivity.this, bean.getNo()));
}
}
};
......
plugin_member/src/main/java/com/rv.member/PurchaseRecordActivity.java
View file @ fa2aeac0
......@@ -58,7 +58,7 @@ public class PurchaseRecordActivity extends BaseStatusActivity<CommonPresenter>
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(MemberOrderDetailsActivity.getIntent(PurchaseRecordActivity.this, dataBean));
startActivity(MemberOrderDetailsActivity.getIntent(PurchaseRecordActivity.this, dataBean.getNo()));
}
});
}
......
plugin_member/src/main/java/com/rv.member/fragment/UserDetailFragment.java
View file @ fa2aeac0
......@@ -125,7 +125,7 @@ public class UserDetailFragment extends BaseFragment<CommonPresenter> implements
@Override
public void click(OrderListBean.DataBeanX.DataBean bean) {
if (bean != null) {
startActivity(OrderDetailActivity.getIntent(getContext(), bean));
startActivity(OrderDetailActivity.getIntent(getContext(), bean.getNo()));
}
}
};
......
plugin_video/build.gradle
View file @ fa2aeac0
apply plugin: 'com.android.library'
android {
compileSdkVersion 28
......
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