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,6 +116,7 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
                             e.printStackTrace();
                         }
 
+                        if (isImInitOk) {
                             SharedPreferences preferences = getSharedPreferences("first_open", MODE_PRIVATE);
                             if (preferences.getBoolean("first", true)) {
                                 preferences.edit().putBoolean("first", false).commit();
@@ -107,6 +127,7 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
                             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());
-        }
         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;
-        }
     }
 
     @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/java/com/rv.member/MemberCenterActivity.java

@@ -12,6 +12,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -26,6 +27,7 @@ import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
@@ -72,12 +74,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
     RoundImageView ivAvatar;
     @BindView(R2.id.tv_nickname)
     TextView tvNickname;
-    @BindView(R2.id.iv_member)
-    ImageView ivMember;
     @BindView(R2.id.tv_login)
     TextView tvLogin;
-    @BindView(R2.id.tv_verified)
-    TextView tvVerified;
     @BindView(R2.id.recyclerView)
     RecyclerView recyclerView;
     @BindView(R2.id.tv_consume_record)
@@ -86,8 +84,12 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
     TextView tvFreeDay;
     @BindView(R2.id.tv_purchase_record)
     TextView tvPurchaseRecord;
-    @BindView(R2.id.tv_member)
-    TextView tvMember;
+    @BindView(R2.id.rl_unlogin)
+    RelativeLayout rlUnLogin;
+    @BindView(R2.id.ll_login)
+    LinearLayout llLogin;
+    @BindView(R2.id.iv_member_level)
+    ImageView ivMember;
 
     private MemberListAdapter adapter;
     private UserInfoBean.UserInfo info;
@@ -108,17 +110,14 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//        EnvUtils.setEnv(EnvUtils.EnvEnum.SANDBOX);
-//        StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
+        StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
     }
 
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
+        titleView.setTitle("会员中心");
         api = WXAPIFactory.createWXAPI(this, RvFrameConfig.APP_ID);
-        titleView.setVisibility(View.GONE);
         recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayout.VERTICAL, false));
-
-//        MemberListBean listBean = MemberCache.getInstance(MemberCenterActivity.this).get();
         MemberListBean listBean = (MemberListBean) RvCache.getInstance().get(CacheEnum.MEMBER);
         if (listBean != null && listBean.getData() != null) {
             adapter = new MemberListAdapter(listBean.getData(), memberLevel, freeUseDay, MemberCenterActivity.this, payListener);
@@ -193,7 +192,6 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
                 MemberListBean listBean = (MemberListBean) result;
                 if (listBean != null && listBean.isRel() && listBean.getData() != null && !listBean.getData().isEmpty()) {
                     RvCache.getInstance().save(listBean, CacheEnum.MEMBER);
-//                    MemberCache.getInstance(getApplicationContext()).save(listBean);
                     if (adapter == null) {
                         adapter = new MemberListAdapter(listBean.getData(), memberLevel, freeUseDay, MemberCenterActivity.this, payListener);
                         recyclerView.setAdapter(adapter);
@@ -220,7 +218,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
     }
 
 
-    @OnClick({R2.id.iv_avatar, R2.id.tv_login, R2.id.tv_verified, R2.id.iv_title, R2.id.tv_consume_record, R2.id.tv_purchase_record, R2.id.tv_free_day})
+    @OnClick({R2.id.iv_avatar, R2.id.tv_login, R2.id.tv_consume_record, R2.id.tv_purchase_record, R2.id.tv_free_day})
     public void onViewClicked(View view) {
         int id = view.getId();
         if (id == R.id.iv_avatar) {
@@ -228,13 +226,6 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
             if (!isLogin()) return;
         } else if (id == R.id.tv_login) {
             if (!isLogin()) return;
-        } else if (id == R.id.tv_verified) {
-            //实名认证
-            if (!isLogin()) return;
-            ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION)
-                    .navigation(this, REQUEST_VERIFIED);
-        } else if (id == R.id.iv_title) {
-            finish();
         } else if (id == R.id.tv_consume_record) {
             startActivity(new Intent(MemberCenterActivity.this, ConsumeRecordActivity.class));
         } else if (id == R.id.tv_purchase_record) {
@@ -292,42 +283,51 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
     }
 
     private void setUserInfoData(UserInfoBean infoBean) {
+        if (TextUtils.isEmpty(OkGoUtil.getToken())) {
+            rlUnLogin.setVisibility(View.VISIBLE);
+            llLogin.setVisibility(View.GONE);
+        } else {
+            rlUnLogin.setVisibility(View.GONE);
+            llLogin.setVisibility(View.VISIBLE);
             if (infoBean != null) {
                 info = infoBean.getData();
                 if (info != null) {
-                GlideManager.getInstance(this).loadImage(info.getHeadimgurl(), ivAvatar);
-                tvNickname.setText(!TextUtils.isEmpty(info.getNickname()) ? info.getNickname() : info.getUsername());
-                if (info.getCertificationStatus() == 0) { //实名认证状态:0-未认证，1-已认证
-                    verified = false;
-                    tvVerified.setText("未实名认证");
-                    tvVerified.setEnabled(true);
-                } else if (info.getCertificationStatus() == 1) {
-                    verified = true;
-                    tvVerified.setText("已实名认证");
-                    tvVerified.setEnabled(false);
+
+                    switch (info.getMemberLevel()) {
+                        case 1:
+//                            tvMember.setText("普通会员");
+                            break;
+                        case 2:
+//                            tvMember.setText("黄金会员");
+                            break;
+                        case 3:
+//                            tvMember.setText("钻石会员");
+                            break;
+                        default:
+                            break;
                     }
 
+                    GlideManager.getInstance(this).loadImage(info.getHeadimgurl(), ivAvatar);
+                    tvNickname.setText(!TextUtils.isEmpty(info.getNickname()) ? info.getNickname() : info.getUsername());
                     tvConsumeRecord.setText(info.getPayCount() + "\n 消费记录");
                     tvFreeDay.setText(info.getRentFreeDays() + "\n 可免费租车 (天)");
                     tvPurchaseRecord.setText(info.getBuyCount() + "\n 购买记录 (次)");
+                    if (!TextUtils.isEmpty(info.getIcon()))
+                        GlideManager.getInstance(getApplicationContext()).loadImage(info.getIcon(), ivMember);
+                }
             }
 
-            if (TextUtils.isEmpty(OkGoUtil.getToken())) {
-                tvNickname.setVisibility(View.GONE);
-                ((View) ivMember.getParent()).setVisibility(View.GONE);
-//                ivMember.setVisibility(View.GONE);
-                tvLogin.setVisibility(View.VISIBLE);
-                tvVerified.setVisibility(View.GONE);
-            } else {
-                tvNickname.setVisibility(View.VISIBLE);
-                tvLogin.setVisibility(View.GONE);
-                tvVerified.setVisibility(View.VISIBLE);
+
+        }
+
+        if (infoBean != null) {
+
+
             if (info != null) {
 
                 ((View) ivMember.getParent()).setVisibility(View.VISIBLE);
 //                    ivMember.setVisibility(View.VISIBLE);
-                    if (!TextUtils.isEmpty(info.getIcon()))
-                        GlideManager.getInstance(getApplicationContext()).loadImage(info.getIcon(), ivMember);
+
                 freeUseDay = info.getRentFreeDays();
                 if (info.getIsMember() == 0) {
                     memberLevel = 0;
@@ -358,7 +358,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
             }
         }
     }
-    }
+
+}
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {

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