修改推广有奖活动规则；修改启动页获取im 配置有可能失败的问题

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

@@ -7,6 +7,9 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.Toast;
+
+import com.base.utils.tools.android.NetworkUtil;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseActivity;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -20,7 +23,9 @@ import com.rv.im.AppConfig;
 import com.rv.im.bean.ImConfig;
 import com.rv.im.bean.ImConfigBean;
 import com.yuyife.okgo.OkGoUtil;
+
 import java.util.concurrent.TimeUnit;
+
 import io.reactivex.Flowable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;
@@ -30,6 +35,10 @@ import io.reactivex.functions.Consumer;
 public class WelcomeActivity extends BaseActivity<CommonPresenter> {
     private Disposable mDisposable = null;
 
+    private boolean isImInitOk = false;
+
+    private boolean isInterval = false;
+
     @Override
     public void onShowResult(int requestType, BaseBean result) {
         if (requestType == 0) {
@@ -37,13 +46,18 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
             ImConfig config;
             if (bean != null && bean.resultCode == 1 && ((ImConfigBean) result).getData() != null) {
                 LogUtil.e("zq", "获取网络配置成功，使用服务端返回的配置并更新本地配置");
+                isImInitOk = true;
                 config = bean.getData();
                 AppConfig appConfig = AppConfig.initConfig(config);
                 RvCache.getInstance().save(appConfig, CacheEnum.IM_CONFIG);
+                if (isInterval && !isFinishing()) {
+                    go();
+                }
             }
         }
     }
 
+
     @Override
     protected int setLayout() {
         return R.layout.rv_act_weclome;
@@ -52,8 +66,16 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         showTitle(false);//隐藏菜单栏
-        interval();
 
+        AppConfig appConfig = (AppConfig) RvCache.getInstance().get(CacheEnum.IM_CONFIG);
+        if (appConfig == null) {
+            if (!NetworkUtil.isNetworkAvailable(getApplicationContext())) {
+                Toast.makeText(getApplicationContext(), "网络异常，im初始化失败，请退出重进", Toast.LENGTH_LONG).show();
+            }
+        } else {
+            isImInitOk = true;
+        }
+        interval();
         LogUtil.d("start");
     }
 
@@ -78,34 +100,22 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
      */
     private void interval() {
         mDisposable = Flowable.interval(2, TimeUnit.SECONDS)
-                .doOnNext(new Consumer<Long>() {
-                    @Override
-                    public void accept(@NonNull Long aLong) throws Exception {
-                    }
+                .doOnNext(aLong -> {
                 })
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<Long>() {
-                    @Override
-                    public void accept(@NonNull Long aLong) {
-                        try {
-                            String token = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_TOKEN, "");
-                            String tokenTime = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_TOKE_TIME, "");
-                            if (!TextUtils.isEmpty(token)) {
-                                OkGoUtil.setToken(token, tokenTime);
-                            }
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-
-                        SharedPreferences preferences = getSharedPreferences("first_open", MODE_PRIVATE);
-                        if (preferences.getBoolean("first", true)) {
-                            preferences.edit().putBoolean("first", false).commit();
-                            startActivity(GuideActivity.getIntent(mActivity));
-                        } else {
-                            startActivity(MainActivity.getIntent(mActivity));
+                .subscribe(aLong -> {
+                    isInterval = true;
+                    try {
+                        String token = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_TOKEN, "");
+                        String tokenTime = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_TOKE_TIME, "");
+                        if (!TextUtils.isEmpty(token)) {
+                            OkGoUtil.setToken(token, tokenTime);
                         }
-                        mDisposable.dispose();
-                        finish();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    if (isImInitOk) {
+                        go();
                     }
                 });
 
@@ -120,6 +130,18 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
         }
     }
 
+    private void go() {
+        SharedPreferences preferences = getSharedPreferences("first_open", MODE_PRIVATE);
+        if (preferences.getBoolean("first", true)) {
+            preferences.edit().putBoolean("first", false).commit();
+            startActivity(GuideActivity.getIntent(mActivity));
+        } else {
+            startActivity(MainActivity.getIntent(mActivity));
+        }
+        mDisposable.dispose();
+        finish();
+    }
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

RvWrapper/src/main/java/com/ruiwenliu/wrapper/receiver/NetWorkReceiver.java

@@ -4,7 +4,6 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
-import android.util.Log;
 import android.widget.Toast;
 
 import com.base.utils.tools.android.NetworkUtil;

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

@@ -73,14 +73,14 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
 
     private void setView(PersonShareBean.PersonShareInfo data) {
 
-        Resources resource= getBaseContext().getResources();
-        ColorStateList csl= resource.getColorStateList(R.color.share_number_color);
+        Resources resource = getBaseContext().getResources();
+        ColorStateList csl = resource.getColorStateList(R.color.share_number_color);
 
         SpannableStringBuilder spanBuilder = new SpannableStringBuilder(data.getTotalIncome() + "元");
         spanBuilder.setSpan(new TextAppearanceSpan(null, Typeface.NORMAL, DisplayUtil.sp2px(this, 24), csl, null), 0, data.getTotalIncome().toString().length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
         tvAmount.setText(spanBuilder);
 
-        int total = data.getInviteNumber() + data.getActivatedNumber() ;
+        int total = data.getInviteNumber() + data.getActivatedNumber();
         SpannableStringBuilder spanBuilder1 = new SpannableStringBuilder(total + "人");
         spanBuilder1.setSpan(new TextAppearanceSpan(null, Typeface.NORMAL, DisplayUtil.sp2px(this, 24), csl, null), 0, String.valueOf(total).length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
         tvPersonInval.setText(spanBuilder1);
@@ -151,7 +151,8 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
         } else if (id == R.id.ll_comein) {
             startActivity(PopularizeActivity.getIntent(getApplicationContext()));
         } else if (id == R.id.tv_ruler) {
-            startActivity(new Intent(getApplicationContext(), ShareRulerActivity.class));
+            String url = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/promotionAward.html";
+            startActivity(WebViewActivity.getIntent(this, url, "推广有奖规则"));
         }
     }