修改部分样式问题

BaseLibrary/src/main/res/drawable/shape_13dp_border_2dc7aa_1dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke android:width="1dp" android:color="@color/color_2dc7aa"/>
+    <corners android:radius="13dp"/>
+</shape>

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

@@ -341,9 +341,9 @@
         <item name="android:drawablePadding">5dp</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:paddingLeft">10dp</item>
-        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingTop">20dp</item>
         <item name="android:paddingRight">12dp</item>
-        <item name="android:paddingBottom">10dp</item>
+        <item name="android:paddingBottom">20dp</item>
         <item name="android:textColor">@color/color_1a1a1a</item>
         <item name="android:textSize">@dimen/sp_16</item>
     </style>

student/src/main/java/com/cooleshow/student/ui/main/NewHomeFragmentV2.java

@@ -14,6 +14,7 @@ import com.chad.library.adapter.base.listener.OnItemChildClickListener;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
+import com.cooleshow.base.constanst.CourseStatusType;
 import com.cooleshow.base.constanst.EventConstants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
@@ -470,6 +471,9 @@ public class NewHomeFragmentV2 extends BaseMVPFragment<FgNewHomeV2LayoutBinding,
         presenter.helpCenterContentList();
         mViewBinding.flCourseEnter.setVisibility(mRecentCourses != null ? View.VISIBLE : View.GONE);
         if (mRecentCourses != null) {
+            boolean isIng = TextUtils.equals(mRecentCourses.status, CourseStatusType.ING.getId());
+            mViewBinding.tvEnterRoom.setText(getString(isIng ? R.string.enter_room_tip_str : R.string.will_start_tip_str));
+            mViewBinding.tvEnterRoom.setBackgroundResource(isIng ? com.cooleshow.base.R.drawable.shape_2dc7aa_13dp: com.cooleshow.base.R.drawable.shape_13dp_border_2dc7aa_1dp);
             mViewBinding.tvLiveTitle.setText(mRecentCourses.courseGroupName);
             String currentTime = TimeUtils.date2String(new Date(System.currentTimeMillis()), "yyyy-MM-dd");
             String startTime = TimeUtils.date2String(

student/src/main/res/layout/fg_new_home_v2_layout.xml

@@ -371,6 +371,7 @@
                                 app:layout_constraintTop_toTopOf="parent" />
 
                             <TextView
+                                android:id="@+id/tv_enter_room"
                                 android:layout_width="76dp"
                                 android:layout_height="26dp"
                                 android:layout_marginEnd="16dp"

student/src/main/res/values/strings.xml

@@ -43,4 +43,6 @@
     <string name="icp_str">ICP备案号：鄂ICP备2021020787号-4A</string>
     <string name="app_info_record">增值电信业务经营许可证：鄂B2-20231246\n教育移动互联网应用备案：教APP备4200224号\n网络安全等级保护备案号：42010043158-24001\nCopyright@2021-2024｜酷乐秀 colexiu.com 版权所有</string>
     <string name="mine_course_search_tip">请输入课程组或老师名称</string>
+    <string name="enter_room_tip_str">进入教室</string>
+    <string name="will_start_tip_str">即将开始</string>
 </resources>

teacher/src/main/java/com/cooleshow/teacher/adapter/TeachableInstrumentAdapter.java

@@ -80,7 +80,7 @@ public class TeachableInstrumentAdapter extends BaseQuickAdapter<TeachableInstru
             if (null != teachableInstrumentBean.subjects && teachableInstrumentBean.subjects.size() > 0) {
                 for (TeachableInstrumentBean subject : teachableInstrumentBean.subjects) {
                     if (subject.id == id) {
-                        subject.isSelect = true;
+                        subject.isSelect = !subject.isSelect;
                     } else {
                         subject.isSelect = false;
                     }

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

@@ -166,6 +166,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         }
         //true限制用户 限制我的收入 酷乐秀推广计划等
         mViewBinding.tvMyAccount.setVisibility(teacherUserInfo.isSettlement ? View.VISIBLE : View.GONE);
+        mViewBinding.tvPromoteIncomeTip.setVisibility(teacherUserInfo.isSettlement ? View.VISIBLE : View.GONE);
         if (mMineCommonToolAdapter != null) {
             ArrayList<MineToolMenuBean> toolsData = MineFragmentToolsHelper.getData(teacherUserInfo.isSettlement ? null : MineFragmentToolsHelper.TYPE_MINE_INCOME);
             mMineCommonToolAdapter.setNewInstance(toolsData);

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

@@ -10,6 +10,7 @@ import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.cooleshow.base.common.WebConstants;
+import com.cooleshow.base.constanst.CourseStatusType;
 import com.cooleshow.base.constanst.EVipType;
 import com.cooleshow.base.constanst.EventConstants;
 import com.cooleshow.base.event.RefreshUserStatusEvent;
@@ -308,6 +309,9 @@ public class NewHomeFragmentV2 extends BaseMVPFragment<FgNewHomeV2LayoutBinding,
         presenter.helpCenterContentList();
         mViewBinding.flCourseEnter.setVisibility(mRecentCourses != null ? View.VISIBLE : View.GONE);
         if (mRecentCourses != null) {
+            boolean isIng = TextUtils.equals(mRecentCourses.status, CourseStatusType.ING.getId());
+            mViewBinding.tvEnterRoom.setText(getString(isIng ? R.string.enter_room_tip_str : R.string.will_start_tip_str));
+            mViewBinding.tvEnterRoom.setBackgroundResource(isIng ? com.cooleshow.base.R.drawable.shape_2dc7aa_13dp: com.cooleshow.base.R.drawable.shape_13dp_border_2dc7aa_1dp);
             mViewBinding.tvLiveTitle.setText(mRecentCourses.courseGroupName);
             String currentTime = TimeUtils.date2String(new Date(System.currentTimeMillis()), "yyyy-MM-dd");
             String startTime = TimeUtils.date2String(
@@ -353,8 +357,9 @@ public class NewHomeFragmentV2 extends BaseMVPFragment<FgNewHomeV2LayoutBinding,
                     .navigation();
             return;
         }
-        if (TextUtils.equals(bean.courseType, CourseConstants.OTHER_COURSE)) {
-            //陪练课
+        if (TextUtils.equals(bean.courseType, CourseConstants.OTHER_COURSE) ||
+                TextUtils.equals(bean.courseType, CourseConstants.VIP_COURSE)) {
+            //VIP课或者趣纠课
             ARouter.getInstance().build(RouterPath.CourseCenter.SPARRING_COURSE_DETAIL)
                     .withString(CourseConstants.COURSE_ID, String.valueOf(bean.courseId))
                     .withString(CourseConstants.COURSE_GROUP_ID, String.valueOf(bean.courseGroupId))

teacher/src/main/java/com/cooleshow/teacher/ui/minestyle/TeachableInstrumentActivity.java

@@ -76,7 +76,7 @@ public class TeachableInstrumentActivity extends BaseMVPActivity<ActivityTeachab
             viewBinding.tvTips.setText("最多可选择1个乐器");
         }
         initCarryData();
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "可教授乐器");
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "乐器选择");
         instrumentList = viewBinding.rvInstrument;
         viewBinding.tvConfirm.setOnClickListener(this);
         LinearLayoutManager manager = new LinearLayoutManager(this);

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

@@ -30,12 +30,12 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_instrument"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_below="@+id/tv_tips"
         android:layout_marginLeft="9dp"
-        android:layout_marginTop="11dp"
+        android:layout_marginTop="5dp"
         android:layout_marginRight="9dp"
-        android:layout_marginBottom="119dp"
+        android:layout_marginBottom="104dp"
         android:nestedScrollingEnabled="false"
         android:overScrollMode="never"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -48,7 +48,7 @@
         android:layout_height="44dp"
         android:layout_marginLeft="27dp"
         android:layout_marginRight="27dp"
-        android:layout_marginBottom="48dp"
+        android:layout_marginBottom="30dp"
         android:background="@drawable/shape_course_status_ing"
         android:gravity="center"
         android:text="确认"

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

@@ -276,6 +276,7 @@
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <TextView
+                        android:id="@+id/tv_enter_room"
                         android:layout_width="76dp"
                         android:layout_height="26dp"
                         android:layout_marginEnd="16dp"
@@ -627,7 +628,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/dp_6"
                         android:gravity="center"
-                        android:text="最热曲目"
+                        android:text="热门曲目"
                         android:textColor="@color/color_333333"
                         android:textSize="@dimen/sp_17"
                         android:textStyle="bold"

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

@@ -766,8 +766,8 @@
             android:layout_marginEnd="14dp"
             android:background="@drawable/bg_white_10dp"
             android:orientation="vertical"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/view_bottom_bg">
@@ -782,6 +782,7 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
+                android:visibility="gone"
                 android:id="@+id/tv_promote_income_tip"
                 android:layout_width="wrap_content"
                 android:layout_height="18dp"
@@ -794,6 +795,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tv_my_account" />
 
             <TextView
+                android:paddingBottom="20dp"
                 android:id="@+id/tv_authentication"
                 style="@style/me_btn_style"
                 android:text="银行卡"
@@ -850,8 +852,8 @@
             android:layout_marginEnd="14dp"
             android:background="@drawable/shape_8dp_white"
             android:orientation="vertical"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
             app:layout_constraintTop_toBottomOf="@+id/cs_menu_usually">
 
             <TextView

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

@@ -2,7 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_marginTop="5dp"
     android:layout_height="wrap_content">
 
 
@@ -11,11 +10,14 @@
         android:layout_width="3dp"
         android:layout_height="13dp"
         android:layout_marginLeft="5dp"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_title"
         android:background="@drawable/mark_2dc7aa_3radius"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@+id/tv_title" />
 
     <TextView
+        android:paddingBottom="7dp"
+        android:paddingTop="7dp"
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -23,13 +25,11 @@
         android:text="xxxxx"
         android:textColor="@color/black_333"
         android:textSize="@dimen/sp_16"
-        app:layout_constraintBottom_toBottomOf="@+id/view_mark"
         app:layout_constraintLeft_toRightOf="@+id/view_mark"
-        app:layout_constraintTop_toTopOf="@+id/view_mark" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_item"
-        android:layout_marginTop="5dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"

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

@@ -12,17 +12,20 @@
     <com.cooleshow.base.widgets.QMUIRadiusImageView
         android:id="@+id/iv_pic"
         android:layout_width="match_parent"
-        android:layout_height="108dp"
+        android:layout_height="0dp"
+        app:layout_constraintDimensionRatio="w,1:1"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:qmui_corner_radius="10dp" />
+
     <View
         android:layout_width="match_parent"
-        android:layout_height="108dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_height="0dp"
         android:background="@drawable/bg_teachable_instrument"
-        />
+        app:layout_constraintBottom_toBottomOf="@+id/iv_pic"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_pic"
+        app:layout_constraintRight_toRightOf="@+id/iv_pic"
+        app:layout_constraintTop_toTopOf="@+id/iv_pic" />
 
     <ImageView
         android:id="@+id/im_check"
@@ -37,7 +40,7 @@
 
     <TextView
         android:id="@+id/tv_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:paddingStart="7dp"
         android:paddingEnd="7dp"
@@ -47,7 +50,7 @@
         android:textSize="@dimen/sp_16"
         android:singleLine="true"
         android:ellipsize="middle"
-        tools:text="阿斯卡静待花开久啊稍阿斯卡静待花开久啊稍等哈斯卡哈大阿斯卡静待花开久啊稍等哈斯卡哈大等哈斯卡哈大"
+        tools:text="阿斯卡"
         app:layout_constraintRight_toRightOf="@+id/iv_pic"
         app:layout_constraintBottom_toBottomOf="@+id/iv_pic"
         app:layout_constraintLeft_toLeftOf="@+id/iv_pic" />

teacher/src/main/res/values/strings.xml

@@ -71,4 +71,6 @@
     <string name="there_no_introduce">暂无介绍</string>
     <string name="no_fans_group_tips">您还没有粉丝群哦</string>
     <string name="mine_course_search_tip">请输入课程组名称</string>
+    <string name="enter_room_tip_str">进入教室</string>
+    <string name="will_start_tip_str">即将开始</string>
 </resources>