Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into Branch_1.4.6

RvClient/src/main/java/com/xxfc/rv/MainActivity.java

@@ -438,7 +438,6 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
         if (mAdapter != null) {
             mAdapter.getCurrentFragment().onActivityResult(requestCode, resultCode, data);
         }
-
     }
 
     @Override

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

@@ -161,6 +161,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
     private final int TYPE_REQUEST_DRIVING = 3;
 
 
+
     private boolean serviceFeeShow = true;
     private boolean cleanFeeShow = true;
     private OrderDataBean dataBean;
@@ -664,6 +665,16 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             tvLayoutMemberHint.setVisibility(View.VISIBLE);
             llLayoutMemberHint.setVisibility(View.VISIBLE);
             tvFreeCarDays.setText("（剩余" + memberData.getRentFreeDays() + "天）");
+            if (memberData.getRentFreeDays() > 0) {
+                swbtnMember.setChecked(true);
+                isMemberType = 1;
+                dataBean.setRentFreeDay(1);
+                couponAmount = 0;
+                getPayMoney();
+            }else {
+                dataBean.setRentFreeDay(0);
+                isMemberType = 0;
+            }
         }
 
         if (priceBean.getData() != null) {