Skip to content

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

修改路径，修改旅游banner跳转到旅游详情；修改首页取还车字样显示

parent 0d3bbe67
Show whitespace changes
Inline Side-by-side
Showing with 215 additions and 75 deletions
RvClient/build.gradle
View file @ dc8cf5bd
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 129
versionName "1.2.9"
versionCode 132
versionName "1.3.2"
multiDexEnabled true
//新版Gradle 是 implementation 为了兼容compile,写上这句话
......
RvFrame/src/main/java/com/frame/rv/config/RvFrameConfig.java
View file @ dc8cf5bd
......@@ -8,11 +8,13 @@ package com.frame.rv.config;
*/
public interface RvFrameConfig extends RvFrameConstant {
// String HOST = "https://xxtest.upyuns.com";
// String HOST = "https://xxtest.upyuns.com";
// String HOST = "http://10.1.37.192:8765";
// String HOST = "http://10.1.37.245:10000";
// String HOST = "https://dev.dfangche.com";
String HOST = "https://api.dfangche.com";
// String HOST = "https://api.dfangche.com";
String HOST = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = "https://mgmt.dfangche.com";
String ADMIN_POST = HOST + "/api/admin/";
String AUTH_POST = HOST + "/api/auth/";
String VEHICLE_POST = HOST + "/vehicle/";//租车
......
module_camp/src/main/java/com/rv/camp/api/CampApi.java
View file @ dc8cf5bd
......@@ -10,7 +10,7 @@ public interface CampApi extends RvFrameConfig {
String TRAVEL_CAMPSITETAG = HOST + "/api/campsite/campsiteTag/app/unauth/tags";
//营地详情H5
String TRAVEL_CAMPSITEDETAI = HOST + "/h5/appHtml/view/campsiteDetail.html";
String TRAVEL_CAMPSITEDETAI = HOST_H5_DETAIL + "/h5/appHtml/view/campsiteDetail.html";
//营地详情
String TRAVEL_UNAUTH_SHOP = HOST + "/api/campsite/campsiteShop/app/unauth/shop";
......
module_discovery/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java
View file @ dc8cf5bd
......@@ -17,10 +17,10 @@ public interface DiscoveryApi extends RvFrameConfig {
String DISCOVERY_UNAUTH_LIST = HOST + "/api/im/msg/app/unauth/list";
//问答详情
String DISCOVERY_FQUESTION = HOST + "/h5/appHtml/view/FQuestion.html";
String DISCOVERY_FQUESTION = HOST_H5_DETAIL + "/h5/appHtml/view/FQuestion.html";
//拍拍详情
String DISCOVERY_FINDDETAILS = HOST + "/h5/appHtml/view/findDetails.html";
String DISCOVERY_FINDDETAILS = HOST_H5_DETAIL + "/h5/appHtml/view/findDetails.html";
// 问答评论
String DISCOVERY_IMCOMMENT_ADD = HOST + "/api/im/imComment/add";
......
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ dc8cf5bd
......@@ -37,19 +37,19 @@ public class ApiConfig {
public static String HTTP_URL_WEIXIN_PAY = RvFrameConfig.VEHICLE_UPLOAD + "pay/app/wx";//微信支付
public static String HTTP_URL_ORDER_LIST = RvFrameConfig.VEHICLE_ORDER + "baseOrder/page";//订单列表
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_CAR_TYPE_DETAIL = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/detail.html";//租车类型详情页
public static String HTTP_URL_CAR_TYPE_ORDERDETAIL = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/orderDetail.html";//订单详情页
public static String HTTP_URL_VIP_ORDERDETAIL = RvFrameConfig.HOST_H5_DETAIL + "/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";//费用明细
public static String HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/travelOrderDetail.html";//旅游订单详情页
public static String HTTP_URL_CAR_TYPE_COSTDETAIL = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/costDetail.html";//费用明细
public static String HTTP_URL_APP_USER_INFO = RvFrameConfig.ADMIN_POST + "app/user/info";//获取用户信息
public static String HTTP_URL_CERTIFICATE = RvFrameConfig.VEHICLE_UPLOAD + "certif/app/certificate";//实名认证
public static String HTTP_URL_UPUSER_EDIT = RvFrameConfig.ADMIN_POST + "app/user/edit";//更新用户信息
public static String HTTP_URL_GETTOURUSERLIST = RvFrameConfig.VEHICLE_TOURUSER + "tourUser/app/unauth/getTourUserList";//获得全部出游人信息
public static String HTTP_URL_DELETEDRIVER = RvFrameConfig.VEHICLE_TOURUSER + "tourUser/app/del"; // 删除出游人
public static String HTTP_URL_ADDANDUPDATE = RvFrameConfig.VEHICLE_TOURUSER + "tourUser/app/addAndUpdate";//添加和更新出游人信息
public static String HTTP_URL_CAR_TYPE_NOTICE = RvFrameConfig.HOST + "/h5/appHtml/view/notice.html";//预定须知
public static String HTTP_URL_CAR_TYPE_NOTICE = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/notice.html";//预定须知
public static String HTTP_URL_COLLECTONLIST = RvFrameConfig.ADMIN_POST + "app/user/collect/page";//我的收藏列表
......@@ -118,8 +118,8 @@ public class ApiConfig {
public static String HTTP_URL_UNAUTH_TYPEITEMS = RvFrameConfig.HOST + "/vehicle/accompanyingItem/app/unauth/type_items";
//随车物品说明
public static String HTTP_URL_WEBVIEW_CARGOODS = RvFrameConfig.HOST + "/h5/appHtml/view/carGoods.html";
public static String HTTP_URL_WEBVIEW_CARGOODS = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/carGoods.html";
//押金退还进度
public static String HTTP_URL_WEBVIEW_REFUNDPROGRESS = RvFrameConfig.HOST + "/h5/appHtml/view/refundProgress.html";
public static String HTTP_URL_WEBVIEW_REFUNDPROGRESS = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/refundProgress.html";
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
View file @ dc8cf5bd
......@@ -14,6 +14,7 @@ import android.view.View;
import android.webkit.JavascriptInterface;
import android.webkit.WebChromeClient;
import android.webkit.WebResourceRequest;
import android.webkit.WebResourceResponse;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
......@@ -319,6 +320,12 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
return super.shouldOverrideUrlLoading(view, request);
}
@Override
public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
WebResourceResponse response = super.shouldInterceptRequest(view, request);
return response;
}
});
mWebView.loadUrl(webUrl);
mWebView.setWebChromeClient(new WebChromeClient() {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ dc8cf5bd
......@@ -795,8 +795,18 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
getCompanyId = data.getIntExtra("company_id", 1);
getCityName = requestData;
getCityId = data.getIntExtra("id", 0);
String getAddress = "%s(%s)";
headTvGetShop.setText(String.format(getAddress, new Object[]{getCompanyName, getCityName}));
StringBuffer buffer = new StringBuffer();
if (!TextUtils.isEmpty(getCompanyName)) {
buffer.append(getCompanyName);
}
if (!TextUtils.isEmpty(getCityName)) {
buffer.append("(").append(getCityName).append(")");
}
if (buffer.length() > 0) {
headTvGetShop.setText(buffer.toString());
} else {
headTvGetShop.setText("");
}
getLatitude = data.getDoubleExtra("latitude", 0);
getLongitude = data.getDoubleExtra("longitude", 0);
setRequestData(type, requestData, getLatitude, getLongitude);
......@@ -804,9 +814,18 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
outCompanyName = data.getStringExtra("company");
outCompanyId = data.getIntExtra("company_id", 1);
outCityName = requestData;
outCityId = data.getIntExtra("id", 0);
String outAddress = "%s(%s)";
headTvOutShop.setText(String.format(outAddress, new Object[]{outCompanyName, outCityName}));
StringBuffer buffer = new StringBuffer();
if (!TextUtils.isEmpty(outCompanyName)) {
buffer.append(outCompanyName);
}
if (!TextUtils.isEmpty(outCityName)) {
buffer.append("(").append(outCityName).append(")");
}
if (buffer.length() > 0) {
headTvOutShop.setText(buffer.toString());
} else {
headTvOutShop.setText("");
}
outLatitude = data.getDoubleExtra("latitude", 0);
outLongitude = data.getDoubleExtra("longitude", 0);
setRequestData(type, requestData, outLatitude, outLongitude);
......@@ -945,9 +964,20 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
private void processData(ShopListBean bean) {
if (bean.getData() != null && bean.getData().getTotalCount() > 0) {
if (headTvGetShop != null) {
String getAdress = "%s(%s)";
getCompanyName = bean.getData().getData().get(0).getName();
headTvGetShop.setText(String.format(getAdress, new Object[]{getCompanyName, getCityName}));
StringBuffer buffer = new StringBuffer();
if (!TextUtils.isEmpty(getCompanyName)) {
buffer.append(getCompanyName);
}
if (!TextUtils.isEmpty(getCityName)) {
buffer.append("(").append(getCityName).append(")");
}
if (buffer.length() > 0) {
headTvGetShop.setText(buffer.toString());
} else {
headTvGetShop.setText("");
}
headTvGetShop.setTextColor(_mActivity.getResources().getColor(R.color.colorMain));
getLatitude = bean.getData().getData().get(0).getLatitude();
getLongitude = bean.getData().getData().get(0).getLongitude();
......@@ -955,9 +985,20 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
}
if (headTvOutShop != null) {
String getAdress = "%s(%s)";
outCompanyName = bean.getData().getData().get(0).getName();
headTvOutShop.setText(String.format(getAdress, new Object[]{outCompanyName, outCityName}));
StringBuffer buffer = new StringBuffer();
if (!TextUtils.isEmpty(outCompanyName)) {
buffer.append(outCompanyName);
}
if (!TextUtils.isEmpty(outCityName)) {
buffer.append("(").append(outCityName).append(")");
}
if (buffer.length() > 0) {
headTvOutShop.setText(buffer.toString());
} else {
headTvOutShop.setText("");
}
headTvOutShop.setTextColor(_mActivity.getResources().getColor(R.color.colorMain));
outLatitude = bean.getData().getData().get(0).getLatitude();
outLongitude = bean.getData().getData().get(0).getLongitude();
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ShareImageActivity.java
View file @ dc8cf5bd
......@@ -9,6 +9,7 @@ import android.graphics.Canvas;
import android.graphics.Color;
import android.os.Bundle;
import android.text.Html;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.view.View;
import android.widget.ImageView;
......@@ -88,8 +89,14 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
GlideManager.getInstance(this).loadImage3(icon, ivGoods);
if (!TextUtils.isEmpty(name))
tvName.setText(name);
else
tvName.setText("");
if (!TextUtils.isEmpty(keyword))
tvContent.setText(Html.fromHtml(keyword));
else
tvContent.setText("");
tvPrice.setText(String.format("%1$s%2$s", price, this.getString(R.string.rv_day)));
//生成带中间图标的二维码
......
module_home/src/main/res/layout/fragment_home.xml
View file @ dc8cf5bd
......@@ -154,7 +154,7 @@
android:layout_marginTop="@dimen/size_5"
android:layout_weight="1"
android:gravity="left|center_vertical"
android:hint="@string/rv_get_car_hint"
android:hint="@string/rv_get_out_hint"
android:textColorHint="@color/textMain"
android:textSize="@dimen/text_16" />
......
module_mine/src/main/res/layout/activity_mine.xml
View file @ dc8cf5bd
......@@ -6,8 +6,7 @@
android:background="@color/colorLine"
android:orientation="vertical">
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -266,8 +265,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:clickable="false"
android:gravity="center"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="invisible">
<ImageView
android:layout_width="@dimen/size_25"
......
module_tourism/src/main/java/com/rv/tourism/TourismFragment.java
View file @ dc8cf5bd
......@@ -46,6 +46,7 @@ import com.rv.tourism.api.TourismApi;
import com.rv.tourism.bean.BeanPopularBrigade;
import com.rv.tourism.bean.BeanPopularBrigadeAll;
import com.rv.tourism.bean.BeanTourAround;
import com.rv.tourism.bean.BeanTourDetail;
import com.rv.tourism.bean.BeanTourismBanner;
import com.rv.tourism.other.PopularTourListActivity;
......@@ -298,8 +299,32 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
case 3:
popularBrigadeAll((BeanPopularBrigadeAll) result);
break;
// case 4:
// BeanTourDetail beanTourDetail = (BeanTourDetail) result;
// if (beanTourDetail.getData() != null) {
// perfectTourDetail(beanTourDetail.getData());
// }
// break;
}
}
/******
* 完善banner信息
* @param data
*/
private void perfectTourDetail(BeanTourAround.DataBeanX.DataBean data) {
if (banners != null) {
for (BeanTourismBanner.DataBean bean : banners) {
if (bean.getId() != null && bean.getId().equals(data.getId())) {
bean.setName(data.getName());
bean.setPrice(data.getPrice());
bean.setContent(data.getContent());
break;
}
}
}
}
private void popularBrigadeAll(BeanPopularBrigadeAll data) {
mAllPopularAdapter.getData().clear();
......@@ -337,11 +362,17 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
for (int i = 0; i < data.getData().size(); i++) {
images.add(data.getData().get(i).getCover());
titles.add("");
// getBannerDetail(data.getData().get(i));
}
}
setBanner();
}
// private void getBannerDetail(BeanTourismBanner.DataBean bean) {
// bean.setId(mPresenter.getIdFromUrl(bean.getUrl()));
// mPresenter.getData(4, String.format(TourismApi.TOUR_DETAIL, bean.getId()), BeanTourDetail.class, false);
// }
/**
* 设置轮番图
......@@ -363,22 +394,6 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
public void OnBannerClick(int position) {
BeanTourismBanner.DataBean dataBean = banners.get(position);
mPresenter.toTarget(getActivity(), dataBean.getUrl(), dataBean.getTitle());
// ComponentName componentName = new ComponentName(getActivity(), "com.rv.share.WebViewActivity");
// Intent intent = new Intent();
// intent.setComponent(componentName);
// intent.putExtra("url", dataBean.getUrl());
// intent.putExtra("title", dataBean.getTitle());
// startActivity(intent);
// BeanTourismBanner.DataBean dataBean = banners.get(position);
// ARouter.getInstance()
// .build(Constance.ACTIVITY_URL_TRAVELDETAILS)
// .withString("id", dataBean.getId())
// .withString("name", dataBean.getTitle())
// .withString("content", dataBean.getContent())
// .withString("url", dataBean.getCover())
// .withDouble("price", Double.valueOf(dataBean.getPrice()))
// .navigation();
}
})
.start();
......
module_tourism/src/main/java/com/rv/tourism/api/TourismApi.java
View file @ dc8cf5bd
......@@ -31,8 +31,10 @@ public interface TourismApi extends RvFrameConfig {
//确认订单查询其它信息
String COMMIT_COLLECT_ORDERUNITPRICE = HOST + "/api/order/baseOrder/app/unauth/getOrderUnitPrice";
public static String HTTP_URL_CAR_TYPE_NOTICE = HOST + "/h5/appHtml/view/notice.html";//预定须知
String HTTP_URL_CAR_TYPE_NOTICE = HOST_H5_DETAIL + "/h5/appHtml/view/notice.html";//预定须知
String TRAVEL_DETAILS = HOST + "/h5/appHtml/view/travelDetails.html";
String TRAVEL_DETAILS = HOST_H5_DETAIL + "/h5/appHtml/view/travelDetails.html";
String TOUR_DETAIL = HOST + "/api/tour/tourGood/app/unauth/usable/%s"; // 旅游详情
}
module_tourism/src/main/java/com/rv/tourism/bean/BeanTourDetail.java 0 → 100644
View file @ dc8cf5bd
package com.rv.tourism.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
public class BeanTourDetail extends BaseBean {
private boolean rel;
private BeanTourAround.DataBeanX.DataBean data;
public boolean isRel() {
return rel;
}
public void setRel(boolean rel) {
this.rel = rel;
}
public BeanTourAround.DataBeanX.DataBean getData() {
return data;
}
public void setData(BeanTourAround.DataBeanX.DataBean data) {
this.data = data;
}
}
module_tourism/src/main/java/com/rv/tourism/bean/BeanTourismBanner.java
View file @ dc8cf5bd
......@@ -14,7 +14,7 @@ public class BeanTourismBanner extends BaseBean {
return data;
}
public void setData( List<DataBean> data) {
public void setData(List<DataBean> data) {
this.data = data;
}
......@@ -36,7 +36,9 @@ public class BeanTourismBanner extends BaseBean {
private String url;//"http://www.sczhrs.gov.cn/app/index/policies/policiesH5?id=5",
private String isDel;//0,
private String rank;//0
private String name;
private String price;
private String content;
public String getId() {
return id;
......@@ -110,10 +112,30 @@ public class BeanTourismBanner extends BaseBean {
this.rank = rank;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
}
}
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ dc8cf5bd
......@@ -43,6 +43,8 @@ import com.rv.tourism.R2;
import com.rv.tourism.api.TourismApi;
import com.rv.tourism.bean.BeanOrderParam;
import com.rv.tourism.bean.BeanTourAround;
import com.rv.tourism.bean.BeanTourDetail;
import com.rv.tourism.bean.BeanTourismBanner;
import com.rv.tourism.bean.BeanTourismCollection;
import com.rv.tourism.presenter.TourismPresenter;
import com.umeng.socialize.UMShareAPI;
......@@ -121,10 +123,12 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
tvTitleCenter.setText("旅游详情");
webUrl = TourismApi.TRAVEL_DETAILS +"?id=" + id;
webUrl = TourismApi.TRAVEL_DETAILS + "?id=" + id;
initWeb();
initRxbus();
initShare(webUrl+"&shareType=app", name, content, url);
if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(url)) {
initShare(webUrl + "&shareType=app", name, content, url);
}
mWebView.loadUrl("JavaScript:getTourStock()"); // Android调用h5
}
......@@ -211,6 +215,9 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
requestCollect();
if (TextUtils.isEmpty(name) || TextUtils.isEmpty(url)) {
getTourDetail();
}
}
//收藏请求
......@@ -242,6 +249,16 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
isCollection = "0";
ivCollect.setEnabled(true);
break;
case 3:
BeanTourDetail beanTourDetail = (BeanTourDetail) result;
if (beanTourDetail.getData() != null) {
url = beanTourDetail.getData().getCover();
name = beanTourDetail.getData().getName();
content = beanTourDetail.getData().getContent();
price = Double.valueOf(beanTourDetail.getData().getPrice());
initShare(webUrl + "&shareType=app", name, content, url);
}
break;
}
}
......@@ -316,10 +333,9 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
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);//设置进度值
}
......@@ -339,11 +355,11 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
if (snsPlatform.mShowWord.equals("生成海报")) {
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_SHAREIMAGE)
.withString("icon",url)
.withString("name",name)
.withString("keyword",content)
.withDouble("price",price)
.withString("url",webUrl)
.withString("icon", url)
.withString("name", name)
.withString("keyword", content)
.withDouble("price", price)
.withString("url", webUrl)
.navigation();
} else if (snsPlatform.mShowWord.equals("复制链接")) {
copyText();
......@@ -357,7 +373,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
if (platform.name().equals("WEIXIN_FAVORITE")) {
showToast( " 收藏成功啦");
showToast(" 收藏成功啦");
} else {
if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
......@@ -441,11 +457,11 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
beanOrderParam = new Gson().fromJson(orderJson,
new TypeToken<BeanOrderParam>() {
}.getType());
if (Integer.valueOf(beanOrderParam.getAdultNum()) < Integer.valueOf(beanOrderParam.getChildNum())){
if (Integer.valueOf(beanOrderParam.getAdultNum()) < Integer.valueOf(beanOrderParam.getChildNum())) {
showToast("成人数要大于或等于儿童数");
}else if (Integer.valueOf(beanOrderParam.getAdultNum()) ==0){
} else if (Integer.valueOf(beanOrderParam.getAdultNum()) == 0) {
showToast("成人数不能为空！");
}else {
} else {
startActivity(TravelerConfirmOrderActivity.getIntent(mActivity, beanOrderParam));
}
......@@ -453,6 +469,10 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
}
}
private void getTourDetail() {
mPresenter.getData(3, String.format(TourismApi.TOUR_DETAIL, id), BeanTourDetail.class, false);
}
/**
* 屏幕横竖屏切换时避免出现window leak的问题
......@@ -491,7 +511,6 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
mWebView.removeJavascriptInterface("AndroidNative");// 向 Web端注入 java 对象
}
mWebView.destroy();// 生命周期销毁
}
private class AddCollection {
......@@ -554,7 +573,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
if (myClipboard == null) {
myClipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
}
ClipData myClip = ClipData.newPlainText("text", webUrl+"&shareType=app");
ClipData myClip = ClipData.newPlainText("text", webUrl + "&shareType=app");
myClipboard.setPrimaryClip(myClip);
showToast("复制成功！");
}
......
plugin_carpurchase/src/main/java/com/xxrv/carpurchase/api/CarPurchaseApi.java
View file @ dc8cf5bd
......@@ -7,7 +7,7 @@ public class CarPurchaseApi {
public static String HTTP_URL_FINDVEHICLEMODEPAGE_LIST = RvFrameConfig.HOST + "/vehicle/vehicleModel/app/unauth/findVehicleModelPage";
//购房车详情
public static String HTTP_URL_GOUDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/gouDetail.html";
public static String HTTP_URL_GOUDETAIL = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/gouDetail.html";
//购房车表单提交
public static String HTTP_URL_BUYVEHICLEFORM = RvFrameConfig.HOST + "/api/app/buyVehicleForm/form-add";
......
plugin_share/src/main/java/com/rv/share/ShareActivity.java
View file @ dc8cf5bd
......@@ -112,7 +112,7 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
int id = view.getId();
if (TextUtils.isEmpty(shareUrl)) {
String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
shareUrl = RvFrameConfig.HOST + "/h5/appHtml/view/newPeopleH5.html?code=" + code + "&userName=" + Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_NAME)
shareUrl = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/newPeopleH5.html?code=" + code + "&userName=" + Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_NAME)
+ "&headUrl=" + Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_HEADERURL, "");
}
if (id == R.id.tv_weixin) {
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/EnchashmentRecordActivity.java
View file @ dc8cf5bd
......@@ -86,7 +86,7 @@ public class EnchashmentRecordActivity extends BaseStatusActivity<CommonPresente
adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
String url = RvFrameConfig.HOST + "/h5/appHtml/view/withdrawDetail.html?id=" + ((WalletcathListBean.ItemWalletcath) adapter.getItem(position)).getId();
String url = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/withdrawDetail.html?id=" + ((WalletcathListBean.ItemWalletcath) adapter.getItem(position)).getId();
ComponentName componentName = new ComponentName(getApplicationContext(), "com.rv.share.WebViewActivity");
Intent intent = new Intent();
intent.setComponent(componentName);
......
plugin_wallet/src/main/java/com/xxrv/wallet/api/WalletApi.java
View file @ dc8cf5bd
......@@ -29,6 +29,6 @@ public class WalletApi {
public static String HTTP_URL_WALLET_CHECKAMOUNT = RvFrameConfig.HOST + "/api/admin/wallet/checkAmount";
//提现详情
public static String HTTP_URL_WALLET_WITHDRAWDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/withdrawDetail.html";
public static String HTTP_URL_WALLET_WITHDRAWDETAIL = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/withdrawDetail.html";
}
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