Merge branch 'master' of http://git.wmzhubo.com/guadoutech/PartTimeJob_CN_Android

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/HomeFragment.kt

@@ -137,27 +137,23 @@ class HomeFragment : YYBaseVDBLoadingFragment<HomeViewModel, FragmentHomeBinding
 
         fun gotoWalletPage() {
             if (requireActivity() is MainActivity) {
-                (requireActivity() as MainActivity).switchFragment(1)
+                (requireActivity() as MainActivity).switchFragment(3)
             }
         }
 
+        //去奖励模块
         fun gotoRewardsPage() {
-
             YYRouterService.rewardsComponentServer?.startRewardsDailyPage()
-
         }
 
-        //切换到NewsFeed-Tab
-        fun gotoNewsFeedTab() {
+        //去兼职页面
+        fun gotoParttimePage() {
             if (requireActivity() is MainActivity) {
-                (requireActivity() as MainActivity).switchFragment(2)
+                (requireActivity() as MainActivity).switchFragment(1)
             }
         }
 
-        fun gotoParttimePage() {
-            YYRouterService.parttimeComponentServer?.startPartTimeJobMainPage()
-        }
-
+        //去兼职详情页面
         fun gotoPartTimeDetailPage() {
             YYRouterService.parttimeComponentServer?.startPartTimeJobDetailPage()
         }

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/MainActivity.kt

@@ -29,8 +29,9 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
 
     //首页的5个TabFragment
     private var mHomeFragment: Fragment? = null
+    private var mPartTimeFragment: Fragment? = null
+    private var mActivesFragment: Fragment? = null
     private var mEWalletFragment: Fragment? = null
-    private var mNewsFeedFragment: Fragment? = null
     private var mProfileFragment: Fragment? = null
     private var mCurPosition = 0  //当前Fragment选中的索引
     private var mClickPage = 0  //当前Fragment选中的索引
@@ -79,16 +80,21 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
                     }
                 }
                 1 -> {
-                    mEWalletFragment?.let {
+                    mPartTimeFragment?.let {
                         if (it is IFragmentRefresh) (it as IFragmentRefresh).scrollTopRefresh()
                     }
                 }
                 2 -> {
-                    mNewsFeedFragment?.let {
+                    mActivesFragment?.let {
                         if (it is IFragmentRefresh) (it as IFragmentRefresh).scrollTopRefresh()
                     }
                 }
                 3 -> {
+                    mEWalletFragment?.let {
+                        if (it is IFragmentRefresh) (it as IFragmentRefresh).scrollTopRefresh()
+                    }
+                }
+                4 -> {
                     mProfileFragment?.let {
                         if (it is IFragmentRefresh) (it as IFragmentRefresh).scrollTopRefresh()
                     }
@@ -109,12 +115,15 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
                 targetFragment = mHomeFragment
             }
             1 -> {
-                targetFragment = mEWalletFragment
+                targetFragment = mPartTimeFragment
             }
             2 -> {
-                targetFragment = mNewsFeedFragment
+                targetFragment = mActivesFragment
             }
             3 -> {
+                targetFragment = mEWalletFragment
+            }
+            4 -> {
                 targetFragment = mProfileFragment
             }
             else -> {
@@ -149,7 +158,7 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
     private fun setupStatusBarColor() {
         //只有Profile页面变白色
         when (mCurPosition) {
-            1, 3 -> setStatusBarWhiteText()
+            2, 3, 4 -> setStatusBarWhiteText()
             else -> setStatusBarBlackText()
         }
     }
@@ -159,10 +168,13 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
         mHomeFragment?.let {
             transaction.hide(it)
         }
-        mEWalletFragment?.let {
+        mPartTimeFragment?.let {
             transaction.hide(it)
         }
-        mNewsFeedFragment?.let {
+        mActivesFragment?.let {
+            transaction.hide(it)
+        }
+        mEWalletFragment?.let {
             transaction.hide(it)
         }
         mProfileFragment?.let {
@@ -177,26 +189,37 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
         when (position) {
             0 -> {
                 mBinding.groupTabHome.isSelected = true
+                mBinding.groupTabParttime.isSelected = false
+                mBinding.groupActivesHome.isSelected = false
                 mBinding.groupTabWallet.isSelected = false
-                mBinding.groupTabNewsfeed.isSelected = false
                 mBinding.groupTabMe.isSelected = false
             }
             1 -> {
                 mBinding.groupTabHome.isSelected = false
-                mBinding.groupTabWallet.isSelected = true
-                mBinding.groupTabNewsfeed.isSelected = false
+                mBinding.groupTabParttime.isSelected = true
+                mBinding.groupActivesHome.isSelected = false
+                mBinding.groupTabWallet.isSelected = false
                 mBinding.groupTabMe.isSelected = false
             }
             2 -> {
                 mBinding.groupTabHome.isSelected = false
+                mBinding.groupTabParttime.isSelected = false
+                mBinding.groupActivesHome.isSelected = true
                 mBinding.groupTabWallet.isSelected = false
-                mBinding.groupTabNewsfeed.isSelected = true
                 mBinding.groupTabMe.isSelected = false
             }
             3 -> {
                 mBinding.groupTabHome.isSelected = false
+                mBinding.groupTabParttime.isSelected = false
+                mBinding.groupActivesHome.isSelected = false
+                mBinding.groupTabWallet.isSelected = true
+                mBinding.groupTabMe.isSelected = false
+            }
+            4 -> {
+                mBinding.groupTabHome.isSelected = false
+                mBinding.groupTabParttime.isSelected = false
+                mBinding.groupActivesHome.isSelected = false
                 mBinding.groupTabWallet.isSelected = false
-                mBinding.groupTabNewsfeed.isSelected = false
                 mBinding.groupTabMe.isSelected = true
             }
         }
@@ -208,8 +231,9 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
     private fun initFragment() {
         // 正常情况下初始化
         mHomeFragment = HomeFragment()
+        mPartTimeFragment = YYRouterService.parttimeComponentServer?.obtainPartTimeFragment()
+        mActivesFragment = YYRouterService.parttimeComponentServer?.obtainActivesFragment()
         mEWalletFragment = YYRouterService.eWalletComponentServer?.obtainEWalletMainFragment(false)
-        mNewsFeedFragment = YYRouterService.newsfeedComponentServer?.obtainNewsFeedMainFragment()
         mProfileFragment = ProfileFragment()
     }
 
@@ -229,12 +253,14 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
             val f1 = manager.findFragmentByTag("1")
             val f2 = manager.findFragmentByTag("2")
             val f3 = manager.findFragmentByTag("3")
+            val f4 = manager.findFragmentByTag("4")
 
             // 复用
             mHomeFragment = f0 ?: HomeFragment()
-            mEWalletFragment = f1 ?: YYRouterService.eWalletComponentServer?.obtainEWalletMainFragment(false)
-            mNewsFeedFragment = f2 ?: YYRouterService.newsfeedComponentServer?.obtainNewsFeedMainFragment()
-            mProfileFragment = f3 ?: ProfileFragment()
+            mPartTimeFragment = f1 ?: YYRouterService.parttimeComponentServer?.obtainPartTimeFragment()
+            mActivesFragment = f2 ?: YYRouterService.parttimeComponentServer?.obtainActivesFragment()
+            mEWalletFragment = f3 ?: YYRouterService.eWalletComponentServer?.obtainEWalletMainFragment(false)
+            mProfileFragment = f4 ?: ProfileFragment()
         }
     }
 
@@ -264,11 +290,11 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
             }
         }
 
-        fun switchEWallet() {
+        fun switchPartTime() {
             mClickPage = 1
             if (mClickPage == mCurPosition) {
                 //重复点击
-                mEWalletFragment?.let {
+                mPartTimeFragment?.let {
                     if (it is IFragmentRefresh) (it as IFragmentRefresh).scrollTopRefresh()
                 }
             } else {
@@ -276,11 +302,11 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
             }
         }
 
-        fun switchNewsFeed() {
+        fun switchActives() {
             mClickPage = 2
             if (mClickPage == mCurPosition) {
                 //重复点击
-                mNewsFeedFragment?.let {
+                mActivesFragment?.let {
                     if (it is IFragmentRefresh) (it as IFragmentRefresh).scrollTopRefresh()
                 }
             } else {
@@ -288,16 +314,29 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
             }
         }
 
+        fun switchEWallet() {
+            mClickPage = 3
+            if (mClickPage == mCurPosition) {
+                //重复点击
+                mEWalletFragment?.let {
+                    if (it is IFragmentRefresh) (it as IFragmentRefresh).scrollTopRefresh()
+                }
+            } else {
+                switchFragment(3)
+            }
+        }
+
+
         //切换Me页面Tab
         fun switchProfile() {
-            mClickPage = 3
+            mClickPage = 4
             if (mClickPage == mCurPosition) {
                 //重复点击
                 mProfileFragment?.let {
                     if (it is IFragmentRefresh) (it as IFragmentRefresh).scrollTopRefresh()
                 }
             } else {
-                switchFragment(3)
+                switchFragment(4)
             }
         }
 

cpt_main/src/main/res/drawable/selector_main_tab_actives.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_active_blue" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_active_blue" android:state_selected="true" />
+    <item android:drawable="@drawable/main_active_blue" android:state_active="true" />
+    <item android:drawable="@drawable/main_active_gray" android:state_selected="false" />
+    <item android:drawable="@drawable/main_active_gray" android:state_active="false" />
+    <item android:drawable="@drawable/main_active_gray" android:state_pressed="false" />
+</selector>

cpt_main/src/main/res/drawable/selector_main_tab_newsfeed.xml

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

cpt_main/src/main/res/drawable/selector_main_tab_parttime.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_part_time_blue" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_part_time_blue" android:state_selected="true" />
+    <item android:drawable="@drawable/main_part_time_blue" android:state_active="true" />
+    <item android:drawable="@drawable/main_part_time_gray" android:state_selected="false" />
+    <item android:drawable="@drawable/main_part_time_gray" android:state_active="false" />
+    <item android:drawable="@drawable/main_part_time_gray" android:state_pressed="false" />
+</selector>

cpt_main/src/main/res/layout/activity_main.xml

@@ -94,71 +94,97 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <!--钱包-->
-            <LinearLayout
-                android:id="@+id/group_tab_wallet"
+            <!-- 兼职 -->
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/group_tab_parttime"
                 style="@style/SelectableItemBackgroundLess"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:gravity="center"
-                android:onClick="@{() -> click.switchEWallet()}"
-                android:orientation="vertical">
+                android:onClick="@{() -> click.switchPartTime()}">
 
                 <ImageView
+                    android:id="@+id/iv_part_time_text"
                     android:layout_width="@dimen/d_30dp"
                     android:layout_height="@dimen/d_30dp"
-                    android:src="@drawable/selector_main_tab_wallet" />
+                    android:src="@drawable/selector_main_tab_parttime"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_part_time_text"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed" />
 
                 <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:id="@+id/tv_part_time_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="钱包"
+                    android: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_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/iv_part_time_text" />
 
-            </LinearLayout>
+                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                    android:id="@+id/tv_part_time_unread_num"
+                    android:layout_width="@dimen/d_15dp"
+                    android:layout_height="@dimen/d_15dp"
+                    android:layout_marginLeft="@dimen/d_30dp"
+                    android:background="@drawable/shape_circle_red"
+                    android:gravity="center"
+                    android:text="2"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/d_8sp"
+                    android:visibility="gone"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            <!-- 朋友圈 -->
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <!-- Actives -->
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/group_tab_newsfeed"
+                android:id="@+id/group_actives_home"
                 style="@style/SelectableItemBackgroundLess"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:onClick="@{() -> click.switchNewsFeed()}">
+                android:onClick="@{() -> click.switchActives()}">
 
                 <ImageView
-                    android:id="@+id/iv_newsfeed_text"
+                    android:id="@+id/iv_actives_text"
                     android:layout_width="@dimen/d_30dp"
                     android:layout_height="@dimen/d_30dp"
-                    android:src="@drawable/selector_main_tab_newsfeed"
-                    app:layout_constraintBottom_toTopOf="@+id/tv_newsfeed_text"
+                    android:src="@drawable/selector_main_tab_actives"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_actives_text"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
 
                 <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                    android:id="@+id/tv_newsfeed_text"
+                    android:id="@+id/tv_actives_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="朋友圈"
+                    android:text="工作状态"
                     android:textColor="@color/selector_tab_main_text"
                     android:textSize="@dimen/d_12sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/iv_newsfeed_text" />
+                    app:layout_constraintTop_toBottomOf="@+id/iv_actives_text" />
 
                 <com.guadou.lib_baselib.font_text_view.TextViewRegular
-                    android:id="@+id/tv_newsfeed_unread_num"
-                    android:layout_width="@dimen/d_8dp"
-                    android:layout_height="@dimen/d_8dp"
+                    android:id="@+id/tv_actives_unread_num"
+                    android:layout_width="@dimen/d_15dp"
+                    android:layout_height="@dimen/d_15dp"
                     android:layout_marginLeft="@dimen/d_30dp"
                     android:background="@drawable/shape_circle_red"
                     android:gravity="center"
+                    android:text="2"
                     android:textColor="@color/white"
+                    android:textSize="@dimen/d_8sp"
                     android:visibility="gone"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
@@ -166,6 +192,32 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <!--钱包-->
+            <LinearLayout
+                android:id="@+id/group_tab_wallet"
+                style="@style/SelectableItemBackgroundLess"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:onClick="@{() -> click.switchEWallet()}"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="@dimen/d_30dp"
+                    android:layout_height="@dimen/d_30dp"
+                    android:src="@drawable/selector_main_tab_wallet" />
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="钱包"
+                    android:textColor="@color/selector_tab_main_text"
+                    android:textSize="@dimen/d_12sp" />
+
+            </LinearLayout>
+
+
             <!-- 我的  -->
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/group_tab_me"

cpt_main/src/main/res/layout/fragment_home.xml

@@ -92,7 +92,7 @@
             android:layout_height="match_parent"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            app:srlEnablePreviewInEditMode="true"
+            app:srlEnablePreviewInEditMode="false"
             app:srlPrimaryColor="@color/white">
 
             <com.scwang.smart.refresh.header.ClassicsHeader
@@ -112,235 +112,270 @@
                     android:orientation="vertical">
 
                     <!--金额和Point显示-->
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="56dp"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        binding:clicks="@{click.gotoWalletPage}">
-
-                        <ImageView
-                            android:id="@+id/icon_wallet"
-                            android:layout_width="@dimen/d_28dp"
-                            android:layout_height="@dimen/d_28dp"
-                            android:layout_marginLeft="@dimen/d_16dp"
-                            android:src="@drawable/home_top_wallet"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintLeft_toLeftOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <View
-                            android:layout_width="21dp"
-                            android:layout_height="10dp"
-                            android:layout_marginBottom="@dimen/d_20dp"
-                            android:background="@drawable/chat_new_icon"
-                            app:layout_constraintBottom_toBottomOf="@id/icon_wallet"
-                            app:layout_constraintLeft_toRightOf="@id/icon_wallet"
-                            app:layout_constraintRight_toRightOf="@id/icon_wallet" />
-
-
-                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="@dimen/d_14dp"
-                            android:text="钱包"
-                            android:textColor="@color/black"
-                            android:textSize="@dimen/d_14sp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintLeft_toRightOf="@id/icon_wallet"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                            android:id="@+id/tv_wallet_money"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="@dimen/d_14dp"
-                            android:layout_marginRight="@dimen/d_7dp"
-                            android:text="¥ 0"
-                            android:textColor="@color/black"
-                            android:textSize="@dimen/d_14dsp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintRight_toLeftOf="@id/iv_back_more"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <ImageView
-                            android:id="@+id/iv_back_more"
-                            android:layout_width="5dp"
-                            android:layout_height="9dp"
-                            android:layout_marginLeft="@dimen/d_7dp"
-                            android:layout_marginRight="@dimen/d_15dp"
-                            android:src="@drawable/home_top_more"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintRight_toRightOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/d_10dp"
-                        android:background="@color/divider_color_f689" />
-
-                    <!--  分类   -->
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="56dp"
                         android:orientation="horizontal">
 
-                        <!--兼职-->
-                        <LinearLayout
-                            android:id="@+id/ll_yy_jobs"
+                        <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="0dp"
-                            android:layout_height="wrap_content"
+                            android:layout_height="match_parent"
                             android:layout_weight="1"
-                            android:gravity="center_horizontal"
-                            android:orientation="vertical"
-                            binding:clicks="@{click.gotoParttimePage}">
-
-                            <RelativeLayout
-                                android:layout_width="@dimen/d_70dp"
-                                android:layout_height="@dimen/d_70dp"
-                                android:layout_marginTop="@dimen/d_16dp">
-
-                                <ImageView
-                                    android:id="@+id/iv_category_yyjobs"
-                                    android:layout_width="@dimen/d_70dp"
-                                    android:layout_height="@dimen/d_70dp"
-                                    android:src="@drawable/home_yyjobs_categroy" />
-
-                                <!-- 未读数量 -->
-                                <View
-                                    android:id="@+id/view_parttime_unread"
-                                    android:layout_width="@dimen/d_8dp"
-                                    android:layout_height="@dimen/d_8dp"
-                                    android:layout_alignParentRight="true"
-                                    android:background="@drawable/shape_circle_red"
-                                    android:gravity="center"
-                                    android:textColor="@color/white"
-                                    android:visibility="gone" />
-
-                            </RelativeLayout>
-
-                            <com.guadou.lib_baselib.font_text_view.TextViewBold
-                                android:id="@+id/tv_category_parttime"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal"
+                            binding:clicks="@{click.gotoWalletPage}">
+
+                            <ImageView
+                                android:id="@+id/icon_wallet"
+                                android:layout_width="@dimen/d_28dp"
+                                android:layout_height="@dimen/d_28dp"
+                                android:layout_marginLeft="@dimen/d_16dp"
+                                android:src="@drawable/home_top_wallet"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintLeft_toLeftOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <View
+                                android:layout_width="21dp"
+                                android:layout_height="10dp"
+                                android:layout_marginBottom="@dimen/d_20dp"
+                                android:background="@drawable/chat_new_icon"
+                                app:layout_constraintBottom_toBottomOf="@id/icon_wallet"
+                                app:layout_constraintLeft_toRightOf="@id/icon_wallet"
+                                app:layout_constraintRight_toRightOf="@id/icon_wallet" />
+
+                            <TextView
+                                android:id="@+id/tv_wallet_money"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/d_3dp"
-                                android:text="兼职工作"
+                                android:layout_marginLeft="@dimen/d_14dp"
+                                android:text="¥ 0"
                                 android:textColor="@color/black"
-                                android:textSize="@dimen/d_14dsp" />
+                                android:textSize="@dimen/d_14sp"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintLeft_toRightOf="@id/icon_wallet"
+                                app:layout_constraintTop_toTopOf="parent" />
 
-                        </LinearLayout>
+                            <ImageView
+                                android:layout_width="5dp"
+                                android:layout_height="9dp"
+                                android:layout_marginLeft="@dimen/d_7dp"
+                                android:src="@drawable/home_top_more"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintLeft_toRightOf="@id/tv_wallet_money"
+                                app:layout_constraintTop_toTopOf="parent" />
 
-                        <!--News Feed-->
-                        <LinearLayout
-                            android:id="@+id/ll_news_feed"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center_horizontal"
-                            android:orientation="vertical"
-                            binding:clicks="@{click.gotoNewsFeedTab}">
-
-                            <RelativeLayout
-                                android:layout_width="@dimen/d_70dp"
-                                android:layout_height="@dimen/d_70dp"
-                                android:layout_marginTop="@dimen/d_16dp">
-
-                                <ImageView
-                                    android:id="@+id/iv_category_newsfeed"
-                                    android:layout_width="@dimen/d_70dp"
-                                    android:layout_height="@dimen/d_70dp"
-                                    android:src="@drawable/home_newsfeed_categroy" />
-
-                                <!-- NewsFeed未读提示-->
-                                <View
-                                    android:id="@+id/view_newsfeed_unread"
-                                    android:layout_width="@dimen/d_8dp"
-                                    android:layout_height="@dimen/d_8dp"
-                                    android:layout_alignParentRight="true"
-                                    android:background="@drawable/shape_circle_red"
-                                    android:gravity="center"
-                                    android:textColor="@color/white"
-                                    android:visibility="gone" />
-
-                                <!-- NewsFeed未读数量-->
-                                <TextView
-                                    android:id="@+id/tv_newsfeed_replay_count"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_alignParentRight="true"
-                                    android:background="@drawable/badge_red"
-                                    android:paddingLeft="@dimen/d_6dp"
-                                    android:paddingTop="@dimen/d_1dp"
-                                    android:paddingRight="@dimen/d_6dp"
-                                    android:paddingBottom="@dimen/d_1dp"
-                                    android:text="0"
-                                    android:textColor="@color/white"
-                                    android:textSize="8sp"
-                                    android:visibility="gone" />
-
-                            </RelativeLayout>
-
-                            <com.guadou.lib_baselib.font_text_view.TextViewBold
-                                android:id="@+id/tv_category_news_feed"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/d_3dp"
-                                android:text="朋友圈"
-                                android:textColor="@color/black"
-                                android:textSize="@dimen/d_14dsp" />
 
-                        </LinearLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <View
+                            android:layout_width="@dimen/d_0.7dp"
+                            android:layout_height="match_parent"
+                            android:background="@color/divider_color_f0" />
 
-                        <!--Rewards-->
                         <LinearLayout
-                            android:id="@+id/ll_rewards"
                             android:layout_width="0dp"
-                            android:layout_height="wrap_content"
+                            android:layout_height="match_parent"
                             android:layout_weight="1"
-                            android:gravity="center_horizontal"
-                            android:orientation="vertical"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal"
                             binding:clicks="@{click.gotoRewardsPage}">
 
-                            <RelativeLayout
-                                android:layout_width="@dimen/d_70dp"
-                                android:layout_height="@dimen/d_70dp"
-                                android:layout_marginTop="@dimen/d_16dp">
-
-                                <ImageView
-                                    android:id="@+id/iv_category_rewards"
-                                    android:layout_width="@dimen/d_70dp"
-                                    android:layout_height="@dimen/d_70dp"
-                                    android:src="@drawable/home_rewards_categroy" />
-
-                                <View
-                                    android:id="@+id/view_rewards_unread"
-                                    android:layout_width="@dimen/d_8dp"
-                                    android:layout_height="@dimen/d_8dp"
-                                    android:layout_alignParentRight="true"
-                                    android:background="@drawable/shape_circle_red"
-                                    android:gravity="center"
-                                    android:textColor="@color/white"
-                                    android:visibility="gone" />
-
-                            </RelativeLayout>
+                            <ImageView
+                                android:id="@+id/icon_rewards"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_19dp"
+                                android:src="@drawable/home_top_point"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintLeft_toLeftOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
 
 
-                            <com.guadou.lib_baselib.font_text_view.TextViewBold
-                                android:id="@+id/tv_category_rewards"
+                            <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/d_3dp"
-                                android:text="积分兑换"
+                                android:layout_marginLeft="@dimen/d_10dp"
+                                android:text="0 积分"
                                 android:textColor="@color/black"
-                                android:textSize="@dimen/d_14dsp" />
+                                android:textColorHint="@color/black"
+                                android:textSize="@dimen/d_14sp" />
+
+                            <ImageView
+                                android:layout_width="@dimen/d_5dp"
+                                android:layout_height="@dimen/d_9dp"
+                                android:layout_marginLeft="@dimen/d_7dp"
+                                android:src="@drawable/home_top_more" />
+
 
                         </LinearLayout>
 
                     </LinearLayout>
 
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_10dp"
+                        android:background="@color/divider_color_f689" />
+
+                    <!--  分类   -->
+                    <!--                    <LinearLayout-->
+                    <!--                        android:layout_width="match_parent"-->
+                    <!--                        android:layout_height="wrap_content"-->
+                    <!--                        android:orientation="horizontal">-->
+
+                    <!--                        &lt;!&ndash;兼职&ndash;&gt;-->
+                    <!--                        <LinearLayout-->
+                    <!--                            android:id="@+id/ll_yy_jobs"-->
+                    <!--                            android:layout_width="0dp"-->
+                    <!--                            android:layout_height="wrap_content"-->
+                    <!--                            android:layout_weight="1"-->
+                    <!--                            android:gravity="center_horizontal"-->
+                    <!--                            android:orientation="vertical"-->
+                    <!--                            binding:clicks="@{click.gotoParttimePage}">-->
+
+                    <!--                            <RelativeLayout-->
+                    <!--                                android:layout_width="@dimen/d_70dp"-->
+                    <!--                                android:layout_height="@dimen/d_70dp"-->
+                    <!--                                android:layout_marginTop="@dimen/d_16dp">-->
+
+                    <!--                                <ImageView-->
+                    <!--                                    android:id="@+id/iv_category_yyjobs"-->
+                    <!--                                    android:layout_width="@dimen/d_70dp"-->
+                    <!--                                    android:layout_height="@dimen/d_70dp"-->
+                    <!--                                    android:src="@drawable/home_yyjobs_categroy" />-->
+
+                    <!--                                &lt;!&ndash; 未读数量 &ndash;&gt;-->
+                    <!--                                <View-->
+                    <!--                                    android:id="@+id/view_parttime_unread"-->
+                    <!--                                    android:layout_width="@dimen/d_8dp"-->
+                    <!--                                    android:layout_height="@dimen/d_8dp"-->
+                    <!--                                    android:layout_alignParentRight="true"-->
+                    <!--                                    android:background="@drawable/shape_circle_red"-->
+                    <!--                                    android:gravity="center"-->
+                    <!--                                    android:textColor="@color/white"-->
+                    <!--                                    android:visibility="gone" />-->
+
+                    <!--                            </RelativeLayout>-->
+
+                    <!--                            <com.guadou.lib_baselib.font_text_view.TextViewBold-->
+                    <!--                                android:id="@+id/tv_category_parttime"-->
+                    <!--                                android:layout_width="wrap_content"-->
+                    <!--                                android:layout_height="wrap_content"-->
+                    <!--                                android:layout_marginTop="@dimen/d_3dp"-->
+                    <!--                                android:text="兼职工作"-->
+                    <!--                                android:textColor="@color/black"-->
+                    <!--                                android:textSize="@dimen/d_14dsp" />-->
+
+                    <!--                        </LinearLayout>-->
+
+                    <!--                        &lt;!&ndash;News Feed&ndash;&gt;-->
+                    <!--                        <LinearLayout-->
+                    <!--                            android:id="@+id/ll_news_feed"-->
+                    <!--                            android:layout_width="0dp"-->
+                    <!--                            android:layout_height="wrap_content"-->
+                    <!--                            android:layout_weight="1"-->
+                    <!--                            android:gravity="center_horizontal"-->
+                    <!--                            android:orientation="vertical"-->
+                    <!--                            binding:clicks="@{click.gotoNewsFeedTab}">-->
+
+                    <!--                            <RelativeLayout-->
+                    <!--                                android:layout_width="@dimen/d_70dp"-->
+                    <!--                                android:layout_height="@dimen/d_70dp"-->
+                    <!--                                android:layout_marginTop="@dimen/d_16dp">-->
+
+                    <!--                                <ImageView-->
+                    <!--                                    android:id="@+id/iv_category_newsfeed"-->
+                    <!--                                    android:layout_width="@dimen/d_70dp"-->
+                    <!--                                    android:layout_height="@dimen/d_70dp"-->
+                    <!--                                    android:src="@drawable/home_newsfeed_categroy" />-->
+
+                    <!--                                &lt;!&ndash; NewsFeed未读提示&ndash;&gt;-->
+                    <!--                                <View-->
+                    <!--                                    android:id="@+id/view_newsfeed_unread"-->
+                    <!--                                    android:layout_width="@dimen/d_8dp"-->
+                    <!--                                    android:layout_height="@dimen/d_8dp"-->
+                    <!--                                    android:layout_alignParentRight="true"-->
+                    <!--                                    android:background="@drawable/shape_circle_red"-->
+                    <!--                                    android:gravity="center"-->
+                    <!--                                    android:textColor="@color/white"-->
+                    <!--                                    android:visibility="gone" />-->
+
+                    <!--                                &lt;!&ndash; NewsFeed未读数量&ndash;&gt;-->
+                    <!--                                <TextView-->
+                    <!--                                    android:id="@+id/tv_newsfeed_replay_count"-->
+                    <!--                                    android:layout_width="wrap_content"-->
+                    <!--                                    android:layout_height="wrap_content"-->
+                    <!--                                    android:layout_alignParentRight="true"-->
+                    <!--                                    android:background="@drawable/badge_red"-->
+                    <!--                                    android:paddingLeft="@dimen/d_6dp"-->
+                    <!--                                    android:paddingTop="@dimen/d_1dp"-->
+                    <!--                                    android:paddingRight="@dimen/d_6dp"-->
+                    <!--                                    android:paddingBottom="@dimen/d_1dp"-->
+                    <!--                                    android:text="0"-->
+                    <!--                                    android:textColor="@color/white"-->
+                    <!--                                    android:textSize="8sp"-->
+                    <!--                                    android:visibility="gone" />-->
+
+                    <!--                            </RelativeLayout>-->
+
+                    <!--                            <com.guadou.lib_baselib.font_text_view.TextViewBold-->
+                    <!--                                android:id="@+id/tv_category_news_feed"-->
+                    <!--                                android:layout_width="wrap_content"-->
+                    <!--                                android:layout_height="wrap_content"-->
+                    <!--                                android:layout_marginTop="@dimen/d_3dp"-->
+                    <!--                                android:text="朋友圈"-->
+                    <!--                                android:textColor="@color/black"-->
+                    <!--                                android:textSize="@dimen/d_14dsp" />-->
+
+                    <!--                        </LinearLayout>-->
+
+                    <!--                        &lt;!&ndash;Rewards&ndash;&gt;-->
+                    <!--                        <LinearLayout-->
+                    <!--                            android:id="@+id/ll_rewards"-->
+                    <!--                            android:layout_width="0dp"-->
+                    <!--                            android:layout_height="wrap_content"-->
+                    <!--                            android:layout_weight="1"-->
+                    <!--                            android:gravity="center_horizontal"-->
+                    <!--                            android:orientation="vertical"-->
+                    <!--                            binding:clicks="@{click.gotoRewardsPage}">-->
+
+                    <!--                            <RelativeLayout-->
+                    <!--                                android:layout_width="@dimen/d_70dp"-->
+                    <!--                                android:layout_height="@dimen/d_70dp"-->
+                    <!--                                android:layout_marginTop="@dimen/d_16dp">-->
+
+                    <!--                                <ImageView-->
+                    <!--                                    android:id="@+id/iv_category_rewards"-->
+                    <!--                                    android:layout_width="@dimen/d_70dp"-->
+                    <!--                                    android:layout_height="@dimen/d_70dp"-->
+                    <!--                                    android:src="@drawable/home_rewards_categroy" />-->
+
+                    <!--                                <View-->
+                    <!--                                    android:id="@+id/view_rewards_unread"-->
+                    <!--                                    android:layout_width="@dimen/d_8dp"-->
+                    <!--                                    android:layout_height="@dimen/d_8dp"-->
+                    <!--                                    android:layout_alignParentRight="true"-->
+                    <!--                                    android:background="@drawable/shape_circle_red"-->
+                    <!--                                    android:gravity="center"-->
+                    <!--                                    android:textColor="@color/white"-->
+                    <!--                                    android:visibility="gone" />-->
+
+                    <!--                            </RelativeLayout>-->
+
+
+                    <!--                            <com.guadou.lib_baselib.font_text_view.TextViewBold-->
+                    <!--                                android:id="@+id/tv_category_rewards"-->
+                    <!--                                android:layout_width="wrap_content"-->
+                    <!--                                android:layout_height="wrap_content"-->
+                    <!--                                android:layout_marginTop="@dimen/d_3dp"-->
+                    <!--                                android:text="积分兑换"-->
+                    <!--                                android:textColor="@color/black"-->
+                    <!--                                android:textSize="@dimen/d_14dsp" />-->
+
+                    <!--                        </LinearLayout>-->
+
+                    <!--                    </LinearLayout>-->
+
                     <!--轮播-->
                     <com.minminaya.widget.GeneralRoundConstraintLayout
                         android:layout_width="match_parent"

cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/router/PartTimeComponentServiceImpl.kt

@@ -1,12 +1,14 @@
 package com.hongyegroup.cpt_parttime.router
 
 import android.content.Context
+import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.guadou.cs_router.ARouterPath
 import com.guadou.cs_router.parttime.IParttimeComponentServer
 import com.hongyegroup.cpt_parttime.ui.PartJobEditProfileInfoActivity
 import com.hongyegroup.cpt_parttime.ui.activity.PartTimeJobDetailActivity
-import com.hongyegroup.cpt_parttime.ui.activity.PartTimeMainActivity
+import com.hongyegroup.cpt_parttime.ui.main.PartTimeActivesFragment
+import com.hongyegroup.cpt_parttime.ui.main.PartTimeHomeFragment
 
 @Route(path = ARouterPath.PATH_SERVICE_PARTTIME, name = "PartTime模块路由服务")
 class PartTimeComponentServiceImpl : IParttimeComponentServer {
@@ -15,8 +17,12 @@ class PartTimeComponentServiceImpl : IParttimeComponentServer {
         PartTimeJobDetailActivity.startInstance()
     }
 
-    override fun startPartTimeJobMainPage() {
-        PartTimeMainActivity.startInstance()
+    override fun obtainPartTimeFragment(): Fragment {
+        return PartTimeHomeFragment()
+    }
+
+    override fun obtainActivesFragment(): Fragment {
+        return PartTimeActivesFragment()
     }
 
     override fun startPartTimeJobEditProfileInfoActivity() {
@@ -29,5 +35,4 @@ class PartTimeComponentServiceImpl : IParttimeComponentServer {
 
     }
 
-
 }

cs_baselib/src/main/res/layout/layout_placeholder_home.xml

@@ -53,73 +53,73 @@
 
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/d_18dp"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <View
-                android:layout_width="62dp"
-                android:layout_height="62dp"
-                android:background="@drawable/shimmer_circle_background" />
-
-            <View
-                android:layout_width="@dimen/d_50dp"
-                android:layout_height="@dimen/d_10dp"
-                android:layout_marginTop="@dimen/d_10dp"
-                android:background="@color/shimmer_background_color" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <View
-                android:layout_width="62dp"
-                android:layout_height="62dp"
-                android:background="@drawable/shimmer_circle_background" />
-
-            <View
-                android:layout_width="@dimen/d_50dp"
-                android:layout_height="@dimen/d_10dp"
-                android:layout_marginTop="@dimen/d_10dp"
-                android:background="@color/shimmer_background_color" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <View
-                android:layout_width="62dp"
-                android:layout_height="62dp"
-                android:background="@drawable/shimmer_circle_background" />
-
-            <View
-                android:layout_width="@dimen/d_50dp"
-                android:layout_height="@dimen/d_10dp"
-                android:layout_marginTop="@dimen/d_10dp"
-                android:background="@color/shimmer_background_color" />
-
-        </LinearLayout>
-
-    </LinearLayout>
+<!--    <LinearLayout-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginTop="@dimen/d_18dp"-->
+<!--        android:orientation="horizontal">-->
+
+<!--        <LinearLayout-->
+<!--            android:layout_width="0dp"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_weight="1"-->
+<!--            android:gravity="center"-->
+<!--            android:orientation="vertical">-->
+
+<!--            <View-->
+<!--                android:layout_width="62dp"-->
+<!--                android:layout_height="62dp"-->
+<!--                android:background="@drawable/shimmer_circle_background" />-->
+
+<!--            <View-->
+<!--                android:layout_width="@dimen/d_50dp"-->
+<!--                android:layout_height="@dimen/d_10dp"-->
+<!--                android:layout_marginTop="@dimen/d_10dp"-->
+<!--                android:background="@color/shimmer_background_color" />-->
+
+<!--        </LinearLayout>-->
+
+<!--        <LinearLayout-->
+<!--            android:layout_width="0dp"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_weight="1"-->
+<!--            android:gravity="center"-->
+<!--            android:orientation="vertical">-->
+
+<!--            <View-->
+<!--                android:layout_width="62dp"-->
+<!--                android:layout_height="62dp"-->
+<!--                android:background="@drawable/shimmer_circle_background" />-->
+
+<!--            <View-->
+<!--                android:layout_width="@dimen/d_50dp"-->
+<!--                android:layout_height="@dimen/d_10dp"-->
+<!--                android:layout_marginTop="@dimen/d_10dp"-->
+<!--                android:background="@color/shimmer_background_color" />-->
+
+<!--        </LinearLayout>-->
+
+<!--        <LinearLayout-->
+<!--            android:layout_width="0dp"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_weight="1"-->
+<!--            android:gravity="center"-->
+<!--            android:orientation="vertical">-->
+
+<!--            <View-->
+<!--                android:layout_width="62dp"-->
+<!--                android:layout_height="62dp"-->
+<!--                android:background="@drawable/shimmer_circle_background" />-->
+
+<!--            <View-->
+<!--                android:layout_width="@dimen/d_50dp"-->
+<!--                android:layout_height="@dimen/d_10dp"-->
+<!--                android:layout_marginTop="@dimen/d_10dp"-->
+<!--                android:background="@color/shimmer_background_color" />-->
+
+<!--        </LinearLayout>-->
+
+<!--    </LinearLayout>-->
 
     <View
         android:layout_width="match_parent"

cs_router/src/main/java/com/guadou/cs_router/parttime/IParttimeComponentServer.kt

@@ -1,12 +1,15 @@
 package com.guadou.cs_router.parttime
 
+import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.template.IProvider
 
 interface IParttimeComponentServer : IProvider {
 
     fun startPartTimeJobDetailPage()
 
-    fun startPartTimeJobMainPage()
+    fun obtainPartTimeFragment(): Fragment
+
+    fun obtainActivesFragment(): Fragment
 
     fun startPartTimeJobEditProfileInfoActivity()