소스 검색

调整徽章显示逻辑

Pq 3 년 전
부모
커밋
3bd55d74be

+ 1 - 3
teacher/src/main/java/com/cooleshow/teacher/ui/homepage/HomePageActivity.java

@@ -162,15 +162,13 @@ public class HomePageActivity extends BaseMVPActivity<ActivityHomePageLayoutBind
         }
         //徽章信息
         if (!TextUtils.isEmpty(info.tag)) {
-            viewBinding.llBadge.setVisibility(View.VISIBLE);
             viewBinding.llBadge.setVipIcon(info.isVip == 1);
             viewBinding.llBadge.setData(info.tag);
         } else {
             if (info.isVip == 1) {
                 viewBinding.llBadge.setVipIcon(true);
-                viewBinding.llBadge.setVisibility(View.VISIBLE);
             } else {
-                viewBinding.llBadge.setVisibility(View.GONE);
+                viewBinding.llBadge.setVipIcon(false);
             }
         }
 

+ 1 - 3
teacher/src/main/java/com/cooleshow/teacher/ui/main/HomeFragment.kt

@@ -101,15 +101,13 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
             mViewBinding.tvNoScore.visibility = View.VISIBLE
         }
         if (!TextUtils.isEmpty(teacherUserInfo.tag)) {
-            mViewBinding.llBadge.setVisible(true)
             mViewBinding.llBadge.setVipIcon(teacherUserInfo.isVip == 1)
             mViewBinding.llBadge.setData(teacherUserInfo.tag)
         } else {
             if (teacherUserInfo.isVip == 1) {
                 mViewBinding.llBadge.setVipIcon(true)
-                mViewBinding.llBadge.setVisible(true)
             } else {
-                mViewBinding.llBadge.setVisible(false)
+                mViewBinding.llBadge.setVipIcon(false)
             }
         }
 

+ 3 - 5
teacher/src/main/java/com/cooleshow/teacher/ui/main/MineFragment.java

@@ -86,15 +86,13 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         }
 
         if (!TextUtils.isEmpty(teacherUserInfo.tag)) {
-            mViewBinding.llBadge.setVisibility(View.VISIBLE);
             mViewBinding.llBadge.setVipIcon(teacherUserInfo.isVip == 1);
             mViewBinding.llBadge.setData(teacherUserInfo.tag);
         } else {
             if (teacherUserInfo.isVip == 1) {
                 mViewBinding.llBadge.setVipIcon(true);
-                mViewBinding.llBadge.setVisibility(View.VISIBLE);
             } else {
-                mViewBinding.llBadge.setVisibility(View.GONE);
+                mViewBinding.llBadge.setVipIcon(false);
             }
         }
 
@@ -111,7 +109,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_DOING)) {
             //入驻审核中
             mViewBinding.ivCertificationStatus.setImageResource(R.drawable.icon_home_entry_doing);
-            mViewBinding.ivCertificationStatus.setVisibility(View.VISIBLE);
+            mViewBinding.ivCertificationStatus.setVisibility(View.GONE);
             hintCertificationOtherView();
         } else if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
             //入驻审核通过
@@ -120,7 +118,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         } else {
             //未通过或者未申请
             mViewBinding.ivCertificationStatus.setImageResource(R.drawable.icon_home_un_certification);
-            mViewBinding.ivCertificationStatus.setVisibility(View.VISIBLE);
+            mViewBinding.ivCertificationStatus.setVisibility(View.GONE);
             hintCertificationOtherView();
         }
 

+ 22 - 22
teacher/src/main/res/layout/activity_home_page_layout.xml

@@ -74,32 +74,32 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"
         app:layout_constraintLeft_toRightOf="@+id/tv_nickname"
         app:layout_constraintTop_toTopOf="@+id/tv_nickname" />
 
-<!--    <ImageView-->
-<!--        android:id="@+id/iv_teacher_entry_tag"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_marginStart="6dp"-->
-<!--        android:src="@drawable/icon_teahcer_entry_tag"-->
-<!--        android:visibility="gone"-->
-<!--        app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"-->
-<!--        app:layout_constraintLeft_toRightOf="@+id/tv_nickname"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/tv_nickname" />-->
+    <!--    <ImageView-->
+    <!--        android:id="@+id/iv_teacher_entry_tag"-->
+    <!--        android:layout_width="wrap_content"-->
+    <!--        android:layout_height="wrap_content"-->
+    <!--        android:layout_marginStart="6dp"-->
+    <!--        android:src="@drawable/icon_teahcer_entry_tag"-->
+    <!--        android:visibility="gone"-->
+    <!--        app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"-->
+    <!--        app:layout_constraintLeft_toRightOf="@+id/tv_nickname"-->
+    <!--        app:layout_constraintTop_toTopOf="@+id/tv_nickname" />-->
 
-<!--    <ImageView-->
-<!--        android:id="@+id/iv_teacher_music_person_tag"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_marginStart="3dp"-->
-<!--        android:src="@drawable/icon_teacher_music_person_tag"-->
-<!--        android:visibility="gone"-->
-<!--        app:layout_constraintBottom_toBottomOf="@+id/iv_teacher_entry_tag"-->
-<!--        app:layout_constraintLeft_toRightOf="@+id/iv_teacher_entry_tag"-->
-<!--        app:layout_constraintTop_toTopOf="@+id/iv_teacher_entry_tag" />-->
+    <!--    <ImageView-->
+    <!--        android:id="@+id/iv_teacher_music_person_tag"-->
+    <!--        android:layout_width="wrap_content"-->
+    <!--        android:layout_height="wrap_content"-->
+    <!--        android:layout_marginStart="3dp"-->
+    <!--        android:src="@drawable/icon_teacher_music_person_tag"-->
+    <!--        android:visibility="gone"-->
+    <!--        app:layout_constraintBottom_toBottomOf="@+id/iv_teacher_entry_tag"-->
+    <!--        app:layout_constraintLeft_toRightOf="@+id/iv_teacher_entry_tag"-->
+    <!--        app:layout_constraintTop_toTopOf="@+id/iv_teacher_entry_tag" />-->
 
     <LinearLayout
         android:id="@+id/ll_subject_container"
@@ -113,12 +113,12 @@
         app:layout_constraintTop_toBottomOf="@+id/tv_nickname" />
 
     <LinearLayout
-        android:visibility="gone"
         android:id="@+id/ll_subject_container2"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:orientation="horizontal"
+        android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="@+id/ll_subject_container"
         app:layout_constraintRight_toRightOf="@+id/ll_subject_container"
         app:layout_constraintTop_toBottomOf="@+id/ll_subject_container" />

+ 1 - 1
teacher/src/main/res/layout/fragment_home_layout.xml

@@ -122,7 +122,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
-            android:visibility="gone"
+            android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"
             app:layout_constraintLeft_toRightOf="@+id/tv_nickname"
             app:layout_constraintRight_toLeftOf="@+id/iv_scan"

+ 2 - 2
teacher/src/main/res/layout/fragment_mine_layout.xml

@@ -82,7 +82,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
-            android:visibility="gone"
+            android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"
             app:layout_constraintLeft_toRightOf="@+id/tv_nickname"
             app:layout_constraintRight_toLeftOf="@+id/iv_scan"
@@ -145,7 +145,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="@+id/iv_avatar"
-            tools:visibility="visible" />
+            tools:visibility="gone" />
 
 
         <View