Bladeren bron

修改学生端首页点击顺序

Pq 8 maanden geleden
bovenliggende
commit
10838bae91

+ 3 - 2
student/src/main/java/com/cooleshow/student/adapter/VIPCourseCourseListAdapter.java

@@ -37,8 +37,9 @@ public class VIPCourseCourseListAdapter extends BaseQuickAdapter<AppointCourseTe
             String starGrade = bean.getStarGrade();
             double i = Double.parseDouble(starGrade);
             rating_bar.setRating((float) i);
-            holder.setGone(R.id.tv_no_score, i > 0);
-            holder.setGone(R.id.rating_bar, i < 0);
+            boolean hasScore = i > 0;
+            holder.setGone(R.id.rating_bar, !hasScore);
+            holder.setGone(R.id.tv_no_score, hasScore);
         } catch (Exception e) {
             e.printStackTrace();
             rating_bar.setRating(0);

+ 10 - 8
student/src/main/java/com/cooleshow/student/ui/main/MainActivity.java

@@ -297,12 +297,20 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
             setTabTextStyle(viewBinding.tvHome);
             return;
         }
-        if (id == R.id.view_course) {
+        if (id == R.id.view_mall) {
             getViewBinding().viewPager.setCurrentItem(1, false);
+            handleTabAnim(viewBinding.tabMall);
+            setTabTextStyle(viewBinding.tvMall);
+            return;
+        }
+
+        if (id == R.id.view_course) {
+            getViewBinding().viewPager.setCurrentItem(2, false);
             handleTabAnim(viewBinding.tabCourse);
             setTabTextStyle(viewBinding.tvCourse);
             return;
         }
+
         if (id == R.id.view_chat) {
             if (UiUtils.isFastClick(200)) {
                 //双击操作
@@ -311,17 +319,11 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
                 }
                 return;
             }
-            getViewBinding().viewPager.setCurrentItem(2, false);
+            getViewBinding().viewPager.setCurrentItem(3, false);
             handleTabAnim(viewBinding.tabChat);
             setTabTextStyle(viewBinding.tvChat);
             return;
         }
-        if (id == R.id.view_mall) {
-            getViewBinding().viewPager.setCurrentItem(3, false);
-            handleTabAnim(viewBinding.tabMall);
-            setTabTextStyle(viewBinding.tvMall);
-            return;
-        }
         if (id == R.id.view_mine) {
             getViewBinding().viewPager.setCurrentItem(4, false);
             handleTabAnim(viewBinding.tabMine);

+ 18 - 18
student/src/main/res/layout/activity_main.xml

@@ -56,8 +56,8 @@
             android:id="@+id/tab_mall"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            app:layout_constraintLeft_toLeftOf="@+id/view_course"
-            app:layout_constraintRight_toRightOf="@+id/view_course"
+            app:layout_constraintLeft_toLeftOf="@+id/view_mall"
+            app:layout_constraintRight_toRightOf="@+id/view_mall"
             app:layout_constraintTop_toTopOf="@+id/tab_home"
             app:lottie_autoPlay="false"
             app:lottie_loop="false"
@@ -67,8 +67,8 @@
             android:id="@+id/tab_course"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            app:layout_constraintLeft_toLeftOf="@+id/view_chat"
-            app:layout_constraintRight_toRightOf="@+id/view_chat"
+            app:layout_constraintLeft_toLeftOf="@+id/view_course"
+            app:layout_constraintRight_toRightOf="@+id/view_course"
             app:layout_constraintTop_toTopOf="@+id/tab_home"
             app:lottie_autoPlay="false"
             app:lottie_loop="false"
@@ -95,8 +95,8 @@
             android:id="@+id/tab_chat"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            app:layout_constraintLeft_toLeftOf="@+id/view_mall"
-            app:layout_constraintRight_toRightOf="@+id/view_mall"
+            app:layout_constraintLeft_toLeftOf="@+id/view_chat"
+            app:layout_constraintRight_toRightOf="@+id/view_chat"
             app:layout_constraintTop_toTopOf="@+id/tab_home"
             app:lottie_autoPlay="false"
             app:lottie_loop="false"
@@ -135,12 +135,12 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:includeFontPadding="false"
-            android:text="商城"
+            android:text="音乐厅"
             android:textColor="@color/color_999999"
             android:textSize="@dimen/sp_10"
             app:layout_constraintBottom_toBottomOf="@+id/tv_home"
-            app:layout_constraintLeft_toLeftOf="@+id/tab_mall"
-            app:layout_constraintRight_toRightOf="@+id/tab_mall"
+            app:layout_constraintLeft_toLeftOf="@+id/view_mall"
+            app:layout_constraintRight_toRightOf="@+id/view_mall"
             app:layout_constraintTop_toTopOf="@+id/tv_home" />
 
         <TextView
@@ -192,36 +192,36 @@
             android:onClick="onTabClick"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toLeftOf="@+id/view_course"
+            app:layout_constraintRight_toLeftOf="@+id/view_mall"
             app:layout_constraintTop_toTopOf="parent" />
 
         <View
-            android:id="@+id/view_course"
+            android:id="@+id/view_mall"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:onClick="onTabClick"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toRightOf="@+id/view_home"
-            app:layout_constraintRight_toLeftOf="@+id/view_chat"
+            app:layout_constraintRight_toLeftOf="@+id/view_course"
             app:layout_constraintTop_toTopOf="parent" />
 
         <View
-            android:id="@+id/view_chat"
+            android:id="@+id/view_course"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:onClick="onTabClick"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toRightOf="@+id/view_course"
-            app:layout_constraintRight_toLeftOf="@+id/view_mall"
+            app:layout_constraintLeft_toRightOf="@+id/view_mall"
+            app:layout_constraintRight_toLeftOf="@+id/view_chat"
             app:layout_constraintTop_toTopOf="parent" />
 
         <View
-            android:id="@+id/view_mall"
+            android:id="@+id/view_chat"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:onClick="onTabClick"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toRightOf="@+id/view_chat"
+            app:layout_constraintLeft_toRightOf="@+id/view_course"
             app:layout_constraintRight_toLeftOf="@+id/view_mine"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -231,7 +231,7 @@
             android:layout_height="0dp"
             android:onClick="onTabClick"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toRightOf="@+id/view_mall"
+            app:layout_constraintLeft_toRightOf="@+id/view_chat"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 

+ 1 - 2
student/src/main/res/layout/item_vip_course_list_layout.xml

@@ -95,8 +95,7 @@
         android:id="@+id/tv_course_num"
         app:layout_constraintTop_toBottomOf="@+id/tv_des"
         android:includeFontPadding="false"
-        tools:text="已上课时34节已上课时34节已上课时34节已上课时34节已上课时34节"
-        android:gravity="center"
+        tools:text="已上课时34节"
         app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_12"