bug修复

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

@@ -115,7 +115,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
         webUrl = ApiConfig.HTTP_URL_CAR_TYPE_DETAIL + "?id=" + mCarBean.getVehicleModel().getId() + "&companyId=" + mCarBean.getCompany().getId();
         initWeb();
         initRxbus();
-        initShare(webUrl + "&shareType=app", mCarBean.getVehicleModel().getName(), mCarBean.getCompany().getAddrDetail(), mCarBean.getVehicleModel().getIcon());
+        initShare(webUrl + "&shareType=app", mCarBean.getVehicleModel().getName(), mCarBean.getVehicleModel().getKeyword(), mCarBean.getVehicleModel().getIcon());
     }
 
     private void initRxbus() {

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

@@ -40,6 +40,7 @@
             android:layout_marginRight="@dimen/size_8"
             android:padding="@dimen/size_8"
             android:text="帮助"
+            android:visibility="gone"
             android:textColor="@color/colorWrite" />
     </RelativeLayout>
 
@@ -214,7 +215,7 @@
             android:layout_height="@dimen/size_30"
             android:textSize="@dimen/text_12"
             android:gravity="center"
-            android:text="*欣新管家扫码验票完成后，才能上车哦！"/>
+            android:text="*滴房车管家扫码验票完成后，才能上车哦！"/>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file

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

@@ -41,6 +41,7 @@
             android:layout_marginRight="@dimen/size_8"
             android:padding="@dimen/size_8"
             android:text="帮助"
+            android:visibility="gone"
             android:textColor="@color/colorWrite" />
     </RelativeLayout>
 
@@ -227,7 +228,7 @@
             android:layout_height="@dimen/size_30"
             android:textSize="@dimen/text_12"
             android:gravity="center"
-            android:text="*欣新管家扫码验证完成后，才能取车哦！"/>
+            android:text="*滴房车管家扫码验证完成后，才能取车哦！"/>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file

module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java

@@ -38,8 +38,6 @@ import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.ruiwenliu.wrapper.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
-import com.ruiwenliu.wrapper.weight.refresh.IFooterWrapper;
-import com.rv.component.control.ProgressWebView;
 import com.rv.tourism.R;
 import com.rv.tourism.R2;
 import com.rv.tourism.api.TourismApi;
@@ -187,9 +185,9 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
 //                    return;
 //                }
 //            }
+//
+              mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
 
-            mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
-            llItemBottom.setVisibility(View.GONE);
         }
     }
 

module_tourism/src/main/res/layout/activity_travel_details.xml

@@ -69,45 +69,51 @@
         android:layout_height="@dimen/size_3"
         android:indeterminateOnly="false"
         android:max="100"
-        android:visibility="gone"
-        android:progressDrawable="@drawable/shape_rv_bg_yellow_progress" >
-    </ProgressBar>
+        android:progressDrawable="@drawable/shape_rv_bg_yellow_progress"
+        android:visibility="gone"></ProgressBar>
 
     <WebView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
         android:id="@+id/webView"
-        />
-
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
 
-    <include layout="@layout/common_line" />
 
     <LinearLayout
         android:id="@+id/ll_item_bottom"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/size_50"
-        android:orientation="horizontal">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/tv_customer_service"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:text="联系客服"
-            android:textColor="@color/colorMain"
-            android:textSize="@dimen/text_14" />
+        <include layout="@layout/common_line" />
 
-        <TextView
-            android:id="@+id/tv_appointment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@color/colorAuxiliaryYellow"
-            android:gravity="center"
-            android:text="立即预订"
-            android:textColor="@color/colorWrite"
-            android:textSize="@dimen/text_14" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/size_50"
+            android:orientation="horizontal">
+
+
+            <TextView
+                android:id="@+id/tv_customer_service"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="联系客服"
+                android:textColor="@color/colorMain"
+                android:textSize="@dimen/text_14" />
+
+            <TextView
+                android:id="@+id/tv_appointment"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@color/colorAuxiliaryYellow"
+                android:gravity="center"
+                android:text="立即预订"
+                android:textColor="@color/colorWrite"
+                android:textSize="@dimen/text_14" />
+
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>

