Merge branch 'fix/lp/lp_fix_avchat' into 'd/v4.4.08'

feat: 抑郁焦虑测试首页问题适配处理，删除无用代码

See merge request app_android_lib/YDL-Component!322

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         ydlrouter_version = '1.2.3'
         constrait_support_version = '1.0.2'
 
-        componentVersion = "0.3.0.39"
+        componentVersion = "0.3.0.40"
     }
     repositories {
         mavenCentral()

m-home/src/ydl/java/com/yidianling/home/adapter/YdlHomeAdapter.kt

@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.ydl.ydl_image.module.GlideApp
+import com.ydl.ydlcommon.data.PlatformDataManager
 import com.yidianling.home.R
 import com.yidianling.home.constract.HomeViewConfig
 import com.yidianling.home.event.HomeImpl
@@ -133,7 +134,7 @@ class YdlHomeAdapter(private val mContext: Context,
         when (viewType) {
             //顶部ViewPager与分类模块
             HomeViewConfig.getOrder().bannerIndex -> {
-                if (viewType == -1){
+                if (viewType == -1) {
                     //空布局
                     val view = View(mContext)
                     val layoutParams = ViewGroup.LayoutParams(
@@ -141,8 +142,13 @@ class YdlHomeAdapter(private val mContext: Context,
                         ViewGroup.LayoutParams.MATCH_PARENT
                     )
                     view.layoutParams = layoutParams
+                    //抑郁焦虑测试适配代码
+                    if (PlatformDataManager.getRam().getChannelName().contains("yyjlcs")) {
+                        view.layoutParams =
+                            ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 1)
+                    }
                     view.visibility = View.GONE
-                    return HomePagerBannerViewHolder(view,viewType)
+                    return HomePagerBannerViewHolder(view, viewType)
                 }
                 return HomePagerBannerViewHolder(HomePagerBannerView(mContext, homeEvent),viewType)
             }

m-home/src/ydl/java/com/yidianling/home/presenter/HomePresenterImpl.kt

@@ -20,7 +20,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Action
 import io.reactivex.functions.Consumer
 import io.reactivex.schedulers.Schedulers
-import java.util.*
 
 
 /**
@@ -106,13 +105,6 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract
                 homeList.add(getHomeItemFromTempData(it, HomeViewConfig.getOrder().dynamicIndex!!))
             }
 
-        val museObservable = mModel.museRequest()
-            .compose(RxUtils.applySchedulers(mView)).map {
-                //首页冥想数据
-                homeList.add(getHomeItemFromTempData(it, HomeViewConfig.getOrder().museIndex!!))
-            }
-
-
         val meditationObservable = mModel.getMeditation()
             .compose(RxUtils.applySchedulers(mView)).map {
                 homeList.add(getHomeItemFromTempData(it,HomeViewConfig.getOrder().museIndex!!))
@@ -159,9 +151,6 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract
         if (HomeViewConfig.getOrder().museIndex!=null){
             mergeArrays.add(meditationObservable)
         }
-//        if (HomeViewConfig.getOrder().museIndex!=null){
-//            mergeArrays.add(museObservable)
-//        }
         if (HomeViewConfig.getOrder().fmIndex!=null){
             mergeArrays.add(fmObservable)
         }
@@ -205,12 +194,6 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract
                         )
                     }
                 })
-
-                //长日志打印
-//                HomeLogPrinter.printLongLog(
-//                    HomePresenterImpl::class.java.simpleName,
-//                    Gson().toJson(homeList)
-//                )
             })
     }
 
@@ -307,10 +290,6 @@ class HomePresenterImpl: BaseHomePresenterImpl<IHomeContract.View, IHomeContract
                     if (dataBean.isRealEmpty || dataBean !is HomeAskBean) homeTempData.askBean else dataBean
                 mHomeAskBean = item.askBean
             }
-//            HomeViewConfig.getOrder().museIndex -> {
-//                item.museBean =
-//                    if (dataBean.isRealEmpty || dataBean !is MuseModuleBean) homeTempData.museBean else dataBean
-//            }
             HomeViewConfig.getOrder().museIndex -> {
                 item.meditationBean =
                     if (dataBean.isRealEmpty || dataBean !is MeditationModuleBean) homeTempData.meditationBean else dataBean