Commit b928654e by 刘鹏

feat: 文章详情改版收尾工作,去掉阿里云埋点日志上传

parent 463b89e1
ext { ext {
dev_mode = false //组件发布的时候需要设置为false dev_mode = false //组件发布的时候需要设置为false
ydl2PublishVersion = "0.2.0.18-local" ydl2PublishVersion = "0.2.0.20-SNAPSHOT"
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
......
package activity package activity
import adapter.ArticlePagerAdapter import adapter.ArticlePagerAdapter
import android.annotation.SuppressLint
import android.graphics.Typeface import android.graphics.Typeface
import android.text.SpannableString import android.text.SpannableString
import android.text.Spanned import android.text.Spanned
...@@ -23,12 +24,15 @@ import io.reactivex.schedulers.Schedulers ...@@ -23,12 +24,15 @@ import io.reactivex.schedulers.Schedulers
class ArticleHomeActivity : BaseActivity() { class ArticleHomeActivity : BaseActivity() {
private var TAG_IDS = mutableListOf(0) private var TAG_IDS = mutableListOf(0)
private var TAGS = mutableListOf("推荐") private var mTabName = mutableListOf("推荐")
private var mTabLayout: TabLayout? = null private var mTabLayout: TabLayout? = null
private var mViewPager: ViewPager2? = null private var mViewPager: ViewPager2? = null
private var mFragments = mutableListOf(ArticleHomeFragment.newInstance(0)) private var mFragments = mutableListOf(ArticleHomeFragment.newInstance(0))
override fun layoutResId(): Int {
return R.layout.article_home_activity_layout
}
override fun initDataAndEvent() { override fun initDataAndEvent() {
mTabLayout = findViewById(R.id.tab_layout) mTabLayout = findViewById(R.id.tab_layout)
mViewPager = findViewById(R.id.view_pager) mViewPager = findViewById(R.id.view_pager)
...@@ -40,25 +44,39 @@ class ArticleHomeActivity : BaseActivity() { ...@@ -40,25 +44,39 @@ class ArticleHomeActivity : BaseActivity() {
finish() finish()
} }
loadData()
}
@SuppressLint("CheckResult")
private fun loadData() {
ArticleHttp.getInstance().getArticleCategoryList() ArticleHttp.getInstance().getArticleCategoryList()
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe { response -> .subscribe { response ->
if (response.code == "200" && response.data != null && !response.data.articleCategoryResponseList.isNullOrEmpty()) { if (response.code == "200" && response.data != null && !response.data.articleCategoryResponseList.isNullOrEmpty()) {
var tabNameString = StringBuffer("推荐")
response.data.articleCategoryResponseList!!.forEach { response.data.articleCategoryResponseList!!.forEach {
TAGS.add(it.name) mTabName.add(it.name)
TAG_IDS.add(it.categoryId) TAG_IDS.add(it.categoryId)
mFragments.add(ArticleHomeFragment.newInstance(it.categoryId)) mFragments.add(ArticleHomeFragment.newInstance(it.categoryId))
tabNameString.append("|${it.name}")
} }
ActionCountUtils.record(
"article_list_main_page",
"article_list_sort_visit",
tabNameString.toString()
)
mViewPager?.post { mViewPager?.post {
mViewPager?.adapter = ArticlePagerAdapter(this, mFragments) mViewPager?.adapter = ArticlePagerAdapter(this, mFragments)
mTabLayout?.addOnTabSelectedListener(object : mTabLayout?.addOnTabSelectedListener(object :
TabLayout.OnTabSelectedListener { TabLayout.OnTabSelectedListener {
override fun onTabSelected(tab: TabLayout.Tab?) { override fun onTabSelected(tab: TabLayout.Tab?) {
ActionCountUtils.record("article_list_main_page","article_list_toptitle_click",tab?.toString()?:"") ActionCountUtils.record(
ActionCountUtils.record("article_list_main_page","article_list_sort_visit",tab?.toString()?:"") "article_list_main_page",
"article_list_toptitle_click",
tab?.text.toString() ?: ""
)
var text: String? = tab?.text.toString().trim() var text: String? = tab?.text.toString().trim()
val spStr = SpannableString(text) val spStr = SpannableString(text)
val styleSpan = StyleSpan(Typeface.BOLD) val styleSpan = StyleSpan(Typeface.BOLD)
...@@ -91,15 +109,12 @@ class ArticleHomeActivity : BaseActivity() { ...@@ -91,15 +109,12 @@ class ArticleHomeActivity : BaseActivity() {
}) })
TabLayoutMediator(mTabLayout!!, mViewPager!!) { tab, position -> TabLayoutMediator(mTabLayout!!, mViewPager!!) { tab, position ->
tab.text = TAGS[position] tab.text = mTabName[position]
}.attach() }.attach()
} }
} }
} }
} }
override fun layoutResId(): Int {
return R.layout.article_home_activity_layout
}
} }
\ No newline at end of file
...@@ -11,7 +11,9 @@ import com.scwang.smart.refresh.footer.ClassicsFooter ...@@ -11,7 +11,9 @@ import com.scwang.smart.refresh.footer.ClassicsFooter
import com.scwang.smart.refresh.header.ClassicsHeader import com.scwang.smart.refresh.header.ClassicsHeader
import com.scwang.smart.refresh.layout.SmartRefreshLayout import com.scwang.smart.refresh.layout.SmartRefreshLayout
import com.ydl.ydl_router.manager.YDLRouterManager import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydl_router.manager.YDLRouterParams
import com.ydl.ydlcommon.base.BaseFragment import com.ydl.ydlcommon.base.BaseFragment
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.article.R import com.yidianling.article.R
import data.ArticleBean import data.ArticleBean
...@@ -38,6 +40,13 @@ class ArticleHomeFragment : BaseFragment() { ...@@ -38,6 +40,13 @@ class ArticleHomeFragment : BaseFragment() {
mTagId = arguments?.getInt(KEY_ARTICLE_TAG_ID, 0) ?: 0 mTagId = arguments?.getInt(KEY_ARTICLE_TAG_ID, 0) ?: 0
} }
override fun layoutResId(): Int {
return R.layout.article_fragment_layout
}
override fun initDataAndEventLazy() {
}
override fun initDataAndEvent() { override fun initDataAndEvent() {
mSmartRefreshLayout = rootView.findViewById(R.id.smart_refresh_layout) mSmartRefreshLayout = rootView.findViewById(R.id.smart_refresh_layout)
...@@ -51,7 +60,10 @@ class ArticleHomeFragment : BaseFragment() { ...@@ -51,7 +60,10 @@ class ArticleHomeFragment : BaseFragment() {
mAdapter.setOnItemClickListener(object : ArticleHomeItemAdapter.OnItemClickListener { mAdapter.setOnItemClickListener(object : ArticleHomeItemAdapter.OnItemClickListener {
override fun onItemClick(articleBean: ArticleBean) { override fun onItemClick(articleBean: ArticleBean) {
ActionCountUtils.record("article_list_main_page","article_list_detail_click") ActionCountUtils.record("article_list_main_page","article_list_detail_click")
YDLRouterManager.router("ydl-user://h5/h5?params={'url':'${articleBean.listAllUrl}'}") YDLRouterManager.router(
IYDLRouterConstant.ROUTER_H5_H5,
YDLRouterParams().putExtra(IYDLRouterConstant.EXTRA_URL, articleBean.listAllUrl!!), ""
)
} }
}) })
mRvArticleContent.layoutManager = mRvArticleContent.layoutManager =
...@@ -86,13 +98,6 @@ class ArticleHomeFragment : BaseFragment() { ...@@ -86,13 +98,6 @@ class ArticleHomeFragment : BaseFragment() {
mSmartRefreshLayout.autoRefresh() mSmartRefreshLayout.autoRefresh()
} }
override fun initDataAndEventLazy() {
}
override fun layoutResId(): Int {
return R.layout.article_fragment_layout
}
private fun getRecommendArticleList(isRefresh: Boolean = true, isLoadMore: Boolean = false) { private fun getRecommendArticleList(isRefresh: Boolean = true, isLoadMore: Boolean = false) {
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
android:id="@+id/tab_layout" android:id="@+id/tab_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:paddingTop="14dp"
app:tabBackground="@color/transparent" app:tabBackground="@color/transparent"
app:tabRippleColor="@color/transparent" app:tabRippleColor="@color/transparent"
app:tabMode="scrollable" app:tabMode="scrollable"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/card_view_article_image" android:id="@+id/card_view_article_image"
android:layout_width="70dp" android:layout_width="84dp"
android:layout_height="70dp" android:layout_height="70dp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -28,11 +28,12 @@ ...@@ -28,11 +28,12 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_article_title" android:id="@+id/tv_article_title"
android:layout_width="match_parent" android:layout_width="0dp"
app:layout_constraintHorizontal_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxHeight="44dp" android:maxHeight="44dp"
android:layout_marginEnd="84dp"
android:maxLines="2" android:maxLines="2"
app:layout_constraintEnd_toStartOf="@id/card_view_article_image"
android:ellipsize="end" android:ellipsize="end"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
...@@ -44,16 +45,18 @@ ...@@ -44,16 +45,18 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_article_desc" android:id="@+id/tv_article_desc"
android:layout_width="match_parent" android:layout_width="0dp"
app:layout_constraintHorizontal_weight="1"
android:layout_height="18dp" android:layout_height="18dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="70dp" app:layout_constraintEnd_toStartOf="@id/card_view_article_image"
android:maxLines="1" android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold" android:textStyle="bold"
android:singleLine="true"
android:textColor="#9D9EA7" android:textColor="#9D9EA7"
tools:text="最伟大的作品,是魔术啊,最伟大的作品,是魔术啊。" tools:text="最伟大的作品,是魔术啊,最伟大的作品,是魔术啊。fdasfa"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_article_title"/> app:layout_constraintTop_toBottomOf="@id/tv_article_title"/>
...@@ -61,7 +64,7 @@ ...@@ -61,7 +64,7 @@
android:id="@+id/card_view_avatar" android:id="@+id/card_view_avatar"
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginTop="20dp" android:layout_marginTop="17dp"
app:layout_constraintStart_toStartOf="@id/tv_article_title" app:layout_constraintStart_toStartOf="@id/tv_article_title"
app:layout_constraintTop_toBottomOf="@id/card_view_article_image" app:layout_constraintTop_toBottomOf="@id/card_view_article_image"
app:cardCornerRadius="8dp"> app:cardCornerRadius="8dp">
...@@ -83,7 +86,6 @@ ...@@ -83,7 +86,6 @@
android:layout_marginStart="3dp" android:layout_marginStart="3dp"
android:textSize="13sp" android:textSize="13sp"
android:textColor="#666666" android:textColor="#666666"
android:textStyle="bold"
tools:text="黄秀章" tools:text="黄秀章"
app:layout_constraintStart_toEndOf="@id/card_view_avatar" app:layout_constraintStart_toEndOf="@id/card_view_avatar"
app:layout_constraintTop_toTopOf="@id/card_view_avatar" app:layout_constraintTop_toTopOf="@id/card_view_avatar"
...@@ -93,12 +95,12 @@ ...@@ -93,12 +95,12 @@
android:id="@+id/tv_article_view_num" android:id="@+id/tv_article_view_num"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="85dp" app:layout_constraintEnd_toStartOf="@id/tv_article_like_num"
tools:text="2656浏览" tools:text="2656浏览"
android:textSize="13sp" android:textSize="13sp"
android:layout_marginEnd="35dp"
android:textColor="#62636F" android:textColor="#62636F"
app:layout_constraintTop_toTopOf="@id/card_view_avatar" app:layout_constraintBaseline_toBaselineOf="@id/tv_author_name"
app:layout_constraintBottom_toBottomOf="@id/card_view_avatar"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
...@@ -108,8 +110,7 @@ ...@@ -108,8 +110,7 @@
tools:text="3327点赞" tools:text="3327点赞"
android:textSize="13sp" android:textSize="13sp"
android:textColor="#62636F" android:textColor="#62636F"
app:layout_constraintTop_toTopOf="@id/card_view_avatar" app:layout_constraintBaseline_toBaselineOf="@id/tv_author_name"
app:layout_constraintBottom_toBottomOf="@id/card_view_avatar"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"/>
<View <View
...@@ -118,7 +119,7 @@ ...@@ -118,7 +119,7 @@
android:layout_height="0.5dp" android:layout_height="0.5dp"
android:background="#EFEFF1" android:background="#EFEFF1"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="30dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/card_view_avatar"/> app:layout_constraintTop_toBottomOf="@id/card_view_avatar"/>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/homeModuleArticleItemViewCardImg" android:layout_below="@+id/homeModuleArticleItemViewCardImg"
android:layout_marginTop="20dp"> android:layout_marginTop="17dp">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/card_view_avatar" android:id="@+id/card_view_avatar"
...@@ -87,7 +87,6 @@ ...@@ -87,7 +87,6 @@
android:textSize="13sp" android:textSize="13sp"
android:textColor="#666666" android:textColor="#666666"
android:layout_marginLeft="@dimen/platform_dp_3" android:layout_marginLeft="@dimen/platform_dp_3"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/card_view_avatar" app:layout_constraintStart_toEndOf="@id/card_view_avatar"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -97,13 +96,13 @@ ...@@ -97,13 +96,13 @@
android:id="@+id/homeModuleArticleItemViewLookNum" android:id="@+id/homeModuleArticleItemViewLookNum"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="85dp" android:layout_marginEnd="35dp"
tools:text="2656浏览" tools:text="2656浏览"
android:textSize="13sp" android:textSize="13sp"
android:textColor="#62636F" android:textColor="#62636F"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintRight_toLeftOf="@id/homeModuleArticleItemViewGreatNum"/>
<TextView <TextView
android:id="@+id/homeModuleArticleItemViewGreatNum" android:id="@+id/homeModuleArticleItemViewGreatNum"
...@@ -127,6 +126,6 @@ ...@@ -127,6 +126,6 @@
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_below="@+id/homeModuleArticleItemViewBottomLayout" android:layout_below="@+id/homeModuleArticleItemViewBottomLayout"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"/> android:layout_marginBottom="30dp"/>
</RelativeLayout> </RelativeLayout>
...@@ -258,18 +258,6 @@ class HttpConfig { ...@@ -258,18 +258,6 @@ class HttpConfig {
}else{ }else{
AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.API, "writeMaiDianDataError:$api---params:$params ---- message:$message") AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.API, "writeMaiDianDataError:$api---params:$params ---- message:$message")
} }
}else{
var params = ""
if (request.method() == "GET") {
params = request.url().query().toString()
} else if (request.method() == "POST") {
params = RequestLogInterceptor.parseParams(request)
}
val message = originalResponse.message()
val api = request.url().encodedPath()
if (api.contains("maidian/writeMaiDianData")){
AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.API, "writeMaiDianDatacode$code:$api---params:$params ---- message:$message")
}
} }
} }
originalResponse originalResponse
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment