Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im

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

@@ -23,11 +23,13 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.alipay.sdk.app.PayTask;
 import com.frame.base.bus.CancelOrderEvent;
 import com.frame.base.bus.Observer;
 import com.frame.base.bus.PaymentSuccessfulEvent;
 import com.frame.base.bus.RxBus;
+import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.frame.rv.widget.PayResult;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -566,9 +568,28 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
 
         @JavascriptInterface
         public void onClick() {
+            //费用明细
             startActivity(WebActivity.getIntent(mActivity, mActivity.getString(R.string.rv_charge_details), ApiConfig.HTTP_URL_CAR_TYPE_COSTDETAIL));
         }
 
+        @JavascriptInterface
+        public void onClickWeb() {
+            //违约金说明
+            ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
+                    .withString("title", "违约金说明")
+                    .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
+                    .withInt("type", 26)
+                    .navigation();
+        }
+
+
+        @JavascriptInterface
+        public void onClickDeposit() {
+            //退押金进度
+            startActivity(DepositefundProgressDetailsActivity.getIntent(mActivity, no));
+        }
+
+
         @JavascriptInterface
         public void showMore() {
             ComponentName cmn = new ComponentName(getApplicationContext(), "com.xxfc.rv.MainActivity");

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

@@ -22,11 +22,13 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.alipay.sdk.app.PayTask;
 import com.frame.base.bus.CancelOrderEvent;
 import com.frame.base.bus.Observer;
 import com.frame.base.bus.PaymentSuccessfulEvent;
 import com.frame.base.bus.RxBus;
+import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.frame.rv.widget.PayResult;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -531,9 +533,20 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
 
         @JavascriptInterface
         public void onClick() {
+            //费用明细
             startActivity(WebActivity.getIntent(mActivity, mActivity.getString(R.string.rv_charge_details), ApiConfig.HTTP_URL_CAR_TYPE_COSTDETAIL));
         }
 
+        @JavascriptInterface
+        public void onClickWeb() {
+            //取消政策
+            ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
+                    .withString("title", "取消政策")
+                    .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
+                    .withInt("type", 3)
+                    .navigation();
+        }
+
 
         @JavascriptInterface
         public void showMore() {

plugin_calendar/src/main/java/com/rv/plugin/calendar/CalendarActivity.java

@@ -308,7 +308,7 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
                 day.setCurDay(true);
                 day.setDefTextColor(context.getResources().getColor(R.color.gray_FFB74B));
                 day.setDefNongTextColor(context.getResources().getColor(R.color.gray_FFB74B));
-                day.setCanBeChoose(false);
+                day.setCanBeChoose(true);
             } else if (CalendarDateUtil.compareDateDay(CalendarDateUtil.getCurDate(), curDay) > 0 || spanIndex >= MAX_SPAN) {
                 //如果是今天以前
                 day.setDefTextColor(context.getResources().getColor(R.color.ri_lhui));