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

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

@@ -70,6 +70,7 @@ import com.rv.home.rv.module.ui.main.home.bean.ListsBean;
 import com.rv.home.rv.module.ui.main.home.bean.OrderDataBean;
 import com.rv.home.rv.module.ui.main.home.bean.SelectedActivitiesBean;
 import com.rv.home.rv.module.ui.main.home.bean.ShopListBean;
+import com.rv.home.rv.module.ui.main.home.presenter.HomePresenter;
 import com.yuyife.banner.Banner;
 import com.yuyife.banner.BannerConfig;
 import com.yuyife.banner.listener.OnBannerListener;
@@ -91,7 +92,7 @@ import io.reactivex.functions.Consumer;
 /**
  * 首页
  */
-public class HomeFragment extends BaseFragment<CommonPresenter> implements ObservableScrollView.ScrollViewListener, SimpleRefreshLayout.OnSimpleRefreshListener {
+public class HomeFragment extends BaseFragment<HomePresenter> implements ObservableScrollView.ScrollViewListener, SimpleRefreshLayout.OnSimpleRefreshListener {
     Unbinder unbinder;
     @BindView(R2.id.ll_layout_renting_a_car)
     LinearLayout llLayoutRentingACar;
@@ -303,12 +304,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 SelectedActivitiesBean.SelectedActivityItem item = (SelectedActivitiesBean.SelectedActivityItem) adapter.getItem(position);
                 if (item != null && !TextUtils.isEmpty(item.getUrl()) && !TextUtils.isEmpty(item.getName())) {
-                    ComponentName componentName = new ComponentName(getActivity(), "com.rv.share.WebViewActivity");
-                    Intent intent = new Intent();
-                    intent.setComponent(componentName);
-                    intent.putExtra("url", item.getUrl());
-                    intent.putExtra("title", item.getName());
-                    startActivity(intent);
+                    mPresenter.toTarget(getActivity(), item.getUrl(), item.getName());
                 }
             }
         });
@@ -920,12 +916,9 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
 
                         if (listsBanners.size() > 0) {
                             BeanHomeBanner.DataBean bean = listsBanners.get(position);
-                            ComponentName componentName = new ComponentName(getActivity(), "com.rv.share.WebViewActivity");
-                            Intent intent = new Intent();
-                            intent.setComponent(componentName);
-                            intent.putExtra("url", bean.getUrl());
-                            intent.putExtra("title", bean.getTitle());
-                            startActivity(intent);
+                            if (bean != null && !TextUtils.isEmpty(bean.getUrl())) {
+                                mPresenter.toTarget(getActivity(), bean.getUrl(), bean.getTitle());
+                            }
                         }
 
                        /* if (localImages != null && localImages.size() > 0) {
@@ -967,8 +960,8 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
             }
         } else {
             headTvGetShop.setText("");
-            latLatitude = 0;
-            lonLongitude = 0;
+            getLatitude = 0;
+            getLongitude = 0;
             headTvOutShop.setText("");
             outLatitude = 0;
             outLongitude = 0;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/presenter/HomePresenter.java

+package com.rv.home.rv.module.ui.main.home.presenter;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+
+import com.rv.home.rv.module.basic.presenter.CommonPresenter;
+
+public class HomePresenter extends CommonPresenter {
+
+    /******
+     * 打开目标页面
+     * @param context
+     * @param url
+     * @param title
+     */
+    public void toTarget(Context context, String url, String title) {
+        if (url.startsWith("http")) {
+            ComponentName componentName = new ComponentName(context, "com.rv.share.WebViewActivity");
+            Intent intent = new Intent();
+            intent.setComponent(componentName);
+            intent.putExtra("url", url);
+            intent.putExtra("title", title);
+            context.startActivity(intent);
+        } else if (url.startsWith("app:")) {
+            String target = null;
+            String[] params = null;
+            if (url.contains("?")) {
+                target = url.substring(url.indexOf(":") + 1, url.indexOf("?"));
+                String paramsString = url.substring(url.indexOf("?") + 1);
+                params = paramsString.split("&");
+            } else {
+                target = url.substring(url.indexOf(":") + 1);
+            }
+            if (!TextUtils.isEmpty(target)) {
+                ComponentName componentName = new ComponentName(context, target);
+                Intent intent = new Intent();
+                intent.setComponent(componentName);
+                if (params != null && params.length > 0) {
+                    for (String param : params) {
+                        String[] values = param.split("=");
+                        if (values.length == 2) {
+                            intent.putExtra(values[0], values[1]);
+                        }
+                    }
+                }
+                context.startActivity(intent);
+            }
+        }
+    }
+}

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

@@ -112,7 +112,7 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
         int id = view.getId();
         if (TextUtils.isEmpty(shareUrl)) {
             String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
-            shareUrl = RvFrameConfig.HOST + "/h5/appHtml/view/invitationCourtesyShare.html?code=" + code + "_P0101";
+            shareUrl = RvFrameConfig.HOST + "/h5/appHtml/view/invitationCourtesyShare.html?code=" + code ;
         }
         if (id == R.id.tv_weixin) {
             mPresenter.shareWx(shareUrl, "新人专享大礼包，快去领！", "  ");