Ver código fonte

首页Tab的重新用图与样式的跳整

liukai 2 anos atrás
pai
commit
2d51ae6ba5
37 arquivos alterados com 125 adições e 134 exclusões
  1. 0 2
      app/src/main/res/layout/activity_splash.xml
  2. 1 1
      build.gradle
  3. 21 27
      cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/MainActivity.kt
  4. BIN
      cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_activities_blue_icon.webp
  5. BIN
      cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_activities_gray_icon.webp
  6. BIN
      cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_jobs_blue_icon.webp
  7. BIN
      cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_jobs_gray_icon.webp
  8. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_home_blue.png
  9. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_home_gray.png
  10. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_me_blue.png
  11. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_me_gray.png
  12. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_yypay_blue.png
  13. BIN
      cpt_main/src/main/res/drawable-xxhdpi/main_yypay_gray.png
  14. 11 0
      cpt_main/src/main/res/drawable/selector_main_tab_active.xml
  15. 10 0
      cpt_main/src/main/res/drawable/selector_main_tab_home.xml
  16. 11 0
      cpt_main/src/main/res/drawable/selector_main_tab_me.xml
  17. 11 0
      cpt_main/src/main/res/drawable/selector_main_tab_partjob.xml
  18. 10 0
      cpt_main/src/main/res/drawable/selector_main_tab_wallet.xml
  19. 48 46
      cpt_main/src/main/res/layout/activity_main.xml
  20. 2 2
      cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/router/PartTimeComponentServiceImpl.kt
  21. 0 6
      cs_cptServices/src/main/java/com/guadou/cs_cptservices/interfaces/IFragmentStatusBarChanged.kt
  22. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/im_default_head.webp
  23. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_me_blue.webp
  24. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_me_gray.webp
  25. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_newsfeed_blue.webp
  26. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_newsfeed_gray.webp
  27. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_notify_blue.webp
  28. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_notify_gray.webp
  29. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_parttime_blue.webp
  30. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_parttime_gray.webp
  31. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_wallet_blue.webp
  32. BIN
      cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_wallet_gray.webp
  33. 0 10
      cs_cptServices/src/main/res/drawable/selector_main_tab_me.xml
  34. 0 10
      cs_cptServices/src/main/res/drawable/selector_main_tab_newsfeed.xml
  35. 0 10
      cs_cptServices/src/main/res/drawable/selector_main_tab_notify.xml
  36. 0 10
      cs_cptServices/src/main/res/drawable/selector_main_tab_parttime.xml
  37. 0 10
      cs_cptServices/src/main/res/drawable/selector_main_tab_wallet.xml

+ 0 - 2
app/src/main/res/layout/activity_splash.xml

@@ -15,14 +15,12 @@
         android:background="@color/white"
         android:background="@color/white"
         tools:viewBindingIgnore="true">
         tools:viewBindingIgnore="true">
 
 
-
         <ImageView
         <ImageView
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_gravity="center"
             android:src="@drawable/splash_center_blue_logo" />
             android:src="@drawable/splash_center_blue_logo" />
 
 
-
     </FrameLayout>
     </FrameLayout>
 
 
 </layout>
 </layout>

+ 1 - 1
build.gradle

@@ -19,7 +19,7 @@ buildscript {
 
 
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
 
-        //路由
+        //ARouter路由自动注册启动优化
         classpath 'com.alibaba:arouter-register:1.0.2'
         classpath 'com.alibaba:arouter-register:1.0.2'
 
 
         //Hilt插件
         //Hilt插件

+ 21 - 27
cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/MainActivity.kt

@@ -8,7 +8,6 @@ import androidx.fragment.app.FragmentTransaction
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.guadou.cs_cptservices.base.activity.YYBaseVDBActivity
 import com.guadou.cs_cptservices.base.activity.YYBaseVDBActivity
 import com.guadou.cs_cptservices.interfaces.IFragmentRefresh
 import com.guadou.cs_cptservices.interfaces.IFragmentRefresh
-import com.guadou.cs_cptservices.interfaces.IFragmentStatusBarChanged
 import com.guadou.cs_router.ARouterPath
 import com.guadou.cs_router.ARouterPath
 import com.guadou.cs_router.YYRouterService
 import com.guadou.cs_router.YYRouterService
 import com.guadou.lib_baselib.bean.DataBindingConfig
 import com.guadou.lib_baselib.bean.DataBindingConfig
@@ -52,6 +51,7 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
     }
     }
 
 
     override fun init(savedInstanceState: Bundle?) {
     override fun init(savedInstanceState: Bundle?) {
+        //沉浸式状态栏
         StatusBarUtils.immersive(this)
         StatusBarUtils.immersive(this)
 
 
         if (savedInstanceState == null) {
         if (savedInstanceState == null) {
@@ -161,10 +161,7 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
     private fun setupStatusBarColor() {
     private fun setupStatusBarColor() {
         //只有Profile页面变白色
         //只有Profile页面变白色
         when (mCurPosition) {
         when (mCurPosition) {
-            4 -> mProfileFragment?.let {
-                //由ProfileMe页面自己决定什么颜色状态栏文本
-                if (it is IFragmentStatusBarChanged) (it as IFragmentStatusBarChanged).setFragmentStatusBarColor()
-            }
+            2, 3, 4 -> setStatusBarWhiteText()
             else -> setStatusBarBlackText()
             else -> setStatusBarBlackText()
         }
         }
     }
     }
@@ -195,38 +192,38 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
         //传递进来的Position设置为选中:
         //传递进来的Position设置为选中:
         when (position) {
         when (position) {
             0 -> {
             0 -> {
-                mBinding.groupTabParttime.isSelected = true
-                mBinding.groupTabNewsfeed.isSelected = false
+                mBinding.groupTabHome.isSelected = true
+                mBinding.groupTabParttime.isSelected = false
+                mBinding.groupTabActives.isSelected = false
                 mBinding.groupTabWallet.isSelected = false
                 mBinding.groupTabWallet.isSelected = false
-                mBinding.groupTabNotify.isSelected = false
                 mBinding.groupTabMe.isSelected = false
                 mBinding.groupTabMe.isSelected = false
             }
             }
             1 -> {
             1 -> {
-                mBinding.groupTabParttime.isSelected = false
-                mBinding.groupTabNewsfeed.isSelected = true
+                mBinding.groupTabHome.isSelected = false
+                mBinding.groupTabParttime.isSelected = true
+                mBinding.groupTabActives.isSelected = false
                 mBinding.groupTabWallet.isSelected = false
                 mBinding.groupTabWallet.isSelected = false
-                mBinding.groupTabNotify.isSelected = false
                 mBinding.groupTabMe.isSelected = false
                 mBinding.groupTabMe.isSelected = false
             }
             }
             2 -> {
             2 -> {
+                mBinding.groupTabHome.isSelected = false
                 mBinding.groupTabParttime.isSelected = false
                 mBinding.groupTabParttime.isSelected = false
-                mBinding.groupTabNewsfeed.isSelected = false
-                mBinding.groupTabWallet.isSelected = true
-                mBinding.groupTabNotify.isSelected = false
+                mBinding.groupTabActives.isSelected = true
+                mBinding.groupTabWallet.isSelected = false
                 mBinding.groupTabMe.isSelected = false
                 mBinding.groupTabMe.isSelected = false
             }
             }
             3 -> {
             3 -> {
+                mBinding.groupTabHome.isSelected = false
                 mBinding.groupTabParttime.isSelected = false
                 mBinding.groupTabParttime.isSelected = false
-                mBinding.groupTabNewsfeed.isSelected = false
-                mBinding.groupTabWallet.isSelected = false
-                mBinding.groupTabNotify.isSelected = true
+                mBinding.groupTabActives.isSelected = false
+                mBinding.groupTabWallet.isSelected = true
                 mBinding.groupTabMe.isSelected = false
                 mBinding.groupTabMe.isSelected = false
             }
             }
             else -> {
             else -> {
+                mBinding.groupTabHome.isSelected = false
                 mBinding.groupTabParttime.isSelected = false
                 mBinding.groupTabParttime.isSelected = false
-                mBinding.groupTabNewsfeed.isSelected = false
+                mBinding.groupTabActives.isSelected = false
                 mBinding.groupTabWallet.isSelected = false
                 mBinding.groupTabWallet.isSelected = false
-                mBinding.groupTabNotify.isSelected = false
                 mBinding.groupTabMe.isSelected = true
                 mBinding.groupTabMe.isSelected = true
             }
             }
         }
         }
@@ -285,8 +282,7 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
      */
      */
     inner class ClickProxy {
     inner class ClickProxy {
 
 
-        //切换兼职工作页面Tab
-        fun switchPartTime() {
+        fun switchHome() {
             mClickPage = 0
             mClickPage = 0
             if (mClickPage == mCurPosition) {
             if (mClickPage == mCurPosition) {
                 //重复点击
                 //重复点击
@@ -298,8 +294,7 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
             }
             }
         }
         }
 
 
-        //切换广场动态页面Tab
-        fun switchNewsFeed() {
+        fun switchPartTime() {
             mClickPage = 1
             mClickPage = 1
             if (mClickPage == mCurPosition) {
             if (mClickPage == mCurPosition) {
                 //重复点击
                 //重复点击
@@ -311,8 +306,7 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
             }
             }
         }
         }
 
 
-        //切换钱包页面Tab
-        fun switchEWallet() {
+        fun switchActives() {
             mClickPage = 2
             mClickPage = 2
             if (mClickPage == mCurPosition) {
             if (mClickPage == mCurPosition) {
                 //重复点击
                 //重复点击
@@ -325,7 +319,7 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
         }
         }
 
 
         //切换消息页面Tab
         //切换消息页面Tab
-        fun switchNotification() {
+        fun switchEWallet() {
             mClickPage = 3
             mClickPage = 3
             if (mClickPage == mCurPosition) {
             if (mClickPage == mCurPosition) {
                 //重复点击
                 //重复点击
@@ -338,7 +332,7 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
         }
         }
 
 
         //切换Me页面Tab
         //切换Me页面Tab
-        fun switchMe() {
+        fun switchProfile() {
             mClickPage = 4
             mClickPage = 4
             if (mClickPage == mCurPosition) {
             if (mClickPage == mCurPosition) {
                 //重复点击
                 //重复点击

BIN
cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_activities_blue_icon.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_activities_gray_icon.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_jobs_blue_icon.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/iv_part_time_jobs_gray_icon.webp


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_home_blue.png


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_home_gray.png


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_me_blue.png


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_me_gray.png


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_yypay_blue.png


BIN
cpt_main/src/main/res/drawable-xxhdpi/main_yypay_gray.png


+ 11 - 0
cpt_main/src/main/res/drawable/selector_main_tab_active.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/iv_part_time_activities_blue_icon" android:state_pressed="true" />
+    <item android:drawable="@drawable/iv_part_time_activities_blue_icon" android:state_selected="true" />
+    <item android:drawable="@drawable/iv_part_time_activities_blue_icon" android:state_active="true" />
+    <item android:drawable="@drawable/iv_part_time_activities_gray_icon" android:state_selected="false" />
+    <item android:drawable="@drawable/iv_part_time_activities_gray_icon" android:state_active="false" />
+    <item android:drawable="@drawable/iv_part_time_activities_gray_icon" android:state_pressed="false" />
+
+</selector>

+ 10 - 0
cpt_main/src/main/res/drawable/selector_main_tab_home.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/main_home_blue" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_home_blue" android:state_selected="true" />
+    <item android:drawable="@drawable/main_home_blue" android:state_active="true" />
+    <item android:drawable="@drawable/main_home_gray" android:state_selected="false" />
+    <item android:drawable="@drawable/main_home_gray" android:state_active="false" />
+    <item android:drawable="@drawable/main_home_gray" android:state_pressed="false" />
+</selector>

+ 11 - 0
cpt_main/src/main/res/drawable/selector_main_tab_me.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/main_me_blue" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_me_blue" android:state_selected="true" />
+    <item android:drawable="@drawable/main_me_blue" android:state_active="true" />
+    <item android:drawable="@drawable/main_me_gray" android:state_selected="false" />
+    <item android:drawable="@drawable/main_me_gray" android:state_active="false" />
+    <item android:drawable="@drawable/main_me_gray" android:state_pressed="false" />
+
+</selector>

+ 11 - 0
cpt_main/src/main/res/drawable/selector_main_tab_partjob.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/iv_part_time_jobs_blue_icon" android:state_pressed="true" />
+    <item android:drawable="@drawable/iv_part_time_jobs_blue_icon" android:state_selected="true" />
+    <item android:drawable="@drawable/iv_part_time_jobs_blue_icon" android:state_active="true" />
+    <item android:drawable="@drawable/iv_part_time_jobs_gray_icon" android:state_selected="false" />
+    <item android:drawable="@drawable/iv_part_time_jobs_gray_icon" android:state_active="false" />
+    <item android:drawable="@drawable/iv_part_time_jobs_gray_icon" android:state_pressed="false" />
+
+</selector>

+ 10 - 0
cpt_main/src/main/res/drawable/selector_main_tab_wallet.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/main_yypay_blue" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_yypay_blue" android:state_selected="true" />
+    <item android:drawable="@drawable/main_yypay_blue" android:state_active="true" />
+    <item android:drawable="@drawable/main_yypay_gray" android:state_selected="false" />
+    <item android:drawable="@drawable/main_yypay_gray" android:state_active="false" />
+    <item android:drawable="@drawable/main_yypay_gray" android:state_pressed="false" />
+</selector>

+ 48 - 46
cpt_main/src/main/res/layout/activity_main.xml

@@ -38,46 +38,48 @@
         <!-- 底部的Tab -->
         <!-- 底部的Tab -->
         <LinearLayout
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/d_50dp"
+            android:layout_height="wrap_content"
             android:background="@color/white"
             android:background="@color/white"
             android:gravity="center_vertical"
             android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:paddingTop="@dimen/d_3dp"
+            android:paddingBottom="@dimen/d_3dp">
 
 
             <!--首页-->
             <!--首页-->
             <androidx.constraintlayout.widget.ConstraintLayout
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/group_tab_parttime"
+                android:id="@+id/group_tab_home"
                 style="@style/SelectableItemBackgroundLess"
                 style="@style/SelectableItemBackgroundLess"
                 android:layout_width="0dp"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:layout_weight="1"
-                android:onClick="@{() -> click.switchPartTime()}">
+                android:onClick="@{() -> click.switchHome()}">
 
 
                 <ImageView
                 <ImageView
-                    android:id="@+id/iv_parttime_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/selector_main_tab_parttime"
-                    app:layout_constraintBottom_toTopOf="@+id/tv_parttime_text"
+                    android:id="@+id/iv_home_text"
+                    android:layout_width="@dimen/d_25dp"
+                    android:layout_height="@dimen/d_25dp"
+                    android:src="@drawable/selector_main_tab_home"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_home_text"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
                     app:layout_constraintVertical_chainStyle="packed" />
 
 
-                <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                    android:id="@+id/tv_parttime_text"
+                <TextView
+                    android:id="@+id/tv_home_text"
                     android:layout_width="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_3dp"
+                    android:layout_marginTop="@dimen/d_1dp"
                     android:text="首页"
                     android:text="首页"
                     android:textColor="@color/selector_tab_main_text"
                     android:textColor="@color/selector_tab_main_text"
                     android:textSize="@dimen/d_12sp"
                     android:textSize="@dimen/d_12sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/iv_parttime_text" />
+                    app:layout_constraintTop_toBottomOf="@+id/iv_home_text" />
 
 
                 <TextView
                 <TextView
-                    android:id="@+id/tv_parttime_unread_num"
+                    android:id="@+id/tv_home_unread_num"
                     android:layout_width="@dimen/d_15dp"
                     android:layout_width="@dimen/d_15dp"
                     android:layout_height="@dimen/d_15dp"
                     android:layout_height="@dimen/d_15dp"
                     android:layout_marginLeft="@dimen/d_30dp"
                     android:layout_marginLeft="@dimen/d_30dp"
@@ -95,39 +97,39 @@
 
 
             <!-- 兼职 -->
             <!-- 兼职 -->
             <androidx.constraintlayout.widget.ConstraintLayout
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/group_tab_newsfeed"
+                android:id="@+id/group_tab_parttime"
                 style="@style/SelectableItemBackgroundLess"
                 style="@style/SelectableItemBackgroundLess"
                 android:layout_width="0dp"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:layout_weight="1"
-                android:onClick="@{() -> click.switchNewsFeed()}">
+                android:onClick="@{() -> click.switchPartTime()}">
 
 
                 <ImageView
                 <ImageView
-                    android:id="@+id/iv_newsfeed_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/selector_main_tab_newsfeed"
-                    app:layout_constraintBottom_toTopOf="@+id/tv_newsfeed_text"
+                    android:id="@+id/iv_parttime_text"
+                    android:layout_width="@dimen/d_25dp"
+                    android:layout_height="@dimen/d_25dp"
+                    android:src="@drawable/selector_main_tab_partjob"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_parttime_text"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
                     app:layout_constraintVertical_chainStyle="packed" />
 
 
-                <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                    android:id="@+id/tv_newsfeed_text"
+                <TextView
+                    android:id="@+id/tv_parttime_text"
                     android:layout_width="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_3dp"
+                    android:layout_marginTop="@dimen/d_1dp"
                     android:text="兼职"
                     android:text="兼职"
                     android:textColor="@color/selector_tab_main_text"
                     android:textColor="@color/selector_tab_main_text"
                     android:textSize="@dimen/d_12sp"
                     android:textSize="@dimen/d_12sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/iv_newsfeed_text" />
+                    app:layout_constraintTop_toBottomOf="@+id/iv_parttime_text" />
 
 
                 <TextView
                 <TextView
-                    android:id="@+id/tv_newsfeed_unread_num"
+                    android:id="@+id/tv_parttime_unread_num"
                     android:layout_width="@dimen/d_15dp"
                     android:layout_width="@dimen/d_15dp"
                     android:layout_height="@dimen/d_15dp"
                     android:layout_height="@dimen/d_15dp"
                     android:layout_marginLeft="@dimen/d_30dp"
                     android:layout_marginLeft="@dimen/d_30dp"
@@ -145,39 +147,39 @@
 
 
             <!-- 工作状态 -->
             <!-- 工作状态 -->
             <androidx.constraintlayout.widget.ConstraintLayout
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/group_tab_notify"
+                android:id="@+id/group_tab_actives"
                 style="@style/SelectableItemBackgroundLess"
                 style="@style/SelectableItemBackgroundLess"
                 android:layout_width="0dp"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:layout_weight="1"
-                android:onClick="@{() -> click.switchNotification()}">
+                android:onClick="@{() -> click.switchActives()}">
 
 
                 <ImageView
                 <ImageView
-                    android:id="@+id/iv_notify_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/selector_main_tab_notify"
-                    app:layout_constraintBottom_toTopOf="@+id/tv_notify_text"
+                    android:id="@+id/iv_actives_text"
+                    android:layout_width="@dimen/d_25dp"
+                    android:layout_height="@dimen/d_25dp"
+                    android:src="@drawable/selector_main_tab_active"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_actives_text"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
                     app:layout_constraintVertical_chainStyle="packed" />
 
 
-                <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                    android:id="@+id/tv_notify_text"
+                <TextView
+                    android:id="@+id/tv_actives_text"
                     android:layout_width="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_3dp"
+                    android:layout_marginTop="@dimen/d_1dp"
                     android:text="工作状态"
                     android:text="工作状态"
                     android:textColor="@color/selector_tab_main_text"
                     android:textColor="@color/selector_tab_main_text"
                     android:textSize="@dimen/d_12sp"
                     android:textSize="@dimen/d_12sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/iv_notify_text" />
+                    app:layout_constraintTop_toBottomOf="@+id/iv_actives_text" />
 
 
                 <TextView
                 <TextView
-                    android:id="@+id/tv_notify_unread_num"
+                    android:id="@+id/tv_actives_unread_num"
                     android:layout_width="@dimen/d_8dp"
                     android:layout_width="@dimen/d_8dp"
                     android:layout_height="@dimen/d_8dp"
                     android:layout_height="@dimen/d_8dp"
                     android:layout_marginLeft="@dimen/d_30dp"
                     android:layout_marginLeft="@dimen/d_30dp"
@@ -203,14 +205,14 @@
                 android:orientation="vertical">
                 android:orientation="vertical">
 
 
                 <ImageView
                 <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/d_25dp"
+                    android:layout_height="@dimen/d_25dp"
                     android:src="@drawable/selector_main_tab_wallet" />
                     android:src="@drawable/selector_main_tab_wallet" />
 
 
                 <com.guadou.lib_baselib.font_text_view.TextViewMedium
                 <com.guadou.lib_baselib.font_text_view.TextViewMedium
                     android:layout_width="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_3dp"
+                    android:layout_marginTop="@dimen/d_1dp"
                     android:text="钱包"
                     android:text="钱包"
                     android:textColor="@color/selector_tab_main_text"
                     android:textColor="@color/selector_tab_main_text"
                     android:textSize="@dimen/d_12sp" />
                     android:textSize="@dimen/d_12sp" />
@@ -224,12 +226,12 @@
                 android:layout_width="0dp"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:layout_weight="1"
-                android:onClick="@{() -> click.switchMe()}">
+                android:onClick="@{() -> click.switchProfile()}">
 
 
                 <ImageView
                 <ImageView
                     android:id="@+id/iv_me_text"
                     android:id="@+id/iv_me_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/d_25dp"
+                    android:layout_height="@dimen/d_25dp"
                     android:src="@drawable/selector_main_tab_me"
                     android:src="@drawable/selector_main_tab_me"
                     app:layout_constraintBottom_toTopOf="@+id/tv_me_text"
                     app:layout_constraintBottom_toTopOf="@+id/tv_me_text"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -237,11 +239,11 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
                     app:layout_constraintVertical_chainStyle="packed" />
 
 
-                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                <TextView
                     android:id="@+id/tv_me_text"
                     android:id="@+id/tv_me_text"
                     android:layout_width="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d_3dp"
+                    android:layout_marginTop="@dimen/d_1dp"
                     android:text="我的"
                     android:text="我的"
                     android:textColor="@color/selector_tab_main_text"
                     android:textColor="@color/selector_tab_main_text"
                     android:textSize="@dimen/d_12sp"
                     android:textSize="@dimen/d_12sp"

+ 2 - 2
cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/router/PartTimeComponentServiceImpl.kt

@@ -22,11 +22,11 @@ class PartTimeComponentServiceImpl : IParttimeComponentServer {
     }
     }
 
 
     override fun obtainPartTimeActivesFragment(): Fragment {
     override fun obtainPartTimeActivesFragment(): Fragment {
-        return PartJobProfileFragment()
+        return JobActivesFragment()
     }
     }
 
 
     override fun obtainPartTimeProfileFragment(): Fragment {
     override fun obtainPartTimeProfileFragment(): Fragment {
-        return JobActivesFragment()
+        return PartJobProfileFragment()
     }
     }
 
 
     override fun init(context: Context?) {
     override fun init(context: Context?) {

+ 0 - 6
cs_cptServices/src/main/java/com/guadou/cs_cptservices/interfaces/IFragmentStatusBarChanged.kt

@@ -1,6 +0,0 @@
-package com.guadou.cs_cptservices.interfaces
-
-interface IFragmentStatusBarChanged {
-
-    fun setFragmentStatusBarColor();
-}

BIN
cs_cptServices/src/main/res/drawable-xxhdpi/im_default_head.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_me_blue.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_me_gray.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_newsfeed_blue.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_newsfeed_gray.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_notify_blue.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_notify_gray.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_parttime_blue.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_parttime_gray.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_wallet_blue.webp


BIN
cs_cptServices/src/main/res/drawable-xxhdpi/main_tab_wallet_gray.webp


+ 0 - 10
cs_cptServices/src/main/res/drawable/selector_main_tab_me.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/main_tab_me_blue" android:state_pressed="true" />
-    <item android:drawable="@drawable/main_tab_me_blue" android:state_selected="true" />
-    <item android:drawable="@drawable/main_tab_me_blue" android:state_active="true" />
-    <item android:drawable="@drawable/main_tab_me_gray" android:state_selected="false" />
-    <item android:drawable="@drawable/main_tab_me_gray" android:state_active="false" />
-    <item android:drawable="@drawable/main_tab_me_gray" android:state_pressed="false" />
-</selector>

+ 0 - 10
cs_cptServices/src/main/res/drawable/selector_main_tab_newsfeed.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/main_tab_newsfeed_blue" android:state_pressed="true" />
-    <item android:drawable="@drawable/main_tab_newsfeed_blue" android:state_selected="true" />
-    <item android:drawable="@drawable/main_tab_newsfeed_blue" android:state_active="true" />
-    <item android:drawable="@drawable/main_tab_newsfeed_gray" android:state_selected="false" />
-    <item android:drawable="@drawable/main_tab_newsfeed_gray" android:state_active="false" />
-    <item android:drawable="@drawable/main_tab_newsfeed_gray" android:state_pressed="false" />
-</selector>

+ 0 - 10
cs_cptServices/src/main/res/drawable/selector_main_tab_notify.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/main_tab_notify_blue" android:state_pressed="true" />
-    <item android:drawable="@drawable/main_tab_notify_blue" android:state_selected="true" />
-    <item android:drawable="@drawable/main_tab_notify_blue" android:state_active="true" />
-    <item android:drawable="@drawable/main_tab_notify_gray" android:state_selected="false" />
-    <item android:drawable="@drawable/main_tab_notify_gray" android:state_active="false" />
-    <item android:drawable="@drawable/main_tab_notify_gray" android:state_pressed="false" />
-</selector>

+ 0 - 10
cs_cptServices/src/main/res/drawable/selector_main_tab_parttime.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/main_tab_parttime_blue" android:state_pressed="true" />
-    <item android:drawable="@drawable/main_tab_parttime_blue" android:state_selected="true" />
-    <item android:drawable="@drawable/main_tab_parttime_blue" android:state_active="true" />
-    <item android:drawable="@drawable/main_tab_parttime_gray" android:state_selected="false" />
-    <item android:drawable="@drawable/main_tab_parttime_gray" android:state_active="false" />
-    <item android:drawable="@drawable/main_tab_parttime_gray" android:state_pressed="false" />
-</selector>

+ 0 - 10
cs_cptServices/src/main/res/drawable/selector_main_tab_wallet.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/main_tab_wallet_blue" android:state_pressed="true" />
-    <item android:drawable="@drawable/main_tab_wallet_blue" android:state_selected="true" />
-    <item android:drawable="@drawable/main_tab_wallet_blue" android:state_active="true" />
-    <item android:drawable="@drawable/main_tab_wallet_gray" android:state_selected="false" />
-    <item android:drawable="@drawable/main_tab_wallet_gray" android:state_active="false" />
-    <item android:drawable="@drawable/main_tab_wallet_gray" android:state_pressed="false" />
-</selector>