Commit d91455b6 authored by jianglx's avatar jianglx

添加 点击订单详情内的再看看按钮的跳转

parent f02312c2
......@@ -229,6 +229,13 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
if (intent != null && "use_member".equals(intent.getStringExtra("from"))) {
setCurrent(TYPE_HOME_PAGE);
}
if (intent != null && "traveldetail".equals(intent.getStringExtra("from"))) {
setCurrent(TYPE_TRAVEL);
}
if (intent != null && "orderdetail".equals(intent.getStringExtra("from"))) {
setCurrent(TYPE_HOME_PAGE);
}
}
/****
......
package com.rv.home.rv.module.ui.main.home.order;
import android.annotation.SuppressLint;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
......@@ -437,6 +438,12 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
@JavascriptInterface
public void showMore() {
ComponentName cmn = new ComponentName(getApplicationContext(), "com.rv.member.MemberCenterActivity");
Intent intent = new Intent();
intent.setComponent(cmn);
startActivity(intent);
finish();
}
}
}
......@@ -3,6 +3,7 @@ package com.rv.home.rv.module.ui.main.home.order;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.ClipboardManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
......@@ -475,7 +476,12 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
@JavascriptInterface
public void showMore() {
// ARouter.getInstance().build().navigation();
ComponentName cmn = new ComponentName(getApplicationContext(), "com.xxfc.rv.MainActivity");
Intent intent = new Intent();
intent.putExtra("from", "orderdetail");
intent.setComponent(cmn);
startActivity(intent);
finish();
}
}
}
......@@ -2,6 +2,7 @@ package com.rv.home.rv.module.ui.main.home.order;
import android.annotation.SuppressLint;
import android.content.ClipboardManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
......@@ -126,13 +127,13 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
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();
}
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)
......@@ -240,12 +241,12 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
payShowSelect(no, orderAmount);
break;
case 4:
startActivity(GetOnTheCarQRCodeActivity.getIntent(mActivity,dataBean));
startActivity(GetOnTheCarQRCodeActivity.getIntent(mActivity, dataBean));
break;
case 5:
break;
case 6:
startActivityForResult(EvaluationActivity.getIntent(mActivity,dataBean), TYPE_REQUEST_EVALUATION);
startActivityForResult(EvaluationActivity.getIntent(mActivity, dataBean), TYPE_REQUEST_EVALUATION);
break;
}
}
......@@ -408,10 +409,9 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
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);//设置进度值
}
......@@ -444,7 +444,12 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
@JavascriptInterface
public void showMore() {
ComponentName cmn = new ComponentName(getApplicationContext(), "com.xxfc.rv.MainActivity");
Intent intent = new Intent();
intent.putExtra("from", "traveldetail");
intent.setComponent(cmn);
startActivity(intent);
finish();
}
}
}
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