Skip to content

Y
YDL-Component-Medical
Commit dddcb33a by 徐健
Options

home

parent 7b60266b
Showing with 264 additions and 162 deletions
app/build.gradle
......@@ -178,12 +178,12 @@ dependencies {
if (true) {
//开发模式
implementation fileTree(dir: 'aars', include: ['*.aar'])
api project(':m-user')
implementation project(':m-user')
implementation modularPublication('com.ydl:m-user-api')
api project(':m-tests')
api project(':m-consultant')
implementation project(':m-tests')
implementation project(':m-consultant')
implementation modularPublication('com.ydl:m-consultant-api')
api project(':m-confide')
implementation project(':m-confide')
implementation project(':m-home')
......@@ -206,8 +206,8 @@ dependencies {
// api rootProject.ext.dependencies["ydl-m-fm-module-ydl"]
// api rootProject.ext.dependencies["ydl-m-fm-api"]
api project(':m-fm')
api project(':m-course')
implementation project(':m-fm')
implementation project(':m-course')
implementation modularPublication('com.ydl:m-fm-api')
implementation modularPublication('com.ydl:m-audioim-api')
} else {
......
config.gradle
ext {
kotlin_version = "1.3.21"
dev_mode = true
dev_mode = false
ydl_app = [
appName : "心理咨询壹点灵",
......@@ -47,7 +47,7 @@ ext {
"m-consultant" : "0.0.44",
"m-fm" : "0.0.21",
"m-user" : "0.0.37",
"m-home" : "0.0.1",
"m-home" : "0.0.4",
"m-muse" : "0.0.19.5",
"m-tests" : "0.0.13.5",
......@@ -63,6 +63,7 @@ ext {
"m-muse-api" : "0.0.1",
"m-tests-api" : "0.0.1",
"m-user-api" : "0.0.7",
"m-home-api" : "0.0.2",
//-------------- 功能组件 --------------
//第一步
......@@ -90,6 +91,7 @@ ext {
"m-fm" : "0.0.15",
"m-tests" : "0.0.4",
"m-user" : "0.0.25",
"m-home" : "0.0.3",
// 以下为接入flutter的模块
"m-muse" : "0.0.7",
......@@ -103,6 +105,7 @@ ext {
"m-muse-api" : "0.0.1",
"m-tests-api" : "0.0.1",
"m-user-api" : "0.0.7",
"m-home-api" : "0.0.2",
//-------------- 功能组件 --------------
//第一步
......
m-home/build.gradle
......@@ -64,19 +64,25 @@ dependencies {
// 注意此处的依赖方式：kotlin中使用和java中使用方式有不同
kapt "com.alibaba:arouter-compiler:$arouter_compiler"
api rootProject.ext.dependencies["ydl-user-router"]
implementation rootProject.ext.dependencies["ydl-user-router"]
if (rootProject.ext.dev_mode){
//开发时使用
api "com.ydl:m-consultant-api:0.0.3"
api "com.ydl:m-user-api:0.0.7"
implementation "com.ydl:m-consultant-api:0.0.3"
implementation "com.ydl:m-user-api:0.0.7"
implementation project(':ydl-webview')
api project(":ydl-platform")
implementation project(':ydl-media')
implementation project(":ydl-platform")
} else {
//发布时使用
implementation "com.ydl:m-consultant-api:0.0.3"
implementation "com.ydl:m-user-api:0.0.7"
implementation "com.ydl:m-home-api:0.0.2"
api (rootProject.ext.dependencies["ydl-platform"]) {
transitive = true
}
api rootProject.ext.dependencies["ydl-webview"]
api rootProject.ext.dependencies["ydl-media"]
}
}
m-home/modular.gradle
......@@ -24,7 +24,7 @@ modular {
groupId = "com.ydl"
artifactId = "m-home-api"
//开发时注释掉版本号，发布api时打开
//version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
// API 层打包时需要引入的依赖
apiDependencies {
implementation "com.google.code.gson:gson:2.8.2"
......
m-home/src/main/modular_api/com/yidianling/home/event/HomeModuleTabEvent.java 0 → 100644
package com.yidianling.home.event;
public class HomeModuleTabEvent {
int tabIndex;
HomeModuleTabEvent(int index) {
tabIndex = index;
}
public int getTabIndex() {
return tabIndex;
}
public void setTabIndex(int tabIndex) {
this.tabIndex = tabIndex;
}
}
m-home/src/ydl/java/com/yidianling/home/event/HomeImpl.kt
......@@ -9,12 +9,17 @@ import android.support.v7.widget.RecyclerView
import android.text.TextUtils
import android.view.View
import com.alibaba.android.arouter.launcher.ARouter
import com.ydl.media.audio.AudioPlayer
import com.ydl.media.audio.model.Music
import com.ydl.media.view.PlayTypeEnum
import com.ydl.media.view.PlayerFloatHelper
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydl_router.manager.YDLRouterParams
import com.ydl.ydl_router.util.YDLRouterParamsUrls
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.base.config.HttpConfig
import com.ydl.ydlcommon.bean.ShareData
import com.ydl.ydlcommon.data.PlatformRamImpl
import com.ydl.ydlcommon.modular.ModularServiceManager
......@@ -107,7 +112,7 @@ class HomeImpl : IHomeEvent {
private var headerView: View? = null
private var mContext: Context? = null
private var mHomeView: IHomeContract.View? = null
var COURSE_DETAIL_H5 = YdlRetrofitUtils.WEB_URL + "fe-app-yidianling/course/Detail/"
var COURSE_DETAIL_H5 = HttpConfig.WEB_URL + "fe-app-yidianling/course/Detail/"
constructor(context: Context, homeView: IHomeContract.View) {
......@@ -173,7 +178,7 @@ class HomeImpl : IHomeEvent {
//防止连击
return
}
var doctorName = if (text != mContext?.resources?.getString(R.string.search_hint) && text != mContext?.resources?.getString(R.string.search)) text else ""
var doctorName = if (text != mContext?.resources?.getString(R.string.search_hint) && text != mContext?.resources?.getString(R.string.platform_search)) text else ""
ARouter.getInstance()
.build("/consult/hot_search")
......@@ -186,7 +191,8 @@ class HomeImpl : IHomeEvent {
//防止连击
return
}
YDLRouterManager.router(IYDLRouterConstant.ROUTER_MAIN_TAB, YDLRouterParams().putExtra(IYDLRouterConstant.EXTRA_TAB, "2"))
EventBus.getDefault().post(HomeModuleTabEvent(2))
// YDLRouterManager.router(IYDLRouterConstant.ROUTER_MAIN_TAB, YDLRouterParams().putExtra(IYDLRouterConstant.EXTRA_TAB, "2"))
ActionCountUtils.count(HomeBIConstants.YDL_USER_CONSULT_MORE_CLICK)
}
......@@ -214,7 +220,7 @@ class HomeImpl : IHomeEvent {
}
if ("全部类别" == data.cateTitle || "全部分类" == data.cateTitle) {
YDLRouterManager.router(IYDLRouterConstant.ROUTER_H5_H5,
YDLRouterParams().putExtra(IYDLRouterConstant.EXTRA_URL, YdlCommonOut.API_HOST_H5 + "experts/cates"))
YDLRouterParams().putExtra(IYDLRouterConstant.EXTRA_URL, HttpConfig.H5_URL + "experts/cates"))
} else {
//跳转咨询频道页 服务入口
YDLRouterManager.router(IYDLRouterConstant.ROUTER_CONSULT_LIST,
......@@ -235,7 +241,7 @@ class HomeImpl : IHomeEvent {
//防止连击
return
}
EventBus.getDefault().post(SelectTabCallPhoneEvent(2))
EventBus.getDefault().post(HomeModuleTabEvent(2))
// YDLRouterManager.router(IYDLRouterConstant.ROUTER_MAIN_TAB,YDLRouterParams().putExtra(IYDLRouterConstant.EXTRA_TAB, "2"))
ActionCountUtils.count(HomeBIConstants.YDL_USER_CONSULT_CLICK)
// 咨询列表页（专家服务搜索页面） ydl-user://consult/list
......@@ -374,7 +380,7 @@ class HomeImpl : IHomeEvent {
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_COURSE_CLICK, bean.id.toString())
val h5Params = H5Params(COURSE_DETAIL_H5 + bean.id, mContext?.getString(R.string.course_detail))
val h5Params = H5Params(COURSE_DETAIL_H5 + bean.id, mContext?.getString(R.string.platform_course_detail))
if (!TextUtils.isEmpty(bean.shareData?.shareUrl)) {
val shareData = ShareData(bean.shareData?.shareUrl, bean.shareData?.title, bean.shareData?.cover, bean.shareData?.desc)
h5Params.shareData = shareData
......@@ -447,14 +453,19 @@ class HomeImpl : IHomeEvent {
override fun fmPlayClick(fmDetail: HomeFMBean.ListBean) {
ActionCountUtils.count(HomeBIConstants.YDL_USER_RADIO_PLAY_CLICK, fmDetail.id.toString())
YDLMusicHelper.fmId = fmDetail.id
YDLMusicHelper.title = fmDetail.name
YDLMusicHelper.name = fmDetail.author
YDLMusicHelper.cover = fmDetail.imageUrl
YDLMusicHelper.isCanClick = true
if (!TextUtils.isEmpty(fmDetail.fmUrl)) {
val music = Music()
music.path = fmDetail.fmUrl
music.album = fmDetail.imageUrl
music.artist = fmDetail.author
music.coverPath = fmDetail.imageUrl
music.title = fmDetail.name
AudioPlayer.get().singlePlay(music, false)
}
PlayerFloatHelper.isCanClick = true
if (PlayerFloatHelper.isShow(mContext!!)) {
if (YDLMusicHelper.playType == 1) {
if (PlayerFloatHelper.playingType == PlayTypeEnum.PLAY_TYPE_FM) {
PlayerFloatHelper.removeView(mContext!!)
PlayerFloatHelper.show(mContext!!)
......@@ -465,8 +476,6 @@ class HomeImpl : IHomeEvent {
} else {
mContext?.let { PlayerFloatHelper.show(it) }
}
YDLMusicHelper.fmPlay(fmDetail.fmUrl)
}
override fun fmMoreClick() {
......@@ -526,7 +535,7 @@ class HomeImpl : IHomeEvent {
override fun publishTrendClick() {
val bundle = Bundle()
bundle.putString(YdlCommonOut.PUBLISH_TYPE, "topic_publish")
bundle.putString("publish_type", "topic_publish")
bundle.putString("topic_id", "44")
bundle.putString("topic_title", "今日打卡")
......
m-home/src/ydl/java/com/yidianling/home/http/HomeHttp.kt
package com.yidianling.home.http
import com.ydl.ydlcommon.base.config.HttpConfig
import com.ydl.ydlcommon.data.http.BaseAPIResponse
import com.ydl.ydlcommon.data.http.BaseResponse
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.router.YdlCommonRouterManager
import com.ydl.ydlnet.YDLHttpUtils
import com.yidianling.home.model.bean.*
import com.yidianling.ydlcommon.bean.MuseModuleBean
import com.yidianling.ydlcommon.http.BaseAPIResponse
import com.yidianling.ydlcommon.http.BaseCommand
import com.yidianling.ydlcommon.http.BaseResponse
import com.yidianling.ydlcommon.http.YdlRetrofitUtils
import com.yidianling.ydlcommon.router.YdlCommonRouterManager
import io.reactivex.Observable
/**
......@@ -39,14 +39,14 @@ class HomeHttp private constructor() {
private fun getPhpHomPagerApi(): HomePagerApi {
if (phpHomPagerApi == null) {
phpHomPagerApi = YdlRetrofitUtils.getRxRetrofit().create(HomePagerApi::class.java)
phpHomPagerApi = YDLHttpUtils.obtainApi(HomePagerApi::class.java)
}
return phpHomPagerApi!!
}
private fun getHomPagerApi(): HomePagerApi {
if (homPagerApi == null) {
homPagerApi = YdlRetrofitUtils.getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_API_JAVA_URL).build().create(HomePagerApi::class.java)
homPagerApi = YDLHttpUtils.obtainApi(HomePagerApi::class.java)
}
return homPagerApi!!
}
......@@ -106,24 +106,18 @@ class HomeHttp private constructor() {
//首页问答 - 点赞
fun askZan(id: String): Observable<BaseResponse<AskResultBean>> {
val cmd = AskRequestParamBean.ZanAction("2", id)
return getPhpHomPagerApi().askZan(formatParams(cmd))
return RxUtils.mapObservable(cmd).flatMap { getPhpHomPagerApi().askZan(it) }
// return getPhpHomPagerApi().askZan(formatParams(cmd))
}
//首页问答 - 关注
fun askFocus(id: String): Observable<BaseResponse<AskResultBean>> {
val cmd = AskRequestParamBean.FocusCmd(id, "1")
return getPhpHomPagerApi().askFocus(formatParams(cmd))
return RxUtils.mapObservable(cmd).flatMap { getPhpHomPagerApi().askFocus(it) }
}
//壹点冥想
fun newMuseRequest(): Observable<BaseAPIResponse<MuseModuleBean>> {
return getHomPagerApi().getMuseData()
}
private fun formatParams(cmd: BaseCommand) =
YdlRetrofitUtils.getMaps(YdlRetrofitUtils.getPostList(cmd))
}
\ No newline at end of file
m-home/src/ydl/java/com/yidianling/home/http/HomePagerApi.kt
package com.yidianling.home.http
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.base.config.YDL_DOMAIN
import com.ydl.ydlcommon.base.config.YDL_DOMAIN_JAVA
import com.ydl.ydlcommon.data.PlatformDataManager
import com.ydl.ydlcommon.data.http.BaseAPIResponse
import com.ydl.ydlcommon.data.http.BaseResponse
import com.yidianling.home.model.bean.*
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.ydlcommon.app.YdlCommonApp
import com.yidianling.ydlcommon.bean.MuseModuleBean
import com.yidianling.ydlcommon.data.YdlDataManager
import com.yidianling.ydlcommon.http.BaseAPIResponse
import com.yidianling.ydlcommon.http.BaseResponse
import io.reactivex.Observable
import retrofit2.http.*
......@@ -22,6 +23,7 @@ interface HomePagerApi {
* 首页头部数据 Banner&分类
*/
@GET("home/index")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun getHomeHeaderData(): Observable<BaseAPIResponse<HomeHeaderBean>>
/**
......@@ -29,14 +31,15 @@ interface HomePagerApi {
* goodType 为空或不传 则获取默认类型数据
*/
@GET("doctor/list")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun getConsultData(@Query("categories") category: String,
@Query("limit") limit: String = "3",
@Query("page") page: String = "1",
@Query("uid") uid: String,
@Query("searchWord") searchWord: String = "",
@Query("showType") showType: String = "0",
@Query("ffrom") ffrom: String = YdlDataManager.getRam().getChannelName(),
@Query("version") version: String = RxDeviceTool.getAppVersionName(YdlCommonApp.getApp())
@Query("ffrom") ffrom: String = PlatformDataManager.getRam().getChannelName(),
@Query("version") version: String = RxDeviceTool.getAppVersionName(BaseApp.getApp())
): Observable<BaseAPIResponse<HomeConsultBean>>
/**
......@@ -44,34 +47,38 @@ interface HomePagerApi {
* goodType 为空或不传 则获取默认类型数据
*/
@GET("auth/listen/search")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun getConfideData(@Query("goodType") goodType: String,
@Query("limit") limit: String = "3",
@Query("page") page: String = "1",
// 1: 查询第一个类型列表，较goodType比，低优先级
@Query("isDefaultType") isDefaultType: String = "1",
@Query("uid") uid: String,
@Query("ffrom") ffrom: String = YdlDataManager.getRam().getChannelName(),
@Query("version") version: String = RxDeviceTool.getAppVersionName(YdlCommonApp.getApp())
@Query("ffrom") ffrom: String = PlatformDataManager.getRam().getChannelName(),
@Query("version") version: String = RxDeviceTool.getAppVersionName(BaseApp.getApp())
): Observable<BaseAPIResponse<HomeConfideBean>>
//首页课程请求
@GET("auth/course/getList")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun getCourseData(@Query("listType") listType: String = "10",
@Query("limit") limit: String = "3",
@Query("uid") uid: String,
@Query("ffrom") ffrom: String = YdlDataManager.getRam().getChannelName(),
@Query("version") version: String = RxDeviceTool.getAppVersionName(YdlCommonApp.getApp())
@Query("ffrom") ffrom: String = PlatformDataManager.getRam().getChannelName(),
@Query("version") version: String = RxDeviceTool.getAppVersionName(BaseApp.getApp())
): Observable<BaseAPIResponse<HomeCourseBean>>
//首页测试请求
@GET("test-item/home-recommend")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun getTestData(@Query("uid") uid: String,
@Query("ffrom") ffrom: String = YdlDataManager.getRam().getChannelName(),
@Query("version") version: String = RxDeviceTool.getAppVersionName(YdlCommonApp.getApp())
@Query("ffrom") ffrom: String = PlatformDataManager.getRam().getChannelName(),
@Query("version") version: String = RxDeviceTool.getAppVersionName(BaseApp.getApp())
): Observable<BaseAPIResponse<MutableList<HomeTestItemBean>>>
//首页问答请求
@GET("ask/list-old")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun getAskData(@Query("perPageRows") perPageRows: String = "6",
@Query("tab") tab: String = "2",
@Query("accessToken") accessToken: String,
......@@ -80,10 +87,12 @@ interface HomePagerApi {
//首页电台请求
@GET("fm/list/all")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun getFMData(@Query("perPageRows") perPageRows: String = "4"): Observable<BaseAPIResponse<HomeFMBean>>
//首页文章请求
@GET("article/list/all")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun getArticleData(@Query("perPageRows") perPageRows: String = "4"): Observable<BaseAPIResponse<HomeArticleBean>>
//首页问答 - 点赞
......@@ -99,5 +108,6 @@ interface HomePagerApi {
//壹点 - 冥想
@GET("meditation/meditation/list")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun getMuseData(): Observable<BaseAPIResponse<MuseModuleBean>>
}
\ No newline at end of file
m-home/src/ydl/java/com/yidianling/home/model/HomeModelImpl.kt
......@@ -3,11 +3,7 @@ package com.yidianling.home.model
import com.ydl.ydlcommon.data.http.BaseAPIResponse
import com.ydl.ydlcommon.data.http.RxUtils
import com.yidianling.home.http.HomeHttp
import com.yidianling.home.constract.IHomeContract
import com.yidianling.home.model.bean.*
import com.yidianling.ydlcommon.http.BaseAPIResponse
import com.yidianling.ydlcommon.bean.MuseModuleBean
import com.yidianling.ydlcommon.http.RxUtils
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
......
m-home/src/ydl/java/com/yidianling/home/model/bean/CouponBean.kt 0 → 100644
package com.yidianling.home.model.bean
/**
* @author jiucheng
* @描述:优惠券信息
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/8/8
*/
class CouponBean {
/**
* {
* "couponId": 10,
* "type": 1, 1：立减 2：折扣
* "amount": 5,
* "discount": 0,
* "validity": "永久有效",
* "condition": "满99元可用",
* "instruction": "测试测试测试测试1231231111"
* }
*/
var title: String? = null
var id: String? = null
var type: String? = null
var amount: String? = null
var discount: String? = null
var validity: String? = null
var condition: String? = null
var instruction: String? = null
var couponId: String? = null
var isSelected = -1//本地维护的选中状态 1 ：选中 其他：未选中
}
m-home/src/ydl/java/com/yidianling/home/model/bean/HomeArticleBean.kt
package com.yidianling.home.model.bean
import com.yidianling.ydlcommon.bean.HomeItemBaseBean
/**
* Created by haorui on 2019/2/14.
* Des:首页文章模块参数
......
m-home/src/ydl/java/com/yidianling/home/model/bean/HomeAskBean.kt
package com.yidianling.home.model.bean
import com.google.gson.annotations.SerializedName
import com.yidianling.ydlcommon.bean.HomeItemBaseBean
/**
* Created by haorui on 2019/2/14.
......
m-home/src/ydl/java/com/yidianling/home/model/bean/HomeConfideBean.kt
package com.yidianling.home.model.bean
import com.yidianling.ydlcommon.bean.HomeItemBaseBean
/**
* Created by haorui on 2019/2/14.
* Des:首页倾听模块参数
......
m-home/src/ydl/java/com/yidianling/home/model/bean/HomeConsultBean.kt
package com.yidianling.home.model.bean
import com.google.gson.annotations.SerializedName
import com.yidianling.ydlcommon.bean.HomeItemBaseBean
/**
* Created by haorui on 2019/3/13.
......
m-home/src/ydl/java/com/yidianling/home/model/bean/HomeCourseBean.kt
package com.yidianling.home.model.bean
import com.yidianling.ydlcommon.bean.HomeItemBaseBean
/**
* Created by haorui on 2019/2/14.
* Des:首页课程模块参数
......
m-home/src/ydl/java/com/yidianling/home/model/bean/HomeFMBean.kt
package com.yidianling.home.model.bean
import com.yidianling.ydlcommon.bean.HomeItemBaseBean
/**
* Created by haorui on 2019/2/14.
* Des:首页电台模块参数
......
m-home/src/ydl/java/com/yidianling/home/model/bean/HomeHeaderBean.kt
package com.yidianling.home.model.bean
import com.yidianling.router.consultant.Keyworks
import com.yidianling.ydlcommon.bean.HomeItemBaseBean
/**
* Created by haorui on 2019/2/14.
......
m-home/src/ydl/java/com/yidianling/home/model/bean/HomeItemBaseBean.kt 0 → 100644
package com.yidianling.home.model.bean
open class HomeItemBaseBean(var isRealEmpty: Boolean)
\ No newline at end of file
m-home/src/ydl/java/com/yidianling/home/model/bean/HomePagerDataBean.kt
package com.yidianling.home.model.bean
import com.yidianling.ydlcommon.bean.MuseModuleBean
/**
* Created by haorui on 2019/2/14.
* Des:首页数据
......
m-home/src/ydl/java/com/yidianling/home/model/bean/HomeTestBean.kt
package com.yidianling.home.model.bean
import com.yidianling.ydlcommon.bean.HomeItemBaseBean
/**
* Created by xj on 2019/9/29.
*/
......
m-home/src/ydl/java/com/yidianling/home/model/bean/MuseModuleBean.kt 0 → 100644
package com.yidianling.home.model.bean
/**
* 冥想模块所有数据
* Created by xj on 2019/9/16.
*/
class MuseModuleBean : HomeItemBaseBean {
constructor():super(false)
constructor(isRealEmpty:Boolean):super(isRealEmpty)
/**
* 冥想数据
*/
var muses: ArrayList<MuseDetailBean>? = null
/**
* 助眠数据
*/
var sleeps: ArrayList<SleepsDetailBean>? = null
data class MuseDetailBean(
val id: Int,
val audioUrl: String,
val backgroundUrl: String,
val category: Int,
val createTime: String,
val effectCode: String,
val isDelete: String,
val name: String,
val playCount: Int,
val sort: Int,
val updateTime: String,
val shareUrl: String,
val appId: String,
val path: String)
data class SleepsDetailBean(
val id: Int,
val audioUrl: String,
val backgroundUrl: String,
val category: Int,
val createTime: String,
val effectCode: String,
val isDelete: String,
val name: String,
val playCount: Int,
val sort: Int,
val updateTime: String,
val shareUrl: String,
val appId: String,
val path: String)
}
\ No newline at end of file
m-home/src/ydl/java/com/yidianling/home/presenter/HomePresenterImpl.kt
......@@ -5,7 +5,6 @@ import android.content.Context
import android.text.TextUtils
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.meituan.robust.patch.annotaion.Modify
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.data.http.ThrowableConsumer
......@@ -21,14 +20,6 @@ import com.yidianling.home.utils.HomeLogPrinter
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxAppTool
import com.yidianling.router.RouterManager
import com.yidianling.ydlcommon.app.YdlCommonApp
import com.yidianling.ydlcommon.bean.HomeItemBaseBean
import com.yidianling.ydlcommon.bean.MuseModuleBean
import com.yidianling.ydlcommon.http.RxUtils
import com.yidianling.ydlcommon.http.ThrowableConsumer
import com.yidianling.ydlcommon.mvp.RxPresenter
import com.yidianling.ydlcommon.utils.SharedPreferencesEditor
import com.yidianling.ydlcommon.utils.YDLAsyncUtils
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
......
m-home/src/ydl/java/com/yidianling/home/ui/view/CouponDialog.kt
......@@ -6,8 +6,8 @@ import android.graphics.drawable.ColorDrawable
import android.os.Bundle
import android.text.TextUtils
import com.yidianling.home.R
import com.yidianling.ydlcommon.pay.model.CouponBean
import kotlinx.android.synthetic.main.dialog_coupon.*
import com.yidianling.home.model.bean.CouponBean
import kotlinx.android.synthetic.ydl.dialog_coupon.*
/**
* @author jiucheng
......@@ -55,7 +55,7 @@ class CouponDialog : Dialog {
tv_money.text = couponBean!!.amount
tv_unit.text = "元"
} else {
tv_money.text = (couponBean!!.discount.toFloat() * 10).toString()
tv_money.text = (couponBean!!.discount?:"0".toFloat() * 10).toString()
tv_unit.text = "折"
}
tv_limit.text = couponBean!!.condition
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeArticleItemView.kt
......@@ -9,7 +9,7 @@ import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeArticleBean
import com.ydl.ydl_image.manager.YDLImageCacheManager
import kotlinx.android.synthetic.main.home_module_article_item_view.view.*
import kotlinx.android.synthetic.ydl.home_module_article_item_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeArticleView.kt
......@@ -8,7 +8,7 @@ import android.widget.LinearLayout
import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeArticleBean
import kotlinx.android.synthetic.main.home_module_article_view.view.*
import kotlinx.android.synthetic.ydl.home_module_article_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeAssuageGriefImageItemView.kt
......@@ -9,9 +9,9 @@ import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.ydl.ydl_image.manager.YDLImageCacheManager
import com.yidianling.common.tools.RxDeviceTool
import kotlinx.android.synthetic.main.home_module_assuage_grief_image_more_five_item_view.view.*
import kotlinx.android.synthetic.main.home_module_assuage_grief_image_under_four_item_view.view.*
import kotlinx.android.synthetic.main.home_module_assuage_grief_image_under_two_item_view.view.*
import kotlinx.android.synthetic.ydl.home_module_assuage_grief_image_more_five_item_view.view.*
import kotlinx.android.synthetic.ydl.home_module_assuage_grief_image_under_four_item_view.view.*
import kotlinx.android.synthetic.ydl.home_module_assuage_grief_image_under_two_item_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeAssuageGriefItemView.kt
......@@ -16,13 +16,15 @@ import com.yidianling.home.model.bean.HomeAskBean
import com.ydl.ydl_image.config.SimpleImageOpConfiger
import com.ydl.ydl_image.manager.YDLImageCacheManager
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.router.YdlCommonRouterManager
import com.ydl.ydlcommon.utils.MoonUtil
import com.ydl.ydlcommon.utils.Utils
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.common.tools.RxImageTool
import com.yidianling.ydlcommon.router.IYDLRouterConstant
import com.yidianling.ydlcommon.router.YdlCommonRouterManager
import com.yidianling.ydlcommon.utils.MoonUtil
import com.yidianling.ydlcommon.utils.Utils
import kotlinx.android.synthetic.main.home_module_assuage_grief_item_view.view.*
import com.yidianling.user.api.service.IUserService
import kotlinx.android.synthetic.ydl.home_module_assuage_grief_item_view.view.*
/**
......@@ -58,8 +60,8 @@ class HomeAssuageGriefItemView(private val mContext: Context, private var homeEv
homeEvent?.askItemClick(bean)
}
val op = SimpleImageOpConfiger()
op.errorPic = com.yidianling.ydlcommon.R.drawable.head_place_hold_pic
op.loadingPic = com.yidianling.ydlcommon.R.drawable.head_place_hold_pic
op.errorPic = R.drawable.platform_head_place_hold_pic
op.loadingPic = R.drawable.platform_head_place_hold_pic
YDLImageCacheManager.showImage(mContext, bean?.header, homeModuleAssuageGriefViewPersonImg, op)
homeModuleAssuageGriefViewPersonName.text = bean?.name
homeModuleAssuageGriefViewTime.text = bean?.timeStr
......@@ -76,7 +78,7 @@ class HomeAssuageGriefItemView(private val mContext: Context, private var homeEv
ll_zan.setOnClickListener {
//防止连击
if (!Utils.isFastClick()) {
if (!YdlCommonRouterManager.getYdlCommonRoute().isLogin()) {
if (!ModularServiceManager.provide(IUserService::class.java).isLogin()) {
//跳转登录
YDLRouterManager.router(IYDLRouterConstant.ROUTER_MINE_LOGIN)
return@setOnClickListener
......@@ -105,7 +107,7 @@ class HomeAssuageGriefItemView(private val mContext: Context, private var homeEv
if (bean.isFocused == 1) {
homeEvent?.askItemClick(bean)
} else {
if (!YdlCommonRouterManager.getYdlCommonRoute().isLogin()) {
if (!ModularServiceManager.provide(IUserService::class.java).isLogin()) {
//跳转登录
YDLRouterManager.router(IYDLRouterConstant.ROUTER_MINE_LOGIN)
return@setOnClickListener
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeAssuageGriefView.kt
......@@ -7,7 +7,7 @@ import android.widget.LinearLayout
import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeAskBean
import kotlinx.android.synthetic.main.home_module_assuage_grief_view.view.*
import kotlinx.android.synthetic.ydl.home_module_assuage_grief_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
......@@ -9,7 +9,7 @@ import android.widget.LinearLayout
import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.common.tools.RxDeviceTool
import kotlinx.android.synthetic.main.home_module_button_banner_view.view.*
import kotlinx.android.synthetic.ydl.home_module_button_banner_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeCategoryContainer.kt
......@@ -12,7 +12,7 @@ import com.yidianling.home.adapter.HomeCategoryAdapter
import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeHeaderBean
import com.yidianling.common.tools.RxImageTool
import kotlinx.android.synthetic.main.home_module_category_container.view.*
import kotlinx.android.synthetic.ydl.home_module_category_container.view.*
/**
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeCommonTitleView.kt
......@@ -4,10 +4,8 @@ import android.content.Context
import android.support.constraint.ConstraintLayout
import android.util.AttributeSet
import android.view.View
import android.widget.LinearLayout
import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import kotlinx.android.synthetic.main.home_module_common_title_view.view.*
import kotlinx.android.synthetic.ydl.home_module_common_title_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeConfideExpertInfoView.kt
......@@ -13,7 +13,7 @@ import com.yidianling.home.model.bean.HomeConfideBean
import com.ydl.ydl_image.config.SimpleImageOpConfiger
import com.ydl.ydl_image.manager.YDLImageCacheManager
import com.yidianling.common.tools.RxImageTool
import kotlinx.android.synthetic.main.home_module_confide_expert_info_view.view.*
import kotlinx.android.synthetic.ydl.home_module_confide_expert_info_view.view.*
/**
* @author jiucheng
......@@ -72,8 +72,8 @@ class HomeConfideExpertInfoView(private var mContext: Context, private var homeE
*/
private fun setHead(bean: HomeConfideBean.BodyBean) {
val op = SimpleImageOpConfiger()
op.errorPic = com.yidianling.ydlcommon.R.drawable.head_place_hold_pic
op.loadingPic = com.yidianling.ydlcommon.R.drawable.head_place_hold_pic
op.errorPic = R.drawable.platform_head_place_hold_pic
op.loadingPic = R.drawable.platform_head_place_hold_pic
op.transform = 0
YDLImageCacheManager.showImage(mContext, bean.confidedIcon, img_head, op)
}
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeConfideView.kt
......@@ -15,7 +15,7 @@ import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeConfideBean
import com.yidianling.home.model.bean.HomeHeaderBean
import com.yidianling.common.tools.LogUtil
import kotlinx.android.synthetic.main.home_module_confide_view.view.*
import kotlinx.android.synthetic.ydl.home_module_confide_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......@@ -72,7 +72,7 @@ class HomeConfideView(private val mContext: Context, private var homeEvent: IHom
var textView = ((tab_layout!!.getChildAt(0) as LinearLayout).getChildAt(lastPosition) as LinearLayout).getChildAt(1)
if (textView != null && textView is TextView) {
textView.textSize = 17f
textView.setTextColor(ContextCompat.getColor(mContext, R.color.color_242424))
textView.setTextColor(ContextCompat.getColor(mContext, R.color.platform_color_242424))
textView.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
......@@ -148,7 +148,7 @@ class HomeConfideView(private val mContext: Context, private var homeEvent: IHom
var textView = ((tabLayout!!.getChildAt(0) as LinearLayout).getChildAt(tab!!.position) as LinearLayout).getChildAt(1)
if (textView != null && textView is TextView) {
textView.textSize = 15f
textView.setTextColor(ContextCompat.getColor(mContext, R.color.color_333333))
textView.setTextColor(ContextCompat.getColor(mContext, R.color.platform_color_333333))
}
}
......@@ -159,7 +159,7 @@ class HomeConfideView(private val mContext: Context, private var homeEvent: IHom
var textView = ((tabLayout!!.getChildAt(0) as LinearLayout).getChildAt(tab!!.position) as LinearLayout).getChildAt(1)
if (textView != null && textView is TextView) {
textView.textSize = 17f
textView.setTextColor(ContextCompat.getColor(mContext, R.color.color_242424))
textView.setTextColor(ContextCompat.getColor(mContext, R.color.platform_color_242424))
textView.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
}
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeConsultItemView.kt
......@@ -10,10 +10,10 @@ import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeConsultBean
import com.ydl.ydl_image.config.SimpleImageOpConfiger
import com.ydl.ydl_image.manager.YDLImageCacheManager
import com.ydl.ydlcommon.utils.StringUtils
import com.ydl.ydlcommon.utils.URLUtils
import com.yidianling.common.tools.RxImageTool
import com.yidianling.ydlcommon.tool.StringUtils
import com.yidianling.ydlcommon.utils.URLUtils
import kotlinx.android.synthetic.main.home_module_consult_item_view.view.*
import kotlinx.android.synthetic.ydl.home_module_consult_item_view.view.*
/**
* @author jiucheng
......@@ -68,8 +68,8 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent:
*/
private fun setHead(bean: HomeConsultBean.ListBean) {
val op = SimpleImageOpConfiger()
op.errorPic = com.yidianling.ydlcommon.R.drawable.head_place_hold_pic
op.loadingPic = com.yidianling.ydlcommon.R.drawable.head_place_hold_pic
op.errorPic = R.drawable.platform_head_place_hold_pic
op.loadingPic = R.drawable.platform_head_place_hold_pic
op.transform = 0
YDLImageCacheManager.showImage(mContext, bean.doctorHead, img_consult_head, op)
}
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeConsultView.kt
......@@ -15,7 +15,7 @@ import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeConsultBean
import com.yidianling.home.model.bean.HomeHeaderBean
import com.yidianling.common.tools.LogUtil
import kotlinx.android.synthetic.main.home_module_confide_view.view.*
import kotlinx.android.synthetic.ydl.home_module_confide_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......@@ -77,7 +77,7 @@ class HomeConsultView(private val mContext: Context, private var homeEvent: IHom
val textView = ((tab_layout!!.getChildAt(0) as LinearLayout).getChildAt(lastPosition) as LinearLayout).getChildAt(1)
if (textView != null && textView is TextView) {
textView.textSize = 17f
textView.setTextColor(ContextCompat.getColor(mContext, R.color.color_242424))
textView.setTextColor(ContextCompat.getColor(mContext, R.color.platform_color_242424))
textView.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
......@@ -158,7 +158,7 @@ class HomeConsultView(private val mContext: Context, private var homeEvent: IHom
var textView = ((tabLayout!!.getChildAt(0) as LinearLayout).getChildAt(tab!!.position) as LinearLayout).getChildAt(1)
if (textView != null && textView is TextView) {
textView.textSize = 15f
textView.setTextColor(ContextCompat.getColor(mContext, R.color.color_333333))
textView.setTextColor(ContextCompat.getColor(mContext, R.color.platform_color_333333))
}
}
......@@ -169,7 +169,7 @@ class HomeConsultView(private val mContext: Context, private var homeEvent: IHom
var textView = ((tabLayout!!.getChildAt(0) as LinearLayout).getChildAt(tab!!.position) as LinearLayout).getChildAt(1)
if (textView != null && textView is TextView) {
textView.textSize = 17f
textView.setTextColor(ContextCompat.getColor(mContext, R.color.color_242424))
textView.setTextColor(ContextCompat.getColor(mContext, R.color.platform_color_242424))
textView.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
}
val bean = list!![tab!!.position]
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeCourseItemView.kt
......@@ -8,7 +8,7 @@ import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeCourseBean
import com.ydl.ydl_image.manager.YDLImageCacheManager
import kotlinx.android.synthetic.main.home_module_course_item_view.view.*
import kotlinx.android.synthetic.ydl.home_module_course_item_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeCourseView.kt
......@@ -7,7 +7,7 @@ import android.widget.LinearLayout
import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeCourseBean
import kotlinx.android.synthetic.main.home_module_course_view.view.*
import kotlinx.android.synthetic.ydl.home_module_course_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeIntelligentItemView.kt
......@@ -8,7 +8,7 @@ import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeFMBean
import com.yidianling.common.tools.RxImageTool
import kotlinx.android.synthetic.main.home_module_intelligent_item_view.view.*
import kotlinx.android.synthetic.ydl.home_module_intelligent_item_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeIntelligentTopItemView.kt
......@@ -11,7 +11,7 @@ import com.ydl.ydl_image.config.SimpleImageOpConfiger
import com.ydl.ydl_image.manager.YDLImageCacheManager
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.common.tools.RxImageTool
import kotlinx.android.synthetic.main.home_module_intelligent_top_item_view.view.*
import kotlinx.android.synthetic.ydl.home_module_intelligent_top_item_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......@@ -46,8 +46,8 @@ class HomeIntelligentTopItemView(private val mContext: Context, private var home
var viewWidth = (screenWidth - RxImageTool.dip2px(30f))
var viewHeight = viewWidth * 143 / 345
val sp = SimpleImageOpConfiger()
sp.loadingPic = R.drawable.default_img
sp.errorPic = R.drawable.default_img
sp.loadingPic = R.drawable.platform_default_img
sp.errorPic = R.drawable.platform_default_img
sp.scaleType = ISimpleImageOpConfig.CENTER_CROP
sp.isCacheOnDisk = true
YDLImageCacheManager.showImage(mContext,bean.imageUrl,homeModuleIntelligentTopViewImage, viewWidth, viewHeight,sp)
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeIntelligentView.kt
......@@ -7,7 +7,7 @@ import android.widget.LinearLayout
import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeFMBean
import kotlinx.android.synthetic.main.home_module_intelligent_view.view.*
import kotlinx.android.synthetic.ydl.home_module_intelligent_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeMuseView.kt
......@@ -9,8 +9,8 @@ import android.widget.LinearLayout
import com.google.gson.Gson
import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.ydlcommon.bean.MuseModuleBean
import kotlinx.android.synthetic.main.home_module_muse_view.view.*
import com.yidianling.home.model.bean.MuseModuleBean
import kotlinx.android.synthetic.ydl.home_module_muse_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomePagerBannerCategoryItemView.kt
......@@ -13,9 +13,9 @@ import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeHeaderBean
import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydlcommon.utils.ScreenUtil
import com.yidianling.common.tools.RxImageTool
import com.yidianling.ydlcommon.utils.ScreenUtil
import kotlinx.android.synthetic.main.home_module_pager_banner_category_view.view.*
import kotlinx.android.synthetic.ydl.home_module_pager_banner_category_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomePagerBannerRealView.kt
......@@ -10,14 +10,14 @@ import android.view.animation.Animation
import android.view.animation.DecelerateInterpolator
import android.view.animation.TranslateAnimation
import android.widget.LinearLayout
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.consultant.constants.HomeBIConstants
import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeHeaderBean
import com.yidianling.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.ydlcommon.utils.actionutil.BIConstants
import kotlinx.android.synthetic.main.home_module_real_view_in.view.*
import kotlinx.android.synthetic.main.home_module_real_view_left.view.*
import kotlinx.android.synthetic.main.home_module_real_view_out.view.*
import kotlinx.android.synthetic.ydl.home_module_real_view_in.view.*
import kotlinx.android.synthetic.ydl.home_module_real_view_left.view.*
import kotlinx.android.synthetic.ydl.home_module_real_view_out.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......@@ -164,7 +164,7 @@ class HomePagerBannerRealView(mContext : Context,homeEvent : IHomeEvent) : Linea
tv_in_content_before.text = getName(bodyBean)
tv_in_content_after.text = String.format("老师%s",bodyBean.contentAfter)
view_in!!.setOnClickListener{
ActionCountUtils.count(BIConstants.UserMainEvent.YDL_USER_NOTICE_CLICK)
ActionCountUtils.count(HomeBIConstants.YDL_USER_NOTICE_CLICK)
homeEvent!!.linkTo(bodyBean.url!!)
}
}
......@@ -173,7 +173,7 @@ class HomePagerBannerRealView(mContext : Context,homeEvent : IHomeEvent) : Linea
tv_out_content_before.text = getName(bodyBean)
tv_out_content_after.text = String.format("老师%s",bodyBean.contentAfter)
view_out!!.setOnClickListener{
ActionCountUtils.count(BIConstants.UserMainEvent.YDL_USER_NOTICE_CLICK)
ActionCountUtils.count(HomeBIConstants.YDL_USER_NOTICE_CLICK)
homeEvent!!.linkTo(bodyBean.url!!)
}
}
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomePagerBannerView.kt
......@@ -5,15 +5,14 @@ import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.RelativeLayout
import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import com.ydl.ydlcommon.view.banner.GlideImageLoader
import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeHeaderBean
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.common.tools.RxImageTool
import com.yidianling.ydlcommon.YdlBuryPointUtil
import com.yidianling.ydlcommon.view.banner.GlideImageLoader
import kotlinx.android.synthetic.main.home_module_pager_banner_view.view.*
import kotlinx.android.synthetic.ydl.home_module_pager_banner_view.view.*
/**
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeTestItemView.kt
......@@ -9,7 +9,7 @@ import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeTestItemBean
import com.ydl.ydl_image.manager.YDLImageCacheManager
import com.yidianling.common.tools.RxImageTool
import kotlinx.android.synthetic.main.home_module_test_item_view.view.*
import kotlinx.android.synthetic.ydl.home_module_test_item_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeTestTopItemView.kt
......@@ -11,7 +11,7 @@ import com.ydl.ydl_image.config.SimpleImageOpConfiger
import com.ydl.ydl_image.manager.YDLImageCacheManager
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.common.tools.RxImageTool
import kotlinx.android.synthetic.main.home_module_intelligent_top_item_view.view.*
import kotlinx.android.synthetic.ydl.home_module_test_top_item_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......@@ -46,8 +46,8 @@ class HomeTestTopItemView(private val mContext: Context, private var homeEvent:
var viewWidth = (screenWidth - RxImageTool.dip2px(30f))
var viewHeight = viewWidth * 143 / 345
val sp = SimpleImageOpConfiger()
sp.loadingPic = R.drawable.default_img
sp.errorPic = R.drawable.default_img
sp.loadingPic = R.drawable.platform_default_img
sp.errorPic = R.drawable.platform_default_img
sp.scaleType = ISimpleImageOpConfig.CENTER_CROP
sp.isCacheOnDisk = true
YDLImageCacheManager.showImage(mContext,bean?.shareImage,homeModuleIntelligentTopViewImage, viewWidth, viewHeight,sp)
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeTestView.kt
......@@ -7,7 +7,7 @@ import android.widget.LinearLayout
import com.yidianling.home.R
import com.yidianling.home.event.IHomeEvent
import com.yidianling.home.model.bean.HomeTestItemBean
import kotlinx.android.synthetic.main.home_module_intelligent_view.view.*
import kotlinx.android.synthetic.ydl.home_module_test_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
......
m-home/src/ydl/java/com/yidianling/home/utils/HomeAnimUtils.kt
......@@ -14,7 +14,6 @@ import com.ydl.ydlcommon.utils.ColorCalculateUtils
import com.yidianling.home.constract.IHomeContract
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.common.tools.RxImageTool
import com.yidianling.ydlcommon.utils.ColorCalculateUtils
/**
* @author yuanWai
......
m-home/src/ydl/res/layout/home_module_article_view.xml
......@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.ydl.home_module.ui.view.HomeCommonTitleView
<com.yidianling.home.ui.view.HomeCommonTitleView
android:id="@+id/homeModuleArticleViewHomeCommonTitleView"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
......
m-home/src/ydl/res/layout/home_module_assuage_grief_view.xml
......@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.ydl.home_module.ui.view.HomeCommonTitleView
<com.yidianling.home.ui.view.HomeCommonTitleView
android:id="@+id/homeModuleAssuageGriefViewHomeCommonTitleView"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
......
m-home/src/ydl/res/layout/home_module_confide_expert_info_view.xml
......@@ -54,7 +54,7 @@
</LinearLayout>
<com.yidianling.ydlcommon.view.TagView
<com.ydl.ydlcommon.view.TagView
android:id="@+id/tag_view"
android:layout_width="match_parent"
android:layout_height="@dimen/platform_dp_16"
......
m-home/src/ydl/res/layout/home_module_confide_view.xml
......@@ -5,7 +5,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<com.ydl.home_module.ui.view.HomeCommonTitleView
<com.yidianling.home.ui.view.HomeCommonTitleView
android:id="@+id/homeModuleConfideViewHomeCommonTitleView"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
......
m-home/src/ydl/res/layout/home_module_consult_item_view.xml
......@@ -55,7 +55,7 @@
</LinearLayout>
<com.yidianling.ydlcommon.view.TagView
<com.ydl.ydlcommon.view.TagView
android:id="@+id/tag_view"
android:layout_width="match_parent"
android:layout_height="@dimen/platform_dp_16"
......
m-home/src/ydl/res/layout/home_module_course_view.xml
......@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.ydl.home_module.ui.view.HomeCommonTitleView
<com.yidianling.home.ui.view.HomeCommonTitleView
android:id="@+id/homeModuleCourseViewHomeCommonTitleView"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
......
m-home/src/ydl/res/layout/home_module_intelligent_view.xml
......@@ -4,7 +4,7 @@
android:layout_height="wrap_content"
>
<com.ydl.home_module.ui.view.HomeCommonTitleView
<com.yidianling.home.ui.view.HomeCommonTitleView
android:id="@+id/homeModuleIntelligentViewHomeCommonTitleView"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
......
m-home/src/ydl/res/layout/home_module_test_view.xml
......@@ -4,7 +4,7 @@
android:layout_height="wrap_content"
>
<com.ydl.home_module.ui.view.HomeCommonTitleView
<com.yidianling.home.ui.view.HomeCommonTitleView
android:id="@+id/homeModuleIntelligentViewHomeCommonTitleView"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
......
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