plugin_search/src/main/java/com/rv/search/TravelSearchActivity.java

@@ -26,6 +26,7 @@ import com.rv.search.bean.BeanTravelSearch;
 import com.rv.search.presenter.SearchPresenter;
 
 import java.util.HashMap;
+import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -35,7 +36,7 @@ import butterknife.OnClick;
  * 旅游搜索
  */
 @Route(path = Constance.ACTIVITY_URL_TRAVELSEARCH)
-public class TravelSearchActivity extends BaseStatusActivity<SearchPresenter> {
+public class TravelSearchActivity extends BaseStatusActivity<SearchPresenter> implements BaseQuickAdapter.RequestLoadMoreListener{
 
     @BindView(R2.id.et_search)
     EditText etSearch;
@@ -52,6 +53,8 @@ public class TravelSearchActivity extends BaseStatusActivity<SearchPresenter> {
     @Autowired()
     String city;
 
+    private  String content;
+
     private TravelSearchAdapter mTravelSearchAdapter;
 
     @Override
@@ -102,7 +105,7 @@ public class TravelSearchActivity extends BaseStatusActivity<SearchPresenter> {
         if (id == R.id.iv_back){
             finish();
         }else if (id == R.id.tv_search){
-            String content = etSearch.getText().toString().trim();
+            content = etSearch.getText().toString().trim();
             if (TextUtils.isEmpty(content)){
                 showToast("请输入搜索内容！");
                 return;
@@ -123,16 +126,12 @@ public class TravelSearchActivity extends BaseStatusActivity<SearchPresenter> {
     private void setData(BeanTravelSearch data) {
         KeyboardUtil.hideKeyboard(mActivity);
         if (mPage == 1) {
-             mTravelSearchAdapter.getData().clear();
-             mTravelSearchAdapter.notifyDataSetChanged();
+            countPage = data.getData().getTotalPage();
+            mTravelSearchAdapter.setNewData(data.getData().getData());
             if (data.getData().getTotalCount() == 0) {
                 mTravelSearchAdapter.setEmptyView(getEmptyView(rvContent, -1, "暂无数据！"));
-                return;
+                mTravelSearchAdapter.notifyDataSetChanged();
             }
-
-            countPage = data.getData().getTotalPage();
-            mTravelSearchAdapter.addNewData(data);
-            mTravelSearchAdapter.loadMoreComplete();
         } else {
             mTravelSearchAdapter.addData(data.getData().getData());
             mTravelSearchAdapter.loadMoreComplete();
@@ -152,10 +151,18 @@ public class TravelSearchActivity extends BaseStatusActivity<SearchPresenter> {
         HashMap<String, Object> map = new HashMap<>();
         map.put("query", search);
         map.put("page", page);
-        map.put("limit", "10");
-        map.put("distance", 10.0);
         map.put("latitude", latLatitude);
         map.put("longitude", lonLongitude);
         mPresenter.getData(0, SearchApi.QUERY_RIM_LIST, BeanTravelSearch.class, map, true);
     }
+
+    @Override
+    public void onLoadMoreRequested() {
+        if (mPage >= countPage) {
+            mTravelSearchAdapter.loadMoreEnd();
+        } else {
+            mPage++;
+            getLoadTourAroundData(mPage,content);
+        }
+    }
 }

plugin_search/src/main/java/com/rv/search/adapter/TravelSearchAdapter.java

@@ -22,10 +22,4 @@ public class TravelSearchAdapter extends BaseQuickAdapter<BeanTravelSearch.DataB
          helper.setText(R.id.tv_name,item.getName());
         helper.setText(R.id.tv_price,String.format("￥%1$s%2$s",item.getPrice(),item.getUnit()));
     }
-
-    public void addNewData(BeanTravelSearch bean) {
-        mData.clear();
-        addData(bean.getData().getData());
-        notifyDataSetChanged();
-    }
 }