去掉审核弹窗

审核完成同步状态
个人信息修改页面头像审核中状态

app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.java

@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 
-import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -29,18 +28,17 @@ import com.yizhuan.erban.UIHelper;
 import com.yizhuan.erban.audio.RecordingVoiceActivity;
 import com.yizhuan.erban.base.BaseActivity;
 import com.yizhuan.erban.common.permission.PermissionActivity;
+import com.yizhuan.erban.common.widget.dialog.DialogManager;
 import com.yizhuan.erban.ui.login.ModifyInfoActivity;
 import com.yizhuan.erban.ui.utils.ImageLoadUtils;
 import com.yizhuan.erban.ui.widget.ButtonItem;
 import com.yizhuan.erban.ui.widget.dialog.CommonMessageDialog;
 import com.yizhuan.erban.utils.RegexUtil;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.base.BaseModel;
 import com.yizhuan.xchat_android_core.file.FileModel;
 import com.yizhuan.xchat_android_core.user.UserModel;
 import com.yizhuan.xchat_android_core.user.bean.UserInfo;
 import com.yizhuan.xchat_android_core.user.bean.UserPhoto;
-import com.yizhuan.xchat_android_core.utils.Transformer;
 import com.yizhuan.xchat_android_library.utils.TimeUtils;
 import com.yizhuan.xchat_android_library.utils.log.MLog;
 
@@ -50,13 +48,8 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Completable;
-import io.reactivex.CompletableSource;
-import io.reactivex.CompletableTransformer;
-import io.reactivex.Single;
 import io.reactivex.SingleObserver;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
 
 /**
  * @author zhouxiangfeng
@@ -80,6 +73,7 @@ public class UserInfoModifyActivity extends BaseActivity
     private RecyclerView photosRecyclerView;
 
     private boolean showAvatarAuditing;
+    private ImageView ivAvatarAuditiong;
 
 
     @Override
@@ -110,6 +104,7 @@ public class UserInfoModifyActivity extends BaseActivity
         if (null != userInfo) {
             audioFileUrl = userInfo.getUserVoice();
             ImageLoadUtils.loadAvatar(this, !TextUtils.isEmpty(userInfo.getNewAvatar()) ? userInfo.getNewAvatar() : userInfo.getAvatar(), civAvatar);
+            ivAvatarAuditiong.setVisibility(userInfo.isReview() ? View.VISIBLE : View.GONE);
             String birth = TimeUtil.getDateTimeString(userInfo.getBirth(), "yyyy-MM-dd");
             tvBirth.setText(birth);
             tvNick.setText(RegexUtil.getPrintableString(userInfo.getNick()));
@@ -145,6 +140,7 @@ public class UserInfoModifyActivity extends BaseActivity
         LinearLayoutManager mLayoutManager =
                 new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, true);
         photosRecyclerView.setLayoutManager(mLayoutManager);
+        ivAvatarAuditiong = findViewById(R.id.iv_avatar_auditing);
 
     }
 
@@ -279,7 +275,7 @@ public class UserInfoModifyActivity extends BaseActivity
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.layout_avatar:
-                if (mUserInfo == null || mUserInfo.isReview()) {
+                if (mUserInfo != null && mUserInfo.isReview()) {
                     toast("头像正在审核中");
                     return;
                 }
@@ -428,17 +424,15 @@ public class UserInfoModifyActivity extends BaseActivity
     }
 
     private void showAvatarAuditingDialog() {
-        final CommonMessageDialog dialog = new CommonMessageDialog(this);
+        toast(R.string.avatar_auditing);
+        //延迟3秒重新获取用户信息更新状态
+        ivAvatarAuditiong.setVisibility(View.VISIBLE);
         Completable.timer(3000, TimeUnit.MILLISECONDS)
                 .compose(bindUntilEvent(ActivityEvent.STOP))
-                .doOnSubscribe(disposable -> {
-                    dialog.openDialog();
-                })
                 .doOnComplete(() -> {
-                    dialog.closeDialog();
+                    UserModel.get().updateCurrentUserInfo().subscribe(userInfoUpdateObserver);
                 }).doOnError(throwable -> {
             throwable.printStackTrace();
-            dialog.closeDialog();
         }).subscribe();
     }
 }

app/src/main/res/layout/activity_user_info_modify.xml

@@ -33,6 +33,7 @@
                 android:textColor="@color/text_title_white"
                 android:textSize="@dimen/font_normal" />
 
+
             <com.yizhuan.erban.common.widget.CircleImageView
                 android:id="@+id/civ_avatar"
                 android:layout_width="55dp"
@@ -41,6 +42,19 @@
                 android:layout_toStartOf="@+id/iv_arrow"
                 android:src="@drawable/default_avatar" />
 
+            <androidx.constraintlayout.utils.widget.ImageFilterView
+                android:layout_width="55dp"
+                android:id="@+id/iv_avatar_auditing"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/civ_avatar"
+                android:layout_alignRight="@id/civ_avatar"
+                android:layout_alignBottom="@id/civ_avatar"
+                android:visibility="visible"
+                android:scaleType="fitXY"
+                android:src="@drawable/ic_avatar_auditing"
+                />
+
+
             <ImageView
                 android:id="@+id/iv_arrow"
                 android:layout_width="wrap_content"

app/src/main/res/values/strings.xml

@@ -909,4 +909,6 @@
     <string name="room_pk_rule">1)只有牌照房房主和超管才可以发起跨房pk，一次只能选择一个牌照房发起；\n 2)只有房主和超管才可以接受或拒绝跨房pk请求，若10秒内不点击pk邀请弹窗，弹窗消失，视为自动拒绝；\n 3)发起pk时需选择pk时间和pk对象，自定义时间下限为5，上限为180，只能填写整数；\n 4)pk发起后，未到pk时间无法自行结束，若有特殊情况需提前结束可联系客服，但本场pk不算胜负。</string>
     <string name="first_charge_help">1.每人仅可获得1次首充福利\n2.每个手机号，设备，实名认证等如已参与过首充，则无法获得奖励。</string>
     <string name="home_like_hint">关注的人和收藏的房间都会出现在这里\n暂无关注的人和收藏的房间哦</string>
+    <string name="avatar_auditing">头像已送审，审核成功后自动应用头像</string>
+
 </resources>