完善兼职Me界面

cpt_parttime/src/main/res/layout/fragment_parttime_job_profile.xml

@@ -161,7 +161,7 @@
                                     tools:text="Lisa Yang" />
 
 
-                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                <com.guadou.lib_baselib.font_text_view.TextViewRegular
                                     android:id="@+id/text_view_email_address"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
@@ -171,7 +171,7 @@
                                     android:textSize="13.8dp"
                                     tools:text="Fangyuan@hongyegroup.com" />
 
-                                <TextView
+                                <com.guadou.lib_baselib.font_text_view.TextViewRegular
                                     android:id="@+id/text_view_joined_date"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
@@ -189,7 +189,7 @@
                                     android:orientation="horizontal">
 
 
-                                    <TextView
+                                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                         android:id="@+id/text_view_profile_points"
                                         android:layout_width="105dp"
                                         android:layout_height="25dp"
@@ -235,7 +235,7 @@
                             android:gravity="center_vertical"
                             android:orientation="horizontal">
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/d_25dp"
@@ -258,7 +258,7 @@
                         </LinearLayout>
 
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:id="@+id/text_view_additional_info_reject"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -275,7 +275,7 @@
                             android:textSize="@dimen/d_14sp"
                             android:visibility="visible" />
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:id="@+id/text_view_additional_info"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -288,7 +288,7 @@
                             android:textColor="#FFC000"
                             android:textSize="@dimen/d_14sp" />
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:id="@+id/btn_urgent"
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/d_35dp"
@@ -317,7 +317,7 @@
                         android:paddingTop="@dimen/d_25dp"
                         android:paddingBottom="@dimen/d_38dp">
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewBold
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/d_23dp"
@@ -325,7 +325,7 @@
                             android:textColor="@color/profile_black_28394a"
                             android:textSize="17dp" />
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:id="@+id/text_view_name"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -339,7 +339,7 @@
                             android:textSize="@dimen/d_14sp"
                             tools:text="Lisa Yang" />
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:id="@+id/text_view_email_address_below"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -352,7 +352,7 @@
                             android:textColor="@color/profile_black_8098b2"
                             android:textSize="@dimen/d_14sp" />
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:id="@+id/text_view_mobile_number"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -365,7 +365,7 @@
                             android:textColor="@color/profile_black_8098b2"
                             android:textSize="@dimen/d_14sp" />
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:id="@+id/text_view_nric_no"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -378,7 +378,7 @@
                             android:textColor="@color/profile_black_8098b2"
                             android:textSize="@dimen/d_14sp" />
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:id="@+id/text_view_nationality"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -391,7 +391,7 @@
                             android:textColor="@color/profile_black_8098b2"
                             android:textSize="@dimen/d_14sp" />
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:id="@+id/tv_rate"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -412,9 +412,9 @@
                             android:layout_marginTop="@dimen/d_20dp"
                             android:gravity="center_vertical"
                             android:orientation="horizontal"
-                            android:visibility="gone">
+                            android:visibility="visible">
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/d_23dp"
@@ -424,7 +424,7 @@
                                 android:textColor="@color/profile_black_8098b2"
                                 android:textSize="@dimen/d_14sp" />
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:id="@+id/tv_request_view_profile_total_hours"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -432,7 +432,7 @@
                                 android:textColor="@color/app_blue"
                                 android:textSize="@dimen/d_14sp" />
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/d_3dp"
@@ -446,7 +446,7 @@
                                 android:layout_height="1dp"
                                 android:layout_weight="1" />
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:id="@+id/tv_profile_rules"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -489,7 +489,7 @@
                             android:gravity="center_vertical"
                             android:orientation="horizontal">
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewBold
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/d_23dp"
@@ -519,7 +519,7 @@
                             android:paddingLeft="@dimen/d_23dp"
                             android:visibility="visible">
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:id="@+id/tv_edit_profile_work_type1"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -532,7 +532,7 @@
                                 android:textSize="@dimen/d_14sp"
                                 android:visibility="gone" />
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:id="@+id/tv_edit_profile_work_type2"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -556,7 +556,7 @@
                             android:paddingLeft="@dimen/d_23dp"
                             android:visibility="visible">
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:id="@+id/tv_edit_profile_work_type3"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -569,7 +569,7 @@
                                 android:textSize="@dimen/d_14sp"
                                 android:visibility="gone" />
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:id="@+id/tv_edit_profile_work_type4"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -594,7 +594,7 @@
                             android:visibility="visible"
                             android:weightSum="2">
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:id="@+id/tv_edit_profile_work_type5"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -607,7 +607,7 @@
                                 android:textSize="@dimen/d_14sp"
                                 android:visibility="gone" />
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:id="@+id/tv_edit_profile_work_type6"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -634,7 +634,7 @@
                         android:paddingTop="@dimen/d_25dp"
                         android:paddingBottom="@dimen/d_38dp">
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewBold
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/d_23dp"

cpt_parttime/src/main/res/layout/include_pensonal_turn_up_rate.xml

