Merge branch 'master-price-john' of http://113.105.137.151:22280/lify/rvapp into master-video

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

@@ -59,7 +59,6 @@ import com.rv.home.rv.module.ApiConfig;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.HomeFragment;
 import com.rv.home.rv.module.ui.main.home.bean.EffectiveTimeBean;
-import com.rv.im.CustomerListActivity;
 import com.rv.im.ImService;
 import com.rv.im.ImSetting;
 import com.rv.im.call.AudioOrVideoController;
@@ -77,6 +76,7 @@ import com.rv.version.DownListenerManager;
 import com.rv.version.bean.VersionCheckBean;
 import com.rv.version.util.DownloadAppUtils;
 import com.rv.version.util.UpdateAppUtils;
+import com.sh.sdk.shareinstall.ShareInstall;
 import com.xxfc.discovery.DiscoveryFragment;
 import com.xxfc.discovery.api.DiscoveryApi;
 import com.xxfc.discovery.bean.DiscoveryIMTokenBean;
@@ -86,6 +86,8 @@ import com.yuyife.okgo.OkGoUtil;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -266,6 +268,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
         checkVersion();
         checkToken();
         getPreRentDays();
+        initShareCode();
     }
 
     @Override
@@ -351,6 +354,27 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
                 .update();
     }
 
+
+    /********
+     * 保存分享的code
+     */
+    private void initShareCode() {
+        ShareInstall.getInstance().getInfo(getIntent(), info -> {
+            // 客户端获取到的参数是json字符串格式
+            LogUtil.d("ShareInstall", "info = " + info);
+            JSONObject object;
+            try {
+                object = new JSONObject(info);
+                String inviteCode = object.optString("code");
+                if (!TextUtils.isEmpty(inviteCode)) {
+                    AppCookie.save("code", inviteCode);
+                }
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        });
+    }
+
     /**
      * 设置token时间检测
      */

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

@@ -76,27 +76,6 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         showTitle(false);//隐藏菜单栏
         permissionProcess();
-        initShareCode();
-    }
-
-    /********
-     * 保存分享的code
-     */
-    private void initShareCode() {
-        ShareInstall.getInstance().getInfo(getIntent(), info -> {
-            // 客户端获取到的参数是json字符串格式
-            LogUtil.d("ShareInstall", "info = " + info);
-            JSONObject object;
-            try {
-                object = new JSONObject(info);
-                String inviteCode = object.optString("code");
-                if (!TextUtils.isEmpty(inviteCode)) {
-                    AppCookie.save("code", inviteCode);
-                }
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-        });
     }
 
     private void init() {

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

@@ -95,20 +95,6 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
         jumptype = intent.getIntExtra("jumptype", 0);
 //        etPhone.setText(""+mActivity.getPackageName());
         initRxbus();
-        ShareInstall.getInstance().getInfo(getIntent(), info -> {
-            // 客户端获取到的参数是json字符串格式
-            LogUtil.d("ShareInstall", "info = " + info);
-            JSONObject object = null;
-            try {
-                object = new JSONObject(info);
-                String inviteCode = object.optString("code");
-                if (!TextUtils.isEmpty(inviteCode)) {
-                    AppCookie.save("code", inviteCode);
-                }
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-        });
     }
 
     @SuppressLint("CheckResult")