瀏覽代碼

修改走查问题

Pq 8 月之前
父節點
當前提交
b649278467

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/adapter/MineLiveCourseListAdapter.java

@@ -51,7 +51,7 @@ public class MineLiveCourseListAdapter extends BaseQuickAdapter<MineLiveCourseLi
         //subjectName
         holder.setText(R.id.tv_course_name, data.subjectName);
         //购买人数
-        holder.setText(R.id.tv_buy_num, UiUtils.getBuyNumTip(data.coursePrice, data.studentCount));
+        holder.setText(R.id.tv_buy_num, UiUtils.getBuyNumTip2(data.coursePrice, data.studentCount));
         //课程封面
         ImageView iv_bg = holder.getView(R.id.iv_bg);
         GlideUtils.INSTANCE.loadImage(getContext(), data.backgroundPic, iv_bg, com.cooleshow.base.R.drawable.bg_video_placeholder);

+ 0 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/homepage/HomePageActivity.java

@@ -178,7 +178,6 @@ public class HomePageActivity extends BaseMVPActivity<ActivityHomePageNewLayoutB
                     view_indicator.setVisibility(View.VISIBLE);
                     tv_text.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_333333));
                     tv_text.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
-                    tv_text.setTextSize(17);
                 }
             }
 
@@ -191,7 +190,6 @@ public class HomePageActivity extends BaseMVPActivity<ActivityHomePageNewLayoutB
                     view_indicator.setVisibility(View.GONE);
                     tv_text.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_666666));
                     tv_text.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
-                    tv_text.setTextSize(15);
                 }
             }
 

+ 18 - 17
teacher/src/main/java/com/cooleshow/teacher/ui/homepage/SheetMusicPageFragment.java

@@ -73,12 +73,12 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
         });
 
         mAdapter.getLoadMoreModule().setOnLoadMoreListener(() -> {
-                //上拉加载
-                if (hasNext) {
-                    currentPage++;
-                    queryList(false);
-                } else {
-                    mAdapter.getLoadMoreModule().loadMoreEnd();
+            //上拉加载
+            if (hasNext) {
+                currentPage++;
+                queryList(false);
+            } else {
+                mAdapter.getLoadMoreModule().loadMoreEnd();
             }
         });
         mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
@@ -169,16 +169,17 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
             mViewBinding.headerView.getLeftText().setText(bean.name);
             queryList(true);
         }).setLayoutRes(com.cooleshow.base.R.layout.pickerview_address_layout, v -> {
-            //自定义布局中的控件初始化及事件处理
-            final TextView tvSubmit = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_finish);
-            TextView ivCancel = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_cancel);
-            tvSubmit.setOnClickListener(v12 -> {
-                pvOptions.returnData();
-                pvOptions.dismiss();
-            });
-            ivCancel.setOnClickListener(v1 -> pvOptions.dismiss());
+                    //自定义布局中的控件初始化及事件处理
+                    final TextView tvSubmit = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_finish);
+                    tvSubmit.setText(getContext().getString(com.cooleshow.base.R.string.confirm_str));
+                    TextView ivCancel = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_cancel);
+                    tvSubmit.setOnClickListener(v12 -> {
+                        pvOptions.returnData();
+                        pvOptions.dismiss();
+                    });
+                    ivCancel.setOnClickListener(v1 -> pvOptions.dismiss());
 
-        }).setTextColorOut(getResources().getColor(com.cooleshow.base.R.color.color_aaaaaa))
+                }).setTextColorOut(getResources().getColor(com.cooleshow.base.R.color.color_aaaaaa))
                 .setDividerColor(Color.TRANSPARENT)
                 .setBgColor(Color.TRANSPARENT).isDialog(false).build();
         pvOptions.setPicker(subjectBeanList);
@@ -319,12 +320,12 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
             return;
         }
 
-        if(id == R.id.tv_filter){
+        if (id == R.id.tv_filter) {
             //声部筛选
             selectVocalPart();
             return;
         }
-        if(id == R.id.tv_search){
+        if (id == R.id.tv_search) {
             mViewBinding.headerView.clearEditFocus();
             musicSearch();
             return;

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

@@ -119,7 +119,7 @@
                     android:layout_width="37dp"
                     android:layout_height="18dp"
                     app:layout_constraintLeft_toRightOf="@+id/view_vip_help_line"
-                    app:layout_constraintTop_toBottomOf="@+id/view_vip_help_line" />
+                    app:layout_constraintBottom_toBottomOf="@+id/iv_avatar" />
 
                 <TextView
                     android:maxLines="1"

+ 1 - 2
teacher/src/main/res/layout/dialog_fans_list_layout.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="wrap_content"
-    android:paddingBottom="18dp"
     android:background="@drawable/bg_white_10dp"
     android:layout_height="wrap_content">
     <ImageView
@@ -25,7 +24,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:layout_marginTop="12dp"
         android:layout_width="0dp"
-        app:layout_constraintHeight_max="300dp"
+        app:layout_constraintHeight_max="250dp"
         android:id="@+id/recyclerView"
         app:layout_constraintRight_toRightOf="@+id/iv_header"
         app:layout_constraintLeft_toLeftOf="@+id/iv_header"

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

@@ -23,7 +23,7 @@
         android:id="@+id/tv_course_status_tip"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="9dp"
+        android:layout_marginTop="5dp"
         android:background="@drawable/shape_d5fff7_9dp_right"
         android:gravity="center"
         android:paddingStart="4dp"
@@ -41,7 +41,7 @@
     <TextView
         android:id="@+id/course_name"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_13"
+        android:layout_height="@dimen/dp_14"
         android:layout_marginEnd="@dimen/dp_5"
         android:layout_marginBottom="@dimen/dp_7"
         android:background="@drawable/shape_66000000_3dp"

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

@@ -26,7 +26,7 @@
         app:layout_constraintTop_toTopOf="parent"
         android:gravity="center"
         android:includeFontPadding="false"
-        android:textSize="@dimen/sp_15"
+        android:textSize="@dimen/sp_16"
         android:textColor="@color/color_666666"
         android:id="@+id/tv_text"
         android:layout_width="wrap_content"

+ 1 - 1
teacher/src/main/res/values/strings.xml

@@ -68,7 +68,7 @@
     <string name="vip_setting_str4">天后结算到您的账户</string>
     <string name="all_attendance_str">全部考勤</string>
     <string name="all_course_status_str">全部状态</string>
-    <string name="there_no_introduce">暂无介</string>
+    <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>