Browse Source

增加老师端部分样式(机构)

Pq 1 year ago
parent
commit
2f212eb37c

+ 17 - 0
teacher/src/main/java/com/cooleshow/teacher/bean/TeacherUserInfo.java

@@ -92,6 +92,8 @@ public class TeacherUserInfo implements Serializable {
     public int isVip;//0非会员 1会员
     private String defaultSubject;//当前声部id 为0表示没有默认声部id
     public String defaultSubjectName;//当前声部name
+    private int tenantId;
+    private String tenantName;
 
     public String getDefaultSubject() {
         if (!TextUtils.equals(defaultSubject, "0")) {
@@ -100,4 +102,19 @@ public class TeacherUserInfo implements Serializable {
         return "";
     }
 
+    public int getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(int tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public void setTenantName(String tenantName) {
+        this.tenantName = tenantName;
+    }
 }

+ 9 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/main/MineFragment.java

@@ -30,6 +30,7 @@ import com.cooleshow.teacher.helper.EventHelper;
 import com.cooleshow.teacher.presenter.main.MinePresenter;
 import com.cooleshow.teacher.widgets.dialog.BadgeDesDialog;
 import com.cooleshow.teacher.widgets.helper.MineFragmentToolsHelper;
+import com.cooleshow.usercenter.constants.UserConstants;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.tbruyelle.rxpermissions3.RxPermissions;
 
@@ -124,7 +125,14 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         }
         GlideUtils.INSTANCE.loadImage(requireContext(), teacherUserInfo.heardUrl, mViewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
         //昵称
-        mViewBinding.tvNickname.setText(UserHelper.getTeacherName(teacherUserInfo.username, teacherUserInfo.userId));
+        String teacherName = UserHelper.getTeacherName(teacherUserInfo.username, teacherUserInfo.userId);
+        if (teacherUserInfo.getTenantId() != UserConstants.NO_HAVE_TENANT) {
+            mViewBinding.tvNickname.setText(String.format("%s%s", teacherUserInfo.getTenantName(), teacherName));
+            mViewBinding.tvNickname.setEllipsize(TextUtils.TruncateAt.MARQUEE);
+        } else {
+            mViewBinding.tvNickname.setText(teacherName);
+            mViewBinding.tvNickname.setEllipsize(TextUtils.TruncateAt.END);
+        }
         //星级
         if (teacherUserInfo.starGrade > 0) {
             mViewBinding.ratingBar.setRating(teacherUserInfo.starGrade);

+ 8 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/main/NewHomeFragment.java

@@ -53,6 +53,7 @@ import com.cooleshow.teacher.widgets.HomeHotAlbumItemDecoration;
 import com.cooleshow.teacher.widgets.HomeHotMusicSheetItemDecoration;
 import com.cooleshow.teacher.widgets.dialog.BadgeDesDialog;
 import com.cooleshow.teacher.widgets.dialog.HomeCertTipDialog;
+import com.cooleshow.usercenter.constants.UserConstants;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.youth.banner.adapter.BannerImageAdapter;
@@ -577,8 +578,14 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
         //昵称
         if (teacherUserInfo != null) {
             String teacherName = UserHelper.getTeacherName(teacherUserInfo.username, teacherUserInfo.userId);
+            mViewBinding.tvTeacherName.setEllipsize(TextUtils.TruncateAt.END);
             if (teacherName.length() > 4) {
-                mViewBinding.tvTeacherName.setText(teacherName);
+                if (teacherUserInfo.getTenantId() != UserConstants.NO_HAVE_TENANT) {
+                    mViewBinding.tvTeacherName.setText(String.format("%s%s", teacherUserInfo.getTenantName(), teacherName));
+                    mViewBinding.tvTeacherName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
+                } else {
+                    mViewBinding.tvTeacherName.setText(teacherName);
+                }
             } else {
                 mViewBinding.tvTeacherName.setText(String.format("你好,%s", teacherName));
             }