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
e428403e
Commit
e428403e
authored
5 years ago
by
严久程
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '心理咨询紧急改版' into dev
parents
300c1693
bb4a972a
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
188 additions
and
111 deletions
+188
-111
config.gradle
config.gradle
+5
-4
ExpertSearchFragment.kt
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
+9
-0
consultant_activity_expert_search_list.xml
m-consultant/src/main/res/layout/consultant_activity_expert_search_list.xml
+43
-33
consultant_assistant_dialog_img.png
m-consultant/src/xlzx/res/drawable-xhdpi/consultant_assistant_dialog_img.png
+0
-0
consultant_assistant_dialog_text_bg.xml
m-consultant/src/xlzx/res/drawable/consultant_assistant_dialog_text_bg.xml
+13
-0
consultant_assistant_dialog_img.png
m-consultant/src/ydl/res/drawable-xhdpi/consultant_assistant_dialog_img.png
+0
-0
consultant_assistant_dialog_text_bg.xml
m-consultant/src/ydl/res/drawable/consultant_assistant_dialog_text_bg.xml
+0
-0
YdlHomeAdapter.kt
m-home/src/xlzx/java/com/yidianling/home/adapter/YdlHomeAdapter.kt
+46
-15
HomeAssuageGriefView.kt
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeAssuageGriefView.kt
+3
-0
HomeButtonBannerView.kt
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
+25
-0
home_course_bt_bg_huawei.png
m-home/src/xlzx/res/drawable-xhdpi/home_course_bt_bg_huawei.png
+0
-0
home_dcotor_bt_bg_huawei.png
m-home/src/xlzx/res/drawable-xhdpi/home_dcotor_bt_bg_huawei.png
+0
-0
home_listen_bt_bg_huawei.png
m-home/src/xlzx/res/drawable-xhdpi/home_listen_bt_bg_huawei.png
+0
-0
home_test_bt_bg_hauwei.png
m-home/src/xlzx/res/drawable-xhdpi/home_test_bt_bg_hauwei.png
+0
-0
home_button_banner_view.xml
m-home/src/xlzx/res/layout/home_button_banner_view.xml
+36
-59
YDLCommonPlugin.kt
ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt
+8
-0
No files found.
config.gradle
View file @
e428403e
...
...
@@ -2,6 +2,7 @@ ext {
kotlin_version
=
"1.3.21"
dev_mode
=
false
ydl_app
=
[
appName
:
"心理咨询壹点灵"
,
applicationId:
"com.cxzapp.yidianling"
,
...
...
@@ -43,10 +44,10 @@ ext {
// -------------- 业务模块 --------------
//第三步 若干
"m-confide"
:
"0.0.48.7.18"
,
"m-consultant"
:
"0.0.5
7.6
"
,
"m-consultant"
:
"0.0.5
8.9
"
,
"m-fm"
:
"0.0.29.3"
,
"m-user"
:
"0.0.60.3"
,
"m-home"
:
"0.0.
19.1
"
,
"m-home"
:
"0.0.
21.3
"
,
"m-im"
:
"0.0.17.4"
,
"m-dynamic"
:
"0.0.7.5"
,
...
...
@@ -76,7 +77,7 @@ ext {
"ydl-media"
:
"0.0.20"
,
"ydl-pay"
:
"0.0.17"
,
"m-audioim"
:
"0.0.48.3.7"
,
"ydl-flutter-base"
:
"0.0.1
0.9
"
,
"ydl-flutter-base"
:
"0.0.1
4.12
"
,
//以下 几乎不会动
"router"
:
"0.0.1"
,
...
...
@@ -270,7 +271,7 @@ ext {
//flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
"ydl-flutter-base"
:
"com.ydl:ydl-flutter-base:${ydlCompileVersion["
ydl
-
flutter
-
base
"]}"
,
//组件化项目中的flutter base模块
"ydl-flutter"
:
"com.ydl:ydl-flutter:0.0.18.
0
@aar"
,
//flutter aar
"ydl-flutter"
:
"com.ydl:ydl-flutter:0.0.18.
9
@aar"
,
//flutter aar
"ydl-flutter-sp"
:
"com.ydl:ydl-flutter-sp:0.0.2@aar"
,
//flutter 缓存 aar
//基础组件 <<--- 先发这个,发完改这里的版本号
...
...
This diff is collapsed.
Click to expand it.
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
View file @
e428403e
...
...
@@ -26,6 +26,7 @@ import com.ydl.ydl_image.listener.YDLImageRecyclerOnScrollListener
import
com.ydl.ydl_image.manager.YDLImageCacheManager
import
com.ydl.ydlcommon.base.BaseMvpFragment
import
com.ydl.ydlcommon.base.config.HttpConfig
import
com.ydl.ydlcommon.data.PlatformDataManager
import
com.ydl.ydlcommon.ui.LogoLoadingView
import
com.ydl.ydlcommon.utils.BuryPointUtils
import
com.ydl.ydlcommon.utils.DisplayUtils
...
...
@@ -74,6 +75,14 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
title_layout
.
setPadding
(
DisplayUtils
.
dp2px
(
context
,
15
),
0
,
0
,
0
)
initViews
()
initData
()
val
ffrom
=
PlatformDataManager
.
getRam
().
getChannelName
()
if
(!
TextUtils
.
isEmpty
(
ffrom
)
&&
ffrom
.
endsWith
(
"huawei"
))
{
rl_hot_fix_for_huawei
.
visibility
=
View
.
GONE
}
else
{
rl_hot_fix_for_huawei
.
visibility
=
View
.
VISIBLE
}
}
override
fun
initDataAndEventLazy
()
{
...
...
This diff is collapsed.
Click to expand it.
m-consultant/src/main/res/layout/consultant_activity_expert_search_list.xml
View file @
e428403e
...
...
@@ -11,57 +11,67 @@
layout=
"@layout/consultant_layout_search_toolbar"
android:layout_width=
"match_parent"
android:layout_height=
"48dp"
/>
<com.yidianling.consultant.ui.view.ExpertSearchSwipeRefreshLayout
android:id=
"@+id/srlContainer"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<android.support.design.widget.CoordinatorLayout
android:id=
"@+id/container"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/consultant_colorBg"
tools:ignore=
"InefficientWeight"
>
<android.support.design.widget.AppBarLayout
android:id=
"@+id/appbar_layout"
<android.support.design.widget.CoordinatorLayout
android:id=
"@+id/container"
android:layout_width=
"match_parent"
android:layout_height=
"
wrap_cont
ent"
android:layout_height=
"
match_par
ent"
android:background=
"@color/consultant_colorBg"
android:clipChildren=
"false"
android:clipToPadding=
"false"
android:theme=
"@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:elevation=
"0dp"
>
tools:ignore=
"InefficientWeight"
>
<android.support.design.widget.CollapsingToolbarLayout
<android.support.design.widget.AppBarLayout
android:id=
"@+id/appbar_layout"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/consultant_colorBg"
android:clipChildren=
"false"
android:clipToPadding=
"false"
app:layout_scrollFlags=
"scroll|exitUntilCollapsed"
>
android:theme=
"@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:elevation=
"0dp"
>
<com.yidianling.consultant.ui.view.topView.RecommendListView
android:id=
"@+id/recommendListView"
<android.support.design.widget.CollapsingToolbarLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
</com.yidianling.consultant.ui.view.topView.RecommendListView>
android:layout_height=
"match_parent"
android:clipChildren=
"false"
android:clipToPadding=
"false"
app:layout_scrollFlags=
"scroll|exitUntilCollapsed"
>
</android.support.design.widget.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout>
<include
layout=
"@layout/consultant_layout_search_content"
/>
<!-- 心理咨询app华为渠道紧急处理,咨询师列表页先简单粗暴的隐藏顶部推荐模块-->
<RelativeLayout
android:id=
"@+id/rl_hot_fix_for_huawei"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:visibility=
"gone"
>
<!--<include layout="@layout/layout_search_head_input"/>-->
<com.yidianling.consultant.ui.view.topView.RecommendListView
android:id=
"@+id/recommendListView"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
</RelativeLayout>
<!--筛选弹窗半透明背景-->
<View
android:id=
"@+id/viewDim_filter"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#40000000"
android:visibility=
"gone"
/>
</android.support.design.widget.CoordinatorLayout>
</android.support.design.widget.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout>
<include
layout=
"@layout/consultant_layout_search_content"
/>
<!--<include layout="@layout/layout_search_head_input"/>-->
<!--筛选弹窗半透明背景-->
<View
android:id=
"@+id/viewDim_filter"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#40000000"
android:visibility=
"gone"
/>
</android.support.design.widget.CoordinatorLayout>
</com.yidianling.consultant.ui.view.ExpertSearchSwipeRefreshLayout>
...
...
This diff is collapsed.
Click to expand it.
m-consultant/src/xlzx/res/drawable-xhdpi/consultant_assistant_dialog_img.png
0 → 100644
View file @
e428403e
49.9 KB
This diff is collapsed.
Click to expand it.
m-consultant/src/xlzx/res/drawable/consultant_assistant_dialog_text_bg.xml
0 → 100644
View file @
e428403e
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<corners
android:topLeftRadius=
"8dp"
android:bottomLeftRadius=
"8dp"
/>
<gradient
android:angle=
"0"
android:startColor=
"#CC1DA1F2"
android:endColor=
"#CC1DA1F2"
/>
</shape>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
m-consultant/src/
main
/res/drawable-xhdpi/consultant_assistant_dialog_img.png
→
m-consultant/src/
ydl
/res/drawable-xhdpi/consultant_assistant_dialog_img.png
View file @
e428403e
File moved
This diff is collapsed.
Click to expand it.
m-consultant/src/
main
/res/drawable/consultant_assistant_dialog_text_bg.xml
→
m-consultant/src/
ydl
/res/drawable/consultant_assistant_dialog_text_bg.xml
View file @
e428403e
File moved
This diff is collapsed.
Click to expand it.
m-home/src/xlzx/java/com/yidianling/home/adapter/YdlHomeAdapter.kt
View file @
e428403e
...
...
@@ -2,13 +2,14 @@ package com.yidianling.home.adapter
import
android.content.Context
import
android.support.v7.widget.RecyclerView
import
android.text.TextUtils
import
android.view.LayoutInflater
import
android.view.View
import
android.view.ViewGroup
import
com.ydl.ydlcommon.data.PlatformDataManager.getRam
import
com.yidianling.home.R
import
com.yidianling.home.constract.YdlHomeViewHolderConstract
import
com.yidianling.home.event.HomeImpl
import
com.yidianling.home.event.IHomeEvent
import
com.yidianling.home.model.bean.HomeAskBean
import
com.yidianling.home.model.bean.HomeConfideBean
import
com.yidianling.home.model.bean.HomeConsultBean
...
...
@@ -22,9 +23,11 @@ import com.yidianling.home.ui.view.*
* @Company 壹点灵
* @date 2019/02/13
*/
class
YdlHomeAdapter
(
private
val
mContext
:
Context
,
private
var
homeEvent
:
HomeImpl
,
private
var
list
:
ArrayList
<
HomePagerDataBean
>)
:
RecyclerView
.
Adapter
<
RecyclerView
.
ViewHolder
>()
{
class
YdlHomeAdapter
(
private
val
mContext
:
Context
,
private
var
homeEvent
:
HomeImpl
,
private
var
list
:
ArrayList
<
HomePagerDataBean
>
)
:
RecyclerView
.
Adapter
<
RecyclerView
.
ViewHolder
>()
{
private
val
mInflater
:
LayoutInflater
=
LayoutInflater
.
from
(
mContext
)
/**
...
...
@@ -141,11 +144,17 @@ class YdlHomeAdapter(private val mContext: Context,
when
(
holder
)
{
//顶部预约专家,即时倾诉,心理课堂,心理测试按钮模块
is
HomeButtonBannerViewHolder
->
{
holder
.
buttonBannerView
.
initData
(
list
[
position
].
headerBean
?.
homeSaleData
,
list
[
position
].
headerBean
?.
askCategoryData
)
holder
.
buttonBannerView
.
initData
(
list
[
position
].
headerBean
?.
homeSaleData
,
list
[
position
].
headerBean
?.
askCategoryData
)
}
//倾诉*排解模块
is
HomeConfideViewHolder
->
{
holder
.
confideViewView
.
setTitle
(
list
[
position
].
headerBean
?.
listenCategoryDate
,
confideSelectPosition
)
holder
.
confideViewView
.
setTitle
(
list
[
position
].
headerBean
?.
listenCategoryDate
,
confideSelectPosition
)
holder
.
confideViewView
.
setConfideExpertInfoView
(
list
[
position
].
confideBean
?.
body
)
confidePosition
=
position
}
...
...
@@ -155,7 +164,15 @@ class YdlHomeAdapter(private val mContext: Context,
}
//解忧*问答模块
is
HomeAssuageGriefViewHolder
->
{
holder
.
assuageGriefViewView
.
initData
(
position
,
list
[
position
].
askBean
?.
data
)
val
ffrom
=
getRam
().
getChannelName
()
if
(!
TextUtils
.
isEmpty
(
ffrom
)
&&
ffrom
.
endsWith
(
"huawei"
))
{
val
parm
=
holder
.
itemView
.
layoutParams
parm
.
height
=
0
holder
.
itemView
.
layoutParams
=
parm
}
else
{
holder
.
assuageGriefViewView
.
initData
(
position
,
list
[
position
].
askBean
?.
data
)
}
}
//文章*阅读模块
is
HomeArticleViewHolder
->
{
...
...
@@ -163,8 +180,14 @@ class YdlHomeAdapter(private val mContext: Context,
}
//咨询模块
is
HomeConsultViewHolder
->
{
holder
.
consultView
.
setTitle
(
list
[
position
].
headerBean
?.
consultCategoryData
,
consultSelectPosition
)
holder
.
consultView
.
setConsultInfoView
(
list
[
position
].
consultBean
?.
list
,
list
[
position
].
headerBean
?.
consultCategoryData
?.
get
(
consultSelectPosition
))
holder
.
consultView
.
setTitle
(
list
[
position
].
headerBean
?.
consultCategoryData
,
consultSelectPosition
)
holder
.
consultView
.
setConsultInfoView
(
list
[
position
].
consultBean
?.
list
,
list
[
position
].
headerBean
?.
consultCategoryData
?.
get
(
consultSelectPosition
)
)
consultPosition
=
position
}
//测试模块
...
...
@@ -177,25 +200,30 @@ class YdlHomeAdapter(private val mContext: Context,
override
fun
getItemCount
():
Int
{
return
list
.
size
}
/**
* 顶部预约专家,即时倾诉,心理测试按钮模块 ViewHolder
*/
inner
class
HomeButtonBannerViewHolder
(
val
buttonBannerView
:
HomeButtonBannerView
)
:
RecyclerView
.
ViewHolder
(
buttonBannerView
)
inner
class
HomeButtonBannerViewHolder
(
val
buttonBannerView
:
HomeButtonBannerView
)
:
RecyclerView
.
ViewHolder
(
buttonBannerView
)
/**
* 咨询模块 ViewHolder
*/
inner
class
HomeConsultViewHolder
(
val
consultView
:
HomeConsultView
)
:
RecyclerView
.
ViewHolder
(
consultView
)
inner
class
HomeConsultViewHolder
(
val
consultView
:
HomeConsultView
)
:
RecyclerView
.
ViewHolder
(
consultView
)
/**
* 倾诉*排解模块 ViewHolder
*/
inner
class
HomeConfideViewHolder
(
val
confideViewView
:
HomeConfideView
)
:
RecyclerView
.
ViewHolder
(
confideViewView
)
inner
class
HomeConfideViewHolder
(
val
confideViewView
:
HomeConfideView
)
:
RecyclerView
.
ViewHolder
(
confideViewView
)
/**
* 课程*成长模块 ViewHolder
*/
inner
class
HomeCourseViewHolder
(
val
courseViewView
:
HomeCourseView
)
:
RecyclerView
.
ViewHolder
(
courseViewView
)
inner
class
HomeCourseViewHolder
(
val
courseViewView
:
HomeCourseView
)
:
RecyclerView
.
ViewHolder
(
courseViewView
)
/**
* 测试模块 ViewHolder
...
...
@@ -205,11 +233,14 @@ class YdlHomeAdapter(private val mContext: Context,
/**
* 解忧*问答模块 ViewHolder
*/
inner
class
HomeAssuageGriefViewHolder
(
val
assuageGriefViewView
:
HomeAssuageGriefView
)
:
RecyclerView
.
ViewHolder
(
assuageGriefViewView
)
inner
class
HomeAssuageGriefViewHolder
(
val
assuageGriefViewView
:
HomeAssuageGriefView
)
:
RecyclerView
.
ViewHolder
(
assuageGriefViewView
)
/**
* 文章*阅读模块 ViewHolder
*/
inner
class
HomeArticleViewHolder
(
val
articleViewView
:
HomeArticleView
)
:
RecyclerView
.
ViewHolder
(
articleViewView
)
inner
class
HomeArticleViewHolder
(
val
articleViewView
:
HomeArticleView
)
:
RecyclerView
.
ViewHolder
(
articleViewView
)
/**
* 底部提示语模块 ViewHolder
...
...
This diff is collapsed.
Click to expand it.
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeAssuageGriefView.kt
View file @
e428403e
package
com.yidianling.home.ui.view
import
android.content.Context
import
android.graphics.Color
import
android.view.View
import
android.view.ViewGroup
import
android.widget.LinearLayout
...
...
@@ -33,6 +34,7 @@ class HomeAssuageGriefView(private val mContext: Context, private var homeEvent:
)
layoutParams
=
params
View
.
inflate
(
mContext
,
R
.
layout
.
home_assuage_grief_view
,
this
)
setBackgroundColor
(
Color
.
GREEN
)
homeModuleAssuageGriefViewHomeCommonTitleView
.
setTitle
(
"解忧·问答"
)
homeModuleAssuageGriefViewHomeCommonTitleView
.
setOnClickListener
{
homeEvent
?.
askMoreClick
()
...
...
@@ -42,6 +44,7 @@ class HomeAssuageGriefView(private val mContext: Context, private var homeEvent:
fun
initData
(
position
:
Int
,
list
:
List
<
HomeAskBean
.
DataBean
>?)
{
//添加View
if
(
list
==
null
)
{
visibility
=
View
.
GONE
return
}
if
(
cacheList
.
size
!=
list
?.
size
)
{
...
...
This diff is collapsed.
Click to expand it.
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
View file @
e428403e
package
com.yidianling.home.ui.view
import
android.content.Context
import
android.graphics.Color
import
android.support.v7.widget.RecyclerView
import
android.text.TextUtils
import
android.view.View
import
android.view.ViewGroup
import
android.widget.FrameLayout
import
android.widget.LinearLayout
import
com.ydl.ydlcommon.data.PlatformDataManager
import
com.yidianling.common.tools.RxImageTool
import
com.yidianling.home.R
import
com.yidianling.home.event.IHomeBaseEvent
...
...
@@ -56,6 +59,28 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
// initButtonView()
val
ffrom
=
PlatformDataManager
.
getRam
().
getChannelName
()
if
(!
TextUtils
.
isEmpty
(
ffrom
)
&&
ffrom
.
endsWith
(
"huawei"
))
{
homeModuleButtonBannerFirst
.
background
=
resources
.
getDrawable
(
R
.
drawable
.
home_dcotor_bt_bg_huawei
)
homeModuleButtonBannerSecond
.
background
=
resources
.
getDrawable
(
R
.
drawable
.
home_test_bt_bg_hauwei
)
homeModuleButtonBannerThird
.
background
=
resources
.
getDrawable
(
R
.
drawable
.
home_course_bt_bg_huawei
)
homeModuleButtonBannerFourth
.
background
=
resources
.
getDrawable
(
R
.
drawable
.
home_listen_bt_bg_huawei
)
homeModuleButtonBannerFirstTitle
.
setTextColor
(
Color
.
WHITE
)
tv_first_text
.
setTextColor
(
Color
.
WHITE
)
homeModuleButtonBannerFourthTitle
.
setTextColor
(
Color
.
WHITE
)
tv_second_text
.
setTextColor
(
Color
.
WHITE
)
homeModuleButtonBannerThirdTitle
.
setTextColor
(
Color
.
WHITE
)
tv_third_text
.
setTextColor
(
Color
.
WHITE
)
homeModuleButtonBannerSecondTitle
.
setTextColor
(
Color
.
WHITE
)
tv_fourth_text
.
setTextColor
(
Color
.
WHITE
)
}
homeModuleButtonBannerFirst
.
setOnClickListener
{
homeEvent
?.
reservationExpertsClick
()
}
...
...
This diff is collapsed.
Click to expand it.
m-home/src/xlzx/res/drawable-xhdpi/home_course_bt_bg_huawei.png
0 → 100644
View file @
e428403e
21.9 KB
This diff is collapsed.
Click to expand it.
m-home/src/xlzx/res/drawable-xhdpi/home_dcotor_bt_bg_huawei.png
0 → 100644
View file @
e428403e
21.4 KB
This diff is collapsed.
Click to expand it.
m-home/src/xlzx/res/drawable-xhdpi/home_listen_bt_bg_huawei.png
0 → 100644
View file @
e428403e
21.5 KB
This diff is collapsed.
Click to expand it.
m-home/src/xlzx/res/drawable-xhdpi/home_test_bt_bg_hauwei.png
0 → 100644
View file @
e428403e
20.8 KB
This diff is collapsed.
Click to expand it.
m-home/src/xlzx/res/layout/home_button_banner_view.xml
View file @
e428403e
...
...
@@ -5,11 +5,6 @@
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<com.yidianling.home.ui.widget.HomeModuleCategoryView
android:id=
"@+id/home_category_view"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -17,8 +12,8 @@
android:layout_marginTop=
"8dp"
android:layout_marginRight=
"15dp"
android:gravity=
"center_horizontal"
android:
orientation=
"horizontal
"
android:
paddingBottom=
"20dp
"
>
android:
paddingBottom=
"12dp
"
android:
orientation=
"horizontal
"
>
<RelativeLayout
...
...
@@ -29,22 +24,23 @@
android:layout_marginRight=
"8dp"
android:layout_weight=
"1"
android:background=
"@drawable/home_dcotor_bt_bg"
android:gravity=
"center"
>
android:gravity=
"center
_horizontal
"
>
<TextView
android:id=
"@+id/homeModuleButtonBannerFirstTitle"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"7dp"
android:text=
"预约咨询"
android:textColor=
"@color/platform_black"
android:textSize=
"@dimen/platform_dp_16"
android:textStyle=
"bold"
/>
<TextView
android:id=
"@+id/tv_first_text"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/homeModuleButtonBannerFirstTitle"
android:layout_marginTop=
"2dp"
android:text=
"1W+师资"
android:textColor=
"@color/platform_color_444444"
android:textSize=
"@dimen/platform_dp_11"
/>
...
...
@@ -58,22 +54,23 @@
android:layout_marginRight=
"8dp"
android:layout_weight=
"1"
android:background=
"@drawable/home_listen_bt_bg"
android:gravity=
"center"
>
android:gravity=
"center
_horizontal
"
>
<TextView
android:id=
"@+id/homeModuleButtonBannerFourthTitle"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"7dp"
android:text=
"心理测试"
android:textColor=
"@color/platform_black"
android:textSize=
"@dimen/platform_dp_16"
android:textStyle=
"bold"
/>
<TextView
android:id=
"@+id/tv_second_text"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/homeModuleButtonBannerFourthTitle"
android:layout_marginTop=
"2dp"
android:text=
"专业权威"
android:textColor=
"@color/platform_color_444444"
android:textSize=
"@dimen/platform_dp_11"
/>
...
...
@@ -87,23 +84,24 @@
android:layout_marginRight=
"8dp"
android:layout_weight=
"1"
android:background=
"@drawable/home_course_bt_bg"
android:gravity=
"center"
android:gravity=
"center
_horizontal
"
android:orientation=
"vertical"
>
<TextView
android:id=
"@+id/homeModuleButtonBannerThirdTitle"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"7dp"
android:text=
"心理课堂"
android:textColor=
"@color/platform_black"
android:textSize=
"@dimen/platform_dp_16"
android:textStyle=
"bold"
/>
<TextView
android:id=
"@+id/tv_third_text"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/homeModuleButtonBannerThirdTitle"
android:layout_marginTop=
"2dp"
android:text=
"学习与成长"
android:textColor=
"@color/platform_color_444444"
android:textSize=
"@dimen/platform_dp_11"
/>
...
...
@@ -114,59 +112,38 @@
android:layout_width=
"0dp"
android:layout_height=
"78dp"
android:layout_weight=
"1"
android:background=
"@drawable/home_test_bt_bg"
>
android:background=
"@drawable/home_test_bt_bg"
android:gravity=
"center_horizontal"
>
<RelativeLayout
<TextView
android:id=
"@+id/homeModuleButtonBannerSecondTitle"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:background=
"@drawable/home_button_first_free_bg"
android:paddingLeft=
"5dp"
android:paddingTop=
"1dp"
android:paddingRight=
"5dp"
android:paddingBottom=
"1dp"
android:visibility=
"gone"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_gravity=
"center"
android:layout_marginTop=
"7dp"
android:text=
"即时倾诉"
android:textColor=
"@color/platform_black"
android:textSize=
"@dimen/platform_dp_16"
android:textStyle=
"bold"
/>
<TextView
android:id=
"@+id/tv_fourth_text"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/homeModuleButtonBannerSecondTitle"
android:layout_centerVertical=
"true"
android:layout_gravity=
"center_horizontal"
android:gravity=
"center_vertical"
android:orientation=
"vertical"
>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:orientation=
"vertical"
>
<TextView
android:id=
"@+id/homeModuleButtonBannerSecondTitle"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:text=
"即时倾诉"
android:textColor=
"@color/platform_black"
android:textSize=
"@dimen/platform_dp_16"
android:textStyle=
"bold"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/homeModuleButtonBannerSecondTitle"
android:layout_centerVertical=
"true"
android:layout_marginTop=
"2dp"
android:text=
"专业解忧"
android:textColor=
"@color/platform_color_444444"
android:textSize=
"@dimen/platform_dp_11"
/>
</LinearLayout>
</LinearLayout>
android:text=
"专业解忧"
android:textColor=
"@color/platform_color_444444"
android:textSize=
"@dimen/platform_dp_11"
/>
</RelativeLayout>
</LinearLayout>
<com.yidianling.home.ui.widget.HomeModuleCategoryView
android:id=
"@+id/home_category_view"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
This diff is collapsed.
Click to expand it.
ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt
View file @
e428403e
...
...
@@ -9,6 +9,7 @@ import com.ydl.ydlcommon.base.BaseApp
import
com.ydl.ydlcommon.base.config.YDLConstants
import
com.ydl.ydlcommon.data.PlatformDataManager
import
com.ydl.ydlcommon.modular.ModularServiceManager
import
com.ydl.ydlcommon.router.YdlCommonOut
import
com.ydl.ydlcommon.utils.SharedPreferencesEditor
import
com.ydl.ydlcommon.utils.YDLCacheUtils
import
com.ydl.ydlcommon.utils.YdlBuryPointUtil
...
...
@@ -40,6 +41,7 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
companion
object
{
const
val
CHANNEL
:
String
=
"lib/common/channel"
const
val
GETPUBLICPARAMAS
:
String
=
"getPublicParamas"
const
val
GET_PACKAGE_AND_FFROM
:
String
=
"get_package_and_ffrom"
// 获取包名和渠道名,中间用,分割
const
val
ACTION_PUSH_EVENT_TRACKING_TAP
:
String
=
"action_push_event_tracking_tap"
// 点击事件埋点
const
val
ACTION_PUSH_EVENT_TRACKING_PV
:
String
=
"action_push_event_tracking_pv"
//pv埋点
...
...
@@ -127,6 +129,11 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
YdlBuryPointUtil
.
sendPv
(
pvPath
)
}
}
GET_PACKAGE_AND_FFROM
->
{
val
packageName
=
YdlCommonOut
.
getApp
().
packageName
val
ffrom
=
PlatformDataManager
.
getRam
().
getChannelName
()
result
.
success
(
"$packageName,$ffrom"
)
}
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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