Skip to content

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

钱包和启动页修改

parent 43809fec
Hide whitespace changes
Inline Side-by-side
Showing with 1005 additions and 352 deletions
RvWrapper/src/main/java/com/ruiwenliu/wrapper/bean/UserInfoBean.java
View file @ 61a8c475
...@@ -85,6 +85,8 @@ public class UserInfoBean extends BaseBean implements Serializable { ...@@ -85,6 +85,8 @@ public class UserInfoBean extends BaseBean implements Serializable {
private String positionName;// 职位名称 private String positionName;// 职位名称
private boolean isBindAliPay; //是否绑定支付宝
public Integer getId() { public Integer getId() {
return id; return id;
...@@ -301,5 +303,13 @@ public class UserInfoBean extends BaseBean implements Serializable { ...@@ -301,5 +303,13 @@ public class UserInfoBean extends BaseBean implements Serializable {
public void setBigIcon(String bigIcon) { public void setBigIcon(String bigIcon) {
this.bigIcon = bigIcon; this.bigIcon = bigIcon;
} }
public boolean isBindAliPay() {
return isBindAliPay;
}
public void setBindAliPay(boolean bindAliPay) {
isBindAliPay = bindAliPay;
}
} }
} }
RvWrapper/src/main/res/values/colors.xml
View file @ 61a8c475
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<color name="gray_ffcc0000">#ffcc0000</color> <color name="gray_ffcc0000">#ffcc0000</color>
<color name="gray_ffff4444">#ffff4444</color> <color name="gray_ffff4444">#ffff4444</color>
<color name="gray_F1F1F1">#F1F1F1</color> <color name="gray_F1F1F1">#F1F1F1</color>
<color name="gray_FFF3E2">#FFF3E2</color>
<!--end--> <!--end-->
</resources> </resources>
component_dialog/src/main/java/com/rv/component/dialog/WalletTipsDialog.java 0 → 100644
View file @ 61a8c475
package com.rv.component.dialog;
import android.content.Context;
import android.support.annotation.NonNull;
import android.view.Gravity;
import android.view.ViewGroup;
import com.ruiwenliu.wrapper.dialog.BaseDialog;
/**
* 钱包温馨提示
*/
public class WalletTipsDialog extends BaseDialog {
public WalletTipsDialog(@NonNull Context context) {
super(context);
setDialogParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
}
@Override
public int getViewLayout() {
return R.layout.rv_dialog_tips_wallet;
}
}
component_dialog/src/main/res/layout/rv_dialog_tips_wallet.xml 0 → 100644
View file @ 61a8c475
<?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">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_40"
android:layout_marginRight="@dimen/size_40"
android:background="@color/colorWrite"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="温馨提示"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18" />
</LinearLayout>
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_marginBottom="@dimen/size_26"
android:text="您的账号暂时无法提现！如有疑问请咨询客服。"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_16" />
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:background="@color/gray_FFB74B"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_ok"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="确认" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
component_utils/src/main/java/com/rv/component/utils/DateUtils.java
View file @ 61a8c475
...@@ -687,6 +687,23 @@ public class DateUtils { ...@@ -687,6 +687,23 @@ public class DateUtils {
return day; return day;
} }
/**
*将yyyy-MM-dd HH:mm:ss格式成dd
*
* @param dateStr yyyy-MM-dd HH:mm:ss
* @return dd
*/
public static String formatDate24(String dateStr) {
String day = "";
try {
Date date = sdf.parse(dateStr);
day = sdf16.format(date);
} catch (Exception e) {
e.printStackTrace();
}
return day;
}
/** /**
* 将yyyy-MM-dd HH:mm:ss格式成MM-dd * 将yyyy-MM-dd HH:mm:ss格式成MM-dd
* *
......
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ 61a8c475
...@@ -95,7 +95,7 @@ public class ApiConfig { ...@@ -95,7 +95,7 @@ public class ApiConfig {
public static String HTTP_URL_CONSUME_LIST = RvFrameConfig.HOST + "/api/admin/walletDetail/page"; public static String HTTP_URL_CONSUME_LIST = RvFrameConfig.HOST + "/api/admin/walletDetail/page";
public static String HTTP_URL_GROUP_INCOME = RvFrameConfig.HOST + "/api/admin/team/teams" ; public static String HTTP_URL_GROUP_INCOME = RvFrameConfig.HOST + "/api/admin/team/teams";
/** /**
* 用户收益 * 用户收益
...@@ -158,7 +158,12 @@ public class ApiConfig { ...@@ -158,7 +158,12 @@ public class ApiConfig {
public static String HTTP_URL_GET_PWD = RvFrameConfig.HOST + "/api/admin/app/user/im/getPwd"; public static String HTTP_URL_GET_PWD = RvFrameConfig.HOST + "/api/admin/app/user/im/getPwd";
/** /**
* 订单详情 * 订单详情
*/ */
public static String HTTP_URL_PRICE_BASEORDER = RvFrameConfig.HOST + "/api/order/baseOrder/"; public static String HTTP_URL_PRICE_BASEORDER = RvFrameConfig.HOST + "/api/order/baseOrder/";
/**
* 获取价格日历
*/
public static String HTTP_URL_CALENDAR_PRICE = RvFrameConfig.HOST + "/vehicle/vehicle_model/calendar_price/app/unauth/list/";
} }
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java
View file @ 61a8c475
...@@ -34,11 +34,13 @@ import com.ruiwenliu.wrapper.base.presenter.CommonPresenter; ...@@ -34,11 +34,13 @@ import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.adapter.AttributeListAdapter; import com.rv.home.rv.module.ui.main.home.adapter.AttributeListAdapter;
import com.rv.home.rv.module.ui.main.home.adapter.CarRentalListAdapter; import com.rv.home.rv.module.ui.main.home.adapter.CarRentalListAdapter;
import com.rv.home.rv.module.ui.main.home.bean.CarAttributeListBean; import com.rv.home.rv.module.ui.main.home.bean.CarAttributeListBean;
import com.rv.home.rv.module.ui.main.home.bean.CarRentalPriceBean;
import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean; import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderDataBean; import com.rv.home.rv.module.ui.main.home.bean.OrderDataBean;
import com.rv.home.rv.module.ui.main.home.dialog.CarAttributePw; import com.rv.home.rv.module.ui.main.home.dialog.CarAttributePw;
import com.rv.home.rv.module.ui.main.home.dialog.CheckPriceDialog; import com.rv.home.rv.module.ui.main.home.dialog.CheckPriceDialog;
import com.rv.home.rv.module.ui.main.home.dialog.SelectAttributeDialog; import com.rv.home.rv.module.ui.main.home.dialog.SelectAttributeDialog;
import com.yuyife.okgo.OkGoUtil;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -155,19 +157,18 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i ...@@ -155,19 +157,18 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
mAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() { mAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override @Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) { public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
CarTypeListBean.DataBeanX.DataBean bean = mAdapter.getItem(position);
if (view.getId() == R.id.tv_item_loook_price) { if (view.getId() == R.id.tv_item_loook_price) {
if (checkPriceDialog == null) { if (checkPriceDialog == null) {
checkPriceDialog = new CheckPriceDialog(mActivity); checkPriceDialog = new CheckPriceDialog(mActivity);
} }
if (checkPriceDialog != null) { getCheckPrice(bean.getVehicleModel().getId());
// checkPriceDialog.setNewData(DetailsData);
checkPriceDialog.show();
}
} }
} }
}); });
} }
@Override @Override
protected void loadData(Bundle savedInstanceState, Intent intent) { protected void loadData(Bundle savedInstanceState, Intent intent) {
getCarAttrList(); getCarAttrList();
...@@ -185,9 +186,13 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i ...@@ -185,9 +186,13 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
case 1: case 1:
processData((CarTypeListBean) result); processData((CarTypeListBean) result);
break; break;
case 2:
checkPrice((CarRentalPriceBean) result);
break;
} }
} }
private void initData(CarAttributeListBean data) { private void initData(CarAttributeListBean data) {
attributeListBean = data; attributeListBean = data;
// .get(0).getChildren(); // .get(0).getChildren();
...@@ -269,6 +274,21 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i ...@@ -269,6 +274,21 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
} }
} }
/**
* 获取价格日历
*
* @param id
*/
private void getCheckPrice(int id) {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
Map<String, Object> map = new LinkedHashMap<>();
map.put("start", DateUtils.formatDate16(begDate));
map.put("end", DateUtils.formatDate16(endDate));
mPresenter.getData(RvFrameConfig.HOST, 2, ApiConfig.HTTP_URL_CALENDAR_PRICE + id, CarRentalPriceBean.class, map, headMap, true);
}
/** /**
* 获取车辆属性列表 * 获取车辆属性列表
...@@ -327,6 +347,20 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i ...@@ -327,6 +347,20 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
getCarList(mPage); getCarList(mPage);
} }
/**
* 设置价格日历
*
* @param result
*/
private void checkPrice(CarRentalPriceBean result) {
if (checkPriceDialog != null) {
checkPriceDialog.setNewData(result.getData());
checkPriceDialog.show();
}
}
private void processData(CarTypeListBean bean) { private void processData(CarTypeListBean bean) {
if (mPage == 1) { if (mPage == 1) {
countPage = bean.getData().getTotalPage(); countPage = bean.getData().getTotalPage();
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
View file @ 61a8c475
...@@ -25,7 +25,6 @@ import android.widget.TextView; ...@@ -25,7 +25,6 @@ import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alipay.sdk.app.PayTask; import com.alipay.sdk.app.PayTask;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.frame.base.bus.LoginUserInfoEvent; import com.frame.base.bus.LoginUserInfoEvent;
import com.frame.base.bus.Observer; import com.frame.base.bus.Observer;
import com.frame.base.bus.PaymentFailedEvent; import com.frame.base.bus.PaymentFailedEvent;
...@@ -35,11 +34,9 @@ import com.frame.base.url.Constance; ...@@ -35,11 +34,9 @@ import com.frame.base.url.Constance;
import com.frame.base.view.StarBar; import com.frame.base.view.StarBar;
import com.frame.rv.config.RvFrameConfig; import com.frame.rv.config.RvFrameConfig;
import com.frame.rv.widget.PayResult; import com.frame.rv.widget.PayResult;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseBean; import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity; import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.bean.BeanUserInfo; import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.util.ViewHolder; import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.util.glide.GlideManager; import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.weight.TitleView; import com.ruiwenliu.wrapper.weight.TitleView;
...@@ -52,7 +49,6 @@ import com.rv.component.utils.DisplayUtil; ...@@ -52,7 +49,6 @@ import com.rv.component.utils.DisplayUtil;
import com.rv.home.R; import com.rv.home.R;
import com.rv.home.R2; import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig; import com.rv.home.rv.module.ApiConfig;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.adapter.SelectedItemAdapter; import com.rv.home.rv.module.ui.main.home.adapter.SelectedItemAdapter;
import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean; import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean;
import com.rv.home.rv.module.ui.main.home.bean.ConfirmOrderBean; import com.rv.home.rv.module.ui.main.home.bean.ConfirmOrderBean;
...@@ -72,7 +68,6 @@ import com.xxrv.coupon.api.CouponApi; ...@@ -72,7 +68,6 @@ import com.xxrv.coupon.api.CouponApi;
import com.xxrv.coupon.bean.CarCouponBean; import com.xxrv.coupon.bean.CarCouponBean;
import com.yuyife.okgo.OkGoUtil; import com.yuyife.okgo.OkGoUtil;
import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
...@@ -113,8 +108,6 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -113,8 +108,6 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
LinearLayout llAddDriving; LinearLayout llAddDriving;
@BindView(R2.id.tv_deposit) @BindView(R2.id.tv_deposit)
TextView tvDeposit; TextView tvDeposit;
@BindView(R2.id.tv_car_not_hurt)
TextView tvCarNotHurt;
@BindView(R2.id.tv_car_not_hurt_money) @BindView(R2.id.tv_car_not_hurt_money)
TextView tvCarNotHurtMoney; TextView tvCarNotHurtMoney;
@BindView(R2.id.tv_passenger_know) @BindView(R2.id.tv_passenger_know)
...@@ -157,11 +150,12 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -157,11 +150,12 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
TextView tvCouponAmount; TextView tvCouponAmount;
@BindView(R2.id.rv_content_select) @BindView(R2.id.rv_content_select)
FlowLayout rvContentSelect; FlowLayout rvContentSelect;
@BindView(R2.id.tv_mark)
TextView tvMark;
private final int TYPE_REQUEST_DRIVING = 3; private final int TYPE_REQUEST_DRIVING = 3;
private boolean serviceFeeShow = true; private boolean serviceFeeShow = true;
private boolean cleanFeeShow = true; private boolean cleanFeeShow = true;
private OrderDataBean dataBean; private OrderDataBean dataBean;
...@@ -377,8 +371,8 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -377,8 +371,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, @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.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.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.tv_privilege_service_hint, R2.id.tv_booking_instructions_hint, R2.id.rl_item_select_coupon, 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_caritem, R2.id.tv_item_select_caritem})
public void onViewClicked(View view) { public void onViewClicked(View view) {
int id = view.getId(); int id = view.getId();
...@@ -421,14 +415,14 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -421,14 +415,14 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
.withInt("type", 25) .withInt("type", 25)
.navigation(); .navigation();
// startActivity(WebActivity.getIntent(mActivity, mActivity.getString(R.string.rv_contract_agreement), ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)); // startActivity(WebActivity.getIntent(mActivity, mActivity.getString(R.string.rv_contract_agreement), ApiConfig.HTTP_URL_CAR_TYPE_NOTICE));
} else if (id == R.id.tv_service_fee_show) { } else if (id == R.id.ll_item_service_fee) {
if (serviceFeeShow) { if (serviceFeeShow) {
tvLayoutServiceFee.setVisibility(View.VISIBLE); tvLayoutServiceFee.setVisibility(View.VISIBLE);
} else { } else {
tvLayoutServiceFee.setVisibility(View.GONE); tvLayoutServiceFee.setVisibility(View.GONE);
} }
serviceFeeShow = !serviceFeeShow; serviceFeeShow = !serviceFeeShow;
} else if (id == R.id.tv_vehicle_cleaning_fee_show) { } else if (id == R.id.ll_item_vehicle_cleaning_fee) {
if (cleanFeeShow) { if (cleanFeeShow) {
llLayoutCleanFee.setVisibility(View.VISIBLE); llLayoutCleanFee.setVisibility(View.VISIBLE);
} else { } else {
...@@ -451,7 +445,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -451,7 +445,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
.withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE) .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type", 4) .withInt("type", 4)
.navigation(); .navigation();
} else if (id == R.id.tv_privilege_service_hint) { } else if (id == R.id.rl_item_privilege_service_hint) {
//尊享服务 //尊享服务
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW) ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title", "尊享服务") .withString("title", "尊享服务")
...@@ -643,6 +637,8 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -643,6 +637,8 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
icon = mCarBean.getVehicleModel().getIcon(); icon = mCarBean.getVehicleModel().getIcon();
} }
GlideManager.getInstance(mActivity).loadImage(icon, ivGoods); GlideManager.getInstance(mActivity).loadImage(icon, ivGoods);
float score = (float) mCarBean.getVehicleModel().getScore() / 10;
tvMark.setText(score + "分");
tvName.setText(mCarBean.getVehicleModel().getName()); tvName.setText(mCarBean.getVehicleModel().getName());
tvContent.setText(mCarBean.getVehicleModel().getKeyword()); tvContent.setText(mCarBean.getVehicleModel().getKeyword());
...@@ -671,7 +667,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -671,7 +667,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
dataBean.setRentFreeDay(1); dataBean.setRentFreeDay(1);
couponAmount = 0; couponAmount = 0;
getPayMoney(); getPayMoney();
}else { } else {
dataBean.setRentFreeDay(0); dataBean.setRentFreeDay(0);
isMemberType = 0; isMemberType = 0;
} }
...@@ -727,15 +723,17 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -727,15 +723,17 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
double payMoney = 0.00; double payMoney = 0.00;
double dayPrice = mCarBean.getVehicleModel().getSum(); double dayPrice = mCarBean.getVehicleModel().getSum();
int dayNum = dataBean.getDayNum(); int dayNum = dataBean.getDayNum();
OrderPriceDetailBean.ChildrenBean childrenBean2 = new OrderPriceDetailBean.ChildrenBean();
childrenBean2.setKey("车辆租赁费");
childrenBean2.setDetail(dayNum + "天");
childrenBean2.setVal("¥" + new BigDecimal(dayPrice * dayNum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
childrenBeanList.add(childrenBean2);
if (isMemberType == 0) { //是否使用会员 0 不使用 if (isMemberType == 0) { //是否使用会员 0 不使用
payMoney = dayPrice * dayNum + priceBean.getData().getDeposit(); //租车和押金价格 payMoney = dayPrice * dayNum + priceBean.getData().getDeposit(); //租车和押金价格
carAmount = dayPrice * dayNum; carAmount = dayPrice * dayNum;
OrderPriceDetailBean.ChildrenBean childrenBean2 = new OrderPriceDetailBean.ChildrenBean();
childrenBean2.setKey("车辆租赁费");
childrenBean2.setDetail("¥" + dayPrice + "/天 *" + dayNum + "天");
childrenBean2.setVal("¥" + new BigDecimal(dayPrice * dayNum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
childrenBeanList.add(childrenBean2);
} else { } else {
if (memberData != null) { if (memberData != null) {
if (dayNum > memberData.getRentFreeDays()) { if (dayNum > memberData.getRentFreeDays()) {
...@@ -743,13 +741,19 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -743,13 +741,19 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
carAmount = dayPrice * (dayNum - memberData.getRentFreeDays()); carAmount = dayPrice * (dayNum - memberData.getRentFreeDays());
OrderPriceDetailBean.ChildrenBean childrenBean1 = new OrderPriceDetailBean.ChildrenBean(); OrderPriceDetailBean.ChildrenBean childrenBean1 = new OrderPriceDetailBean.ChildrenBean();
childrenBean1.setKey("车辆租赁费"); childrenBean1.setKey("免费天数");
childrenBean1.setDetail("¥" + dayPrice + "/天 *" + (dayNum - memberData.getRentFreeDays()) + "天"); childrenBean1.setDetail("会员天数" + (dayNum - memberData.getRentFreeDays()) + "天");
childrenBean1.setVal("¥" + new BigDecimal(dayPrice * (dayNum - memberData.getRentFreeDays())).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); childrenBean1.setVal("-¥" + new BigDecimal(dayPrice * memberData.getRentFreeDays()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
childrenBeanList.add(childrenBean1); childrenBeanList.add(childrenBean1);
} else if (dayNum <= memberData.getRentFreeDays()) { } else if (dayNum <= memberData.getRentFreeDays()) {
payMoney = priceBean.getData().getDeposit(); payMoney = priceBean.getData().getDeposit();
carAmount = 0; carAmount = 0;
OrderPriceDetailBean.ChildrenBean childrenBean1 = new OrderPriceDetailBean.ChildrenBean();
childrenBean1.setKey("免费天数");
childrenBean1.setDetail("会员天数" + dayNum + "天");
childrenBean1.setVal("-¥" + new BigDecimal(dayPrice * dayNum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
childrenBeanList.add(childrenBean1);
} }
} }
} }
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/CarRentalCheckPriceAdapter.java
View file @ 61a8c475
...@@ -2,19 +2,41 @@ package com.rv.home.rv.module.ui.main.home.adapter; ...@@ -2,19 +2,41 @@ package com.rv.home.rv.module.ui.main.home.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.rv.component.utils.DateUtils;
import com.rv.home.R; import com.rv.home.R;
import com.rv.home.rv.module.ui.main.home.bean.CarRentalPriceBean;
import com.rv.home.rv.module.ui.main.home.bean.SearchBean; import com.rv.home.rv.module.ui.main.home.bean.SearchBean;
/** /**
* 租车价格查看 * 租车价格查看
*/ */
public class CarRentalCheckPriceAdapter extends BaseQuickAdapter<String, BaseViewHolder> { public class CarRentalCheckPriceAdapter extends BaseQuickAdapter<CarRentalPriceBean.DataBean, BaseViewHolder> {
private boolean type;
public CarRentalCheckPriceAdapter() { public CarRentalCheckPriceAdapter() {
super(R.layout.rv_item_carrental_check_price); super(R.layout.rv_item_carrental_check_price);
} }
@Override @Override
protected void convert(BaseViewHolder helper, String item) { protected void convert(BaseViewHolder helper, CarRentalPriceBean.DataBean item) {
helper.setText(R.id.tv_date, DateUtils.formatDate24(item.getDate()));
if (item.getSelect()) {
helper.setBackgroundColor(R.id.ll_item_bg, mContext.getResources().getColor(R.color.gray_FFF3E2));
} else {
helper.setBackgroundColor(R.id.ll_item_bg, mContext.getResources().getColor(R.color.colorWrite));
}
if (type) {
helper.setText(R.id.tv_price, item.getFreeDays());
} else {
helper.setText(R.id.tv_price, "¥" + item.getPrice());
}
}
public void setType(boolean type) {
this.type = type;
} }
} }
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/CarRentalPriceBean.java 0 → 100644
View file @ 61a8c475
package com.rv.home.rv.module.ui.main.home.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
import java.util.List;
public class CarRentalPriceBean extends BaseBean {
private List<DataBean> data;
private boolean rel;
public List<DataBean> getData() {
return data;
}
public void setData(List<DataBean> data) {
this.data = data;
}
public boolean isRel() {
return rel;
}
public void setRel(boolean rel) {
this.rel = rel;
}
public static class DataBean implements Serializable {
private String date;
private String price;
private String freeDays;
private boolean isSelect;
public String getDate() {
return date;
}
public void setDate(String date) {
this.date = date;
}
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public String getFreeDays() {
return freeDays;
}
public void setFreeDays(String freeDays) {
this.freeDays = freeDays;
}
public boolean getSelect() {
return isSelect;
}
public void setSelect(boolean select) {
isSelect = select;
}
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/dialog/CheckPriceDialog.java
View file @ 61a8c475
...@@ -14,8 +14,10 @@ import com.ruiwenliu.wrapper.util.ViewHolder; ...@@ -14,8 +14,10 @@ import com.ruiwenliu.wrapper.util.ViewHolder;
import com.rv.home.R; import com.rv.home.R;
import com.rv.home.rv.module.ui.main.home.HomeFragment; import com.rv.home.rv.module.ui.main.home.HomeFragment;
import com.rv.home.rv.module.ui.main.home.adapter.CarRentalCheckPriceAdapter; import com.rv.home.rv.module.ui.main.home.adapter.CarRentalCheckPriceAdapter;
import com.rv.home.rv.module.ui.main.home.bean.CarRentalPriceBean;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
/** /**
* 查看租车每天价格 * 查看租车每天价格
...@@ -52,28 +54,29 @@ public class CheckPriceDialog extends BaseDialog { ...@@ -52,28 +54,29 @@ public class CheckPriceDialog extends BaseDialog {
tvCash.setTextColor(getContext().getResources().getColor(R.color.colorWrite)); tvCash.setTextColor(getContext().getResources().getColor(R.color.colorWrite));
tvMember.setSelected(false); tvMember.setSelected(false);
tvMember.setTextColor(getContext().getResources().getColor(R.color.gray_FFB74B)); tvMember.setTextColor(getContext().getResources().getColor(R.color.gray_FFB74B));
adapter.setType(false);
adapter.notifyDataSetChanged();
} else if (id == R.id.tv_item_use_member) { } else if (id == R.id.tv_item_use_member) {
tvCash.setSelected(false); tvCash.setSelected(false);
tvCash.setTextColor(getContext().getResources().getColor(R.color.gray_FFB74B)); tvCash.setTextColor(getContext().getResources().getColor(R.color.gray_FFB74B));
tvMember.setSelected(true); tvMember.setSelected(true);
tvMember.setTextColor(getContext().getResources().getColor(R.color.colorWrite)); tvMember.setTextColor(getContext().getResources().getColor(R.color.colorWrite));
adapter.setType(true);
adapter.notifyDataSetChanged();
} }
} }
}, R.id.tv_item_use_cash, R.id.tv_item_use_member); }, R.id.tv_item_use_cash, R.id.tv_item_use_member);
initData();
} }
private void initData() {
ArrayList<String> strings = new ArrayList<>();
for (int i = 0; i < 30; i++) {
strings.add("" + i);
}
adapter.addData(strings);
}
@Override @Override
public int getViewLayout() { public int getViewLayout() {
return R.layout.rv_dialog_check_price; return R.layout.rv_dialog_check_price;
} }
public void setNewData(List<CarRentalPriceBean.DataBean> data) {
if (adapter != null && data != null) {
adapter.setNewData(data);
}
}
} }
module_home/src/main/res/layout/rv_act_confim_order.xml
View file @ 61a8c475
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"> android:layout_weight="1">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -24,13 +23,13 @@ ...@@ -24,13 +23,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorWrite" android:background="@color/colorWrite"
android:paddingTop="@dimen/size_15" android:padding="@dimen/size_15"
android:padding="@dimen/size_15"> android:paddingTop="@dimen/size_15">
<ImageView <ImageView
android:id="@+id/iv_goods" android:id="@+id/iv_goods"
android:layout_width="@dimen/size_150" android:layout_width="@dimen/size_130"
android:layout_height="@dimen/size_100" android:layout_height="@dimen/size_90"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/shape_rv_line_bg" /> android:src="@drawable/shape_rv_line_bg" />
...@@ -55,23 +54,42 @@ ...@@ -55,23 +54,42 @@
android:id="@+id/tv_content" android:id="@+id/tv_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_3" android:layout_marginTop="@dimen/size_10"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:text="" android:text=""
android:textColor="@color/textGray" android:textColor="@color/textGray"
android:textSize="@dimen/text_12" /> android:textSize="@dimen/text_12" />
<com.frame.base.view.StarBar
android:id="@+id/rating_bar" <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:isClick="true" android:layout_marginTop="@dimen/size_10"
app:starCount="5" android:gravity="center_vertical"
app:starDistance="3dp" android:orientation="horizontal">
app:starEmpty="@drawable/rv_vehicle_icon_star_gray"
app:starFill="@drawable/rv_vehicle_icon_star_light" <TextView
app:starSize="@dimen/size_12" /> android:id="@+id/tv_mark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/gray_707070"
android:textSize="@dimen/text_12" />
<com.frame.base.view.StarBar
android:id="@+id/rating_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_3"
app:isClick="true"
app:starCount="5"
app:starDistance="3dp"
app:starEmpty="@drawable/rv_vehicle_icon_star_gray"
app:starFill="@drawable/rv_vehicle_icon_star_light"
app:starSize="@dimen/size_12" />
</LinearLayout>
<TextView <TextView
android:id="@+id/tv_price" android:id="@+id/tv_price"
...@@ -82,7 +100,8 @@ ...@@ -82,7 +100,8 @@
android:maxLines="1" android:maxLines="1"
android:text="￥0天" android:text="￥0天"
android:textColor="@color/colorAuxiliaryRed" android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -103,8 +122,8 @@ ...@@ -103,8 +122,8 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="活动日期：" android:text="租车日期："
android:textColor="@color/textGray" android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" />
<TextView <TextView
...@@ -140,8 +159,8 @@ ...@@ -140,8 +159,8 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/rv_get_car_address_" android:text="取车公司："
android:textColor="@color/textGray" android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" />
<TextView <TextView
...@@ -149,7 +168,7 @@ ...@@ -149,7 +168,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/rv_get_car_hint" android:hint="@string/rv_get_car_hint"
android:textColor="@color/text_Main" android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
</LinearLayout> </LinearLayout>
...@@ -175,8 +194,8 @@ ...@@ -175,8 +194,8 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="还车地址：" android:text="还车公司： "
android:textColor="@color/textGray" android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" />
<TextView <TextView
...@@ -184,7 +203,7 @@ ...@@ -184,7 +203,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/rv_get_out_hint" android:hint="@string/rv_get_out_hint"
android:textColor="@color/textMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
</LinearLayout> </LinearLayout>
...@@ -260,161 +279,6 @@ ...@@ -260,161 +279,6 @@
<!--android:textSize="@dimen/text_16" />--> <!--android:textSize="@dimen/text_16" />-->
<!--</LinearLayout>--> <!--</LinearLayout>-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite"
android:orientation="vertical"
android:paddingTop="@dimen/size_15"
android:paddingBottom="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_weight="1"
android:paddingLeft="@dimen/size_15"
android:paddingBottom="@dimen/size_15"
android:text="@string/rv_driving_set"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16"
android:visibility="gone" />
<include
layout="@layout/common_line"
android:visibility="gone" />
<LinearLayout
android:id="@+id/ll_item_xin_driving"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone">
<CheckBox
android:id="@+id/rb_xin_driving"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:layout_marginBottom="@dimen/size_15"
android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10"
android:text="@string/rv_select_driving_num_hint"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_xin_driving_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="（￥600/天）"
android:textColor="@color/colorBg"
android:textSize="@dimen/text_14" />
</LinearLayout>
<include
layout="@layout/common_line"
android:visibility="gone" />
<LinearLayout
android:id="@+id/ll_item_driver_add"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<CheckBox
android:id="@+id/rb_user_driving"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_8"
android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10"
android:text="@string/rv_user_driving"
android:textSize="@dimen/text_14"
android:visibility="gone" />
<TextView
android:id="@+id/tv_user_driving_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_20"
android:layout_weight="1"
android:text="添加驾驶人"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<ImageView
android:id="@+id/iv_add_driving"
android:layout_width="@dimen/size_45"
android:layout_height="@dimen/size_25"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:padding="@dimen/size_3"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:src="@drawable/rv_common_icon_thestaff" />
</LinearLayout>
</LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:id="@+id/ll_add_driving"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="horizontal"
android:padding="@dimen/size_15"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rv_driving_info"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:layout_weight="1">
<TextView
android:id="@+id/tv_person"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="dsdsdsd"
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_id_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tv_person"
android:text="dsdsdsd"
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
</RelativeLayout>
<TextView
android:id="@+id/tv_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/rv_delete"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -454,9 +318,9 @@ ...@@ -454,9 +318,9 @@
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:id="@+id/rl_item_privilege_service_hint"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorWrite" android:background="@color/colorWrite"
android:padding="@dimen/size_15"> android:padding="@dimen/size_15">
...@@ -477,7 +341,6 @@ ...@@ -477,7 +341,6 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:drawableRight="@drawable/common_icon_rig_gray" android:drawableRight="@drawable/common_icon_rig_gray"
android:drawablePadding="@dimen/size_5" android:drawablePadding="@dimen/size_5"
android:text="详细说明"
android:textColor="@color/text_Gray" android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" /> android:textSize="@dimen/text_10" />
</RelativeLayout> </RelativeLayout>
...@@ -485,6 +348,7 @@ ...@@ -485,6 +348,7 @@
<include layout="@layout/common_line" /> <include layout="@layout/common_line" />
<LinearLayout <LinearLayout
android:id="@+id/ll_item_service_fee"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorWrite" android:background="@color/colorWrite"
...@@ -495,22 +359,11 @@ ...@@ -495,22 +359,11 @@
android:id="@+id/tv_lab1" android:id="@+id/tv_lab1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="已含租车服务费" android:drawableRight="@drawable/rv_common_icon_notice"
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_service_fee_show"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_2"
android:drawableRight="@drawable/common_icon_more_details_up"
android:drawablePadding="@dimen/size_5" android:drawablePadding="@dimen/size_5"
android:paddingLeft="@dimen/size_20" android:text="已含租车费"
android:paddingRight="@dimen/size_20" android:textColor="@color/colorMain"
android:text="@string/rv_detailed_info" android:textSize="@dimen/text_14" />
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout> </LinearLayout>
<TextView <TextView
...@@ -533,6 +386,7 @@ ...@@ -533,6 +386,7 @@
<LinearLayout <LinearLayout
android:id="@+id/ll_item_vehicle_cleaning_fee"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorWrite" android:background="@color/colorWrite"
...@@ -542,22 +396,11 @@ ...@@ -542,22 +396,11 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableRight="@drawable/rv_common_icon_notice"
android:drawablePadding="@dimen/size_5"
android:text="已含车辆清洁费" android:text="已含车辆清洁费"
android:textColor="@color/textMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_vehicle_cleaning_fee_show"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_2"
android:drawableRight="@drawable/common_icon_more_details_up"
android:drawablePadding="@dimen/size_5"
android:paddingLeft="@dimen/size_20"
android:paddingRight="@dimen/size_20"
android:text="@string/rv_detailed_info"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -615,21 +458,10 @@ ...@@ -615,21 +458,10 @@
android:layout_weight="1" android:layout_weight="1"
android:button="@drawable/selector_rv_check" android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10" android:paddingLeft="@dimen/size_10"
android:text="@string/rv_car_not_hurt" android:text="不计免赔服务"
android:textColor="@color/textMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_car_not_hurt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_2"
android:layout_toRightOf="@id/tv_lab3"
android:paddingLeft="@dimen/size_20"
android:paddingRight="@dimen/size_20"
android:text="@string/rv_include_car_clear"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView <TextView
android:id="@+id/tv_car_not_hurt_money" android:id="@+id/tv_car_not_hurt_money"
...@@ -641,29 +473,6 @@ ...@@ -641,29 +473,6 @@
android:textColor="@color/colorBg" android:textColor="@color/colorBg"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" />
</RelativeLayout> </RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginBottom="@dimen/size_10"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="不计免赔服务 "
android:textColor="@color/colorMain"
android:textSize="@dimen/text_10" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:text="如在租赁期间内购买购买不计免赔服务，则1500元本车车辆损伤无需赔偿。"
android:textColor="@color/textGray"
android:textSize="@dimen/text_10" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -682,7 +491,7 @@ ...@@ -682,7 +491,7 @@
android:text="会员特权" android:text="会员特权"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" android:textSize="@dimen/text_16"
android:visibility="gone" /> android:visibility="visible" />
<LinearLayout <LinearLayout
android:id="@+id/ll_layout_member_hint" android:id="@+id/ll_layout_member_hint"
...@@ -741,11 +550,168 @@ ...@@ -741,11 +550,168 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="暂无优惠券" android:text="暂无优惠券"
android:drawableRight="@drawable/common_icon_rig_gray"
android:drawablePadding="@dimen/size_5"
android:textColor="@color/gray_FFB74B" android:textColor="@color/gray_FFB74B"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite"
android:orientation="vertical"
android:paddingTop="@dimen/size_15"
android:paddingBottom="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_weight="1"
android:paddingLeft="@dimen/size_15"
android:paddingBottom="@dimen/size_15"
android:text="@string/rv_driving_set"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16"
android:visibility="gone" />
<include
layout="@layout/common_line"
android:visibility="gone" />
<LinearLayout
android:id="@+id/ll_item_xin_driving"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone">
<CheckBox
android:id="@+id/rb_xin_driving"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:layout_marginBottom="@dimen/size_15"
android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10"
android:text="@string/rv_select_driving_num_hint"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_xin_driving_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="（￥600/天）"
android:textColor="@color/colorBg"
android:textSize="@dimen/text_14" />
</LinearLayout>
<include
layout="@layout/common_line"
android:visibility="gone" />
<LinearLayout
android:id="@+id/ll_item_driver_add"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<CheckBox
android:id="@+id/rb_user_driving"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_8"
android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10"
android:text="@string/rv_user_driving"
android:textSize="@dimen/text_14"
android:visibility="gone" />
<TextView
android:id="@+id/tv_user_driving_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_20"
android:layout_weight="1"
android:text="添加驾驶人"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<ImageView
android:id="@+id/iv_add_driving"
android:layout_width="@dimen/size_45"
android:layout_height="@dimen/size_25"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:padding="@dimen/size_3"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:src="@drawable/rv_common_icon_thestaff" />
</LinearLayout>
</LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:id="@+id/ll_add_driving"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="horizontal"
android:padding="@dimen/size_15"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rv_driving_info"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:layout_weight="1">
<TextView
android:id="@+id/tv_person"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="dsdsdsd"
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_id_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tv_person"
android:text="dsdsdsd"
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
</RelativeLayout>
<TextView
android:id="@+id/tv_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/rv_delete"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -757,10 +723,10 @@ ...@@ -757,10 +723,10 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<TextView <TextView
android:id="@+id/tv_item_caritem" android:id="@+id/tv_item_caritem"
...@@ -778,11 +744,11 @@ ...@@ -778,11 +744,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10" android:layout_marginLeft="@dimen/size_10"
android:paddingTop="@dimen/size_15"
android:paddingBottom="@dimen/size_15"
android:gravity="right"
android:drawableRight="@drawable/common_icon_rig_gray" android:drawableRight="@drawable/common_icon_rig_gray"
android:drawablePadding="@dimen/size_5" android:drawablePadding="@dimen/size_5"
android:gravity="right"
android:paddingTop="@dimen/size_15"
android:paddingBottom="@dimen/size_15"
android:text="选择" android:text="选择"
android:textColor="@color/text_Gray" android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" /> android:textSize="@dimen/text_10" />
......
module_home/src/main/res/layout/rv_item_carrental_check_price.xml
View file @ 61a8c475
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ll_item_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_70" android:layout_height="@dimen/size_60"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/tv_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="15" android:text="15"
...@@ -13,6 +15,7 @@ ...@@ -13,6 +15,7 @@
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
<TextView <TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_3" android:layout_marginTop="@dimen/size_3"
......
module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java
View file @ 61a8c475
package com.rv.rvmine.traveler; package com.rv.rvmine.traveler;
import android.Manifest; import android.Manifest;
import android.annotation.SuppressLint;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.alipay.sdk.app.AuthTask;
import com.base.utils.ui.datetime.selector.util.TextUtil; import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.base.utils.ui.image.round.RoundImageView; import com.base.utils.ui.image.round.RoundImageView;
import com.bigkoo.pickerview.TimePickerView; import com.bigkoo.pickerview.TimePickerView;
...@@ -29,7 +32,6 @@ import com.ruiwenliu.wrapper.util.permission.RxPermission; ...@@ -29,7 +32,6 @@ import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.ruiwenliu.wrapper.weight.TitleView; import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.dialog.PickerDialog; import com.rv.component.dialog.PickerDialog;
import com.rv.component.utils.IsAppInstall; import com.rv.component.utils.IsAppInstall;
import com.rv.component.utils.MyTextWatcher;
import com.rv.home.rv.module.ApiConfig; import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.ui.main.home.bean.ImageUploadBean; import com.rv.home.rv.module.ui.main.home.bean.ImageUploadBean;
import com.rv.rvmine.R; import com.rv.rvmine.R;
...@@ -40,6 +42,9 @@ import com.umeng.socialize.UMAuthListener; ...@@ -40,6 +42,9 @@ import com.umeng.socialize.UMAuthListener;
import com.umeng.socialize.UMShareAPI; import com.umeng.socialize.UMShareAPI;
import com.umeng.socialize.bean.SHARE_MEDIA; import com.umeng.socialize.bean.SHARE_MEDIA;
import com.umeng.socialize.utils.SocializeUtils; import com.umeng.socialize.utils.SocializeUtils;
import com.xxrv.wallet.api.WalletApi;
import com.xxrv.wallet.bean.AuthResult;
import com.xxrv.wallet.bean.WalletAuthInfoBean;
import com.yuyife.okgo.OkGoUtil; import com.yuyife.okgo.OkGoUtil;
import java.io.File; import java.io.File;
...@@ -85,6 +90,10 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen ...@@ -85,6 +90,10 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
LinearLayout llItemBindingQq; LinearLayout llItemBindingQq;
@BindView(R2.id.ll_item_binding_wechat) @BindView(R2.id.ll_item_binding_wechat)
LinearLayout llItemBindingWechat; LinearLayout llItemBindingWechat;
@BindView(R2.id.tv_binding_alipy)
TextView tvBindingAlipy;
@BindView(R2.id.ll_item_binding_alipy)
LinearLayout llItemBindingAlipy;
private UserInfoBean.UserInfo info; private UserInfoBean.UserInfo info;
private String ivAvatarUrl; private String ivAvatarUrl;
public ProgressDialog dialog; public ProgressDialog dialog;
...@@ -97,8 +106,10 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen ...@@ -97,8 +106,10 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
private String mWXOpenid; private String mWXOpenid;
private String mUnionid; private String mUnionid;
private String mHeadImg; private String mHeadImg;
private String aliCode;
private String birthday = ""; private String birthday = "";
private static final int SDK_AUTH_FLAG = 2;
public static Intent getIntent(Context context, UserInfoBean.UserInfo info) { public static Intent getIntent(Context context, UserInfoBean.UserInfo info) {
return new Intent(context, PersonalInformationActivity.class) return new Intent(context, PersonalInformationActivity.class)
...@@ -178,6 +189,14 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen ...@@ -178,6 +189,14 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
tvBindingQq.setText("已绑定"); tvBindingQq.setText("已绑定");
llItemBindingQq.setEnabled(false); llItemBindingQq.setEnabled(false);
} }
if (info.isBindAliPay()) {
tvBindingAlipy.setText("已绑定");
llItemBindingAlipy.setEnabled(false);
} else {
tvBindingAlipy.setText("去授权绑定支付宝");
llItemBindingAlipy.setEnabled(true);
}
} }
} }
...@@ -192,6 +211,9 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen ...@@ -192,6 +211,9 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
RxBus.post(new UserInfoEvent()); RxBus.post(new UserInfoEvent());
finish(); finish();
break; break;
case 2:
alipayAuthV2((WalletAuthInfoBean) result);
break;
} }
} }
...@@ -215,7 +237,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen ...@@ -215,7 +237,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
} }
@OnClick({R2.id.rl_item_avatar, R2.id.ll_item_date_of_birth, R2.id.ll_item_sex, R2.id.ll_item_binding_qq, R2.id.ll_item_binding_wechat}) @OnClick({R2.id.rl_item_avatar, R2.id.ll_item_date_of_birth, R2.id.ll_item_sex, R2.id.ll_item_binding_qq, R2.id.ll_item_binding_wechat, R2.id.ll_item_binding_alipy})
public void onViewClicked(View view) { public void onViewClicked(View view) {
int id = view.getId(); int id = view.getId();
if (id == R.id.rl_item_avatar) { if (id == R.id.rl_item_avatar) {
...@@ -244,9 +266,18 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen ...@@ -244,9 +266,18 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
return; return;
} }
bindThirdParty(SHARE_MEDIA.WEIXIN); bindThirdParty(SHARE_MEDIA.WEIXIN);
} else if (id == R.id.ll_item_binding_alipy) {
getAuthInfo();
} }
} }
private void getAuthInfo() {
Map<String, Object> map = new LinkedHashMap<>();
map.put("apiName", "com.xinxin.rv");
map.put("appName", "滴房车");
mPresenter.getData(RvFrameConfig.HOST, 2, WalletApi.HTTP_URL_WALLET_UNAUTH_GETPARAM, WalletAuthInfoBean.class, map, false);
}
private void bindThirdParty(SHARE_MEDIA share_media) { private void bindThirdParty(SHARE_MEDIA share_media) {
UMShareAPI.get(mActivity).getPlatformInfo(mActivity, share_media, this); UMShareAPI.get(mActivity).getPlatformInfo(mActivity, share_media, this);
} }
...@@ -342,7 +373,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen ...@@ -342,7 +373,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
break; break;
} }
}else{ } else {
new AppSettingsDialog.Builder(PersonalInformationActivity.this). new AppSettingsDialog.Builder(PersonalInformationActivity.this).
setTitle("需要获取相机权限、存储权限") setTitle("需要获取相机权限、存储权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限") .setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
...@@ -362,6 +393,59 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen ...@@ -362,6 +393,59 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
} }
} }
/**
* 支付宝授权
*/
private void alipayAuthV2(final WalletAuthInfoBean bean) {
Runnable authRunnable = new Runnable() {
@Override
public void run() {
// 构造AuthTask 对象
AuthTask authTask = new AuthTask(PersonalInformationActivity.this);
// 调用授权接口，获取授权结果
Map<String, String> result = authTask.authV2(bean.getData(), true);
Message msg = new Message();
msg.what = SDK_AUTH_FLAG;
msg.obj = result;
mHandler.sendMessage(msg);
}
};
// 必须异步调用
Thread authThread = new Thread(authRunnable);
authThread.start();
}
@SuppressLint("HandlerLeak")
private Handler mHandler = new Handler() {
@SuppressWarnings("unused")
public void handleMessage(Message msg) {
switch (msg.what) {
case SDK_AUTH_FLAG: {
@SuppressWarnings("unchecked")
AuthResult authResult = new AuthResult((Map<String, String>) msg.obj, true);
String resultStatus = authResult.getResultStatus();
// 判断resultStatus 为“9000”且result_code
// 为“200”则代表授权成功，具体状态码代表含义可参考授权接口文档
if (TextUtils.equals(resultStatus, "9000") && TextUtils.equals(authResult.getResultCode(), "200")) {
// 传入，则支付账户为该授权账户
aliCode = authResult.getAuthCode();
tvBindingAlipy.setText("已绑定");
showToast("授权成功！");
} else {
// 其他状态值则为授权失败
}
break;
}
default:
break;
}
}
};
/** /**
* 上传文件 * 上传文件
...@@ -402,7 +486,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen ...@@ -402,7 +486,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
if (info == null) { if (info == null) {
return; return;
} }
mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, birthday, sex, mWXOpenid, mUnionid, mQQOpenid), getHeadMap(), true); mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, birthday, sex, mWXOpenid, mUnionid, mQQOpenid, aliCode), getHeadMap(), true);
// mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, birthday, sex, "", "", ""), getHeadMap(), true); // mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, birthday, sex, "", "", ""), getHeadMap(), true);
} }
...@@ -481,8 +565,9 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen ...@@ -481,8 +565,9 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
private String wxOpenid; private String wxOpenid;
private String unionid; private String unionid;
private String openid; private String openid;
private String aliCode;
public UserInfo(String id, String userid, String username, String status, String nickname, String realname, String headimgurl, String birthday, int sex, String wxOpenid, String unionid, String openid) { public UserInfo(String id, String userid, String username, String status, String nickname, String realname, String headimgurl, String birthday, int sex, String wxOpenid, String unionid, String openid, String aliCode) {
this.id = id; this.id = id;
this.userid = userid; this.userid = userid;
this.username = username; this.username = username;
...@@ -495,6 +580,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen ...@@ -495,6 +580,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
this.wxOpenid = wxOpenid; this.wxOpenid = wxOpenid;
this.unionid = unionid; this.unionid = unionid;
this.openid = openid; this.openid = openid;
this.aliCode = aliCode;
} }
public String getId() { public String getId() {
...@@ -592,6 +678,14 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen ...@@ -592,6 +678,14 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
public void setOpenid(String openid) { public void setOpenid(String openid) {
this.openid = openid; this.openid = openid;
} }
public String getAliCode() {
return aliCode;
}
public void setAliCode(String aliCode) {
this.aliCode = aliCode;
}
} }
......
module_mine/src/main/res/layout/activity_personal_information.xml
View file @ 61a8c475
...@@ -57,11 +57,11 @@ ...@@ -57,11 +57,11 @@
android:layout_marginLeft="@dimen/size_15" android:layout_marginLeft="@dimen/size_15"
android:layout_weight="1" android:layout_weight="1"
android:background="@null" android:background="@null"
android:ellipsize="end"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
android:hint="请输入昵称" android:hint="请输入昵称"
android:maxLength="32" android:maxLength="32"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textColorHint="@color/colorGray" android:textColorHint="@color/colorGray"
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
...@@ -323,5 +323,41 @@ ...@@ -323,5 +323,41 @@
android:layout_marginLeft="@dimen/size_8" android:layout_marginLeft="@dimen/size_8"
android:src="@drawable/common_icon_rig_black" /> android:src="@drawable/common_icon_rig_black" />
</LinearLayout> </LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:id="@+id/ll_item_binding_alipy"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="支付宝"
android:textColor="@color/text_Main"
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/tv_binding_alipy"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/size_15"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:hint="去授权绑定支付宝"
android:text=""
android:textColor="@color/colorMain"
android:textColorHint="@color/colorGray"
android:textSize="@dimen/text_16" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_8"
android:src="@drawable/common_icon_rig_black" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
plugin_wallet/src/main/java/com/xxrv/wallet/activity/WalletActivity.java
View file @ 61a8c475
...@@ -25,6 +25,8 @@ import com.ruiwenliu.wrapper.statusbar.StatusBarUtil; ...@@ -25,6 +25,8 @@ import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
import com.ruiwenliu.wrapper.util.ViewHolder; import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.weight.TitleView; import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.dialog.VerifiedTipsDialog; import com.rv.component.dialog.VerifiedTipsDialog;
import com.rv.component.dialog.WalletTipsDialog;
import com.rv.home.rv.module.ApiConfig;
import com.xxrv.wallet.R; import com.xxrv.wallet.R;
import com.xxrv.wallet.R2; import com.xxrv.wallet.R2;
import com.xxrv.wallet.api.WalletApi; import com.xxrv.wallet.api.WalletApi;
...@@ -64,6 +66,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -64,6 +66,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
private BeanUserInfo.UserInfo userInfo; private BeanUserInfo.UserInfo userInfo;
private static final int SDK_AUTH_FLAG = 2; private static final int SDK_AUTH_FLAG = 2;
private String isFrozen;
@Override @Override
...@@ -162,6 +165,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -162,6 +165,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
private void setWalletData(WalletBean bean) { private void setWalletData(WalletBean bean) {
if (bean != null && bean.getData() != null) { if (bean != null && bean.getData() != null) {
isFrozen = bean.getData().getIsFrozen();
balance = bean.getData().getBalance(); balance = bean.getData().getBalance();
tvWalletBalance.setText("¥" + bean.getData().getBalance()); tvWalletBalance.setText("¥" + bean.getData().getBalance());
tvTodayAmount.setText(bean.getData().getTodayAmount()); tvTodayAmount.setText(bean.getData().getTodayAmount());
...@@ -188,14 +192,43 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -188,14 +192,43 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
} }
@OnClick({R2.id.iv_back, R2.id.tv_item_withdraw, R2.id.rl_item_consumer_details, R2.id.rl_item_commission_record, R2.id.rl_item_withdrawals_record}) @OnClick({R2.id.iv_back, R2.id.tv_item_wallet_hint, R2.id.tv_item_withdraw, R2.id.rl_item_consumer_details, R2.id.rl_item_commission_record, R2.id.rl_item_withdrawals_record})
public void onViewClicked(View view) { public void onViewClicked(View view) {
int id = view.getId(); final int id = view.getId();
if (id == R.id.iv_back) { if (id == R.id.iv_back) {
finish(); finish();
} else if (id == R.id.tv_item_wallet_hint) {
//钱包提现规则
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title", "提现规则")
.withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type", 24)
.navigation();
} else if (id == R.id.tv_item_withdraw) { } else if (id == R.id.tv_item_withdraw) {
//提现 //提现
if (!TextUtils.isEmpty(isFrozen)) { //// 0 正常 1冻结
if ("1".equals(isFrozen)) {
new WalletTipsDialog(mActivity) {
@Override
public void helper(ViewHolder helper) {
super.helper(helper);
helper.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (v.getId() == R.id.tv_ok) {
dismiss();
}
}
}, R.id.tv_ok);
}
}.show();
return;
}
}
if (userInfo != null) { ////实名认证状态:0-未认证，1-已认证 if (userInfo != null) { ////实名认证状态:0-未认证，1-已认证
if (0 == userInfo.getCertificationStatus()) { if (0 == userInfo.getCertificationStatus()) {
new VerifiedTipsDialog(mActivity) { new VerifiedTipsDialog(mActivity) {
...@@ -264,7 +297,6 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -264,7 +297,6 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
map.put("apiName", "com.xinxin.rv"); map.put("apiName", "com.xinxin.rv");
map.put("appName", "滴房车"); map.put("appName", "滴房车");
mPresenter.getData(RvFrameConfig.HOST, 2, WalletApi.HTTP_URL_WALLET_UNAUTH_GETPARAM, WalletAuthInfoBean.class, map, false); mPresenter.getData(RvFrameConfig.HOST, 2, WalletApi.HTTP_URL_WALLET_UNAUTH_GETPARAM, WalletAuthInfoBean.class, map, false);
} }
private void getAccountNumber() { private void getAccountNumber() {
...@@ -315,10 +347,9 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -315,10 +347,9 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
if (TextUtils.equals(resultStatus, "9000") && TextUtils.equals(authResult.getResultCode(), "200")) { if (TextUtils.equals(resultStatus, "9000") && TextUtils.equals(authResult.getResultCode(), "200")) {
// 传入，则支付账户为该授权账户 // 传入，则支付账户为该授权账户
putAlipayCode(authResult.getAuthCode()); putAlipayCode(authResult.getAuthCode());
showToast(authResult.toString()); showToast("授权成功！");
} else { } else {
// 其他状态值则为授权失败 // 其他状态值则为授权失败
showToast(authResult.toString());
} }
break; break;
} }
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/WithdrawActivity.java
View file @ 61a8c475
package com.xxrv.wallet.activity; package com.xxrv.wallet.activity;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
...@@ -11,6 +15,7 @@ import android.widget.ImageView; ...@@ -11,6 +15,7 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.alipay.sdk.app.AuthTask;
import com.frame.base.bus.RxBus; import com.frame.base.bus.RxBus;
import com.frame.base.bus.WithdrawSuccessEvent; import com.frame.base.bus.WithdrawSuccessEvent;
import com.frame.base.url.Constance; import com.frame.base.url.Constance;
...@@ -20,13 +25,19 @@ import com.ruiwenliu.wrapper.base.BaseStatusActivity; ...@@ -20,13 +25,19 @@ import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.util.ViewHolder; import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.util.listener.TextChangedListener; import com.ruiwenliu.wrapper.util.listener.TextChangedListener;
import com.ruiwenliu.wrapper.weight.TitleView; import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.IsAppInstall;
import com.rv.home.rv.module.ApiConfig; import com.rv.home.rv.module.ApiConfig;
import com.umeng.socialize.UMAuthListener;
import com.umeng.socialize.UMShareAPI;
import com.umeng.socialize.bean.SHARE_MEDIA;
import com.umeng.socialize.utils.SocializeUtils;
import com.xxrv.wallet.R; import com.xxrv.wallet.R;
import com.xxrv.wallet.R2; import com.xxrv.wallet.R2;
import com.xxrv.wallet.api.WalletApi; import com.xxrv.wallet.api.WalletApi;
import com.xxrv.wallet.bean.AccountNumberListBean; import com.xxrv.wallet.bean.AccountNumberListBean;
import com.xxrv.wallet.bean.AlipayListBean; import com.xxrv.wallet.bean.AuthResult;
import com.xxrv.wallet.bean.CheckAmountBean; import com.xxrv.wallet.bean.CheckAmountBean;
import com.xxrv.wallet.bean.WalletAuthInfoBean;
import com.xxrv.wallet.bean.WithdrawBean; import com.xxrv.wallet.bean.WithdrawBean;
import com.xxrv.wallet.bean.WithdrawalRulesBean; import com.xxrv.wallet.bean.WithdrawalRulesBean;
import com.xxrv.wallet.dialog.AccountTypeSelectionDialog; import com.xxrv.wallet.dialog.AccountTypeSelectionDialog;
...@@ -47,7 +58,7 @@ import butterknife.OnClick; ...@@ -47,7 +58,7 @@ import butterknife.OnClick;
/** /**
* 提现 * 提现
*/ */
public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> { public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> implements UMAuthListener {
@BindView(R2.id.et_withdrawal_amount) @BindView(R2.id.et_withdrawal_amount)
...@@ -65,7 +76,11 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -65,7 +76,11 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
private List<AccountNumberListBean.DataBean> accountNumberList; private List<AccountNumberListBean.DataBean> accountNumberList;
private AccountNumberListBean.DataBean selectAccountNumber; private AccountNumberListBean.DataBean selectAccountNumber;
private String balance; private String balance;
private WithdrawalRulesBean.DataBean rulesData;
private boolean isType;
private static final int SDK_AUTH_FLAG = 2;
public ProgressDialog dialog;
private AccountTypeSelectionDialog accountTypeSelectionDialog;
public static Intent getIntent(Context context, String balance) { public static Intent getIntent(Context context, String balance) {
return new Intent(context, WithdrawActivity.class) return new Intent(context, WithdrawActivity.class)
...@@ -84,11 +99,15 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -84,11 +99,15 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
balance = intent.getStringExtra("balance"); balance = intent.getStringExtra("balance");
tvHint.setText("当前账户余额" + balance + "元"); tvHint.setText("当前账户余额" + balance + "元");
dialog = new ProgressDialog(this);
etWithdrawalAmount.addTextChangedListener(new TextChangedListener() { etWithdrawalAmount.addTextChangedListener(new TextChangedListener() {
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
super.afterTextChanged(s); super.afterTextChanged(s);
String withdrawalAmount = etWithdrawalAmount.getText().toString(); String withdrawalAmount = etWithdrawalAmount.getText().toString();
if (rulesData == null) {
return;
}
if (withdrawalAmount.length() > 0) { if (withdrawalAmount.length() > 0) {
tvItemWithdraw.setEnabled(true); tvItemWithdraw.setEnabled(true);
tvItemWithdraw.setSelected(true); tvItemWithdraw.setSelected(true);
...@@ -96,6 +115,12 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -96,6 +115,12 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
if (Double.valueOf(withdrawalAmount) > Double.valueOf(balance)) { if (Double.valueOf(withdrawalAmount) > Double.valueOf(balance)) {
tvHint.setText("提现金额不能超过账户余额，当前账户余额" + balance + "元"); tvHint.setText("提现金额不能超过账户余额，当前账户余额" + balance + "元");
tvHint.setTextColor(getResources().getColor(R.color.colorBg)); tvHint.setTextColor(getResources().getColor(R.color.colorBg));
} else if (Double.valueOf(withdrawalAmount) < rulesData.getMinAmount()) {
tvHint.setText("提现金额不能低于" + rulesData.getMinAmount() + "元，当前账户余额" + balance + "元");
tvHint.setTextColor(getResources().getColor(R.color.colorBg));
} else if (Double.valueOf(withdrawalAmount) > rulesData.getAmountOfDay()) {
tvHint.setText("提现金额不能大于" + rulesData.getAmountOfDay() + "元，当前账户余额" + balance + "元");
tvHint.setTextColor(getResources().getColor(R.color.colorBg));
} else { } else {
tvHint.setText("当前账户余额" + balance + "元"); tvHint.setText("当前账户余额" + balance + "元");
tvHint.setTextColor(getResources().getColor(R.color.textGray)); tvHint.setTextColor(getResources().getColor(R.color.textGray));
...@@ -157,17 +182,26 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -157,17 +182,26 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
case 4: case 4:
WithdrawBean bean = (WithdrawBean) result; WithdrawBean bean = (WithdrawBean) result;
if (bean != null) { if (bean != null) {
startActivity(CashWithdrawalDetailsActivity.getIntent(mActivity, String.valueOf(bean.getData()),selectAccountNumber.getNickname(),withdrawalAmount)); startActivity(CashWithdrawalDetailsActivity.getIntent(mActivity, String.valueOf(bean.getData()), selectAccountNumber.getNickname(), withdrawalAmount));
RxBus.post(new WithdrawSuccessEvent()); RxBus.post(new WithdrawSuccessEvent());
finish(); finish();
} }
break; break;
case 5: case 5:
AccountNumberListBean bean2 = (AccountNumberListBean) result; AccountNumberListBean bean2 = (AccountNumberListBean) result;
accountNumberList = bean2.getData(); accountNumberList = bean2.getData();
setAccountNumber(bean2); setAccountNumber(bean2);
break; break;
case 6:
alipayAuthV2((WalletAuthInfoBean) result);
break;
case 7:
getAccountNumber();
if (accountTypeSelectionDialog != null) {
accountTypeSelectionDialog.dismiss();
}
selectShow();
break;
} }
} }
...@@ -228,7 +262,8 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -228,7 +262,8 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
*/ */
private void setWithdrawalRules(WithdrawalRulesBean bean) { private void setWithdrawalRules(WithdrawalRulesBean bean) {
if (bean.getData() != null) { if (bean.getData() != null) {
etWithdrawalAmount.setHint("提现金额至少" + bean.getData().getMinAmount() + "元，单笔限额 " + bean.getData().getAmountOfDay() + "万"); rulesData = bean.getData();
etWithdrawalAmount.setHint("提现金额至少" + bean.getData().getMinAmount() + "元，单笔限额 " + bean.getData().getAmountOfDay() + "元");
} }
} }
...@@ -256,25 +291,53 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -256,25 +291,53 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
* 选择帐号 * 选择帐号
*/ */
private void selectShow() { private void selectShow() {
new AccountTypeSelectionDialog(mActivity) { accountTypeSelectionDialog = new AccountTypeSelectionDialog(mActivity) {
@Override @Override
public void helper(final ViewHolder helper) { public void helper(final ViewHolder helper) {
super.helper(helper); super.helper(helper);
if (accountNumberList != null && accountNumberList.size() > 0) { if (accountNumberList != null && accountNumberList.size() > 0) {
AccountNumberListBean.DataBean dataBean1 = accountNumberList.get(0); AccountNumberListBean.DataBean dataBean1 = accountNumberList.get(0);
if (dataBean1.getType() == 1) { if (dataBean1.getType() == 1) {
isType = false;
helper.setText(R.id.tv_name1, "支付宝余额(" + dataBean1.getNickname() + ")"); helper.setText(R.id.tv_name1, "支付宝余额(" + dataBean1.getNickname() + ")");
helper.setImageResource(R.id.iv_icon1, R.drawable.common_icon_wallet_alipay); helper.setImageResource(R.id.iv_icon1, R.drawable.common_icon_wallet_alipay);
helper.setText(R.id.tv_name3, "添加微信提现，绑定微信");
} else if (dataBean1.getType() == 2) { } else if (dataBean1.getType() == 2) {
helper.setText(R.id.tv_name1, "微信零钱(" + dataBean1.getNickname() + ")"); helper.setText(R.id.tv_name1, "微信零钱(" + dataBean1.getNickname() + ")");
helper.setImageResource(R.id.iv_icon1, R.drawable.common_icon_wallet_weiwx); helper.setImageResource(R.id.iv_icon1, R.drawable.common_icon_wallet_weiwx);
helper.setText(R.id.tv_name3, "添加支付宝提现，绑定支付宝");
isType = true;
} }
ImageView select = (ImageView) helper.getView(R.id.iv_select1); ImageView select1 = (ImageView) helper.getView(R.id.iv_select1);
if (dataBean1.getCheck()) { if (dataBean1.getCheck()) {
select.setSelected(true); select1.setSelected(true);
} else { } else {
select.setSelected(false); select1.setSelected(false);
}
helper.setVisible(R.id.ll_item_select2, false);
helper.setVisible(R.id.ll_item_select3, true);
if (accountNumberList.size() > 1) {
helper.setVisible(R.id.ll_item_select2, true);
helper.setVisible(R.id.ll_item_select3, false);
AccountNumberListBean.DataBean dataBean2 = accountNumberList.get(1);
if (dataBean2.getType() == 1) {
helper.setText(R.id.tv_name2, "支付宝余额(" + dataBean2.getNickname() + ")");
helper.setImageResource(R.id.iv_icon2, R.drawable.common_icon_wallet_alipay);
} else if (dataBean2.getType() == 2) {
helper.setText(R.id.tv_name2, "微信零钱(" + dataBean2.getNickname() + ")");
helper.setImageResource(R.id.iv_icon2, R.drawable.common_icon_wallet_weiwx);
}
ImageView select2 = (ImageView) helper.getView(R.id.iv_select2);
if (dataBean2.getCheck()) {
select2.setSelected(true);
} else {
select2.setSelected(false);
}
} }
} }
...@@ -293,14 +356,51 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -293,14 +356,51 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
} else { } else {
select.setSelected(false); select.setSelected(false);
} }
} else if (id == R.id.ll_item_select2) {
dataBean = accountNumberList.get(1);
ImageView select = (ImageView) helper.getView(R.id.iv_select2);
if (dataBean.getCheck()) {
select.setSelected(true);
} else {
select.setSelected(false);
}
} else if (id == R.id.ll_item_select3) {
if (isType) {
//绑定支付宝
getAuthInfo();
} else {
//绑定微信
if (!IsAppInstall.isWeixinAvilible(mActivity)) {
showToast("亲，您微信还没有安装呢");
return;
}
bindThirdParty(SHARE_MEDIA.WEIXIN);
}
} else if (id == R.id.tv_ok) { } else if (id == R.id.tv_ok) {
selectAccountNumber = dataBean; selectAccountNumber = dataBean;
dismiss(); dismiss();
} }
} }
}, R.id.iv_close, R.id.ll_item_select1, R.id.tv_ok); }, R.id.iv_close, R.id.ll_item_select1, R.id.ll_item_select2, R.id.ll_item_select3, R.id.tv_ok);
} }
}.show(); };
if (accountTypeSelectionDialog != null) {
accountTypeSelectionDialog.show();
}
}
private void bindThirdParty(SHARE_MEDIA share_media) {
UMShareAPI.get(mActivity).getPlatformInfo(mActivity, share_media, this);
}
private void getAuthInfo() {
Map<String, Object> map = new LinkedHashMap<>();
map.put("apiName", "com.xinxin.rv");
map.put("appName", "滴房车");
mPresenter.getData(RvFrameConfig.HOST, 6, WalletApi.HTTP_URL_WALLET_UNAUTH_GETPARAM, WalletAuthInfoBean.class, map, false);
} }
/** /**
...@@ -371,13 +471,116 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> { ...@@ -371,13 +471,116 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 4, WalletApi.HTTP_URL_WALLET_APPLYCATH, WithdrawBean.class, new Withdraw(withdrawalAmount, passContent, selectAccountNumber.getTxAlipay(), selectAccountNumber.getNickname(), "1"), headMap, true); mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 4, WalletApi.HTTP_URL_WALLET_APPLYCATH, WithdrawBean.class, new Withdraw(withdrawalAmount, passContent, selectAccountNumber.getTxAlipay(), selectAccountNumber.getNickname(), "1"), headMap, true);
} }
/**
* 支付宝授权
*/
private void alipayAuthV2(final WalletAuthInfoBean bean) {
Runnable authRunnable = new Runnable() {
@Override
public void run() {
// 构造AuthTask 对象
AuthTask authTask = new AuthTask(WithdrawActivity.this);
// 调用授权接口，获取授权结果
Map<String, String> result = authTask.authV2(bean.getData(), true);
Message msg = new Message();
msg.what = SDK_AUTH_FLAG;
msg.obj = result;
mHandler.sendMessage(msg);
}
};
// 必须异步调用
Thread authThread = new Thread(authRunnable);
authThread.start();
}
@SuppressLint("HandlerLeak")
private Handler mHandler = new Handler() {
@SuppressWarnings("unused")
public void handleMessage(Message msg) {
switch (msg.what) {
case SDK_AUTH_FLAG: {
@SuppressWarnings("unchecked")
AuthResult authResult = new AuthResult((Map<String, String>) msg.obj, true);
String resultStatus = authResult.getResultStatus();
// 判断resultStatus 为“9000”且result_code
// 为“200”则代表授权成功，具体状态码代表含义可参考授权接口文档
if (TextUtils.equals(resultStatus, "9000") && TextUtils.equals(authResult.getResultCode(), "200")) {
// 传入，则支付账户为该授权账户
putAlipayCode(authResult.getAuthCode());
showToast("授权成功！");
} else {
// 其他状态值则为授权失败
}
break;
}
default:
break;
}
}
};
private void putAlipayCode(String code) {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
Map<String, Object> map = new LinkedHashMap<>();
map.put("code", code);
mPresenter.getData(RvFrameConfig.HOST, 7, WalletApi.HTTP_URL_WALLET_ALIPAY_GETUSERINFO, BaseBean.class, map, headMap, false);
}
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this); ButterKnife.bind(this);
} }
@Override
public void onStart(SHARE_MEDIA share_media) {
SocializeUtils.safeShowDialog(dialog);
}
@Override
public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> data) {
if (dialog != null) {
SocializeUtils.safeCloseDialog(dialog);
}
data.get("iconurl");
// mUnionid = data.get("unionid");
// mWXOpenid = data.get("openid");
// mName = data.get("name");
}
@Override
public void onError(SHARE_MEDIA share_media, int i, Throwable t) {
SocializeUtils.safeCloseDialog(dialog);
showToast(mActivity.getString(com.rv.home.R.string.rv_login_authorization_failure) + t.getMessage());
}
@Override
public void onCancel(SHARE_MEDIA share_media, int i) {
SocializeUtils.safeCloseDialog(dialog);
}
@Override
public void onDestroy() {
super.onDestroy();
UMShareAPI.get(mActivity).release();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
UMShareAPI.get(mActivity).onSaveInstanceState(outState);
}
private class Withdraw { private class Withdraw {
private String amount; private String amount;
private String password; private String password;
......
plugin_wallet/src/main/java/com/xxrv/wallet/bean/WalletBean.java
View file @ 61a8c475
package com.xxrv.wallet.bean; package com.xxrv.wallet.bean;
import com.ruiwenliu.wrapper.base.BaseBean; import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable; import java.io.Serializable;
/** /**
...@@ -30,43 +31,44 @@ public class WalletBean extends BaseBean { ...@@ -30,43 +31,44 @@ public class WalletBean extends BaseBean {
} }
public static class DataBean implements Serializable { public static class DataBean implements Serializable {
private String userId;// ": 78, 用户id private String userId;// ": 78, 用户id
private String balance;// ": 0.20, 余额 private String balance;// ": 0.20, 余额
private String totalAmount;// ": 0.20, 总收益 private String totalAmount;// ": 0.20, 总收益
private String todayAmount;// ": 0.20 今日收益 private String todayAmount;// ": 0.20 今日收益
private String unbooked; //未入账（元） private String unbooked; //未入账（元）
private String isFrozen;// 0 正常 1冻结
public String getUserId() {
return userId; public String getUserId() {
} return userId;
}
public void setUserId(String userId) { public void setUserId(String userId) {
this.userId = userId; this.userId = userId;
} }
public String getBalance() { public String getBalance() {
return balance; return balance;
} }
public void setBalance(String balance) { public void setBalance(String balance) {
this.balance = balance; this.balance = balance;
} }
public String getTotalAmount() { public String getTotalAmount() {
return totalAmount; return totalAmount;
} }
public void setTotalAmount(String totalAmount) { public void setTotalAmount(String totalAmount) {
this.totalAmount = totalAmount; this.totalAmount = totalAmount;
} }
public String getTodayAmount() { public String getTodayAmount() {
return todayAmount; return todayAmount;
} }
public void setTodayAmount(String todayAmount) { public void setTodayAmount(String todayAmount) {
this.todayAmount = todayAmount; this.todayAmount = todayAmount;
} }
public String getUnbooked() { public String getUnbooked() {
return unbooked; return unbooked;
...@@ -75,5 +77,13 @@ public class WalletBean extends BaseBean { ...@@ -75,5 +77,13 @@ public class WalletBean extends BaseBean {
public void setUnbooked(String unbooked) { public void setUnbooked(String unbooked) {
this.unbooked = unbooked; this.unbooked = unbooked;
} }
public String getIsFrozen() {
return isFrozen;
}
public void setIsFrozen(String isFrozen) {
this.isFrozen = isFrozen;
}
} }
} }
plugin_wallet/src/main/res/layout/rv_dialog_account_type_selection.xml
View file @ 61a8c475
...@@ -65,6 +65,69 @@ ...@@ -65,6 +65,69 @@
android:src="@drawable/selector_rv_icon_mark" /> android:src="@drawable/selector_rv_icon_mark" />
</LinearLayout> </LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_item_select2"
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<ImageView
android:id="@+id/iv_icon2"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_name2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_8"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<ImageView
android:id="@+id/iv_select2"
android:layout_width="@dimen/size_16"
android:layout_height="@dimen/size_16"
android:src="@drawable/selector_rv_icon_mark" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_select3"
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<ImageView
android:id="@+id/iv_icon3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/common_icon_add" />
<TextView
android:id="@+id/tv_name3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_8"
android:text="添加支付宝提现，绑定支付宝"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_half" android:layout_height="@dimen/size_half"
......
plugin_wallet/src/main/res/layout/rv_dialog_verify_account_hint.xml
View file @ 61a8c475
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
android:id="@+id/tv_pay_amount" android:id="@+id/tv_pay_amount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="50元" android:text=""
android:textColor="@color/textGray" android:textColor="@color/textGray"
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
</LinearLayout> </LinearLayout>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:text="xxxxx" android:text=""
android:textColor="@color/textGray" android:textColor="@color/textGray"
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
</LinearLayout> </LinearLayout>
......
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