Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
2341a33d
Commit
2341a33d
authored
May 04, 2022
by
刘鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat : 心理咨询金刚位改版UI还原,首页埋点事件
parent
8858314a
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
74 additions
and
57 deletions
+74
-57
config.gradle
config.gradle
+2
-2
HomeBIConstants.kt
m-home/src/main/java/com/yidianling/home/constants/HomeBIConstants.kt
+2
-0
YdlHomeFragment.kt
m-home/src/xlzx/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
+5
-0
HomeButtonBannerView.kt
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
+7
-7
HomeConsultItemView.kt
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeConsultItemView.kt
+16
-11
HomeConsultView.kt
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeConsultView.kt
+2
-2
HomeModuleCategoryView.kt
m-home/src/xlzx/java/com/yidianling/home/ui/widget/HomeModuleCategoryView.kt
+3
-2
home_more_icon_gray.png
m-home/src/xlzx/res/drawable-xhdpi/home_more_icon_gray.png
+0
-0
qingsu_new_free_dynamic.gif
m-home/src/xlzx/res/drawable/qingsu_new_free_dynamic.gif
+0
-0
home_button_banner_view.xml
m-home/src/xlzx/res/layout/home_button_banner_view.xml
+12
-14
home_common_title_big_full_view.xml
m-home/src/xlzx/res/layout/home_common_title_big_full_view.xml
+17
-14
home_consult_item_view.xml
m-home/src/xlzx/res/layout/home_consult_item_view.xml
+1
-1
home_consult_view.xml
m-home/src/xlzx/res/layout/home_consult_view.xml
+2
-3
home_item_tag.xml
m-home/src/xlzx/res/layout/home_item_tag.xml
+1
-1
YdlHomeFragment.kt
m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
+4
-0
No files found.
config.gradle
View file @
2341a33d
...
...
@@ -9,7 +9,7 @@ ext {
"m-consultant"
:
"0.0.60.16"
,
"m-fm"
:
"0.0.30.08"
,
"m-user"
:
"0.0.62.04"
,
"m-home"
:
"0.0.23.
26
"
,
"m-home"
:
"0.0.23.
35
"
,
"m-im"
:
"0.0.21.29"
,
"m-dynamic"
:
"0.0.7.35"
,
"m-article"
:
"0.0.0.10"
,
...
...
@@ -96,7 +96,7 @@ ext {
"m-consultant"
:
"0.0.60.16"
,
"m-fm"
:
"0.0.30.08"
,
"m-user"
:
"0.0.62.04"
,
"m-home"
:
"0.0.23.
26
"
,
"m-home"
:
"0.0.23.
35
"
,
"m-im"
:
"0.0.21.29"
,
"m-dynamic"
:
"0.0.7.35"
,
"m-article"
:
"0.0.0.8"
,
...
...
m-home/src/main/java/com/yidianling/home/constants/HomeBIConstants.kt
View file @
2341a33d
...
...
@@ -39,6 +39,8 @@ class HomeBIConstants {
const
val
YDL_HOME_DWELL_TIME
:
String
=
YDL_USER_MAIN_PAGE
+
"ydl_user_main_page_stay_visit"
// 首页停留时长
const
val
YDL_HOME_ZHUMIANMINGXIANG
:
String
=
YDL_USER_MAIN_PAGE
+
"ydl_user_sleep_aid_more_click"
// 首页助眠冥想
const
val
YDL_HOME_ZHUMIANICON
:
String
=
YDL_USER_MAIN_PAGE
+
"ydl_user_sleep_aid_type_click"
// 首页_助眠_icon
const
val
YDL_HOME_SEARCH_TAG
:
String
=
YDL_USER_MAIN_PAGE
+
"ydl_user_search_tag"
// 首页_定制咨询点击tag
const
val
YDL_HOME_POPUPWINDOWS_PAGE_POPUP
:
String
=
YDL_USER_MAIN_PAGE
+
"popupwindows_page_popup"
// 首页弹窗页面弹出事件(99元3小时弹出事件)
}
...
...
m-home/src/xlzx/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
View file @
2341a33d
...
...
@@ -210,6 +210,9 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
}
else
{
YDLRouterManager
.
router
(
act
.
btnLinkurl
)
}
//定制咨询点击事件埋点
ActionCountUtils
.
count
(
HomeBIConstants
.
YDL_HOME_SEARCH_TAG
,
"1"
)
}
}
else
{
img_ad
.
visibility
=
View
.
GONE
...
...
@@ -245,6 +248,8 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
location
[
1
]
-
heig
,
location
[
0
]
).
show
()
//99元3小时弹出事件
ActionCountUtils
.
count
(
HomeBIConstants
.
YDL_HOME_POPUPWINDOWS_PAGE_POPUP
,
"1"
)
}
}
}
...
...
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
View file @
2341a33d
package
com.yidianling.home.ui.view
import
android.content.Context
import
android.graphics.Color
import
androidx.recyclerview.widget.RecyclerView
import
android.text.TextUtils
import
android.view.View
import
android.view.ViewGroup
import
android.widget.FrameLayout
import
android.widget.LinearLayout
import
android
.widget.RelativeLayout
import
com.
ydl.ydlcommon.data.PlatformDataManager
import
com.
yidianling.common.tools.RxImageTool
import
android
x.recyclerview.widget.RecyclerView
import
com.
bumptech.glide.Glide
import
com.
bumptech.glide.load.engine.DiskCacheStrategy
import
com.yidianling.home.R
import
com.yidianling.home.event.IHomeBaseEvent
import
com.yidianling.home.model.bean.HomeHeaderBean
...
...
@@ -38,6 +34,10 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
layoutParams
=
params
View
.
inflate
(
mContext
,
R
.
layout
.
home_button_banner_view
,
this
)
Glide
.
with
(
context
)
.
load
(
R
.
drawable
.
qingsu_new_free_dynamic
)
.
diskCacheStrategy
(
DiskCacheStrategy
.
RESOURCE
)
.
into
(
qingsuGif
)
homeModuleButtonBannerFirst
.
setOnClickListener
{
homeEvent
?.
reservationExpertsClick
()
}
...
...
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeConsultItemView.kt
View file @
2341a33d
...
...
@@ -51,11 +51,25 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent:
//设置名称
tv_consult_name
.
text
=
bean
.
name
//咨询师标签
setTag
(
bean
)
//设置接通率文案
setConnection
(
bean
)
//设置向TA咨询人数
setConfideNum
(
bean
)
setOnClickListener
{
val
url
=
URLUtils
.
appendParmas
(
bean
.
linkUrl
,
"cateId"
,
cateId
)
homeEvent
!!
.
consultItemClick
(
url
,
bean
.
doctorId
)
}
}
/**咨询师标签*/
private
fun
setTag
(
bean
:
HomeConsultBean
.
ListBean
)
{
ll_tags
.
removeAllViews
()
if
(!
TextUtils
.
isEmpty
(
bean
.
tags
))
{
val
tagList
=
bean
.
tags
?.
split
(
"|"
)
for
(
tag
in
tagList
)
{
if
(!
TextUtils
.
isEmpty
(
tag
))
{
tagList
.
forEachIndexed
{
index
,
tag
->
if
(
index
<
2
&&
!
TextUtils
.
isEmpty
(
tag
))
{
val
view
=
LayoutInflater
.
from
(
context
)
.
inflate
(
R
.
layout
.
home_item_tag
,
ll_tags
,
false
)
view
.
tvTag
.
text
=
tag
...
...
@@ -63,15 +77,6 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent:
}
}
}
//设置接通率文案
setConnection
(
bean
)
//设置向TA咨询人数
setConfideNum
(
bean
)
setOnClickListener
{
val
url
=
URLUtils
.
appendParmas
(
bean
.
linkUrl
,
"cateId"
,
cateId
)
homeEvent
!!
.
consultItemClick
(
url
,
bean
.
doctorId
)
}
}
/**
...
...
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeConsultView.kt
View file @
2341a33d
...
...
@@ -219,8 +219,8 @@ class HomeConsultView(private val mContext: Context, private var homeEvent: IHom
txtView
.
typeface
=
Typeface
.
DEFAULT
txtView
.
setPadding
(
dp10
,
dp5
,
dp10
,
dp7
)
}
else
{
txtView
.
textSize
=
1
5
f
txtView
.
setTextColor
(
Color
.
parseColor
(
"#
4B4A4A
"
))
txtView
.
textSize
=
1
4
f
txtView
.
setTextColor
(
Color
.
parseColor
(
"#
5E5E5E
"
))
txtView
.
typeface
=
Typeface
.
DEFAULT_BOLD
txtView
.
setPadding
(
dp10
,
dp5
,
dp10
,
dp7
)
}
...
...
m-home/src/xlzx/java/com/yidianling/home/ui/widget/HomeModuleCategoryView.kt
View file @
2341a33d
...
...
@@ -69,6 +69,7 @@ class HomeModuleCategoryView : FrameLayout {
var
dp6
:
Int
=
0
var
dp8
:
Int
=
0
var
dp12
:
Int
=
0
//左右间距
var
dp15
:
Int
=
0
/**
* 倍数
...
...
@@ -116,13 +117,13 @@ class HomeModuleCategoryView : FrameLayout {
dp6
=
RxImageTool
.
dip2px
(
4f
)
dp12
=
RxImageTool
.
dip2px
(
12f
)
categoryEightWidth
=
ScreenUtil
.
screenWidth
-
RxImageTool
.
dp2px
(
30
f
)
categoryEightWidth
=
ScreenUtil
.
screenWidth
-
RxImageTool
.
dp2px
(
8
f
)
textViewWidth
=
categoryEightWidth
/
4
imageEightViewWidth
=
RxImageTool
.
dip2px
(
38f
)
textViewHeight
=
RxImageTool
.
dip2px
(
28f
)
margin
=
(
categoryEightWidth
-
4
*
imageEightViewWidth
)
/
8
dp8
=
RxImageTool
.
dip2px
(
8f
)
dp15
=
RxImageTool
.
dip2px
(
15
f
)
dp15
=
RxImageTool
.
dip2px
(
4
f
)
}
fun
initData
(
askCategoryDataBean
:
List
<
HomeHeaderBean
.
AskCategoryDataBean
>?)
{
...
...
m-home/src/xlzx/res/drawable-xhdpi/home_more_icon_gray.png
0 → 100644
View file @
2341a33d
433 Bytes
m-home/src/xlzx/res/drawable/qingsu_new_free_dynamic.gif
0 → 100644
View file @
2341a33d
21.1 KB
m-home/src/xlzx/res/layout/home_button_banner_view.xml
View file @
2341a33d
...
...
@@ -15,9 +15,9 @@
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"
15
dp"
android:layout_marginTop=
"
20
dp"
android:layout_marginRight=
"
15
dp"
android:layout_marginLeft=
"
4
dp"
android:layout_marginTop=
"
15
dp"
android:layout_marginRight=
"
4
dp"
android:gravity=
"center_horizontal|bottom"
android:orientation=
"horizontal"
android:paddingBottom=
"12dp"
>
...
...
@@ -80,24 +80,22 @@
<ImageView
android:id=
"@+id/third_icon"
android:layout_width=
"
66
dp"
android:layout_height=
"
59
dp"
android:layout_width=
"
71
dp"
android:layout_height=
"
64
dp"
android:paddingLeft=
"7dp"
android:paddingTop=
"
7
dp"
android:paddingRight=
"
7
dp"
android:paddingTop=
"
12
dp"
android:paddingRight=
"
12
dp"
android:scaleType=
"fitXY"
android:src=
"@drawable/home_banner_third_icon"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@drawable/home_buttom_banner_free_bg"
android:text=
"免费"
android:textColor=
"@color/white"
android:textSize=
"10sp"
<ImageView
android:id=
"@+id/qingsuGif"
android:layout_width=
"45dp"
android:layout_height=
"24dp"
app:layout_constraintRight_toRightOf=
"@id/third_icon"
app:layout_constraintTop_toTopOf=
"@id/third_icon"
/>
...
...
m-home/src/xlzx/res/layout/home_common_title_big_full_view.xml
View file @
2341a33d
...
...
@@ -11,7 +11,7 @@
android:id=
"@+id/homeModuleCommonTitleViewFullTitle"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/platform_dp_1
5
"
android:layout_marginLeft=
"@dimen/platform_dp_1
6
"
android:paddingRight=
"@dimen/platform_dp_1"
android:textColor=
"@color/platform_color_242424"
android:textSize=
"20sp"
...
...
@@ -35,28 +35,27 @@
<TextView
android:layout_width=
"0dp"
app:layout_constraintHorizontal_weight=
"1"
android:layout_height=
"wrap_content"
android:maxLines=
"1"
android:ellipsize=
"end"
android:maxLines=
"1"
android:text=
" 人在这里发生了改变"
android:textColor=
"@color/platform_color_999999"
app:layout_constraintBaseline_toBaselineOf=
"@id/homeModuleCommonTitleViewFullTitle"
android:textSize=
"13sp"
app:layout_constraintRight_toLeftOf=
"@id/homeModuleCommonTitleViewMorell"
app:layout_constraintLeft_toRightOf=
"@id/people_num"
/>
app:layout_constraintBaseline_toBaselineOf=
"@id/homeModuleCommonTitleViewFullTitle"
app:layout_constraintHorizontal_weight=
"1"
app:layout_constraintLeft_toRightOf=
"@id/people_num"
app:layout_constraintRight_toLeftOf=
"@id/homeModuleCommonTitleViewMorell"
/>
<LinearLayout
android:id=
"@+id/homeModuleCommonTitleViewMorell"
android:layout_width=
"wrap_content"
android:layout_height=
"@dimen/platform_dp_28"
android:layout_marginRight=
"@dimen/platform_dp_15"
android:layout_marginBottom=
"@dimen/platform_dp_3"
android:layout_height=
"@dimen/platform_dp_18"
android:layout_marginRight=
"@dimen/platform_dp_16"
android:background=
"@drawable/home_show_more_line"
android:gravity=
"center"
android:orientation=
"horizontal"
android:paddingLeft=
"
10
dp"
android:paddingRight=
"
10
dp"
android:paddingLeft=
"
8
dp"
android:paddingRight=
"
8
dp"
android:visibility=
"visible"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
>
...
...
@@ -66,12 +65,16 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/platform_dp_2"
android:drawableRight=
"@drawable/home_sale_arrow"
android:drawablePadding=
"4dp"
android:gravity=
"center"
android:text=
"更多"
android:textColor=
"@color/platform_color_666666"
android:textSize=
"12dp"
/>
android:textSize=
"10sp"
/>
<ImageView
android:layout_marginLeft=
"2dp"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@drawable/home_more_icon_gray"
/>
</LinearLayout>
...
...
m-home/src/xlzx/res/layout/home_consult_item_view.xml
View file @
2341a33d
...
...
@@ -85,7 +85,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"6dp"
android:layout_marginBottom=
"1
6
dp"
android:layout_marginBottom=
"1
2
dp"
android:layout_marginEnd=
"@dimen/platform_dp_10"
android:layout_marginStart=
"@dimen/platform_dp_16"
android:gravity=
"center_vertical"
...
...
m-home/src/xlzx/res/layout/home_consult_view.xml
View file @
2341a33d
...
...
@@ -24,8 +24,8 @@
android:layout_height=
"wrap_content"
app:tabGravity=
"fill"
app:tabIndicatorHeight=
"0dp"
android:layout_marginLeft=
"
1
2dp"
android:layout_marginRight=
"
12
dp"
android:layout_marginLeft=
"2dp"
android:layout_marginRight=
"
8
dp"
app:tabMode=
"scrollable"
app:tabPaddingStart=
"4dp"
app:tabPaddingEnd=
"4dp"
...
...
@@ -38,7 +38,6 @@
<FrameLayout
android:id=
"@+id/ll_content"
android:layout_marginTop=
"4dp"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
...
...
m-home/src/xlzx/res/layout/home_item_tag.xml
View file @
2341a33d
...
...
@@ -10,5 +10,5 @@
android:paddingLeft=
"4dp"
android:paddingRight=
"4dp"
android:textColor=
"@color/platform_color_999999"
android:textSize=
"10
d
p"
android:textSize=
"10
s
p"
tools:text=
"恋爱情感"
/>
m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
View file @
2341a33d
...
...
@@ -326,6 +326,8 @@ open class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterIm
}
else
{
YDLRouterManager
.
router
(
act
.
btnLinkurl
)
}
//定制咨询点击事件埋点
ActionCountUtils
.
count
(
HomeBIConstants
.
YDL_HOME_SEARCH_TAG
,
"1"
)
}
}
else
{
img_ad
.
visibility
=
View
.
GONE
...
...
@@ -352,6 +354,8 @@ open class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterIm
//文案不为空才显示引导--李思开
if
(!
TextUtils
.
isEmpty
(
act
.
title
))
{
ActivityGuideDialog
(
mActivity
,
act
.
imageUrl
,
act
.
title
).
show
()
//99元3小时弹出事件
ActionCountUtils
.
count
(
HomeBIConstants
.
YDL_HOME_POPUPWINDOWS_PAGE_POPUP
,
"1"
)
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment