Newsfeed page update

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

@@ -143,7 +143,8 @@ class HomeFragment : YYBaseVDBLoadingFragment<HomeViewModel, FragmentHomeBinding
 
         //去奖励模块
         fun gotoRewardsPage() {
-            YYRouterService.rewardsComponentServer?.startRewardsDailyPage()
+//            YYRouterService.rewardsComponentServer?.startRewardsDailyPage()
+            YYRouterService.newsfeedComponentServer?.startNewsFeedHomePage()
         }
 
         //去兼职页面

cpt_newsfeed/src/main/AndroidManifest.xml

@@ -4,13 +4,15 @@
 
     <application android:allowBackup="true">
 
-        <activity android:name=".ui.NewsFeedDetailActivity" />
+        <activity android:name=".ui.activity.NewsFeedDetailActivity" />
 
-        <activity android:name=".ui.NewsFeedPostActivity" />
+        <activity android:name=".ui.activity.NewsFeedPostActivity" />
 
-        <activity android:name=".ui.NewsFeedFollowsActivity" />
+        <activity android:name=".ui.activity.NewsFeedFollowsActivity" />
 
-        <activity android:name=".ui.NewsFeedProfileActivity" />
+        <activity android:name=".ui.activity.NewsFeedProfileActivity" />
+
+        <activity android:name=".ui.activity.NewsFeedMainActivity"/>
 
     </application>
 

cpt_newsfeed/src/main/java/com/hongyegroup/cpt_newsfeed/router/NewsFeedComponentServiceImpl.kt

@@ -5,12 +5,20 @@ import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.guadou.cs_router.ARouterPath
 import com.guadou.cs_router.newsfeed.INewsFeedComponentServer
-import com.hongyegroup.cpt_newsfeed.ui.NewsFeedMainFragment
+import com.hongyegroup.cpt_newsfeed.ui.activity.NewsFeedMainActivity
+import com.hongyegroup.cpt_newsfeed.ui.activity.NewsFeedPostActivity
+import com.hongyegroup.cpt_newsfeed.ui.fragment.NewsFeedMainFragment
 
 @Route(path = ARouterPath.PATH_SERVICE_NEWSFEED, name = "NewsFeed模块路由服务")
 class NewsFeedComponentServiceImpl : INewsFeedComponentServer {
 
+    //去NewsFeed的首页
+    override fun startNewsFeedHomePage() {
+        NewsFeedMainActivity.startInstance()
+    }
+
     override fun startNewsFeedPostPage() {
+        NewsFeedPostActivity.startInstance()
     }
 
     override fun obtainNewsFeedMainFragment(): Fragment {
@@ -18,7 +26,7 @@ class NewsFeedComponentServiceImpl : INewsFeedComponentServer {
     }
 
     override fun init(context: Context?) {
-    }
 
+    }
 
 }

cpt_newsfeed/src/main/java/com/hongyegroup/cpt_newsfeed/ui/NewsFeedDetailActivity.kt

@@ -1,4 +1,4 @@
-package com.hongyegroup.cpt_newsfeed.ui
+package com.hongyegroup.cpt_newsfeed.ui.activity
 
 import android.content.Intent
 import android.os.Bundle

cpt_newsfeed/src/main/java/com/hongyegroup/cpt_newsfeed/ui/NewsFeedFollowsActivity.kt

@@ -1,4 +1,4 @@
-package com.hongyegroup.cpt_newsfeed.ui
+package com.hongyegroup.cpt_newsfeed.ui.activity
 
 import android.content.Intent
 import android.os.Bundle

cpt_newsfeed/src/main/java/com/hongyegroup/cpt_newsfeed/ui/activity/NewsFeedMainActivity.kt

