Skip to content

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

bus修复

parent c809a4b8
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 36 deletions
RvClient/build.gradle
View file @ 07d36090
......@@ -7,8 +7,8 @@ android {
applicationId "com.xxfc.rv"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 104
versionName "1.0.4"
versionCode 105
versionName "1.0.5"
multiDexEnabled true
//新版Gradle 是 implementation 为了兼容compile,写上这句话
......
RvClient/src/main/java/com/xxfc/rv/wxapi/WXPayEntryActivity.java
View file @ 07d36090
......@@ -70,7 +70,6 @@ public class WXPayEntryActivity extends BaseStatusActivity<CommonPresenter> impl
switch (resp.errCode) {
case 0:
RxBus.post(new PaymentSuccessfulEvent());
finish();
break;
case -1:
finish();
......
RvClient/src/main/res/layout/rv_pay_result.xml
View file @ 07d36090
......@@ -3,8 +3,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_width="match_parent"
>
android:layout_width="match_parent">
<ImageView
android:layout_marginTop="@dimen/size_80"
......@@ -40,6 +39,4 @@
android:layout_height="@dimen/size_50" />
</LinearLayout>
\ No newline at end of file
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java
View file @ 07d36090
......@@ -137,7 +137,7 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
dataBean.setModelId(bean.getVehicleModel().getId());
dataBean.setStartCompanyId(bean.getCompany().getId());
}
startActivity(CarDetailActivity.getIntent(mActivity, dataBean, bean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
startActivity(CarDetailActivity.getIntent(mActivity, dataBean, bean, begDate, endDate));
}
}
});
......@@ -407,13 +407,15 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
endDate = data.getStringExtra("endDate");
tvGetDate.setText("取" + DateUtils.formatDate66(begDate));
tvOutDate.setText("还" + DateUtils.formatDate66(endDate));
onFresh();
try {
dataBean.setStartTime(TimeManager.dateToStamp(begDate));
dataBean.setEndTime(TimeManager.dateToStamp(endDate));
} catch (ParseException e) {
e.printStackTrace();
}
onFresh();
} else if (requestCode == 110 && resultCode == RESULT_OK) {
double lat = data.getDoubleExtra("latitude", 0);
double lon = data.getDoubleExtra("longitude", 0);
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
View file @ 07d36090
......@@ -66,7 +66,6 @@ import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
/**
......@@ -252,6 +251,13 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
tvPerson.setText(Html.fromHtml(getContent(drivingListBean.getName(), drivingListBean.getPhone())));
tvIdCard.setText(Html.fromHtml(getContent(mActivity.getString(R.string.rv_id_card), drivingListBean.getIdCard())));
drivingType = 2;
rbXinDriving.setChecked(false);
rbUserDriving.setChecked(true);
if (drivingListBean != null) {
llAddDriving.setVisibility(View.VISIBLE);
}
getPayMoney();
break;
}
}
......@@ -259,34 +265,34 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
}
@OnClick({R2.id.rl_goods, R2.id.tv_get_car_address, R2.id.tv_out_car_address, R2.id.iv_add_driving,
R2.id.tv_detail, R2.id.tv_confirm_order, R2.id.tv_delete, R2.id.rb_xin_driving,
R2.id.rb_user_driving, R2.id.tv_contract_agreement, R2.id.tv_service_fee_show, R2.id.tv_vehicle_cleaning_fee_show,
R2.id.tv_detail, R2.id.tv_confirm_order, R2.id.tv_delete, R2.id.rb_xin_driving,R2.id.ll_item_xin_driving,
R2.id.rb_user_driving,R2.id.tv_user_driving_hint, R2.id.tv_contract_agreement, R2.id.tv_service_fee_show, R2.id.tv_vehicle_cleaning_fee_show,
R2.id.tv_lab3, R2.id.tv_deposit_hint, R2.id.tv_privilege_service_hint, R2.id.tv_booking_instructions_hint})
public void onViewClicked(View view) {
int i = view.getId();
if (i == R.id.rl_goods) {
} else if (i == R.id.tv_get_car_address) {
} else if (i == R.id.tv_out_car_address) {
} else if (i == R.id.iv_add_driving) {
int id = view.getId();
if (id == R.id.rl_goods) {
} else if (id == R.id.tv_get_car_address) {
} else if (id == R.id.tv_out_car_address) {
} else if (id == R.id.iv_add_driving) {
startActivityForResult(DrivingListActivity.getIntent(mActivity, drivingListBean), TYPE_REQUEST_DRIVING);
} else if (i == R.id.tv_detail) {
} else if (id == R.id.tv_detail) {
showOrderDetail(llBottom);
} else if (i == R.id.tv_confirm_order) {
} else if (id == R.id.tv_confirm_order) {
confirmOrder();
} else if (i == R.id.tv_delete) {
} else if (id == R.id.tv_delete) {
drivingListBean = null;
llAddDriving.setVisibility(View.GONE);
} else if (i == R.id.rb_xin_driving) {
} else if (id == R.id.rb_xin_driving || id == R.id.ll_item_xin_driving) {
drivingType = 1;
rbUserDriving.setChecked(false);
llAddDriving.setVisibility(View.GONE);
rbXinDriving.setChecked(true);
dataBean.setMyDriverIds("1");
getPayMoney();
} else if (i == R.id.rb_user_driving) {
} else if (id == R.id.rb_user_driving || id == R.id.tv_user_driving_hint) {
drivingType = 2;
rbXinDriving.setChecked(false);
rbUserDriving.setChecked(true);
......@@ -294,23 +300,23 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
llAddDriving.setVisibility(View.VISIBLE);
}
getPayMoney();
} else if (i == R.id.tv_contract_agreement) {
} else if (id == R.id.tv_contract_agreement) {
startActivity(WebActivity.getIntent(mActivity, mActivity.getString(R.string.rv_contract_agreement), ApiConfig.HTTP_URL_CAR_TYPE_NOTICE));
} else if (i == R.id.tv_service_fee_show) {
} else if (id == R.id.tv_service_fee_show) {
if (serviceFeeShow) {
tvLayoutServiceFee.setVisibility(View.VISIBLE);
} else {
tvLayoutServiceFee.setVisibility(View.GONE);
}
serviceFeeShow = !serviceFeeShow;
} else if (i == R.id.tv_vehicle_cleaning_fee_show) {
} else if (id == R.id.tv_vehicle_cleaning_fee_show) {
if (cleanFeeShow) {
llLayoutCleanFee.setVisibility(View.VISIBLE);
} else {
llLayoutCleanFee.setVisibility(View.GONE);
}
cleanFeeShow = !cleanFeeShow;
} else if (i == R.id.tv_lab3) {
} else if (id == R.id.tv_lab3) {
if (tvLab3.isChecked()) {
deductiblePriceType = 1;
dataBean.setDamageSafe(1);
......@@ -319,21 +325,21 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
deductiblePriceType = 0;
}
getPayMoney();
} else if (i == R.id.tv_deposit_hint) {
} else if (id == R.id.tv_deposit_hint) {
//欣新平台租车押金
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title", "欣新平台租车押金")
.withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type", 4)
.navigation();
} else if (i == R.id.tv_privilege_service_hint) {
} else if (id == R.id.tv_privilege_service_hint) {
//尊享服务
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title", "尊享服务")
.withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type", 5)
.navigation();
} else if (i == R.id.tv_booking_instructions_hint) {
} else if (id == R.id.tv_booking_instructions_hint) {
//预订须知
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title", "预订须知")
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ForPaymentAdapter.java
View file @ 07d36090
......@@ -53,7 +53,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
}
helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 10);
helper.setText(R.id.tv_car_type, dataBean.getName());
......
module_home/src/main/res/layout/rv_act_confim_order.xml
View file @ 07d36090
......@@ -282,6 +282,7 @@
<include layout="@layout/common_line" />
<LinearLayout
android:id="@+id/ll_item_xin_driving"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
......@@ -330,20 +331,23 @@
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_user_driving_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/rv_user_driving_hint"
android:textColor="@color/textGray"
android:layout_marginRight="@dimen/size_20"
android:textSize="@dimen/text_12" />
<ImageView
android:id="@+id/iv_add_driving"
android:layout_width="@dimen/size_25"
android:layout_width="@dimen/size_45"
android:layout_height="@dimen/size_25"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/size_15"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:padding="@dimen/size_3"
android:src="@drawable/rv_common_icon_thestaff" />
</LinearLayout>
......
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ 07d36090
......@@ -139,12 +139,14 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
tvViewPrivileges.setText("会员中心");
mSimpleRefreshLayout.setPullDownEnable(false);
} else {
tvNickname.setVisibility(View.VISIBLE);
ivMember.setVisibility(View.VISIBLE);
tvLogin.setVisibility(View.GONE);
tvVerified.setVisibility(View.VISIBLE);
tvViewPrivileges.setText("查看会员特权");
mSimpleRefreshLayout.setPullDownEnable(true);
}
}
......@@ -179,7 +181,6 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
getUserData();
}
});
}
......@@ -357,10 +358,10 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
@Override
public void onShowResult(int requestType, BaseBean result) {
mSimpleRefreshLayout.onRefreshComplete();
switch (requestType) {
case 0:
userInfoData((UserInfoBean) result);
mSimpleRefreshLayout.onRefreshComplete();
break;
case 1:
bannerData((BeanHomeBanner) result);
......@@ -416,6 +417,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
tvLogin.setVisibility(View.GONE);
tvVerified.setVisibility(View.VISIBLE);
}
mSimpleRefreshLayout.setPullDownEnable(true);
}
}
......
module_mine/src/main/java/com/rv/rvmine/bean/UserInfoBean.java
View file @ 07d36090
......@@ -76,6 +76,8 @@ public class UserInfoBean extends BaseBean {
// 会员等级
private int memberLevel;
private int discount;
public Integer getId() {
return id;
}
......@@ -259,5 +261,13 @@ public class UserInfoBean extends BaseBean {
public void setMemberLevel(int memberLevel) {
this.memberLevel = memberLevel;
}
public int getDiscount() {
return discount;
}
public void setDiscount(int discount) {
this.discount = discount;
}
}
}
module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java
View file @ 07d36090
......@@ -141,8 +141,6 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
RxBus.post(new UserInfoEvent());
finish();
break;
}
}
......
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