1.home page top layout update

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

@@ -140,6 +140,13 @@ class HomeFragment : YYBaseVDBLoadingFragment<HomeViewModel, FragmentHomeBinding
             toast("去奖励页面")
         }
 
+        //切换到NewsFeed-Tab
+        fun gotoNewsFeedTab() {
+            if (requireActivity() is MainActivity) {
+                (requireActivity() as MainActivity).switchFragment(2)
+            }
+        }
+
         fun gotoParttimePage() {
             toast("去兼职页面")
         }

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

@@ -100,7 +100,7 @@ class MainActivity : YYBaseVDBActivity<MainViewModel, ActivityMainBinding>() {
     // ============================  Fragment begin ↓  =============================
 
     //切换索引
-    private fun switchFragment(index: Int) {
+    fun switchFragment(index: Int) {
         val targetFragment: Fragment?
         val targetTag = index.toString()
 

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

@@ -112,116 +112,242 @@
                     android:orientation="vertical">
 
                     <!--金额和Point显示-->
-                    <LinearLayout
+                    <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_14sp"
+                            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:orientation="horizontal">
 
-                        <androidx.constraintlayout.widget.ConstraintLayout
+                        <!--兼职-->
+                        <LinearLayout
+                            android:id="@+id/ll_yy_jobs"
                             android:layout_width="0dp"
-                            android:layout_height="match_parent"
+                            android:layout_height="wrap_content"
                             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.TextViewRegular
-                                android:id="@+id/tv_wallet_money"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
+                            binding:clicks="@{click.gotoParttimePage}">
+
+                            <RelativeLayout
+                                android:layout_width="@dimen/d_65dp"
+                                android:layout_height="@dimen/d_65dp"
+                                android:layout_marginTop="@dimen/d_16dp">
+
+                                <ImageView
+                                    android:id="@+id/iv_category_yyjobs"
+                                    android:layout_width="@dimen/d_65dp"
+                                    android:layout_height="@dimen/d_65dp"
+                                    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:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="@dimen/d_14dp"
-                                android:text="¥ 0"
+                                android:layout_marginTop="@dimen/d_3dp"
+                                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" />
-
-                            <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" />
+                                android:textSize="@dimen/d_15sp" />
 
+                        </LinearLayout>
 
-                        </androidx.constraintlayout.widget.ConstraintLayout>
+                        <!--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_65dp"
+                                android:layout_height="@dimen/d_65dp"
+                                android:layout_marginTop="@dimen/d_16dp">
+
+                                <ImageView
+                                    android:id="@+id/iv_category_newsfeed"
+                                    android:layout_width="@dimen/d_65dp"
+                                    android:layout_height="@dimen/d_65dp"
+                                    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_15sp" />
 
-                        <View
-                            android:layout_width="@dimen/d_1dp"
-                            android:layout_height="match_parent"
-                            android:background="@color/divider_color_f0" />
+                        </LinearLayout>
 
+                        <!--Rewards-->
                         <LinearLayout
+                            android:id="@+id/ll_rewards"
                             android:layout_width="0dp"
-                            android:layout_height="match_parent"
+                            android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
                             binding:clicks="@{click.gotoRewardsPage}">
 
-                            <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" />
+                            <RelativeLayout
+                                android:layout_width="@dimen/d_65dp"
+                                android:layout_height="@dimen/d_65dp"
+                                android:layout_marginTop="@dimen/d_16dp">
+
+                                <ImageView
+                                    android:id="@+id/iv_category_rewards"
+                                    android:layout_width="@dimen/d_65dp"
+                                    android:layout_height="@dimen/d_65dp"
+                                    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" />
 
-                            <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                            </RelativeLayout>
+
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                android:id="@+id/tv_category_re"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="@dimen/d_10dp"
-                                android:text="0 积分"
+                                android:layout_marginTop="@dimen/d_3dp"
+                                android:text="积分兑换"
                                 android:textColor="@color/black"
-                                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" />
-
+                                android:textSize="@dimen/d_15sp" />
 
                         </LinearLayout>
 
                     </LinearLayout>
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/d_10dp"
-                        android:background="@color/divider_color_f689" />
-
                     <!--轮播-->
                     <com.minminaya.widget.GeneralRoundConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/d_15dp"
-                        android:layout_marginTop="@dimen/d_16dp"
+                        android:layout_marginTop="@dimen/d_18dp"
                         android:layout_marginRight="@dimen/d_15dp"
                         app:corner_radius="@dimen/d_5dp">
 

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

@@ -17,7 +17,7 @@ public class TypefaceUtil {
     }
 
     public static Typeface getBold() {
-        return Typeface.create("sans-serif", Typeface.BOLD);
+        return Typeface.create("sans-serif-light", Typeface.BOLD);
     }
 
 

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

@@ -53,11 +53,79 @@
 
     </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"
         android:layout_height="180dp"
         android:layout_marginLeft="@dimen/d_15dp"
-        android:layout_marginTop="@dimen/d_15dp"
+        android:layout_marginTop="@dimen/d_19dp"
         android:layout_marginRight="@dimen/d_15dp"
         android:background="@drawable/shimmer_bg_rounded_corners5" />