bug修复

RvClient/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.xxfc.rv"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 106
-        versionName "1.0.6"
+        versionCode 107
+        versionName "1.0.7"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

RvWrapper/build.gradle

@@ -61,4 +61,6 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
     api 'com.github.bumptech.glide:okhttp3-integration:4.3.1'
     api 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
+
+    implementation 'com.alibaba:fastjson:1.2.21'
 }

RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseStatusActivity.java

@@ -7,12 +7,18 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.alibaba.fastjson.JSON;
+import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.frame.rv.config.RvFrameConstant;
 import com.ruiwenliu.wrapper.R;
+import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.ruiwenliu.wrapper.inter.OnViewHolder;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
+import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.ViewHolder;
+import com.yuyife.okgo.OkGoUtil;
 
 /**
  * Created by ruiwen
@@ -135,4 +141,13 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
         });
     }
 
+
+    protected  BeanUserInfo.UserInfo getUserInfo(){
+        BeanUserInfo.UserInfo userInfo = null;
+        String spStringCode = UtilsManager.getInstance(OkGoUtil.application).getSPStringCode(SPConstance.USER_JSON, SPConstance.USER_JSON_USERINFO);
+        if (!TextUtil.isEmpty(spStringCode)) {
+            userInfo = JSON.parseObject(spStringCode, BeanUserInfo.UserInfo.class);
+        }
+        return userInfo;
+    }
 }

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java

@@ -153,7 +153,6 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
             mWebView.removeJavascriptInterface("AndroidNative");// 向 Web端注入 java 对象
         }
         mWebView.destroy();// 生命周期销毁
-
     }
 
     @Override

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java

@@ -58,6 +58,7 @@ import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.yuyife.okgo.OkGoUtil;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -550,7 +551,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             childrenBean4.setVal("¥" + priceBean.getData().getDamageSafePrice() * dayNum);
             childrenBeanList.add(childrenBean4);
         }
-        tvPayMoney.setText(String.format("¥%1$s", payMoney));
+        tvPayMoney.setText(String.format("¥%1$s", new BigDecimal(payMoney).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
 
         orderPriceDetailBean = new OrderPriceDetailBean();
         orderPriceDetailBean.setKey("费用明细");

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/HotCarTypeAdapter.java

@@ -22,7 +22,7 @@ public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.Data
 
     @Override
     protected void convert(BaseGlideHolder helper, HomeHotGoodListBean.DataBean bean) {
-        helper.loadRoundImage(mContext,bean.getImgUrl(), (ImageView) helper.getView(R.id.iv_goods),6);
+        helper.loadRoundImage(mContext,bean.getIcon(), (ImageView) helper.getView(R.id.iv_goods),6);
         helper.setText(R.id.tv_name,bean.getName());
         helper.setText(R.id.tv_content,bean.getName1());
         if (!TextUtil.isEmpty(bean.getPrice())) {
@@ -31,8 +31,6 @@ public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.Data
             helper.setText(R.id.tv_price,"");
         }
     }
-
-
 //    @Override
 //    public int getItemCount() {
 //        return 4;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/CarTypeListBean.java

@@ -10,6 +10,7 @@ import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.yuyife.okgo.OkGoUtil;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -203,7 +204,7 @@ public class CarTypeListBean extends BaseBean implements Serializable {
                             }
                         }
                     }
-                    return amount;
+                    return new BigDecimal(amount).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
                 }
 
                 public double getPrice() {

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/HomeHotGoodListBean.java

 package com.rv.home.rv.module.ui.main.home.bean;
 
+import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.ruiwenliu.wrapper.base.BaseBean;
 
 import java.io.Serializable;
@@ -59,6 +60,19 @@ public class HomeHotGoodListBean extends BaseBean {
             this.imgUrl = imgUrl;
         }
 
+        public String getIcon() {
+            String icon = "";
+            if (!TextUtil.isEmpty(imgUrl)) {
+                String[] icons = imgUrl.split(",");
+                if (icons != null && icons.length > 0) {
+                    icon = icons[0];
+                } else {
+                    icon = imgUrl;
+                }
+            }
+            return icon;
+        }
+
         public String getName1() {
             return name1;
         }

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/OrderPriceBean.java

@@ -46,9 +46,9 @@ public class OrderPriceBean extends BaseBean{
         private double orderAmount;
         private double goodsAmount;
         private double vehicleAmount;
-        private int driverAmount; //司机价格
+        private double driverAmount; //司机价格
         private double driverPrice;  //司机单价
-        private int deposit;      //	押金价格
+        private double deposit;      //	押金价格
         private String costDetail;
         private double damageSafePrice;//免赔付单价
         private double damageSafeAmount;//免赔付价格
@@ -85,7 +85,7 @@ public class OrderPriceBean extends BaseBean{
             this.vehicleAmount = vehicleAmount;
         }
 
-        public int getDriverAmount() {
+        public double getDriverAmount() {
             return driverAmount;
         }
 
@@ -93,7 +93,7 @@ public class OrderPriceBean extends BaseBean{
             this.driverAmount = driverAmount;
         }
 
-        public int getDeposit() {
+        public double getDeposit() {
             return deposit;
         }
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/CompletedAdapter.java

@@ -53,7 +53,7 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                     helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
                     helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
                 }
-                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getOrderAmount()));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
                 helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_evaluation));
                 helper.addOnClickListener(R.id.tv_process);
                 break;
@@ -72,7 +72,7 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
                 helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
-                helper.setText(R.id.tv_price, String.format("¥%1$s", "3200000"));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getRealAmount()));
                 helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_evaluation));
                 helper.addOnClickListener(R.id.tv_camp_process);
                 break;
@@ -90,7 +90,7 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.loadRoundImage(mContext, dataBean3.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
                 helper.setText(R.id.tv_name, dataBean3.getName());
                 helper.setText(R.id.tv_content,dataBean3.getOrderMemberDetail().getContent() );
-                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean3.getOrderAmount()));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean3.getRealAmount()));
                 helper.setVisible(R.id.tv_member_pay,false);
 //                helper.setText(R.id.tv_member_pay, mContext.getString(R.string.rv_to_pay_for));
 //                helper.addOnClickListener(R.id.tv_member_pay);

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ForPaymentAdapter.java

@@ -62,7 +62,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                     helper.setText(R.id.tv_get_address, dataBean.getOrderRentVehicleDetail().getStart_addr());
                     helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
                     helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
-                    helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getOrderAmount()));
+                    helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
                 }
                 helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_pay_for));
                 helper.addOnClickListener(R.id.tv_process);
@@ -81,7 +81,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) + TimeManager.stampToDate2(String.valueOf(dataBean.getOrderTourDetail().getStartTime())));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
-                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getOrderAmount()));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
                 helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
                 helper.addOnClickListener(R.id.tv_camp_process);
                 break;
@@ -98,7 +98,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
                 helper.setText(R.id.tv_name, dataBean.getName());
                 helper.setText(R.id.tv_content, dataBean.getOrderMemberDetail().getContent());
-                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getOrderAmount()));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
                 helper.setText(R.id.tv_member_pay, mContext.getString(R.string.rv_to_pay_for));
                 helper.addOnClickListener(R.id.tv_member_pay);
                 break;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/HaveToTravelAdapter.java

@@ -53,7 +53,7 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
                     helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
                     helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
                 }
-                helper.setText(R.id.tv_price,String.format("¥%1$s",dataBean.getOrderAmount()));
+                helper.setText(R.id.tv_price,String.format("¥%1$s",dataBean.getRealAmount()));
                 helper.setText(R.id.tv_process,mContext.getString(R.string.rv_to_out_car));
                 helper.addOnClickListener(R.id.tv_process);
                 break;
@@ -72,7 +72,7 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
                 helper.setText(R.id.tv_car_type,dataBean2.getName());
                 helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
-                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getOrderAmount()));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getRealAmount()));
                 helper.setVisible(R.id.tv_camp_process,false);
 //                helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
 //                helper.addOnClickListener(R.id.tv_camp_process);

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/OrderListAdapter.java

@@ -53,7 +53,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                     helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
                     helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
                 }
-                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getOrderAmount()));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
 
                 /**
                  *
@@ -117,7 +117,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
                 helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) + TimeManager.stampToDate2(String.valueOf(dataBean2.getOrderTourDetail().getStartTime())));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
-                helper.setText(R.id.tv_price, String.format("¥%1$s", "3200000"));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getRealAmount()));
 
                 /**
                  *
@@ -181,7 +181,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.loadRoundImage(mContext, dataBean3.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
                 helper.setText(R.id.tv_name, dataBean3.getName());
                 helper.setText(R.id.tv_content,dataBean3.getOrderMemberDetail().getContent() );
-                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean3.getOrderAmount()));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean3.getRealAmount()));
 
                 /**
                  *

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ToTravelAdapter.java

@@ -53,7 +53,7 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                     helper.setText(R.id.tv_out_time, TimeManager.stampToDate(String.valueOf(dataBean.getOrderRentVehicleDetail().getEnd_time())));
                     helper.setText(R.id.tv_out_address, dataBean.getOrderRentVehicleDetail().getEnd_addr());
                 }
-                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getOrderAmount()));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
                 helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_get_car));
                 helper.addOnClickListener(R.id.tv_process);
                 break;
@@ -72,7 +72,7 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_car_type, dataBean2.getName());
                 helper.setText(R.id.tv_out_time, mContext.getString(R.string.rv_to_time) +TimeManager.stampToDate2(String.valueOf( dataBean2.getOrderTourDetail().getStartTime())));
                 helper.setText(R.id.tv_count_person, String.format("%1$s%2$s", mContext.getString(R.string.rv_to_person), dataBean2.getOrderTourDetail().getTotalNumber(), mContext.getString(R.string.rv_person)));
-                helper.setText(R.id.tv_price, String.format("¥%1$s", "3200000"));
+                helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean2.getRealAmount()));
                 helper.setText(R.id.tv_camp_process, mContext.getString(R.string.tv_boarding));
                 helper.addOnClickListener(R.id.tv_camp_process);
                 break;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/bean/OrderListBean.java

@@ -127,6 +127,7 @@ public class OrderListBean extends BaseBean {
             private int statusX;
             private double goodsAmount;
             private double orderAmount;
+            private double realAmount;
             private int userId;
             private String picture;
             private String crtTime;
@@ -143,6 +144,14 @@ public class OrderListBean extends BaseBean {
             private int detailId;
             private String name;
 
+            public double getRealAmount() {
+                return realAmount;
+            }
+
+            public void setRealAmount(double realAmount) {
+                this.realAmount = realAmount;
+            }
+
             public int getId() {
                 return id;
             }

module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java

@@ -20,6 +20,9 @@ import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
+import com.frame.base.bus.IDCardCertificationEvent;
+import com.frame.base.bus.Observer;
+import com.frame.base.bus.RxBus;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.google.gson.Gson;
@@ -51,6 +54,7 @@ import java.util.Map;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
 
@@ -108,10 +112,23 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         tvTitleCenter.setText("旅游详情");
         webUrl = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=" + id;
         initWeb();
+        initRxbus();
         initShare(webUrl+"&shareType=app", name, content, url);
         mWebView.loadUrl("JavaScript:getTourStock()"); // Android调用h5
     }
 
+    private void initRxbus() {
+        RxBus.tObservable(IDCardCertificationEvent.class)
+                .observeOn(Schedulers.newThread())
+                .subscribe(new Observer<IDCardCertificationEvent>(disposable) {
+                    @Override
+                    public void onNext(IDCardCertificationEvent event) {
+                        mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
+                        llItemBottom.setVisibility(View.GONE);
+                    }
+                });
+    }
+
     @OnClick({R2.id.iv_back, R2.id.tv_appointment, R2.id.iv_collect, R2.id.iv_share, R2.id.tv_customer_service})
     public void onViewClicked(View view) {
         int id = view.getId();
@@ -143,6 +160,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
                 ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
                 return;
             }
+
             BeanUserInfo.UserInfo userInfo = getUserInfo();
             if (userInfo !=null){
                 if (userInfo.getCertificationStatus() ==0){