Skip to content

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

租车下单优化

parent c1e243f8
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 27 deletions
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
View file @ 48571918
......@@ -4,6 +4,7 @@ import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Build;
......@@ -132,6 +133,12 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
if (checkPriceDialog == null) {
checkPriceDialog = new CheckPriceDialog(mActivity);
checkPriceDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
mWebView.loadUrl("JavaScript:showDailyPriceJs()"); // Android调用h5
}
});
}
}
......@@ -207,6 +214,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
if (checkPriceDialog != null) {
checkPriceDialog.setNewData(result.getData());
checkPriceDialog.show();
mWebView.loadUrl("JavaScript:showDailyPriceJs()"); // Android调用h5
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
View file @ 48571918
......@@ -407,8 +407,8 @@ 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.ll_item_xin_driving,
R2.id.rb_user_driving, R2.id.tv_user_driving_hint, R2.id.tv_contract_agreement, R2.id.ll_item_service_fee, R2.id.ll_item_vehicle_cleaning_fee,
R2.id.tv_lab3, R2.id.tv_deposit_hint, R2.id.rl_item_privilege_service_hint, R2.id.tv_booking_instructions_hint, R2.id.rl_item_select_coupon,
R2.id.tv_item_caritem, R2.id.tv_item_select_caritem, R2.id.tv_item_loook_price})
R2.id.tv_lab3, R2.id.tv_deposit_hint, R2.id.tv_booking_instructions_hint, R2.id.rl_item_select_coupon,
R2.id.tv_item_caritem, R2.id.tv_item_select_caritem, R2.id.tv_item_loook_price, R2.id.iv_lab3_hint})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.rl_goods) {
......@@ -480,13 +480,6 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
.withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type", 4)
.navigation();
} else if (id == R.id.rl_item_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 (id == R.id.tv_booking_instructions_hint) {
//预订须知
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
......@@ -519,6 +512,12 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
checkPriceDialog = new CheckPriceDialog(mActivity);
}
getDailyPrice();
} else if (id == R.id.iv_lab3_hint) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title", "车损免赔说明")
.withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type", 5)
.navigation();
}
}
......@@ -544,7 +543,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
// }
if (tvPassengerKnow.isChecked() == false) {
showToast("请同意预定须知");
showToast("请阅读并同意《租车合同协议》");
return;
}
String inviterPhone = edtInviterPhone.getText().toString().trim();
......@@ -956,16 +955,16 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
int offsetY = -(detailPw.getContentView().getMeasuredHeight() + view.getHeight());
PopupWindowCompat.showAsDropDown(detailPw, view, offsetX, offsetY, Gravity.START);
/**
* 点击popupWindow让背景变暗
*/
/**
* 点击popupWindow让背景变暗
*/
final WindowManager.LayoutParams lp = getWindow().getAttributes();
lp.alpha = 0.5f;//代表透明程度，范围为0 - 1.0f
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
getWindow().setAttributes(lp);
/**
* 退出popupWindow时取消暗背景
*/
/**
* 退出popupWindow时取消暗背景
*/
detailPw.setOnDismissListener(new PopupWindow.OnDismissListener() {
@Override
public void onDismiss() {
......
module_home/src/main/res/layout/rv_act_confim_order.xml
View file @ 48571918
......@@ -388,7 +388,8 @@
android:drawableRight="@drawable/common_icon_rig_gray"
android:drawablePadding="@dimen/size_5"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
android:textSize="@dimen/text_10"
android:visibility="gone" />
</RelativeLayout>
<include layout="@layout/common_line" />
......@@ -495,25 +496,41 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:padding="@dimen/size_15">
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<CheckBox
android:id="@+id/tv_lab3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_weight="1"
android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10"
android:paddingTop="@dimen/size_15"
android:paddingBottom="@dimen/size_15"
android:text="不计免赔服务"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/iv_lab3_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/tv_lab3"
android:paddingLeft="@dimen/size_5"
android:paddingTop="@dimen/size_15"
android:paddingRight="@dimen/size_25"
android:paddingBottom="@dimen/size_15"
android:src="@drawable/rv_common_icon_notice" />
<TextView
android:id="@+id/tv_car_not_hurt_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_weight="1"
android:text="￥0/日"
android:textColor="@color/colorBg"
......@@ -838,12 +855,12 @@
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite"
android:padding="@dimen/size_15">
android:padding="@dimen/size_15"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......@@ -880,9 +897,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@drawable/selector_rv_check"
android:checked="true"
android:paddingLeft="@dimen/size_10"
android:text="@string/rv_passenger_security"
android:text="已阅读并同意"
android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_14" />
......@@ -890,7 +906,7 @@
android:id="@+id/tv_contract_agreement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rv_contract_agreement"
android:text="《租车合同协议》"
android:textColor="@color/gray_FFB74B"
android:textSize="@dimen/text_16" />
</LinearLayout>
......
module_mine/src/main/res/layout/rv_item_mine_collection_car_rental.xml
View file @ 48571918
......@@ -17,8 +17,7 @@
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:scaleType="centerCrop"
android:src="@drawable/aa_ivava" />
android:scaleType="centerCrop" />
<LinearLayout
android:layout_width="match_parent"
......
module_mine/src/main/res/layout/rv_item_mine_collection_travel.xml
View file @ 48571918
......@@ -16,8 +16,7 @@
android:layout_width="@dimen/size_120"
android:layout_height="@dimen/size_80"
android:layout_marginLeft="@dimen/size_15"
android:scaleType="centerCrop"
android:src="@drawable/aa_ivava" />
android:scaleType="centerCrop" />
<RelativeLayout
android:layout_width="match_parent"
......
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