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/login/RegisteredActivity.java

@@ -120,6 +120,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
 
             @Override
             public void onClick(View widget) {
+                avoidHintColor(widget);
                 ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
                         .withString("title", "用户协议")
                         .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
@@ -142,11 +143,13 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
 
             @Override
             public void onClick(View widget) {
+                avoidHintColor(widget);
                 ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
                         .withString("title", "隐私政策")
                         .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
                         .withInt("type", 19)
                         .navigation();
+
             }
 
             @Override
@@ -163,6 +166,12 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
         tvAgreement.setText(ssb, TextView.BufferType.SPANNABLE);
     }
 
+
+    private void avoidHintColor(View view) {
+        if (view instanceof TextView)
+            ((TextView) view).setHighlightColor(getResources().getColor(android.R.color.transparent));
+    }
+
     @Override
     public void onShowResult(int requestType, BaseBean result) {
         switch (requestType) {

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

@@ -95,6 +95,8 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
             titleView.setTitle("选择取车公司");
         } else if (shopType == 2) {
             titleView.setTitle("选择还车公司");
+        } else if (shopType == 3) {
+            titleView.setTitle("选择预约公司");
         }
         titleView.setImageResource(R.id.iv_title_left, R.drawable.rv_common_icon_back_dark);
         Drawable drawable = getResources().getDrawable(R.drawable.icon_position);

plugin_carpurchase/src/main/java/com/xxrv/carpurchase/activity/ReservationInformationActivity.java

@@ -135,7 +135,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
 
     @Override
     public void onShowResult(int requestType, BaseBean result) {
-         switch (requestType){
+        switch (requestType) {
             case 1:
                 showToast("预约成功！");
                 finish();
@@ -152,10 +152,11 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
         } else if (id == R.id.ll_item_select_branch_office) {
             ARouter.getInstance()
                     .build(Constance.ACTIVITY_URL_SELECTSHOP)
-                    .withDouble("mLat",latLatitude)
-                    .withDouble("mLon",lonLongitude)
-                    .withString("cityName",nowCity)
-                    .navigation(mActivity,122);
+                    .withDouble("mLat", latLatitude)
+                    .withDouble("mLon", lonLongitude)
+                    .withString("cityName", nowCity)
+                    .withInt("shopType", 3)
+                    .navigation(mActivity, 122);
         } else if (id == R.id.tv_item_submit) {
             upDate();
         }
@@ -183,16 +184,16 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
         }
 
         String date = tvDate.getText().toString();
-        if (TextUtils.isEmpty(date)){
+        if (TextUtils.isEmpty(date)) {
             showToast("预约时间不能为空！");
             return;
         }
 
-//        String branchoffice = tvBranchOfficeName.getText().toString();
-//        if (TextUtils.isEmpty(branchoffice)){
-//            showToast("分公司不能为空！");
-//            return;
-//        }
+        String branchoffice = tvBranchOfficeName.getText().toString();
+        if (TextUtils.isEmpty(branchoffice)){
+            showToast("分公司不能为空！");
+            return;
+        }
 
         Map<String, Object> headMap = new LinkedHashMap<>();
         if (OkGoUtil.getToken() != null)
@@ -206,7 +207,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
         map.put("modelId", id);
         map.put("remark", etRemark.getText().toString().trim());
 
-        mPresenter.postBodyData(RvFrameConfig.HOST, 1, CarPurchaseApi.HTTP_URL_BUYVEHICLEFORM, BaseBean.class, map,headMap, true);
+        mPresenter.postBodyData(RvFrameConfig.HOST, 1, CarPurchaseApi.HTTP_URL_BUYVEHICLEFORM, BaseBean.class, map, headMap, true);
     }
 
 
@@ -281,7 +282,6 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
     }
 
 
-
     /**
      * 定位权限处理
      */

plugin_carpurchase/src/main/res/layout/activity_reservation_information.xml

@@ -8,10 +8,14 @@
     android:orientation="vertical"
     tools:context=".activity.ReservationInformationActivity">
 
-    <LinearLayout
+    <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <LinearLayout
@@ -40,7 +44,7 @@
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:maxLines="1"
-                    android:text="2222222222222"
+                        android:text=""
                         android:textColor="@color/textMain"
                         android:textSize="@dimen/text_16" />
 
@@ -61,7 +65,7 @@
                             android:layout_weight="1"
                             android:ellipsize="end"
                             android:maxLines="1"
-                        android:text="2222222222222"
+                            android:text=""
                             android:textColor="@color/textGray"
                             android:textSize="@dimen/text_12" />
 
@@ -102,7 +106,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                        android:text="22222222"
+                            android:text=""
                             android:textColor="@color/colorAuxiliaryRed"
                             android:textSize="@dimen/text_16"
                             android:textStyle="bold" />
@@ -313,32 +317,33 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="@dimen/size_25"
                     android:background="@null"
-                android:paddingTop="@dimen/size_5"
-                android:paddingBottom="@dimen/size_5"
                     android:gravity="left|center_vertical"
                     android:hint="请输入备注信息"
+                    android:paddingTop="@dimen/size_5"
+                    android:paddingBottom="@dimen/size_5"
                     android:text=""
                     android:textColor="@color/colorMain"
                     android:textColorHint="@color/colorGray"
                     android:textSize="@dimen/text_14" />
             </LinearLayout>
         </LinearLayout>
+    </android.support.v4.widget.NestedScrollView>
 
     <LinearLayout
-        android:background="@color/colorWrite"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/size_70">
+        android:layout_height="@dimen/size_70"
+        android:background="@color/colorWrite">
 
         <TextView
             android:id="@+id/tv_item_submit"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center"
             android:layout_margin="@dimen/size_12"
             android:background="@drawable/shape_rv_bg_shallow_dark_yellow_circle"
+            android:gravity="center"
+            android:text="提交"
             android:textColor="@color/colorWrite"
-            android:textSize="@dimen/text_16"
-            android:text="提交"/>
+            android:textSize="@dimen/text_16" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file