Skip to content

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

增加会员订单列表

parent db0790c5
Show whitespace changes
Inline Side-by-side
Showing with 339 additions and 34 deletions
module_camp/src/main/java/com/rv/camp/CampFragment.java
View file @ 77b9eeef
......@@ -134,6 +134,7 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
isOpen = !isOpen;
} else if (id == R.id.iv_camp_map) {
//地图
showToast("亲，该功能还在开发中。。。");
} else if (id == R.id.v_shadow) {
rvType.setVisibility(View.GONE);
vShadow.setVisibility(View.GONE);
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ 77b9eeef
......@@ -546,6 +546,11 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
} else if (id == R.id.tv_book_now) {
//立即预定
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_TRAVELSEARCH)
.withDouble("latLatitude",latLatitude)
.withDouble("lonLongitude",lonLongitude)
.navigation();
} else if (id == R.id.ll_item_rv_hot_label1) {
//热门标签1
......@@ -631,6 +636,8 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
}
}else if (id == R.id.ll_item_top){
scrollview.fullScroll(View.FOCUS_UP);
}else if (id == R.id.travel_server_image){
showToast("亲，该功能还在开发中。。。");
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/AllOrderFragment.java
View file @ 77b9eeef
......@@ -98,6 +98,8 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
payShowSelect(dataBean.getNo(),dataBean.getOrderAmount());
}else if (id == R.id.tv_camp_process){
payShowSelect(dataBean.getNo(),dataBean.getOrderAmount());
}else if (id == R.id.tv_member_pay){
payShowSelect(dataBean.getNo(),dataBean.getOrderAmount());
}
break;
case 4:
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @ 77b9eeef
......@@ -96,6 +96,9 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
}else if (id == R.id.tv_camp_process){
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
payShowSelect(dataBean.getNo(),dataBean.getOrderAmount());
}else if (id == R.id.tv_member_pay){
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
payShowSelect(dataBean.getNo(),dataBean.getOrderAmount());
}
}
});
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/CompletedAdapter.java
View file @ 77b9eeef
......@@ -23,11 +23,13 @@ import java.util.List;
public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT = 1;
public static final int TYPE_TO_TRAVEL = 2;
public static final int TYPE_TO_MEMBER = 3;
public CompletedAdapter(List<MultiItemEntity> data) {
super(data);
addItemType(TYPE_FOR_PAYMENT, R.layout.rv_item_order_for_payment);
addItemType(TYPE_TO_TRAVEL, R.layout.rv_item_order_to_travel);
addItemType(TYPE_TO_MEMBER, R.layout.rv_item_order_to_member);
}
@Override
......@@ -74,6 +76,25 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_evaluation));
helper.addOnClickListener(R.id.tv_camp_process);
break;
case TYPE_TO_MEMBER:
OrderListBean.DataBeanX.DataBean dataBean3 = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean3 ==null){
return;
}
if (dataBean3.getOrderMemberDetail() ==null){
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean3.getCrtTime()));
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
helper.loadRoundImage(mContext, dataBean3.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
helper.setText(R.id.tv_name, dataBean3.getName());
helper.setText(R.id.tv_content,dataBean3.getOrderMemberDetail().getContent() );
helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean3.getOrderAmount()));
helper.setVisible(R.id.tv_member_pay,false);
// helper.setText(R.id.tv_member_pay, mContext.getString(R.string.rv_to_pay_for));
// helper.addOnClickListener(R.id.tv_member_pay);
break;
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ForPaymentAdapter.java
View file @ 77b9eeef
package com.rv.home.rv.module.ui.main.home.order.adapter;
import android.text.TextUtils;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
......@@ -8,8 +7,8 @@ import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.ruiwenliu.wrapper.util.BaseGlideHolder;
import com.ruiwenliu.wrapper.util.TimeManager;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
import java.util.List;
/**
......@@ -21,11 +20,13 @@ import java.util.List;
public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT = 1; //1--租车；2--旅游
public static final int TYPE_TO_TRAVEL = 2;
public static final int TYPE_TO_MEMBER = 3;
public ForPaymentAdapter(List<MultiItemEntity> data) {
super(data);
addItemType(TYPE_FOR_PAYMENT, R.layout.rv_item_order_for_payment);
addItemType(TYPE_TO_TRAVEL, R.layout.rv_item_order_to_travel);
addItemType(TYPE_TO_MEMBER, R.layout.rv_item_order_to_member);
}
@Override
......@@ -58,19 +59,38 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
if (dataBean2 == null) {
return;
}
if (dataBean2.getOrderTourDetail() ==null ){
if (dataBean2.getOrderTourDetail() == null) {
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean2.getCrtTime()));
helper.setText(R.id.tv_city, dataBean2.getOrderTourDetail().getStartCityName());
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 50);
helper.loadRoundImage(mContext, dataBean2.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
helper.setText(R.id.tv_car_type, dataBean2.getName());
helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) + TimeManager.stampToDate2(String.valueOf(dataBean2.getOrderTourDetail().getStartTime())));
helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getOrderAmount()));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
helper.addOnClickListener(R.id.tv_camp_process);
break;
case TYPE_TO_MEMBER:
OrderListBean.DataBeanX.DataBean dataBean3 = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean3 ==null){
return;
}
if (dataBean3.getOrderMemberDetail() ==null){
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean3.getCrtTime()));
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.loadRoundImage(mContext, dataBean3.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
helper.setText(R.id.tv_name, dataBean3.getName());
helper.setText(R.id.tv_content,dataBean3.getOrderMemberDetail().getContent() );
helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean3.getOrderAmount()));
helper.setText(R.id.tv_member_pay, mContext.getString(R.string.rv_to_pay_for));
helper.addOnClickListener(R.id.tv_member_pay);
break;
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/OrderListAdapter.java
View file @ 77b9eeef
......@@ -24,11 +24,13 @@ import java.util.List;
public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT = 1;
public static final int TYPE_TO_TRAVEL = 2;
public static final int TYPE_TO_MEMBER = 3;
public OrderListAdapter(List<MultiItemEntity> data) {
super(data);
addItemType(TYPE_FOR_PAYMENT, R.layout.rv_item_order_for_payment);
addItemType(TYPE_TO_TRAVEL, R.layout.rv_item_order_to_travel);
addItemType(TYPE_TO_MEMBER, R.layout.rv_item_order_to_member);
}
@Override
......@@ -165,6 +167,58 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper.addOnClickListener(R.id.tv_camp_process);
break;
case TYPE_TO_MEMBER:
OrderListBean.DataBeanX.DataBean dataBean3 = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean3 ==null){
return;
}
if (dataBean3.getOrderMemberDetail() ==null){
return;
}
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean3.getCrtTime()));
helper.loadRoundImage(mContext, dataBean3.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
helper.setText(R.id.tv_name, dataBean3.getName());
helper.setText(R.id.tv_content,dataBean3.getOrderMemberDetail().getContent() );
helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean3.getOrderAmount()));
/**
*
(query)
订单状态
0–删除
1–创建订单
2–取消
3–待付款
4–待出行
5–出行中（进行中）
6–已完成
*/
switch (dataBean3.getStatusX()) {
case 0:
helper.setText(R.id.tv_order_state, "删除");
helper.setVisible(R.id.tv_member_pay, false);
break;
case 2:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.tv_cancelled));
helper.setVisible(R.id.tv_member_pay, false);
break;
case 3:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.setText(R.id.tv_member_pay, mContext.getString(R.string.rv_to_pay_for));
helper.setVisible(R.id.tv_member_pay, true);
break;
case 6:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
helper.setVisible(R.id.tv_member_pay, false);
break;
default:
break;
}
helper.addOnClickListener(R.id.tv_member_pay);
break;
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/bean/OrderListBean.java
View file @ 77b9eeef
......@@ -8,6 +8,8 @@ import com.rv.home.rv.module.ui.main.home.order.adapter.OrderListAdapter;
import java.io.Serializable;
import java.util.List;
import retrofit2.http.PUT;
/**
* Created :Auser
* Date: 2019/5/30.
......@@ -96,10 +98,10 @@ public class OrderListBean extends BaseBean {
this.data = data;
}
public static class DataBean implements MultiItemEntity,Serializable {
public static class DataBean implements MultiItemEntity, Serializable {
/**
* no : 4a0c200a-c4f0-4c37-8cdc-d2ee5cc08c20
* type : 1 订单类型 1–租车；2–旅游
* type : 1 订单类型 1–租车；2–旅游 3-会员
* status : 3
* goodsAmount : 71200.02
* orderAmount : 91200.02
......@@ -136,6 +138,7 @@ public class OrderListBean extends BaseBean {
private String updHost;
private OrderRentVehicleDetail orderRentVehicleDetail;
private OrderTourDetail orderTourDetail;
private OrderMemberDetail orderMemberDetail;
private int detailId;
private String name;
......@@ -299,6 +302,14 @@ public class OrderListBean extends BaseBean {
this.detailId = detailId;
}
public OrderMemberDetail getOrderMemberDetail() {
return orderMemberDetail;
}
public void setOrderMemberDetail(OrderMemberDetail orderMemberDetail) {
this.orderMemberDetail = orderMemberDetail;
}
@Override
public int getItemType() {
return type;
......@@ -530,7 +541,7 @@ public class OrderListBean extends BaseBean {
}
}
public static class OrderTourDetail implements Serializable{
public static class OrderTourDetail implements Serializable {
/**
* contactEmail string
* 联系邮箱
......@@ -766,6 +777,78 @@ public class OrderListBean extends BaseBean {
this.totalNumber = totalNumber;
}
}
public static class OrderMemberDetail implements Serializable {
private String id;//主键
private String memberLevel;//会员等级
private String memberLevelId;//会员等级id
private String name;//
private String orderId;//
private int rebate;//
private String rentFreeNum;//
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getMemberLevel() {
return memberLevel;
}
public void setMemberLevel(String memberLevel) {
this.memberLevel = memberLevel;
}
public String getMemberLevelId() {
return memberLevelId;
}
public void setMemberLevelId(String memberLevelId) {
this.memberLevelId = memberLevelId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public int getRebate() {
return rebate;
}
public void setRebate(int rebate) {
this.rebate = rebate;
}
public String getRentFreeNum() {
return rentFreeNum;
}
public void setRentFreeNum(String rentFreeNum) {
this.rentFreeNum = rentFreeNum;
}
public String getContent() {
int discount = rebate / 10;
return "永久" + discount + "折租车，免费用车" + rentFreeNum + "天";
}
}
}
}
}
module_home/src/main/res/layout/rv_item_order_to_member.xml 0 → 100644
View file @ 77b9eeef
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tv_order_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorLine"
android:padding="@dimen/size_15"
android:text="下单时间：2019-05-12 10:00"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:padding="@dimen/size_15">
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="会员购买"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_order_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="待付款"
android:textColor="@color/textMain"
android:textSize="@dimen/text_12" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="horizontal"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:paddingBottom="@dimen/size_15">
<ImageView
android:id="@+id/iv_goods"
android:layout_width="@dimen/size_100"
android:layout_height="@dimen/size_100"
android:scaleType="centerCrop" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_marginLeft="@dimen/size_8"
android:orientation="vertical">
<TextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:text="普通会员"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_car_type"
android:layout_marginTop="@dimen/size_8"
android:text="永久8折租车，免费用车5天"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_price"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="¥5000"
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/tv_member_pay"
android:layout_width="@dimen/size_70"
android:layout_height="wrap_content"
android:background="@drawable/shape_rv_bg_yellow"
android:gravity="center"
android:paddingTop="@dimen/size_5"
android:paddingBottom="@dimen/size_5"
android:text="立即支付"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ 77b9eeef
......@@ -203,7 +203,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
if (isLogin()) return;
startActivity(OrderListActivity.getIntent(_mActivity, 4));
}else if (id ==R.id.rl_item_my_release){
} else if (id == R.id.rl_item_my_release) {
//我的发布
if (isLogin()) return;
......@@ -215,18 +215,18 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
} else if (id == R.id.rl_item_personal_information) {
//个人资料
if (isLogin()) return;
startActivity(PersonalInformationActivity.getIntent(_mActivity,info));
startActivity(PersonalInformationActivity.getIntent(_mActivity, info));
} else if (id == R.id.rl_item_setting) {
//设置
if (isLogin()) return;
startActivityForResult(SettingActivity.getIntent(_mActivity), 101);
}else if (id == R.id.rl_item_driver){
} else if (id == R.id.rl_item_driver) {
//驾驶人
if (isLogin()) return;
startActivity(DrivingListActivity.getIntent(_mActivity,null));
}else if (id == R.id.rl_item_traveler){
startActivity(DrivingListActivity.getIntent(_mActivity, null));
} else if (id == R.id.rl_item_traveler) {
//出游人
if (isLogin()) return;
startActivity(ChooseAVisitorActivity.getIntent(_mActivity));
......@@ -328,7 +328,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
private void userInfoData(UserInfoBean infoBean) {
if (infoBean != null) {
info = infoBean.getData();
if (info !=null) {
if (info != null) {
GlideManager.getInstance(_mActivity).loadImage(info.getHeadimgurl(), ivAvatar);
tvNickname.setText(info.getUsername());
//更新实名信息
......@@ -341,17 +341,17 @@ public class MineFragment extends BaseFragment<CommonPresenter> {
tvVerified.setEnabled(false);
}
if ("0".equals(info.getIsMember())) {
if (0 == info.getIsMember()) {
tvMembershipLevel.setText("会员特权");
ivMember.setImageResource(R.drawable.mycenter_icon_type_general_user);
} else if ("1".equals(info.getIsMember())) {
if ("1".equals(info.getMemberLevel())) { //1 普通会员 2 黄金会员 3 钻石会员
} else if (1 == info.getIsMember()) {
if (1 == info.getMemberLevel()) { //1 普通会员 2 黄金会员 3 钻石会员
tvMembershipLevel.setText(" 普通会员特权");
ivMember.setImageResource(R.drawable.mycenter_icon_type_ordinary_member);
} else if ("2".equals(info.getMemberLevel())) {
} else if (2 == info.getMemberLevel()) {
tvMembershipLevel.setText("黄金会员特权");
ivMember.setImageResource(R.drawable.mycenter_icon_type_gold_member);
} else if ("3".equals(info.getMemberLevel())) {
} else if (3 == info.getMemberLevel()) {
tvMembershipLevel.setText("钻石会员特权");
ivMember.setImageResource(R.drawable.mycenter_icon_type_diamond_membership);
}
......
module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java
View file @ 77b9eeef
......@@ -184,10 +184,10 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
} else if (id == R.id.ll_item_binding_qq) {
//绑定qq
showToast("亲，该功能还在开发中。。。");
} else if (id == R.id.ll_item_binding_wechat) {
//绑定微信
showToast("亲，该功能还在开发中。。。");
}
}
......
module_mine/src/main/java/com/rv/rvmine/traveler/SettingActivity.java
View file @ 77b9eeef
......@@ -62,13 +62,13 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> {
}else if (id == R.id.ll_item_app_push){
//App推送消息
showToast("亲，该功能还在开发中。。。");
}else if (id == R.id.rl_item_clear_cache){
//清除缓存
showToast("亲，该功能还在开发中。。。");
}else if (id == R.id.rl_item_check_for_updates){
//检查更新
showToast("亲，该功能还在开发中。。。");
}else if (id == R.id.rl_item_about_us){
//关于我们
startActivity(AboutUsActivity.getIntent(mActivity));
......
module_tourism/src/main/java/com/rv/tourism/TourismFragment.java
View file @ 77b9eeef
......@@ -188,7 +188,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
.withDouble("lonLongitude",lonLongitude)
.navigation();
} else if (id == R.id.travel_server_image) {
showToast("亲，该功能还在开发中。。。");
} else if (id == R.id.ll_item_popular_brigade_many || id == R.id.iv_popular_brigade_many) {
//查看热门更多
llLayoutPopularMore.setVisibility(View.VISIBLE);
......
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ 77b9eeef
......@@ -80,7 +80,6 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
@Autowired()
String id;
@Autowired()
String name;
......@@ -104,6 +103,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
tvTitleCenter.setText("旅游详情");
webUrl = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=" + id;
initWeb();
initShare(webUrl, name, content, url);
......@@ -139,8 +139,8 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
// startActivity(LoginRvActivity.getIntent(mActivity));
return;
}
mWebView.loadUrl("JavaScript:getTourStock()"); // Android调用h5
// mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
llItemBottom.setVisibility(View.GONE);
}
}
......@@ -342,20 +342,18 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
@JavascriptInterface
public void tourStock(int num) {
showToast("22222");
if (num > 0) {
mWebView.post(new Runnable() {
@Override
public void run() {
mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
llItemBottom.setVisibility(View.GONE);
}
});
} else {
mWebView.post(new Runnable() {
@Override
public void run() {
showToast("库存不足");
TvAppointment.setEnabled(false);
TvAppointment.setText("库存不足");
TvAppointment.setBackground(mActivity.getResources().getDrawable(R.color.gray_707070));
}
......
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