Im 会员中心初次修改

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         flavorDimensions "default"
-        versionCode 146
-        versionName "1.4.6"
+        versionCode 153
+        versionName "1.5.3"
         multiDexEnabled true
 
 

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

@@ -7,6 +7,8 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
+
+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 +22,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 +34,8 @@ import io.reactivex.functions.Consumer;
 public class WelcomeActivity extends BaseActivity<CommonPresenter> {
     private Disposable mDisposable = null;
 
+    private boolean isImInitOk = false;
+
     @Override
     public void onShowResult(int requestType, BaseBean result) {
         if (requestType == 0) {
@@ -37,6 +43,7 @@ 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);
@@ -44,6 +51,18 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
         }
     }
 
+    @Override
+    public void onShowError(String errorMsg, int errorType) {
+        AppConfig appConfig = (AppConfig) RvCache.getInstance().get(CacheEnum.IM_CONFIG);
+        if (appConfig == null) {
+            if (!NetworkUtil.isNetworkAvailable(getApplicationContext())) {
+                showToast("网络异常，im初始化失败，请退出重进");
+            }
+            return;
+        }
+        isImInitOk = true;
+    }
+
     @Override
     protected int setLayout() {
         return R.layout.rv_act_weclome;
@@ -97,15 +116,17 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
                             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));
+                        if (isImInitOk) {
+                            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();
                         }
-                        mDisposable.dispose();
-                        finish();
                     }
                 });
 

RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseActivity.java

@@ -29,7 +29,6 @@ import java.lang.reflect.ParameterizedType;
 public abstract class BaseActivity<P extends MvpPresenter> extends BaseWrapperActivity implements BaseView, NetWorkReceiver.NetChangListener {
     protected P mPresenter;
     private LoadingDialog mLoadingDialog;
-    private boolean isLoadData = false;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -45,10 +44,7 @@ public abstract class BaseActivity<P extends MvpPresenter> extends BaseWrapperAc
         }
         mPresenter.attachView(this);
         mLoadingDialog = createLoadingDialog();
-        if (NetworkUtil.isNetworkAvailable(mActivity)) {
-            isLoadData = true;
-            loadData(savedInstanceState, getIntent());
-        }
+        loadData(savedInstanceState, getIntent());
         NetWorkReceiver.getInstance().register(this);
     }
 
@@ -123,10 +119,7 @@ public abstract class BaseActivity<P extends MvpPresenter> extends BaseWrapperAc
 
     @Override
     public void netAvailable() {
-        if (!isLoadData) {
-            loadData(null, getIntent());
-            isLoadData = true;
-        }
+        loadData(null, getIntent());
     }
 
     @Override

RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/OkHttpCreate.java

 package com.ruiwenliu.wrapper.http;
 
-import android.os.Build;
 import android.os.Environment;
 
 import com.ruiwenliu.wrapper.BuildConfig;

plugin_member/src/main/res/drawable/shape_rv_bg_circle_white.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/size_30" />
+    <solid android:color="@color/white" />
+</shape>
\ No newline at end of file

plugin_member/src/main/res/drawable/shape_rv_bg_top_unlogin.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="5dp" />
+
+    <gradient
+        android:startColor="#E5B895"
+        android:endColor="#F8D3B8"
+        android:angle="90"
+        />
+</shape>
\ No newline at end of file