@@ -0,0 +1,39 @@
+package com.hongyegroup.cpt_newsfeed.ui.activity
+
+import android.os.Bundle
+import com.guadou.cs_cptservices.base.activity.YYBaseVMActivity
+import com.guadou.lib_baselib.base.vm.EmptyViewModel
+import com.guadou.lib_baselib.ext.commContext
+import com.guadou.lib_baselib.ext.gotoActivity
+import com.guadou.lib_baselib.utils.StatusBarUtils
+import com.hongyegroup.cpt_newsfeed.R
+import com.hongyegroup.cpt_newsfeed.ui.fragment.NewsFeedMainFragment
+
+/**
+ * 朋友圈主页 实际上为空容器
+ * 内部加载Fragment实现
+ */
+class NewsFeedMainActivity : YYBaseVMActivity<EmptyViewModel>() {
+
+    companion object {
+        fun startInstance() {
+            commContext().gotoActivity<NewsFeedMainActivity>()
+        }
+    }
+
+    override fun getLayoutIdRes(): Int = R.layout.activity_newsfeed_main
+
+    override fun startObserve() {
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+
+        StatusBarUtils.immersive(this)
+
+        supportFragmentManager.beginTransaction()
+            .add(R.id.fragment_container, NewsFeedMainFragment())
+            .commitAllowingStateLoss()
+    }
+
+
+}

cpt_newsfeed/src/main/java/com/hongyegroup/cpt_newsfeed/ui/NewsFeedPostActivity.kt

@@ -1,4 +1,4 @@
-package com.hongyegroup.cpt_newsfeed.ui
+package com.hongyegroup.cpt_newsfeed.ui.activity
 
 import android.content.Intent
 import android.os.Bundle

cpt_newsfeed/src/main/java/com/hongyegroup/cpt_newsfeed/ui/NewsFeedProfileActivity.kt

@@ -1,4 +1,4 @@
-package com.hongyegroup.cpt_newsfeed.ui
+package com.hongyegroup.cpt_newsfeed.ui.activity
 
 import android.content.Intent
 import android.os.Bundle
@@ -6,6 +6,7 @@ import com.guadou.lib_baselib.base.activity.BaseVMActivity
 import com.guadou.lib_baselib.base.vm.EmptyViewModel
 import com.guadou.lib_baselib.utils.CommUtils
 import com.hongyegroup.cpt_newsfeed.R
