bug修复

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

@@ -205,7 +205,7 @@ public class MainActivity extends BaseActivity<CommonPresenter>{
         } else if (id == R.id.rl_camp) {
             setCurrent(TYPE_CAMP);
         } else if (id == R.id.rl_found) {
-            setCurrent(TYPE_FOUND);
+//            setCurrent(TYPE_FOUND);
         } else if (id == R.id.rl_mine) {
             setCurrent(TYPE_MINE);
         }
@@ -216,7 +216,7 @@ public class MainActivity extends BaseActivity<CommonPresenter>{
         list.add(HomeFragment.getInstance(TYPE_HOME_PAGE));
         list.add(TourismFragment.getInstance(TYPE_TRAVEL));
         list.add(CampFragment.getInstance(TYPE_CAMP));
-        list.add(DiscoveryFragment.getInstance(TYPE_FOUND));
+//        list.add(DiscoveryFragment.getInstance(TYPE_FOUND));
         list.add(MineFragment.getInstance(TYPE_MINE));
         return list;
     }

RvFrame/src/main/java/com/frame/rv/config/RvFrameConfig.java

@@ -11,7 +11,8 @@ public interface RvFrameConfig extends RvFrameConstant {
 //    String HOST = "https://xxtest.upyuns.com";
 //    String HOST = "http://10.1.37.192:8765";
 //    String HOST = "http://10.1.37.245:10000";
-    String HOST = "https://dev.dfangche.com";
+//    String HOST = "https://dev.dfangche.com";
+    String HOST = "https://api.dfangche.com";
     String ADMIN_POST = HOST + "/api/admin/";
     String AUTH_POST = HOST + "/api/auth/";
     String VEHICLE_POST = HOST + "/vehicle/";//租车

module_camp/src/main/java/com/rv/camp/CampFragment.java

@@ -86,9 +86,10 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
         mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
         permissionProcess();
         campAdapter = new CampListAdapter();
+        rvContent.setItemAnimator(null);
         rvContent.setLayoutManager(new GridLayoutManager(_mActivity, 2));
         rvContent.addItemDecoration(new AbSpacesItemDecoration(20,10));// 分割线。
-        rvContent.setNestedScrollingEnabled(false);
+//        rvContent.setNestedScrollingEnabled(false);
         rvContent.setAdapter(campAdapter);
 
         campTypeListAdapter = new CampTypeListAdapter();
@@ -120,6 +121,25 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
                         .navigation();
             }
         });
+
+        campAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override public void onLoadMoreRequested() {
+                if (rvContent != null) {
+                    rvContent.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (mPage >= countPage) {
+                                campAdapter.loadMoreEnd();
+                            } else {
+                                mPage++;
+                                getCampList(mPage);
+                            }
+                        }
+                    }, 200);
+                }
+            }
+        }, rvContent);
+
     }
 
     @Override
@@ -166,12 +186,12 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
 
     @Override
     public void onLoadMoreRequested() {
-        if (mPage >= countPage) {
-            campAdapter.loadMoreEnd();
-        } else {
-            mPage++;
-            getCampList(mPage);
-        }
+//        if (mPage >= countPage) {
+//            campAdapter.loadMoreEnd();
+//        } else {
+//            mPage++;
+//            getCampList(mPage);
+//        }
     }
 
 
@@ -180,7 +200,7 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
      */
     private void getCampList(int page) {
         Map<String, Object> map = new LinkedHashMap<>();
-        map.put("page", page);
+        map.put("pageNo", page);
         if (type != null) {
             map.put("type", type);
         }
@@ -212,7 +232,6 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
 
     private void processData(CampListBean bean) {
         if (mPage == 1) {
-            campAdapter.getData().clear();
             if (bean.getData().getTotalCount() == 0) {
                 campAdapter.notifyDataSetChanged();
 //                campAdapter.setEmptyView(getEmptyView(rvContent, -1, "还没有营地信息！"));
@@ -223,7 +242,6 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
             if (bean.getData().getData() != null) {
                 campAdapter.setNewData(bean.getData().getData());
             }
-            campAdapter.loadMoreComplete();
         } else {
             if (bean.getData().getData() != null) {
                 campAdapter.addData(bean.getData().getData());

module_discovery/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java

@@ -3,7 +3,7 @@ package com.xxfc.discovery.api;
 import com.frame.rv.config.RvFrameConfig;
 
 public interface DiscoveryApi extends RvFrameConfig {
-    String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
+    String IMA_BASEUSRL = "https://imapi.dfangche.com/xxfcim";
     //问题列表
     String DISCOVERY_IMQUESTION_LIST = HOST + "/api/im/imQuestion/list";
 

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

@@ -125,6 +125,7 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
                         break;
                     case 5:
                         if (id == R.id.tv_process) {
+                            startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity, dataBean));
                         } else if (id == R.id.tv_camp_process) {
                             startActivity(GetOnTheCarQRCodeActivity.getIntent(_mActivity, dataBean));
                         }

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

@@ -80,7 +80,7 @@ public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implement
             @Override
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
                 int id = view.getId();
-                if (id == R.id.tv_rvtour_label){
+                if (id == R.id.tv_process){
                     OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
                     startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity,dataBean));
                 }

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

@@ -124,7 +124,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         webUrl = TourismApi.TRAVEL_DETAILS +"?id=" + id;
         initWeb();
         initRxbus();
-        initShare(webUrl+"&shareType=app", name, content, url);
+        initShare(webUrl+"&shareType=app", name, "", url);
         mWebView.loadUrl("JavaScript:getTourStock()"); // Android调用h5
     }
 

plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java

@@ -15,6 +15,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.alipay.sdk.app.EnvUtils;
 import com.base.utils.ui.image.round.RoundImageView;
 import com.frame.base.bus.PaymentFailedEvent;
 import com.frame.base.bus.PaymentSuccessfulEvent;
@@ -104,6 +105,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        EnvUtils.setEnv(EnvUtils.EnvEnum.SANDBOX);
 //        StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
     }