活动bug修复

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

@@ -11,7 +11,6 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.EditText;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.baidu.location.BDAbstractLocationListener;
@@ -200,7 +199,7 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
             isOpen = true;
         } else if (id == R.id.ll_item_search) {
 
-            startActivity(CampSearchActivity.getIntent(_mActivity));
+            startActivity(CampSearchActivity.getIntent(_mActivity, latLatitude, lonLongitude));
         }
     }
 

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

@@ -10,7 +10,9 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
@@ -45,9 +47,13 @@ public class CampSearchActivity extends BaseStatusActivity<CampPresenter> implem
     private int mPage;
     private int countPage;
     private String content;
+    private double latLatitude = 0;
+    private double lonLongitude;
 
-    public static Intent getIntent(Context context) {
-        return new Intent(context, CampSearchActivity.class);
+    public static Intent getIntent(Context context, double latLatitude, double lonLongitude) {
+        return new Intent(context, CampSearchActivity.class)
+                .putExtra("latLatitude", latLatitude)
+                .putExtra("lonLongitude", lonLongitude);
     }
 
     @Override
@@ -59,6 +65,9 @@ public class CampSearchActivity extends BaseStatusActivity<CampPresenter> implem
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         showTitle(false);
 
+        latLatitude = intent.getDoubleExtra("latLatitude", 0);
+        lonLongitude = intent.getDoubleExtra("lonLongitude", 0);
+
         campAdapter = new CampListAdapter();
         rvContent.setItemAnimator(null);
         rvContent.setLayoutManager(new GridLayoutManager(mActivity, 2));
@@ -67,6 +76,19 @@ public class CampSearchActivity extends BaseStatusActivity<CampPresenter> implem
         rvContent.setAdapter(campAdapter);
         campAdapter.setEmptyView(getEmptyView(rvContent, -1, "还没有营地信息！"));
 
+        campAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                CampListBean.DataBeanX.DataBean data = (CampListBean.DataBeanX.DataBean) adapter.getItem(position);
+                ARouter.getInstance()
+                        .build(Constance.ACTIVITY_URL_CAMPDETAIL)
+                        .withString("id", data.getId())
+                        .withDouble("longitude", lonLongitude)
+                        .withDouble("latitude", latLatitude)
+                        .navigation();
+            }
+        });
+
         campAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
             @Override
             public void onLoadMoreRequested() {

plugin_share/src/main/java/com/rv/share/WebViewActivity.java

@@ -62,6 +62,11 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
         ivTitleLeft.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (rvWebView.canGoBack()) {
+                    //返回上一个页
+                    rvWebView.goBack();
+                    return;
+                }
                 finish();
             }
         });
@@ -88,6 +93,16 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
 
     }
 
+    @Override
+    public void onBackPressedSupport() {
+        if (rvWebView.canGoBack()) {
+            //返回上一个页
+            rvWebView.goBack();
+            return;
+        }
+        super.onBackPressedSupport();
+    }
+
     @Override
     public void onDestroy() {
         if (rvWebView != null) {