活动优化

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         flavorDimensions "default"
-        versionCode 154
-        versionName "1.5.4"
+        versionCode 156
+        versionName "1.5.6"
         multiDexEnabled true
 
 

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

@@ -2,7 +2,6 @@ package com.xxfc.rv;
 
 import android.app.AlertDialog;
 import android.app.Notification;
-import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.ComponentName;
@@ -30,7 +29,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.base.utils.tools.android.NetworkUtil;
 import com.base.utils.ui.image.round.RoundImageView;
 import com.bumptech.glide.Glide;
 import com.frame.base.url.Constance;
@@ -436,7 +434,6 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
     }
 
 
-
     private void getActivityPopup() {
         Map<String, Object> map = new HashMap<>();
         if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
@@ -705,6 +702,13 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
         if (!TextUtils.isEmpty(copyCode)) {
             AppCookie.save("code", copyCode);
 
+            if (copyCode.contains("-")) {
+                String[] split = copyCode.split("-");
+                if (split != null && split.length > 0) {
+                    copyCode = split[0];
+                }
+            }
+
             String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
             if (!code.equals(copyCode)) {   //判断是否是自己点分享，防止
                 getShareUser(copyCode);

module_home/src/main/java/com/rv/home/rv/module/ui/login/ConfirmPwdActivity.java

@@ -101,7 +101,14 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
 
         String inviteCode = AppCookie.getStringValue("code");
         if (!TextUtils.isEmpty(inviteCode)) {
-            etInviteCode.setText(inviteCode);
+            if (inviteCode.contains("_")) {
+                String[] split = inviteCode.split("-");
+                if (split != null && split.length > 0) {
+                    etInviteCode.setText(split[0]);
+                }
+            } else {
+                etInviteCode.setText(inviteCode);
+            }
             etInviteCode.setEnabled(false);
         }
         initData();
@@ -211,7 +218,7 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
         text.setText("");
     }
 
-    @OnClick({R2.id.iv_clear_pwd,  R2.id.tv_agreement, R2.id.tv_registered})
+    @OnClick({R2.id.iv_clear_pwd, R2.id.tv_agreement, R2.id.tv_registered})
     public void onViewClicked(View view) {
         if (view.getId() == R.id.iv_clear_pwd) {
             pwdShow = !pwdShow;
@@ -258,7 +265,12 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
         if (isQQ == 0) {
             map.put("unionid", uid);
         }
-        map.put("code", getInviteCode());
+        String inviteCode = AppCookie.getStringValue("code");
+        if (!TextUtils.isEmpty(inviteCode)) {
+            map.put("code", inviteCode);
+        } else {
+            map.put("code", getInviteCode());
+        }
         mPresenter.postData(2, ApiConfig.HTTP_URL_OTHER_LOGIN_BIND, RegisteredBean.class, map, true);
     }
 

module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java

@@ -104,7 +104,15 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
         if (mType == 0) {
             String inviteCode = AppCookie.getStringValue("code");
             if (!TextUtils.isEmpty(inviteCode)) {
-                etInviteCode.setText(inviteCode);
+                if (inviteCode.contains("_")) {
+                    String[] split = inviteCode.split("-");
+                    if (split != null && split.length > 0) {
+                        etInviteCode.setText(split[0]);
+                    }
+                } else {
+                    etInviteCode.setText(inviteCode);
+
+                }
                 etInviteCode.setEnabled(false);
             }
         }
@@ -308,7 +316,13 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
         map.put("username", getPhone());
         map.put("mobilecode", getCode());
         map.put("password", getPwd());
-        map.put("code", getInviteCode());
+
+        String inviteCode = AppCookie.getStringValue("code");
+        if (!TextUtils.isEmpty(inviteCode)) {
+            map.put("code", inviteCode);
+        } else {
+            map.put("code", getInviteCode());
+        }
         mPresenter.postData(RvFrameConfig.AUTH_POST, 1, ApiConfig.HTTP_URL_USER_REGISTER, RegisteredBean.class, map, headMap, true);
     }
 

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

@@ -315,7 +315,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
                 SelectedActivitiesBean.SelectedActivityItem item = (SelectedActivitiesBean.SelectedActivityItem) adapter.getItem(position);
                 mPresenter.saveOnclick("3", String.valueOf(item.getId()));
                 if (item != null && !TextUtils.isEmpty(item.getUrl()) && !TextUtils.isEmpty(item.getName())) {
-                    mPresenter.toTarget(getActivity(), item.getUrl(), item.getName());
+                    mPresenter.toTarget(getActivity(), item.getUrl(), item.getName(),String.valueOf(item.getId()));
                 }
             }
         });
@@ -1216,7 +1216,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
                             BeanHomeBanner.DataBean bean = listsBanners.get(position);
                             mPresenter.saveOnclick("2", bean.getId());
                             if (bean != null && !TextUtils.isEmpty(bean.getUrl())) {
-                                mPresenter.toTarget(getActivity(), bean.getUrl(), bean.getTitle());
+                                mPresenter.toTarget(getActivity(), bean.getUrl(), bean.getTitle(),bean.getId());
                             }
                         }
 

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

@@ -17,7 +17,7 @@ public class HomePresenter extends CommonPresenter {
      * @param url
      * @param title
      */
-    public void toTarget(Context context, String url, String title) {
+    public void toTarget(Context context, String url, String title, String id) {
 
         if (!TextUtils.isEmpty(url) && url.contains("login=1")) {
             if (!isLogin(context)) {
@@ -30,6 +30,7 @@ public class HomePresenter extends CommonPresenter {
             intent.setComponent(componentName);
             intent.putExtra("url", url);
             intent.putExtra("title", title);
+            intent.putExtra("id", id);
             context.startActivity(intent);
         } else if (url.startsWith("app:")) {
             String target = null;

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

@@ -71,7 +71,7 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
                 finish();
             }
         });
-        rvWebView = new RvWebView(getApplicationContext(), listener);
+        rvWebView = new RvWebView(getApplicationContext(),listener);
         if (NetworkUtil.isNetworkAvailable(this)) {
             llContent.addView(rvWebView);
             if (!TextUtils.isEmpty(url)) {

plugin_share/src/main/java/com/rv/share/view/RvWebView.java

@@ -34,6 +34,7 @@ public class RvWebView extends WebView {
     private ProgressBar progressBar;
     private WebViewListener listener;
 
+
     public RvWebView(Context context, WebViewListener listener) {
         super(context);
         this.listener = listener;