@@ -16,7 +16,7 @@
         android:paddingTop="@dimen/d_25dp"
         android:paddingBottom="@dimen/d_38dp">
 
-        <TextView
+        <com.guadou.lib_baselib.font_text_view.TextViewBold
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/d_23dp"
@@ -55,7 +55,7 @@
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <TextView
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
                         android:id="@+id/tv_no_show_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -77,7 +77,7 @@
                         app:layout_constraintLeft_toRightOf="@id/view_zi"
                         app:layout_constraintTop_toTopOf="@id/tv_no_show_value" />
 
-                    <TextView
+                    <com.guadou.lib_baselib.font_text_view.TextViewBold
                         android:id="@+id/tv_no_show_value"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -104,7 +104,7 @@
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <TextView
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
                         android:id="@+id/tv_cancel_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -126,7 +126,7 @@
                         app:layout_constraintLeft_toRightOf="@id/view_fen"
                         app:layout_constraintTop_toTopOf="@id/tv_cancel_value" />
 
-                    <TextView
+                    <com.guadou.lib_baselib.font_text_view.TextViewBold
                         android:id="@+id/tv_cancel_value"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -201,7 +201,7 @@
                 android:layout_weight="1.2"
                 android:orientation="vertical">
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
                     android:id="@+id/tv_grooming_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -219,7 +219,7 @@
                     android:progress="3"
                     android:progressDrawable="@drawable/progress_horizontal_grooming" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewBold
                     android:id="@+id/tv_grooming_value"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -259,7 +259,7 @@
                     app:layout_constraintLeft_toLeftOf="@id/tv_average_text"
                     app:layout_constraintTop_toBottomOf="@id/tv_average_text" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewBold
                     android:id="@+id/tv_average_value"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -279,7 +279,7 @@
                 android:layout_weight="1"
                 android:orientation="vertical">
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
                     android:id="@+id/tv_attitude_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -302,7 +302,7 @@
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tv_attitude_text" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewBold
                     android:id="@+id/tv_attitude_value"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -332,7 +332,7 @@
                 android:layout_weight="1.2"
                 android:orientation="vertical">
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
                     android:id="@+id/tv_perforamnce_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -350,7 +350,7 @@
                     android:progress="3"
                     android:progressDrawable="@drawable/progress_horizontal_perforamnce" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewBold
                     android:id="@+id/tv_perforamnce_value"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -368,7 +368,7 @@
                 android:layout_weight="1.2"
                 android:orientation="vertical">
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
                     android:id="@+id/tv_experience_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -390,7 +390,7 @@
                     app:layout_constraintLeft_toLeftOf="@id/tv_experience_text"
                     app:layout_constraintTop_toBottomOf="@id/tv_experience_text" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewBold
                     android:id="@+id/tv_experience_value"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

cs_baselib/src/main/java/com/guadou/lib_baselib/font_text_view/TypefaceUtil.java

@@ -17,13 +17,13 @@ public class TypefaceUtil {
         return Typeface.create("sans-serif", Typeface.NORMAL);
     }
 
-    public static Typeface getSFMedium(Context context) {
-        return FontCache.getTypeface("PingFang_Medium.ttf", context);
-    }
-
-    public static Typeface getSFBold(Context context) {
-        return FontCache.getTypeface("PingFang_Bold.ttf", context);
-    }
+//    public static Typeface getSFMedium(Context context) {
+//        return FontCache.getTypeface("PingFang_Medium.ttf", context);
+//    }
+//
+//    public static Typeface getSFBold(Context context) {
+//        return FontCache.getTypeface("PingFang_Bold.ttf", context);
+//    }
     public static Typeface getMedium() {
         return Typeface.create("sans-serif-medium", Typeface.NORMAL);
     }

cs_cptServices/src/main/java/com/guadou/cs_cptservices/widget/MyCircleProgressView.kt

@@ -253,14 +253,14 @@ class MyCircleProgressView(context: Context?, attrs: AttributeSet?) : View(conte
         mValuePaint!!.color = mValueColor!! //字体颜色
         mValuePaint!!.textAlign = Paint.Align.CENTER //从中间向两边绘制，不需要再次计算文字
 //        mValuePaint!!.typeface = Typeface.DEFAULT_BOLD //字体加粗
-        mValuePaint!!.typeface = TypefaceUtil.getSFBold(context) //字体加粗
+        mValuePaint!!.typeface = TypefaceUtil.getBold() //字体加粗
 
         mHintPaint = TextPaint()
         mHintPaint!!.isAntiAlias = antiAlias!!
         mHintPaint!!.textSize = mHintSize!!
         mHintPaint!!.color = mHintColor!!
         mHintPaint!!.textAlign = Paint.Align.CENTER
-        mHintPaint!!.typeface = TypefaceUtil.getSFBold(context) //自定义字体
+        mHintPaint!!.typeface = TypefaceUtil.getRegular() //自定义字体
     }
 
     override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {