Преглед на файлове

1.字体的一些修改
2.通知列表的完成,(模板代码) 列表的占位布局,列表的刷新与加载更多等逻辑

liukai преди 2 години
родител
ревизия
b9230e641b

+ 13 - 27
cpt_ewallet/src/main/res/layout/fragment_ewallet_main.xml

@@ -74,18 +74,7 @@
                             app:layout_constraintRight_toRightOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/d_10dp"
-                            android:layout_marginRight="@dimen/d_8dp"
-                            android:text=""
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/d_12sp"
-                            app:layout_constraintRight_toLeftOf="@+id/tv_money"
-                            app:layout_constraintTop_toTopOf="@+id/tv_money" />
-
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:id="@+id/tv_money"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -115,14 +104,14 @@
                             app:layout_constraintTop_toBottomOf="@+id/tv_money"
                             app:layout_constraintTop_toTopOf="@+id/ll_available">
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="提现金额:"
                                 android:textColor="@color/white"
                                 android:textSize="@dimen/d_13sp" />
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewBold
                                 android:id="@+id/tv_giro"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -151,14 +140,14 @@
                             app:layout_constraintRight_toRightOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tv_money">
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="可用余额:"
                                 android:textColor="@color/white"
                                 android:textSize="@dimen/d_13sp" />
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewBold
                                 android:id="@+id/tv_available"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -171,7 +160,6 @@
 
                         </LinearLayout>
 
-
                         <ImageView
                             android:id="@+id/iv_bolang"
                             android:layout_width="match_parent"
@@ -202,7 +190,7 @@
                                 android:layout_height="@dimen/d_35dp"
                                 android:src="@drawable/wallet_withdrawn_icon" />
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="@dimen/d_5dp"
@@ -232,7 +220,7 @@
                                 android:layout_height="@dimen/d_35dp"
                                 android:src="@drawable/wallet_appointments_icon" />
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="@dimen/d_5dp"
@@ -265,14 +253,13 @@
                             android:layout_height="@dimen/d_26dp"
                             android:src="@drawable/wallet_password_icon" />
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/d_8dp"
                             android:text="支付密码设置"
                             android:textColor="@color/gray_76"
-                            android:textSize="@dimen/d_15sp"
-                            binding:typefaceRegular="@{true}" />
+                            android:textSize="@dimen/d_15sp" />
 
                         <View
                             android:layout_width="0dp"
@@ -308,14 +295,13 @@
                             android:layout_height="@dimen/d_25dp"
                             android:src="@drawable/wallet_history_icon" />
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/d_8dp"
                             android:text="电子钱包交易记录"
                             android:textColor="@color/gray_76"
-                            android:textSize="@dimen/d_15sp"
-                            binding:typefaceRegular="@{true}" />
+                            android:textSize="@dimen/d_15sp" />
 
                         <View
                             android:layout_width="0dp"
@@ -350,7 +336,7 @@
                             android:layout_height="@dimen/d_25dp"
                             android:src="@drawable/wallet_invoice_icon" />
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/d_8dp"
@@ -370,7 +356,7 @@
 
                     </LinearLayout>
 
-                    <TextView
+                    <com.guadou.lib_baselib.font_text_view.TextViewBold
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/d_10dp"

+ 6 - 5
cpt_ewallet/src/main/res/layout/item_ewallet_history.xml

@@ -34,12 +34,12 @@
                 android:scaleType="centerCrop"
                 android:src="@drawable/plachholder_img_job_img" />
 
-            <TextView
+            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_12dp"
+                android:layout_marginLeft="11dp"
                 android:layout_marginTop="@dimen/d_16dp"
-                android:layout_marginRight="@dimen/d_12dp"
+                android:layout_marginRight="14dp"
                 android:layout_toLeftOf="@id/tv_change"
                 android:layout_toRightOf="@id/iv_icon"
                 android:ellipsize="end"
@@ -49,7 +49,7 @@
                 android:textColor="@color/text_yellow_ff9300"
                 android:textSize="@dimen/d_17sp" />
 
-            <TextView
+            <com.guadou.lib_baselib.font_text_view.TextViewRegular
                 android:id="@+id/tv_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
                 android:textColor="@color/gray_76"
                 android:textSize="@dimen/d_13sp" />
 
-            <TextView
+            <com.guadou.lib_baselib.font_text_view.TextViewMedium
                 android:id="@+id/tv_change"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -71,6 +71,7 @@
                 android:text="+30.25"
                 android:textColor="@color/profile_red"
                 android:textSize="@dimen/d_24sp" />
+
         </RelativeLayout>
 
 

+ 4 - 0
cpt_main/src/main/AndroidManifest.xml

@@ -8,6 +8,10 @@
             android:name=".ui.MainActivity"
             android:launchMode="singleTask" />
 
+        <activity
+            android:name=".ui.NotificationActivity"
+            android:launchMode="singleTop" />
+
     </application>
 
 </manifest>

+ 2 - 2
cpt_main/src/main/java/com/hongyegroup/cpt_main/mvvm/NotificationMainViewModel.kt

@@ -19,7 +19,7 @@ import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 @HiltViewModel
-class NotificationMainViewModel @Inject constructor(
+class NotificationViewModel @Inject constructor(
     private val savedStateHandle: SavedStateHandle
 ) : BaseViewModel() {
 
@@ -40,7 +40,7 @@ class NotificationMainViewModel @Inject constructor(
             //开始Loading
             if (isNeedPlaceHolder) loadStartLoading()
             val result = withContext(Dispatchers.IO) {
-                delay(1000)
+                delay(1500)
 
                 val list = mutableListOf<NotificationBean>()
                 for (i in 1..10) {

+ 4 - 0
cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/HomeFragment.kt

@@ -147,6 +147,10 @@ class HomeFragment : YYBaseVDBLoadingFragment<HomeViewModel, FragmentHomeBinding
         fun gotoBulletinBoardPage() {
             toast("去公告板页面")
         }
+
+        fun gotoNotificationPage() {
+            NotificationActivity.startInstance()
+        }
     }
 
 

+ 3 - 6
cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/MainActivity.kt

@@ -1,6 +1,5 @@
 package com.hongyegroup.cpt_main.ui
 
-import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
@@ -11,7 +10,8 @@ import com.guadou.cs_cptservices.interfaces.IFragmentRefresh
 import com.guadou.cs_router.ARouterPath
 import com.guadou.cs_router.YYRouterService
 import com.guadou.lib_baselib.bean.DataBindingConfig
-import com.guadou.lib_baselib.utils.CommUtils
+import com.guadou.lib_baselib.ext.commContext
+import com.guadou.lib_baselib.ext.gotoActivity
 import com.guadou.lib_baselib.utils.NetWorkUtil
 import com.guadou.lib_baselib.utils.StatusBarUtils
 import com.hongyegroup.cpt_main.BR
@@ -38,10 +38,7 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
 
     companion object {
         fun startInstance() {
-            val context = CommUtils.getContext()
-            val intent = Intent(context, MainActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(intent)
+            commContext().gotoActivity<MainActivity>()
         }
     }
 

+ 25 - 27
cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/NotificationFragment.kt

@@ -1,45 +1,53 @@
 package com.hongyegroup.cpt_main.ui
 
 import android.os.Bundle
-import android.view.View
 import com.chad.library.adapter.base.listener.OnLoadMoreListener
-import com.guadou.cs_cptservices.base.fragment.YYBaseVDBLoadingFragment
+import com.guadou.cs_cptservices.base.activity.YYBaseVDBLoadingActivity
 import com.guadou.cs_cptservices.interfaces.IFragmentRefresh
 import com.guadou.lib_baselib.bean.DataBindingConfig
 import com.guadou.lib_baselib.engine.toast
+import com.guadou.lib_baselib.ext.commContext
+import com.guadou.lib_baselib.ext.gotoActivity
 import com.guadou.lib_baselib.ext.vertical
 import com.guadou.lib_baselib.view.gloading.GLoadingTitleStatus
 import com.guadou.lib_baselib.view.gloading.Gloading
-import com.guadou.lib_baselib.view.gloading.GloadingGlobalAdapter
+import com.guadou.lib_baselib.view.gloading.GloadingPlaceHolderlAdapter
 import com.hongyegroup.cpt_main.BR
 import com.hongyegroup.cpt_main.R
-import com.hongyegroup.cpt_main.databinding.FragmentNotificationMainBinding
-import com.hongyegroup.cpt_main.mvvm.NotificationMainViewModel
+import com.hongyegroup.cpt_main.databinding.ActivityNotificationBinding
+import com.hongyegroup.cpt_main.mvvm.NotificationViewModel
 import com.scwang.smart.refresh.layout.api.RefreshLayout
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener
 
 /**
  * 通知列表
  */
-class NotificationFragment : YYBaseVDBLoadingFragment<NotificationMainViewModel, FragmentNotificationMainBinding>(), IFragmentRefresh,
+class NotificationActivity : YYBaseVDBLoadingActivity<NotificationViewModel, ActivityNotificationBinding>(), IFragmentRefresh,
     OnLoadMoreListener, OnRefreshListener {
 
+    companion object {
+        fun startInstance() {
+            commContext().gotoActivity<NotificationActivity>()
+        }
+    }
+
     override fun getDataBindingConfig(): DataBindingConfig {
-        return DataBindingConfig(R.layout.fragment_notification_main, BR.viewModel, mViewModel)
-            .addBindingParams(BR.click, ClickProxy())
+        return DataBindingConfig(R.layout.activity_notification, BR.viewModel, mViewModel)
     }
 
-    //重新生成GLoading对象-跳动动画
-    override fun generateGLoading(view: View): Gloading.Holder {
-        return Gloading.from(GloadingGlobalAdapter())
-            .wrap(view, GLoadingTitleStatus(true, true, true))
+    //重新生成GLoading对象
+    override fun generateGLoading(): Gloading.Holder {
+        return Gloading.from(GloadingPlaceHolderlAdapter(R.layout.layout_placeholder_normal))
+            .wrap(this, GLoadingTitleStatus(true, true, false))
             .withRetry { onGoadingRetry() }
     }
 
     override fun startObserve() {
+
     }
 
     override fun init(savedInstanceState: Bundle?) {
+        setStatusBarBlackText()
 
         initRV()
         initData()
@@ -59,6 +67,10 @@ class NotificationFragment : YYBaseVDBLoadingFragment<NotificationMainViewModel,
     }
 
     private fun initListener() {
+        mBinding.easyTitle.addRightText("全部已读") {
+            toast("全部已读消息")
+        }
+
         //Adapter的滑动监听,监听加载更多
         mViewModel.mAdapter.loadMoreModule.isEnableLoadMore = false
         mViewModel.mAdapter.loadMoreModule.preLoadNumber = 4
@@ -99,9 +111,7 @@ class NotificationFragment : YYBaseVDBLoadingFragment<NotificationMainViewModel,
     }
 
     private fun initRV() {
-        mBinding.recyclerView.vertical().apply {
-            adapter = mViewModel.mAdapter
-        }
+        mBinding.recyclerView.vertical().adapter = mViewModel.mAdapter
     }
 
     override fun scrollTopRefresh() {
@@ -111,17 +121,5 @@ class NotificationFragment : YYBaseVDBLoadingFragment<NotificationMainViewModel,
         mBinding.refreshLayout.autoRefresh()
     }
 
-    /**
-     * DataBinding事件处理
-     */
-    inner class ClickProxy {
-
-        //阅读全部
-        fun readAll() {
-            toast("阅读全部")
-        }
-
-    }
-
 
 }

+ 8 - 8
cpt_main/src/main/res/layout/activity_main.xml

@@ -65,7 +65,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
                     android:id="@+id/tv_home_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/iv_home_text" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewRegular
                     android:id="@+id/tv_home_unread_num"
                     android:layout_width="@dimen/d_15dp"
                     android:layout_height="@dimen/d_15dp"
@@ -115,7 +115,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
                     android:id="@+id/tv_parttime_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -128,7 +128,7 @@
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/iv_parttime_text" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewRegular
                     android:id="@+id/tv_parttime_unread_num"
                     android:layout_width="@dimen/d_15dp"
                     android:layout_height="@dimen/d_15dp"
@@ -165,7 +165,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
                     android:id="@+id/tv_actives_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -178,7 +178,7 @@
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/iv_actives_text" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewRegular
                     android:id="@+id/tv_actives_unread_num"
                     android:layout_width="@dimen/d_8dp"
                     android:layout_height="@dimen/d_8dp"
@@ -239,7 +239,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
                     android:id="@+id/tv_me_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -252,7 +252,7 @@
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/iv_me_text" />
 
-                <TextView
+                <com.guadou.lib_baselib.font_text_view.TextViewRegular
                     android:id="@+id/tv_me_unread_num"
                     android:layout_width="@dimen/d_15dp"
                     android:layout_height="@dimen/d_15dp"

+ 7 - 36
cpt_main/src/main/res/layout/fragment_notification_main.xml

@@ -9,11 +9,7 @@
 
         <variable
             name="viewModel"
-            type="com.hongyegroup.cpt_main.mvvm.NotificationMainViewModel" />
-
-        <variable
-            name="click"
-            type="com.hongyegroup.cpt_main.ui.NotificationFragment.ClickProxy" />
+            type="com.hongyegroup.cpt_main.mvvm.NotificationViewModel" />
 
     </data>
 
@@ -23,38 +19,13 @@
         android:background="@color/white"
         android:orientation="vertical">
 
-        <com.guadou.lib_baselib.view.titlebar.StatusbarGrayView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_46dp">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="信息"
-                android:textColor="@color/black"
-                android:textSize="@dimen/d_18sp" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right|center_vertical"
-                android:layout_marginRight="@dimen/d_15dp"
-                android:text="全部已读"
-                android:textColor="@color/profile_red"
-                android:textSize="@dimen/d_16sp"
-                binding:clicks="@{click.readAll}" />
-
-        </FrameLayout>
-
-        <View
+        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
+            android:id="@+id/easy_title"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_color_ee" />
+            android:layout_height="wrap_content"
+            app:Easy_menuTextColor="@color/profile_red"
+            app:Easy_menuTextSize="@dimen/d_15sp"
+            app:Easy_title="消息列表" />
 
         <com.scwang.smart.refresh.layout.SmartRefreshLayout
             android:id="@+id/refresh_layout"

+ 8 - 8
cpt_main/src/main/res/layout/fragment_home.xml

@@ -51,6 +51,7 @@
                 android:layout_gravity="center"
                 android:layout_marginRight="@dimen/d_15dp"
                 android:contentDescription="通知列表"
+                binding:clicks="@{click.gotoNotificationPage}"
                 android:src="@drawable/main_title_notification_icon"
                 android:visibility="visible"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -144,7 +145,7 @@
                                 app:layout_constraintLeft_toRightOf="@id/icon_wallet"
                                 app:layout_constraintRight_toRightOf="@id/icon_wallet" />
 
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewRegular
                                 android:id="@+id/tv_wallet_money"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -191,8 +192,7 @@
                                 app:layout_constraintLeft_toLeftOf="parent"
                                 app:layout_constraintTop_toTopOf="parent" />
 
-
-                            <TextView
+                            <com.guadou.lib_baselib.font_text_view.TextViewRegular
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/d_10dp"
@@ -249,7 +249,7 @@
 
 
                     <!-- 热门 -->
-                    <TextView
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/d_15dp"
@@ -271,7 +271,7 @@
                         android:overScrollMode="never" />
 
                     <!-- 当地市的工作 -->
-                    <TextView
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/d_15dp"
@@ -293,7 +293,7 @@
                         android:overScrollMode="never" />
 
                     <!-- 当地区域的工作 -->
-                    <TextView
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/d_15dp"
@@ -323,7 +323,7 @@
                         android:orientation="horizontal"
                         binding:clicks="@{click.gotoBulletinBoardPage}">
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/d_15dp"
@@ -332,7 +332,7 @@
                             android:textColor="@color/black"
                             android:textSize="@dimen/d_17sp" />
 
-                        <TextView
+                        <com.guadou.lib_baselib.font_text_view.TextViewRegular
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginRight="@dimen/d_15dp"

+ 2 - 2
cpt_main/src/main/res/layout/item_home_job_tips.xml

@@ -36,7 +36,7 @@
             binding:placeholder="@{@drawable/placeholder_img_top_round_tips}"
             binding:topRoundRadius="@{5}" />
 
-        <TextView
+        <com.guadou.lib_baselib.font_text_view.TextViewMedium
             android:id="@+id/tv_content_title"
             android:layout_width="match_parent"
             android:layout_height="@dimen/d_40dp"
@@ -51,7 +51,7 @@
             android:textSize="@dimen/d_14sp" />
 
 
-        <TextView
+        <com.guadou.lib_baselib.font_text_view.TextViewRegular
             android:id="@+id/tv_sub_titme"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

+ 6 - 6
cpt_main/src/main/res/layout/item_home_part_time_job.xml

@@ -39,7 +39,7 @@
                 binding:topRoundRadius="@{5}"
                 tools:src="@drawable/placeholder_img_top_round_job" />
 
-            <TextView
+            <com.guadou.lib_baselib.font_text_view.TextViewRegular
                 android:id="@+id/tv_job_tag"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
                 android:textSize="@dimen/d_12sp" />
         </FrameLayout>
 
-        <TextView
+        <com.guadou.lib_baselib.font_text_view.TextViewMedium
             android:id="@+id/tv_job_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -77,7 +77,7 @@
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
-            <TextView
+            <com.guadou.lib_baselib.font_text_view.TextViewRegular
                 android:id="@+id/tv_job_hour_rate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -85,7 +85,7 @@
                 android:textColor="@color/app_blue"
                 android:textSize="@dimen/d_15sp" />
 
-            <TextView
+            <com.guadou.lib_baselib.font_text_view.TextViewRegular
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="/时"
@@ -97,14 +97,14 @@
                 android:layout_height="1dp"
                 android:layout_weight="1" />
 
-            <TextView
+            <com.guadou.lib_baselib.font_text_view.TextViewRegular
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="总计"
                 android:textColor="@color/gray_76"
                 android:textSize="@dimen/d_13sp" />
 
-            <TextView
+            <com.guadou.lib_baselib.font_text_view.TextViewRegular
                 android:id="@+id/tv_job_est"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

+ 3 - 4
cpt_main/src/main/res/layout/item_notification.xml

@@ -46,9 +46,9 @@
                     android:layout_height="wrap_content"
                     android:text="您的面试已获得兼职工作的批准。"
                     android:textColor="@color/notify_dark_blue"
-                    android:textSize="@dimen/d_18sp" />
+                    android:textSize="@dimen/d_17sp" />
 
-                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                <com.guadou.lib_baselib.font_text_view.TextViewRegular
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/d_5dp"
@@ -68,12 +68,11 @@
                         android:layout_height="wrap_content"
                         android:src="@drawable/notify_date_icon" />
 
-                    <TextView
+                    <com.guadou.lib_baselib.font_text_view.TextViewRegular
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/d_9dp"
                         android:layout_weight="1"
-                        android:fontFamily="sans-serif-light"
                         android:text="2022.1.12 06:00"
                         android:textColor="@color/gray_76"
                         android:textSize="@dimen/d_14sp" />