租车和钱包修改

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

@@ -34,6 +34,7 @@ import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.ruiwenliu.wrapper.bean.UserInfoBean;
 import com.ruiwenliu.wrapper.util.UtilsManager;
@@ -41,15 +42,17 @@ import com.ruiwenliu.wrapper.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.utils.Cookie;
+import com.rv.component.utils.DateUtils;
 import com.rv.component.utils.IsAppInstall;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
-import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
+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.OrderDataBean;
 import com.rv.home.rv.module.ui.main.home.bean.OrderPriceBean;
+import com.rv.home.rv.module.ui.main.home.dialog.CheckPriceDialog;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.shareboard.SnsPlatform;
@@ -88,6 +91,9 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
     private ShareManager shareManager;
     private String webUrl;
     private ClipboardManager myClipboard;
+    private String begDate;
+    private String endDate;
+    private CheckPriceDialog checkPriceDialog;
 
     public static Intent getIntent(Context context, OrderDataBean bean, CarTypeListBean.DataBeanX.DataBean carBean, String startTime, String endTime) {
         return new Intent(context, CarDetailActivity.class)
@@ -114,6 +120,8 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         dataBean = (OrderDataBean) intent.getSerializableExtra("bean");
         mCarBean = (CarTypeListBean.DataBeanX.DataBean) intent.getSerializableExtra("carBean");
+        begDate = getIntent().getStringExtra("startTime");
+        endDate = getIntent().getStringExtra("endTime");
         showTitle(false);
         tvTitleCenter.setText("车辆详情");
         webUrl = ApiConfig.HTTP_URL_CAR_TYPE_DETAIL + "?id=" + mCarBean.getVehicleModel().getId() + "&companyId=" + mCarBean.getCompany().getId();
@@ -121,6 +129,10 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
         initRxbus();
         String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
         initShare(webUrl + "&shareType=app&code=" + code, mCarBean.getVehicleModel().getName(), mCarBean.getVehicleModel().getKeyword(), mCarBean.getVehicleModel().getIcon());
+
+        if (checkPriceDialog == null) {
+            checkPriceDialog = new CheckPriceDialog(mActivity);
+        }
     }
 
     private void initRxbus() {
@@ -179,9 +191,25 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
                 OrderPriceBean priceBean = (OrderPriceBean) result;
                 startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime"), priceBean));
                 break;
+            case 2:
+                checkPrice((CarRentalPriceBean) result);
+                break;
+        }
+    }
+
+    /**
+     * 设置价格日历
+     *
+     * @param result
+     */
+    private void checkPrice(CarRentalPriceBean result) {
+        if (checkPriceDialog != null) {
+            checkPriceDialog.setNewData(result.getData());
+            checkPriceDialog.show();
         }
     }
 
+
     private void userInfoData(UserInfoBean infoBean) {
         if (infoBean != null) {
             UserInfoBean.UserInfo info = infoBean.getData();
@@ -485,6 +513,20 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
             in.setComponent(componentName);
             startActivity(in);
         }
+
+        /**
+         * 查看每天价格
+         */
+        @JavascriptInterface
+        public void showDailyPrice() {
+            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 + mCarBean.getVehicleModel().getId(), CarRentalPriceBean.class, map, headMap, false);
+        }
     }
 
     /**

module_home/src/main/res/layout/rv_dialog_check_price.xml

@@ -4,6 +4,7 @@
     android:layout_height="wrap_content"
     android:background="@color/colorWrite"
     android:orientation="vertical"
+    android:paddingBottom="@dimen/size_10"
     android:paddingLeft="@dimen/size_15"
     android:paddingRight="@dimen/size_15">
 
@@ -130,6 +131,7 @@
     <android.support.v7.widget.RecyclerView
         android:id="@+id/rv_content"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
+        android:layout_height="wrap_content">
+    </android.support.v7.widget.RecyclerView>
 
 </LinearLayout>
\ No newline at end of file

plugin_wallet/src/main/java/com/xxrv/wallet/activity/WalletActivity.java

@@ -111,7 +111,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
                 .subscribe(new Observer<IDCardCertificationEvent>(disposable) {
                     @Override
                     public void onNext(IDCardCertificationEvent event) {
-                        getCheckSetPwd();
+                        getAccountNumber();
                     }
                 });
     }
@@ -142,9 +142,9 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
                     num++;
                 }
             }
-            if (num >0){
-                startActivity(WithdrawActivity.getIntent(mActivity, balance));
-            }else {
+            if (num > 0) {
+                getCheckSetPwd();
+            } else {
                 showBindingDialog();
             }
 
@@ -267,7 +267,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
                     }.show();
 
                 } else {
-                    getCheckSetPwd();
+                    getAccountNumber();
                 }
             }
 
@@ -298,7 +298,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
     private void setCheckPwd(WalletCheckPwdBean bean) {
         if (bean != null) {
             if (bean.isData()) {  //true-设置过；false-没有
-                getAccountNumber();
+                startActivity(WithdrawActivity.getIntent(mActivity, balance));
             } else {
                 startActivity(SetPayPwdActivity.getIntent(mActivity, 0));
             }