修改老师端首页和个人中心页面样式

BaseLibrary/src/main/res/values/colors.xml

@@ -197,5 +197,6 @@
     <color name="color_66000000">#66000000</color>
     <color name="color_ff5a56">#FF5A56</color>
     <color name="color_f8f8f8">#f8f8f8</color>
+    <color name="color_ff7b31">#FF7B31</color>
 
 </resources>

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

@@ -126,15 +126,13 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         GlideUtils.INSTANCE.loadImage(requireContext(), teacherUserInfo.heardUrl, mViewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
         //昵称
         String teacherName = UserHelper.getTeacherName(teacherUserInfo.username, teacherUserInfo.userId);
+        mViewBinding.tvNickname.setText(teacherName);
+        //机构名称
         if (UserHelper.isTenantAccount(teacherUserInfo.getTenantId())) {
-            mViewBinding.tvNickname.setEllipsize(TextUtils.TruncateAt.MARQUEE);
-            mViewBinding.tvNickname.setText(String.format("%s%s", teacherUserInfo.getTenantName(), teacherName));
-            if (isResumed()) {
-                mViewBinding.tvNickname.requestFocus();
-            }
+            mViewBinding.flTenantName.setVisibility(View.VISIBLE);
+            mViewBinding.tvTenantName.setText(teacherUserInfo.getTenantName());
         } else {
-            mViewBinding.tvNickname.setEllipsize(TextUtils.TruncateAt.END);
-            mViewBinding.tvNickname.setText(teacherName);
+            mViewBinding.flTenantName.setVisibility(View.GONE);
         }
         //星级
         if (teacherUserInfo.starGrade > 0) {

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

@@ -581,19 +581,16 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
             String teacherName = UserHelper.getTeacherName(teacherUserInfo.username, teacherUserInfo.userId);
             mViewBinding.tvTeacherName.setEllipsize(TextUtils.TruncateAt.END);
             if (teacherName.length() > 4) {
-                if (UserHelper.isTenantAccount(teacherUserInfo.getTenantId())) {
-                    mViewBinding.tvTeacherName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
-                    mViewBinding.tvTeacherName.setText(String.format("%s%s", teacherUserInfo.getTenantName(), teacherName));
-                    if (isResumed()) {
-                        mViewBinding.tvTeacherName.requestFocus();
-                    }
-                } else {
-                    mViewBinding.tvTeacherName.setEllipsize(TextUtils.TruncateAt.END);
-                    mViewBinding.tvTeacherName.setText(teacherName);
-                }
+                mViewBinding.tvTeacherName.setText(teacherName);
             } else {
                 mViewBinding.tvTeacherName.setText(String.format("你好，%s", teacherName));
             }
+            if (UserHelper.isTenantAccount(teacherUserInfo.getTenantId())) {
+                mViewBinding.flTenantName.setVisibility(View.VISIBLE);
+                mViewBinding.tvTenantName.setText(teacherUserInfo.getTenantName());
+            } else {
+                mViewBinding.flTenantName.setVisibility(View.GONE);
+            }
         }
         //星级
         if (teacherUserInfo.starGrade > 0) {

teacher/src/main/res/drawable/shape_12ffa673_border_ffbf9a_4dp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#12ffa673"/>
+    <stroke android:color="#ffbf9a" android:width="1dp"/>
+    <corners android:radius="4dp"/>
+</shape>

teacher/src/main/res/layout/fragment_mine_layout.xml

@@ -68,21 +68,49 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            app:layout_goneMarginEnd="13dp"
             android:includeFontPadding="false"
             android:textColor="@color/color_1a1a1a"
             android:textSize="@dimen/sp_18"
-            android:singleLine="true"
+            android:maxLines="1"
             android:ellipsize="end"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
+            app:layout_constraintVertical_chainStyle="packed"
             app:layout_constraintWidth_default="wrap"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintBottom_toTopOf="@+id/tv_badge_title"
+            app:layout_constraintBottom_toTopOf="@+id/fl_tenant_name"
             app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
             app:layout_constraintTop_toTopOf="@+id/iv_avatar"
             app:layout_constraintRight_toLeftOf="@+id/iv_edu_cert"
-            tools:text="测试昵称" />
+            tools:text="测试昵称测试昵称测试昵称测试昵测试昵称测试昵称测试昵称测试昵称测试昵称测试昵称测试昵称测试昵称测试昵称测试昵称测试昵称测试昵称测试昵称测试昵称测试昵称测试昵称称" />
+
+        <FrameLayout
+            tools:visibility="visible"
+            android:visibility="gone"
+            android:id="@+id/fl_tenant_name"
+            android:layout_width="0dp"
+            android:layout_marginTop="8dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
+            app:layout_constraintLeft_toLeftOf="@+id/tv_nickname"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_nickname">
+
+            <TextView
+                android:id="@+id/tv_tenant_name"
+                android:layout_width="wrap_content"
+                android:layout_height="18dp"
+                android:layout_marginEnd="14dp"
+                android:background="@drawable/shape_12ffa673_border_ffbf9a_4dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:textColor="@color/color_ff7b31"
+                android:textSize="@dimen/sp_12"
+                app:layout_constraintHorizontal_bias="0"
+                tools:text="星机构武汉市构武汉市小星星机构武汉市星机构武汉市构武汉市小星星机构武汉市星机构武汉市构武汉市小星星机构武汉市" />
+        </FrameLayout>
 
 
         <ImageView
@@ -92,7 +120,7 @@
             android:layout_marginStart="8dp"
             android:src="@drawable/icon_education_cert"
             android:visibility="gone"
-            tools:visibility="visible"
+            tools:visibility="gone"
             app:layout_constraintRight_toLeftOf="@+id/iv_teacher_cert"
             app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"
             app:layout_constraintLeft_toRightOf="@+id/tv_nickname"
@@ -106,7 +134,7 @@
             android:layout_marginStart="6dp"
             android:src="@drawable/icon_teacher_cert"
             android:visibility="gone"
-            tools:visibility="visible"
+            tools:visibility="gone"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"
             app:layout_constraintLeft_toRightOf="@+id/iv_edu_cert"
@@ -131,18 +159,51 @@
             app:layout_constraintRight_toRightOf="@+id/iv_avatar"
             app:layout_constraintTop_toTopOf="@+id/vip_help_view" />
 
+
+        <ImageView
+            android:id="@+id/iv_certification_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            android:src="@drawable/icon_home_un_certification"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/iv_avatar"
+            tools:visibility="gone" />
+
+        <View
+            android:id="@+id/certification_tip_help_view"
+            android:layout_width="1px"
+            android:layout_height="1px"
+            android:layout_marginBottom="15dp"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_certification_status"
+            app:layout_constraintLeft_toLeftOf="@+id/iv_certification_status" />
+
+        <ImageView
+            android:id="@+id/iv_un_certification_tip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            android:src="@drawable/icon_home_certification_tip"
+            android:visibility="gone"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/certification_tip_help_view"
+            tools:visibility="gone" />
+
+
         <TextView
             android:id="@+id/tv_badge_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="9dp"
             android:includeFontPadding="false"
             android:text="勋章:"
             android:textColor="@color/color_666666"
             android:textSize="@dimen/sp_12"
-            app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
-            app:layout_constraintLeft_toLeftOf="@+id/tv_nickname"
-            app:layout_constraintTop_toBottomOf="@+id/tv_nickname" />
+            app:layout_constraintLeft_toLeftOf="@+id/iv_avatar"
+            app:layout_constraintTop_toBottomOf="@+id/iv_avatar" />
 
         <com.cooleshow.base.widgets.BadgeIconListView
             android:id="@+id/ll_badge"
@@ -162,8 +223,8 @@
             android:text="评分:"
             android:textColor="@color/color_666666"
             android:textSize="@dimen/sp_12"
+            app:layout_constraintRight_toLeftOf="@+id/rating_bar"
             app:layout_constraintBottom_toBottomOf="@+id/tv_badge_title"
-            app:layout_constraintLeft_toRightOf="@+id/ll_badge"
             app:layout_constraintTop_toTopOf="@+id/tv_badge_title" />
 
 
@@ -172,13 +233,14 @@
             style="@style/HomeRatingBar"
             android:layout_width="wrap_content"
             android:layout_height="19dp"
+            android:layout_marginEnd="21dp"
             android:isIndicator="true"
             android:numStars="5"
             android:rating="0"
             android:stepSize="1"
             android:visibility="visible"
+            app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintBottom_toBottomOf="@+id/tv_score_title"
-            app:layout_constraintLeft_toRightOf="@+id/tv_score_title"
             app:layout_constraintTop_toTopOf="@+id/tv_score_title" />
 
         <TextView
@@ -192,48 +254,16 @@
             app:layout_constraintLeft_toRightOf="@+id/tv_score_title"
             app:layout_constraintTop_toTopOf="@+id/tv_score_title" />
 
-        <ImageView
-            android:id="@+id/iv_certification_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:src="@drawable/icon_home_un_certification"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/iv_avatar"
-            tools:visibility="gone" />
-
-
-        <View
-            android:id="@+id/certification_tip_help_view"
-            android:layout_width="1px"
-            android:layout_height="1px"
-            android:layout_marginBottom="15dp"
-            app:layout_constraintBottom_toBottomOf="@+id/iv_certification_status"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_certification_status" />
-
-        <ImageView
-            android:id="@+id/iv_un_certification_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:src="@drawable/icon_home_certification_tip"
-            android:visibility="gone"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/certification_tip_help_view"
-            tools:visibility="gone" />
-
         <View
             android:id="@+id/view_vip_bg"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_82"
             android:layout_marginLeft="21dp"
-            android:layout_marginTop="17dp"
+            android:layout_marginTop="10dp"
             android:layout_marginRight="21dp"
             android:background="@drawable/icon_mine_vip_bg"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/iv_avatar"
+            app:layout_constraintTop_toBottomOf="@+id/tv_badge_title"
             app:layout_goneMarginTop="30dp" />
 
         <View
@@ -241,10 +271,10 @@
             android:layout_width="match_parent"
             android:layout_height="80dp"
             android:layout_marginStart="14dp"
-            android:layout_marginTop="62dp"
+            android:layout_marginTop="55dp"
             android:layout_marginEnd="14dp"
             android:background="@drawable/shape_8dp_white"
-            app:layout_constraintTop_toBottomOf="@+id/iv_avatar" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_badge_title" />
 
 
         <TextView

teacher/src/main/res/layout/fragment_new_home_layout.xml

@@ -25,31 +25,32 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:layout_marginEnd="40dp"
             android:ellipsize="end"
             android:includeFontPadding="false"
-            android:singleLine="true"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:text="您好"
+            android:maxLines="1"
             android:textColor="@color/color_1a1a1a"
             android:textSize="@dimen/sp_22"
             android:textStyle="bold"
-            android:marqueeRepeatLimit="marquee_forever"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toLeftOf="@+id/iv_scan"
+            app:layout_constraintRight_toLeftOf="@+id/iv_vip"
             app:layout_constraintTop_toBottomOf="@+id/view_status_bar"
-            tools:text="您好,李老师李老师李老师李老师李老师" />
+            app:layout_constraintWidth_default="wrap"
+            tools:text="您好,李老师您好,李老师您好,李老师" />
 
         <ImageView
             android:id="@+id/iv_vip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
+            android:layout_marginStart="2dp"
+            android:layout_marginEnd="6dp"
             android:layout_marginBottom="2dp"
             android:src="@drawable/icon_vip_enable"
             app:layout_constraintBottom_toBottomOf="@+id/tv_teacher_name"
-            app:layout_constraintLeft_toRightOf="@+id/tv_teacher_name" />
+            app:layout_constraintLeft_toRightOf="@+id/tv_teacher_name"
+            app:layout_constraintRight_toLeftOf="@+id/iv_scan"
+            app:layout_constraintTop_toTopOf="@+id/tv_teacher_name" />
 
         <ImageView
             android:id="@+id/iv_scan"
@@ -115,6 +116,33 @@
                     app:layout_constraintBottom_toBottomOf="@+id/top_help_line"
                     app:layout_constraintTop_toTopOf="parent" />
 
+                <FrameLayout
+                    tools:visibility="visible"
+                    android:visibility="gone"
+                    android:id="@+id/fl_tenant_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/top_view_bg">
+
+                    <TextView
+                        android:id="@+id/tv_tenant_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="18dp"
+                        android:layout_marginStart="14dp"
+                        android:layout_marginEnd="14dp"
+                        android:background="@drawable/shape_12ffa673_border_ffbf9a_4dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
+                        android:maxLines="1"
+                        android:ellipsize="end"
+                        android:textColor="@color/color_ff7b31"
+                        android:textSize="@dimen/sp_12"
+                        app:layout_constraintHorizontal_bias="0"
+                        tools:text="星机构武汉市构武汉市小星星机构武汉市星机构武汉市构武汉市小星星机构武汉市星机构武汉市构武汉市小星星机构武汉市" />
+                </FrameLayout>
+
                 <TextView
                     android:id="@+id/tv_score_name"
                     android:layout_width="wrap_content"
@@ -149,10 +177,11 @@
                     android:layout_width="23dp"
                     android:layout_height="23dp"
                     android:layout_marginStart="14dp"
-                    android:layout_marginTop="5dp"
+                    android:layout_marginTop="11dp"
+                    app:layout_goneMarginTop="5dp"
                     android:background="@drawable/icon_style_badge_new_enable"
                     app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/top_view_bg" />
+                    app:layout_constraintTop_toBottomOf="@+id/fl_tenant_name" />
 
                 <ImageView
                     android:id="@+id/iv_video_badge"
@@ -274,12 +303,12 @@
                     app:layout_constraintTop_toTopOf="@+id/iv_cert" />
 
                 <TextView
-                    android:gravity="center"
                     android:id="@+id/tv_current_subject"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:drawableRight="@drawable/icon_arrow_down2"
                     android:drawablePadding="5dp"
+                    android:gravity="center"
                     android:paddingTop="5dp"
                     android:paddingBottom="5dp"
                     android:textColor="@color/color_666666"
@@ -395,13 +424,13 @@
                         android:scrollbars="none" />
 
                     <FrameLayout
-                        android:visibility="visible"
-                        android:layout_marginBottom="5dp"
                         android:id="@+id/rl_indicator"
                         android:layout_width="wrap_content"
                         android:layout_height="3dp"
                         android:layout_gravity="center_horizontal|bottom"
+                        android:layout_marginBottom="5dp"
                         android:background="@drawable/shape_d8d8d8_3dp"
+                        android:visibility="visible"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/viewpager_menu">
@@ -555,18 +584,18 @@
                     app:lottie_loop="true" />
 
                 <ImageView
-                    android:adjustViewBounds="true"
+                    android:id="@+id/iv_tenant_tools_enter"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="14dp"
+                    android:layout_marginTop="12dp"
                     android:layout_marginEnd="14dp"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/icon_home_tanant_train_tools_enter"
                     android:visibility="gone"
-                    android:id="@+id/iv_tenant_tools_enter"
-                    android:layout_marginTop="12dp"
-                    app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/fl_course_enter"
-                    android:src="@drawable/icon_home_tanant_train_tools_enter"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/fl_course_enter" />
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_hot_album"