修改老师端学历认证教资认证判断字段

teacher/src/main/java/com/cooleshow/teacher/bean/TeacherUserInfo.java

@@ -66,6 +66,8 @@ public class TeacherUserInfo implements Serializable {
     public String realName;
     public String subject;
     public int entryFlag;
+    public int degreeFlag;// 老师学历认证
+    public int teacherFlag;//教资认证
     public int userId;
     public String subjectId;
     public String updateTime;
@@ -83,6 +85,6 @@ public class TeacherUserInfo implements Serializable {
     public String workUnit;
     public Object liveDate;
     public String createTime;
-    public String tag ;//用于显示老师徽章
-    public int isVip ;//0非会员 1会员
+    public String tag;//用于显示老师徽章
+    public int isVip;//0非会员 1会员
 }

teacher/src/main/java/com/cooleshow/teacher/constants/TeacherInfoConstants.java

@@ -15,7 +15,4 @@ public class TeacherInfoConstants {
     public static final String MUSICIAN_STATUS_UNPASS = "UNPASS";//音乐人认证状态->申请未通过
 
 
-
-    public static final String DEGREE = "DEGREE";//学历认证
-    public static final String TEACHER = "TEACHER";//教资认证
 }

teacher/src/main/java/com/cooleshow/teacher/ui/homepage/HomePageActivity.java

@@ -243,6 +243,8 @@ public class HomePageActivity extends BaseMVPActivity<ActivityHomePageLayoutBind
         viewBinding.ivAvatar.setBorderColor(info.isVip == 1 ? getResources().getColor(com.cooleshow.base.R.color.color_fce2b7) : getResources().getColor(com.cooleshow.base.R.color.white));
         GlideUtils.INSTANCE.loadImage(this, info.heardUrl, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
         GlideUtils.INSTANCE.loadImageWhitVague(this, info.heardUrl, viewBinding.ivHeaderBg, R.drawable.bg_home_page_header);
+        //学历认证 教资认证标签
+        updateCertStatusUI(info.degreeFlag, info.teacherFlag);
         //昵称
         viewBinding.tvNickname.setText(info.username);
         //subjectName
@@ -260,6 +262,22 @@ public class HomePageActivity extends BaseMVPActivity<ActivityHomePageLayoutBind
         }
     }
 
+    private void updateCertStatusUI(int degreeFlag, int teacherFlag) {
+        //学历认证
+        if (degreeFlag == 1) {
+            viewBinding.ivEduCert.setVisibility(View.VISIBLE);
+        } else {
+            viewBinding.ivEduCert.setVisibility(View.GONE);
+        }
+
+        //教资认证
+        if (teacherFlag == 1) {
+            viewBinding.ivTeacherCert.setVisibility(View.VISIBLE);
+        } else {
+            viewBinding.ivTeacherCert.setVisibility(View.GONE);
+        }
+    }
+
     private void createSubjectView(String text) {
         TextView textView = (TextView) LayoutInflater.from(this).inflate(com.cooleshow.base.R.layout.view_subject_item_layout, viewBinding.llSubjectContainer, false);
         textView.setText(text);

teacher/src/main/java/com/cooleshow/teacher/ui/main/MineFragment.java

@@ -100,7 +100,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         }
         mViewBinding.ivVip.setImageResource(teacherUserInfo.isVip == 1 ? com.cooleshow.base.R.drawable.icon_vip_able : com.cooleshow.base.R.drawable.icon_vip_enable);
         mViewBinding.llBadge.setData(teacherUserInfo.tag);
-        updateCertStatusUI(teacherUserInfo.tag);
+        updateCertStatusUI(teacherUserInfo.degreeFlag, teacherUserInfo.teacherFlag);
         //粉丝数
         mViewBinding.tvFansNum.setText(teacherUserInfo.fansNum);
         //已上课时数
@@ -132,16 +132,16 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         }
     }
 
-    private void updateCertStatusUI(String tag) {
+    private void updateCertStatusUI(int degreeFlag, int teacherFlag) {
         //学历认证
-        if (tag.contains(TeacherInfoConstants.DEGREE)) {
+        if (degreeFlag == 1) {
             mViewBinding.ivEduCert.setVisibility(View.VISIBLE);
         } else {
             mViewBinding.ivEduCert.setVisibility(View.GONE);
         }
 
         //教资认证
-        if (tag.contains(TeacherInfoConstants.TEACHER)) {
+        if (teacherFlag == 1) {
             mViewBinding.ivTeacherCert.setVisibility(View.VISIBLE);
         } else {
             mViewBinding.ivTeacherCert.setVisibility(View.GONE);

teacher/src/main/java/com/cooleshow/teacher/ui/main/NewHomeFragment.java

@@ -73,7 +73,8 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
     private HomeHotMusicSheetAdapter mHomeHotMusicSheetAdapter;
     private ArrayList<HomeMenuBean.BannerBean> mBannerList = new ArrayList<>();
     private BannerImageAdapter mBannerImageAdapter;
-    private String teacherCertTag = "";
+    private int teacherFlag = 0;//教资认证
+    private int degreeFlag = 0;//老师学历认证
     private String entryStatus = "";//达人认证状态
 
     @Override
@@ -435,12 +436,13 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
             mViewBinding.ratingBar.setVisibility(View.VISIBLE);
         }
         //徽章
-        this.teacherCertTag = teacherUserInfo.tag;
         handleBadgeUI(teacherUserInfo.tag);
         //VIP
         mViewBinding.ivVip.setImageResource(teacherUserInfo.isVip == 0 ? com.cooleshow.base.R.drawable.icon_vip_enable : com.cooleshow.base.R.drawable.icon_vip_able);
         //入驻状态
-        if (isEnableForBadge(teacherUserInfo.tag, TeacherInfoConstants.DEGREE) && isEnableForBadge(teacherUserInfo.tag, TeacherInfoConstants.TEACHER)) {
+        this.teacherFlag = teacherUserInfo.teacherFlag;
+        this.degreeFlag = teacherUserInfo.degreeFlag;
+        if (teacherUserInfo.degreeFlag == 1 && teacherUserInfo.teacherFlag == 1) {
             mViewBinding.viewCertRedPoint.setVisibility(View.GONE);
         } else {
             if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
@@ -576,7 +578,7 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
     private void showCertTipDialog() {
         HomeCertTipDialog homeCertTipDialog = new HomeCertTipDialog(getContext());
         homeCertTipDialog.show();
-        homeCertTipDialog.setData(teacherCertTag);
+        homeCertTipDialog.setData(degreeFlag, teacherFlag);
     }
 
     private void showBadgeDialog() {

teacher/src/main/java/com/cooleshow/teacher/widgets/dialog/HomeCertTipDialog.java

@@ -17,8 +17,6 @@ import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 
-import static com.cooleshow.teacher.constants.TeacherInfoConstants.DEGREE;
-import static com.cooleshow.teacher.constants.TeacherInfoConstants.TEACHER;
 
 /**
  * Author by pq, Date on 2022/8/24.
@@ -67,9 +65,9 @@ public class HomeCertTipDialog extends Dialog {
         });
     }
 
-    public void setData(String tag) {
+    public void setData(int degreeFlag, int teacherFlag) {
         int certNum = 0;
-        if (tag.contains(DEGREE)) {
+        if (degreeFlag == 1) {
             certNum++;
             mIvEducationCertStatus.setImageResource(R.drawable.icon_check_select);
             mTvEducationCertStatus.setText("已认证");
@@ -79,7 +77,7 @@ public class HomeCertTipDialog extends Dialog {
             mTvEducationCertStatus.setText("未认证");
             mTvEducationCertStatus.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff0000));
         }
-        if (tag.contains(TEACHER)) {
+        if (teacherFlag == 1) {
             certNum++;
             mIvTeachersCertStatus.setImageResource(R.drawable.icon_check_select);
             mTvTeachersCertStatus.setText("已认证");