Browse Source

修改部分样式问题

Pq 6 tháng trước cách đây
mục cha
commit
07ae52f367

+ 9 - 9
BaseLibrary/src/main/java/com/cooleshow/base/utils/UiUtils.java

@@ -300,15 +300,15 @@ public class UiUtils {
     }
     }
 
 
     public static String getBuyNumTip(String lessonPrice, String buyCount) {
     public static String getBuyNumTip(String lessonPrice, String buyCount) {
-        try {
-            double v = Double.parseDouble(lessonPrice);
-            if (v == 0) {
-                return buyCount + "人已领取";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return buyCount + "人已购买";
+//        try {
+//            double v = Double.parseDouble(lessonPrice);
+//            if (v == 0) {
+//                return buyCount + "人已领取";
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+        return buyCount + "人学习";
     }
     }
 
 
     public static String getBuyNumTip2(String lessonPrice, String buyCount) {
     public static String getBuyNumTip2(String lessonPrice, String buyCount) {

+ 3 - 0
BaseLibrary/src/main/java/com/cooleshow/base/widgets/dialog/CommonFilterDialog.java

@@ -3,6 +3,7 @@ package com.cooleshow.base.widgets.dialog;
 import android.app.Dialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Color;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.Gravity;
 import android.view.View;
 import android.view.View;
@@ -85,9 +86,11 @@ public class CommonFilterDialog<T> extends Dialog implements View.OnClickListene
                 tv_text.setText(text);
                 tv_text.setText(text);
                 if (holder.getLayoutPosition() == selectPos) {
                 if (holder.getLayoutPosition() == selectPos) {
                     tv_text.setBackgroundResource(R.drawable.shape_f2f2f2_6dp);
                     tv_text.setBackgroundResource(R.drawable.shape_f2f2f2_6dp);
+                    tv_text.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
                     tv_text.setTextColor(getContext().getResources().getColor(R.color.color_2dc7aa));
                     tv_text.setTextColor(getContext().getResources().getColor(R.color.color_2dc7aa));
                 } else {
                 } else {
                     tv_text.setBackgroundColor(Color.TRANSPARENT);
                     tv_text.setBackgroundColor(Color.TRANSPARENT);
+                    tv_text.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
                     tv_text.setTextColor(getContext().getResources().getColor(R.color.color_333333));
                     tv_text.setTextColor(getContext().getResources().getColor(R.color.color_333333));
                 }
                 }
             }
             }

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

@@ -361,11 +361,11 @@
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintLeft_toLeftOf="parent"
                         tools:text="毕业于中央音乐学员长笛专业,师从央音长笛系。曾获得2016年锦绣杯长笛大赛冠军。自2018年起研究长笛启蒙、考级到专业考试教育。总结出一套适合各个阶段需要的教学方式。所教学员考级通过率100%,专业院校复试率92%。"
                         tools:text="毕业于中央音乐学员长笛专业,师从央音长笛系。曾获得2016年锦绣杯长笛大赛冠军。自2018年起研究长笛启蒙、考级到专业考试教育。总结出一套适合各个阶段需要的教学方式。所教学员考级通过率100%,专业院校复试率92%。"
                         android:text="暂无介绍"
                         android:text="暂无介绍"
+                        android:lineSpacingMultiplier="1.2"
                         android:textColor="@color/color_777777"
                         android:textColor="@color/color_777777"
                         android:textSize="@dimen/sp_13"
                         android:textSize="@dimen/sp_13"
                         android:id="@+id/tv_introduce"
                         android:id="@+id/tv_introduce"
                         android:layout_width="match_parent"
                         android:layout_width="match_parent"
-                        android:minHeight="98dp"
                         android:layout_height="wrap_content"/>
                         android:layout_height="wrap_content"/>
 
 
                     <com.cooleshow.teacher.widgets.StyleEmptyView
                     <com.cooleshow.teacher.widgets.StyleEmptyView

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

@@ -30,7 +30,7 @@
         app:tabIndicatorColor="@color/color_2dc7aa"
         app:tabIndicatorColor="@color/color_2dc7aa"
         app:tabIndicatorFullWidth="false"
         app:tabIndicatorFullWidth="false"
         app:tabIndicatorHeight="4dp"
         app:tabIndicatorHeight="4dp"
-        app:tabMode="auto"
+        app:tabMode="fixed"
         app:tabPaddingEnd="0dp"
         app:tabPaddingEnd="0dp"
         app:tabPaddingStart="0dp"
         app:tabPaddingStart="0dp"
         app:tabRippleColor="@null"
         app:tabRippleColor="@null"

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

@@ -90,7 +90,7 @@
         android:id="@+id/search_btn"
         android:id="@+id/search_btn"
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/dp_26"
         android:layout_height="@dimen/dp_26"
-        android:layout_marginRight="@dimen/dp_4"
+        android:layout_marginRight="@dimen/dp_1"
         android:background="@drawable/bg_white_13dp"
         android:background="@drawable/bg_white_13dp"
         android:gravity="center"
         android:gravity="center"
         android:paddingStart="12dp"
         android:paddingStart="12dp"

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

@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"/>
         android:layout_height="wrap_content"/>
 
 
     <androidx.recyclerview.widget.RecyclerView
     <androidx.recyclerview.widget.RecyclerView
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="20dp"
         android:layout_width="0dp"
         android:layout_width="0dp"
         app:layout_constraintHeight_max="250dp"
         app:layout_constraintHeight_max="250dp"
         android:id="@+id/recyclerView"
         android:id="@+id/recyclerView"

+ 1 - 2
teacher/src/main/res/layout/item_mine_style_fans_group_layout.xml

@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingTop="12dp"
-    android:paddingBottom="12dp"
+    android:paddingBottom="20dp"
     android:paddingStart="20dp">
     android:paddingStart="20dp">
 
 
     <de.hdodenhof.circleimageview.CircleImageView
     <de.hdodenhof.circleimageview.CircleImageView