Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

RvClient/src/main/AndroidManifest.xml

@@ -119,7 +119,7 @@
 
         <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
-            android:value="NrMH6EqS8HZLtcYzqIUXQFsw7rZUK9S8" /> <!-- <meta-data -->
+            android:value="QaN98C5rV8hawNLVix0FAPLSsz7uh2q1" /> <!-- <meta-data -->
         <!-- android:name="android.max_aspect" -->
         <!-- android:value="2.1" /> -->
         <!-- autoSize布局最大分辨率 -->
@@ -132,6 +132,11 @@
             android:value="640" /> <!-- umShare 相关 start -->
         <!-- WeiXin callback -->
 
+        <meta-data
+            android:name="UMENG_APPKEY"
+            android:value="5d242bf24ca357797e000922" >
+        </meta-data>
+
         <activity
             android:name=".wxapi.WXEntryActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

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

@@ -120,16 +120,16 @@ public class RvClientApplication extends FrameApp {
     private void initUM() {
         //设置LOG开关，默认为false
         UMConfigure.setLogEnabled(true);
-        UMConfigure.init(this, "5bc3fed7b465f5eedb000027", "MeiYeYi", UMConfigure.DEVICE_TYPE_PHONE, null);
-//
-    }
+        UMConfigure.init(this, "5d242bf24ca357797e000922", "umeng", UMConfigure.DEVICE_TYPE_PHONE, null);
+//        PlatformConfig.setWeixin(RvFrameConfig.APP_ID, "088effbd5e5c5340779d512f87fab15e");
+        PlatformConfig.setWeixin(RvFrameConfig.APP_ID, "128cf4ad74b73c16ae5c5b3601da3f27");
 
-    {
-        PlatformConfig.setWeixin(RvFrameConfig.APP_ID, "088effbd5e5c5340779d512f87fab15e");
         PlatformConfig.setQQZone("100424468", "c7394704798a158208a74ab60104f0ba");
+
     }
 
 
+
     private void initAuto() {
 
         //当 App 中出现多进程, 并且您需要适配所有的进程, 就需要在 App 初始化时调用 initCompatMultiProcess()

module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java

@@ -39,6 +39,7 @@ public class ApiConfig {
     public static String HTTP_URL_PAY_THE_CALLBACK = RvFrameConfig.VEHICLE_ORDER + "baseOrder/pay";//订单支付
     public static String HTTP_URL_CAR_TYPE_DETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/detail.html";//租车类型详情页
     public static String HTTP_URL_CAR_TYPE_ORDERDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/orderDetail.html";//订单详情页
+    public static String HTTP_URL_VIP_ORDERDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/vipOrderDetail.html?no=%s";
     public static String HTTP_URL_BASEORDER_CANCEL = RvFrameConfig.VEHICLE_ORDER + "baseOrder/cancel/";//重置密码
     public static String HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/travelOrderDetail.html";//旅游订单详情页
     public static String HTTP_URL_CAR_TYPE_COSTDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/costDetail.html";//费用明细
@@ -68,5 +69,5 @@ public class ApiConfig {
 
     public static String HTTP_URL_FIND_BANNERLIST = RvFrameConfig.HOST + "/api/app/banner/app/unauth/findBannerlist"; // banner图接口
 
-    public static String HTTP_URL_EFFECTIVE_TIME =  RvFrameConfig.VEHICLE_ORDER + "/baseOrder/app/unauth/getOrderParam" ; // 获取订单失效时间
+    public static String HTTP_URL_EFFECTIVE_TIME = RvFrameConfig.VEHICLE_ORDER + "/baseOrder/app/unauth/getOrderParam"; // 获取订单失效时间
 }

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

@@ -82,7 +82,7 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
                 } else if (2 == dataBean.getType()) {
                     startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
                 } else if (3 == dataBean.getType()) {
-                    startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean),3);
+                    startActivityForResult(MemberOrderDetailsActivity.getIntent(_mActivity, dataBean),3);
                 }
             }
         });

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

@@ -88,7 +88,7 @@ public class CompletedFragment extends BaseFragment<CommonPresenter> implements
                 } else if (2 == dataBean.getType()) {
                     startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
                 } else if (3 == dataBean.getType()) {
-                    startActivity(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean));
+                    startActivity(MemberOrderDetailsActivity.getIntent(_mActivity, dataBean));
                 }
             }
         });

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

@@ -9,18 +9,12 @@ import android.os.Message;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.View;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
-import com.frame.base.bus.CancelOrderEvent;
-import com.frame.base.bus.Observer;
-import com.frame.base.bus.PaymentFailedEvent;
 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.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
@@ -32,7 +26,6 @@ import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
-import com.rv.home.rv.module.ui.main.home.ConfirmOrderActivity;
 import com.rv.home.rv.module.ui.main.home.bean.EffectiveTimeBean;
 import com.rv.home.rv.module.ui.main.home.bean.OrderPayBean;
 import com.rv.home.rv.module.ui.main.home.order.adapter.ForPaymentAdapter;
@@ -47,7 +40,6 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import butterknife.BindView;
-import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
@@ -113,7 +105,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
                 } else if (2 == dataBean.getType()) {
                     startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
                 } else if (3 == dataBean.getType()) {
-
+                    startActivityForResult(MemberOrderDetailsActivity.getIntent(_mActivity, dataBean), 3);
                 }
             }
         });

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

@@ -42,6 +42,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@null"
+                android:gravity="left|center_vertical"
                 android:hint="@string/rv_name_hint"
                 android:maxLength="10"
                 android:paddingLeft="@dimen/size_20"
@@ -80,6 +81,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@null"
+                android:gravity="left|center_vertical"
                 android:hint="@string/rv_phone_hint"
                 android:inputType="number"
                 android:maxLength="11"
@@ -120,6 +122,7 @@
                 android:layout_height="match_parent"
                 android:background="@null"
                 android:digits="0123456789xyzXYZ"
+                android:gravity="left|center_vertical"
                 android:hint="@string/rv_id_card_hint"
                 android:inputType="number|text"
                 android:maxLength="18"

module_mine/src/main/res/layout/activity_add_avisitor.xml

@@ -79,6 +79,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@null"
+                android:gravity="center_vertical|left"
                 android:hint="@string/et_traveler_name_hint"
                 android:maxLength="10"
                 android:paddingLeft="@dimen/size_5"
@@ -187,14 +188,15 @@
             </LinearLayout>
 
             <EditText
-                android:inputType="number|text"
-                android:digits="0123456789xyzXYZ"
                 android:id="@+id/et_id_card"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@null"
+                android:digits="0123456789xyzXYZ"
+                android:gravity="center_vertical|left"
                 android:hint="@string/et_id_card_hint"
+                android:inputType="number|text"
                 android:maxLength="18"
                 android:paddingLeft="@dimen/size_5"
                 android:text=""
@@ -229,6 +231,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@null"
+                android:gravity="center_vertical|left"
                 android:hint="@string/et_phone_hint"
                 android:inputType="phone|number"
                 android:maxLength="11"

plugin_version/src/main/res/xml/update_file_paths.xml

 <?xml version="1.0" encoding="utf-8"?>
 <paths>
 
-    <files-path name="name" path="" />
+    <files-path name="files-path" path="" />
      
-    <cache-path name="name" path="" />
+    <cache-path name="cache-path" path="" />
      
-    <external-path name="name" path="" />
+    <external-path name="external-path" path="photo" />
      
-    <external-files-path name="name" path="" />
+    <external-files-path name="external-files-path" path="" />
      
-    <external-cache-path name="name" path="" />
+    <external-cache-path name="external-cache-path" path="" />
 </paths>