+import com.hongyegroup.cpt_newsfeed.ui.fragment.NewsFeedProfileFragment
 
 /**
  * 个人的主页 实际上为空容器

cpt_newsfeed/src/main/java/com/hongyegroup/cpt_newsfeed/ui/NewsFeedFansFragment.kt

@@ -1,4 +1,4 @@
-package com.hongyegroup.cpt_newsfeed.ui
+package com.hongyegroup.cpt_newsfeed.ui.fragment
 
 import android.os.Bundle
 import com.guadou.cs_cptservices.base.fragment.YYBaseVDBLazyLoadingFragment

cpt_newsfeed/src/main/java/com/hongyegroup/cpt_newsfeed/ui/NewsFeedFollowFragment.kt

@@ -1,4 +1,4 @@
-package com.hongyegroup.cpt_newsfeed.ui
+package com.hongyegroup.cpt_newsfeed.ui.fragment
 
 import android.os.Bundle
 import com.guadou.cs_cptservices.base.fragment.YYBaseVDBLazyLoadingFragment

cpt_newsfeed/src/main/java/com/hongyegroup/cpt_newsfeed/ui/NewsFeedListFragment.kt

@@ -1,4 +1,4 @@
-package com.hongyegroup.cpt_newsfeed.ui
+package com.hongyegroup.cpt_newsfeed.ui.fragment
 
 import android.os.Bundle
 import android.view.View

cpt_newsfeed/src/main/java/com/hongyegroup/cpt_newsfeed/ui/NewsFeedMainFragment.kt

@@ -1,4 +1,4 @@
-package com.hongyegroup.cpt_newsfeed.ui
+package com.hongyegroup.cpt_newsfeed.ui.fragment
 
 import android.content.Intent
 import android.os.Bundle
@@ -15,6 +15,7 @@ import com.hongyegroup.cpt_newsfeed.BR
 import com.hongyegroup.cpt_newsfeed.R
 import com.hongyegroup.cpt_newsfeed.databinding.FragmentNewsfeedMainBinding
 import com.hongyegroup.cpt_newsfeed.mvvm.NewsFeedMainViewModel
+import com.hongyegroup.cpt_newsfeed.ui.activity.NewsFeedPostActivity
 
 /**
  * 首页动态广场的页面

cpt_newsfeed/src/main/java/com/hongyegroup/cpt_newsfeed/ui/NewsFeedProfileFragment.kt

@@ -1,4 +1,4 @@
-package com.hongyegroup.cpt_newsfeed.ui
+package com.hongyegroup.cpt_newsfeed.ui.fragment
 
 import android.os.Bundle
 import com.guadou.cs_cptservices.base.fragment.YYBaseVDBLazyLoadingFragment

cpt_newsfeed/src/main/res/layout/activity_newsfeed_detail.xml

@@ -13,7 +13,7 @@
 
         <variable
             name="click"
-            type="com.hongyegroup.cpt_newsfeed.ui.NewsFeedDetailActivity.ClickProxy" />
+            type="com.hongyegroup.cpt_newsfeed.ui.activity.NewsFeedDetailActivity.ClickProxy" />
 
     </data>
 

cpt_newsfeed/src/main/res/layout/activity_newsfeed_follows.xml

@@ -13,7 +13,7 @@
 
         <variable
             name="click"
-            type="com.hongyegroup.cpt_newsfeed.ui.NewsFeedFollowsActivity.ClickProxy" />
+            type="com.hongyegroup.cpt_newsfeed.ui.activity.NewsFeedFollowsActivity.ClickProxy" />
 
     </data>
 

cpt_newsfeed/src/main/res/layout/activity_newsfeed_main.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
+
+</FrameLayout>

cpt_newsfeed/src/main/res/layout/activity_newsfeed_post.xml

@@ -13,7 +13,7 @@
 
         <variable
             name="click"
-            type="com.hongyegroup.cpt_newsfeed.ui.NewsFeedPostActivity.ClickProxy" />
+            type="com.hongyegroup.cpt_newsfeed.ui.activity.NewsFeedPostActivity.ClickProxy" />
 
     </data>
 

cpt_newsfeed/src/main/res/layout/fragment_newsfeed_fans.xml

@@ -13,7 +13,7 @@
 
         <variable
             name="click"
-            type="com.hongyegroup.cpt_newsfeed.ui.NewsFeedFansFragment.ClickProxy" />
+            type="com.hongyegroup.cpt_newsfeed.ui.fragment.NewsFeedFansFragment.ClickProxy" />
 
         <import type="android.text.TextUtils" />
 

cpt_newsfeed/src/main/res/layout/fragment_newsfeed_follow.xml

@@ -13,7 +13,7 @@
 
         <variable
             name="click"
-            type="com.hongyegroup.cpt_newsfeed.ui.NewsFeedFollowFragment.ClickProxy" />
+            type="com.hongyegroup.cpt_newsfeed.ui.fragment.NewsFeedFollowFragment.ClickProxy" />
 
         <import type="android.text.TextUtils" />
 

cpt_newsfeed/src/main/res/layout/fragment_newsfeed_main.xml

@@ -13,7 +13,7 @@
 
         <variable
             name="click"
-            type="com.hongyegroup.cpt_newsfeed.ui.NewsFeedMainFragment.ClickProxy" />
+            type="com.hongyegroup.cpt_newsfeed.ui.fragment.NewsFeedMainFragment.ClickProxy" />
 
     </data>
 

cpt_newsfeed/src/main/res/layout/fragment_newsfeed_profile.xml

@@ -13,7 +13,7 @@
 
         <variable
             name="click"
-            type="com.hongyegroup.cpt_newsfeed.ui.NewsFeedProfileFragment.ClickProxy" />
+            type="com.hongyegroup.cpt_newsfeed.ui.fragment.NewsFeedProfileFragment.ClickProxy" />
 
         <import type="android.text.TextUtils" />
 

cs_router/src/main/java/com/guadou/cs_router/newsfeed/INewsFeedComponentServer.kt

@@ -5,6 +5,8 @@ import com.alibaba.android.arouter.facade.template.IProvider
 
 interface INewsFeedComponentServer : IProvider {
 
+    fun startNewsFeedHomePage()
+
     fun startNewsFeedPostPage()
 
     fun obtainNewsFeedMainFragment(): Fragment