HomeFragment配置化

config.gradle

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = false
+    dev_mode = true
 
     ydl_app = [
             appName      : "心理咨询壹点灵",
@@ -69,7 +69,7 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.11",
+            "ydl-platform"    : "0.0.39.17",
             //第二步 若干
 
             "ydl-webview"     : "0.0.38.13",

m-home/build.gradle

@@ -29,7 +29,7 @@ android {
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         flavorDimensions "versionCode"
-
+        vectorDrawables.useSupportLibrary = true
     }
 
     lintOptions {
@@ -60,7 +60,6 @@ android {
             res.srcDirs = ['src/main/res']
         }
     }
-
 }
 
 dependencies {

m-home/src/main/java/com/yidianling/home/event/HomeBaseImpl.kt

@@ -24,13 +24,14 @@ import com.ydl.ydlcommon.bean.ShareData
 import com.ydl.ydlcommon.data.PlatformRamImpl
 import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.router.IYDLRouterConstant
+import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.Utils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.utils.remind.ToastHelper
 import com.ydl.ydlcommon.view.dialog.CommonDialog
-import com.yidianling.home.constants.HomeBIConstants
 import com.yidianling.home.R
 import com.yidianling.home.api.event.HomeModuleTabEvent
+import com.yidianling.home.constants.HomeBIConstants
 import com.yidianling.home.constract.IHomeContract
 import com.yidianling.home.model.bean.*
 import com.yidianling.im.api.bean.IMRequestCallback
@@ -135,7 +136,7 @@ open class HomeBaseImpl : IHomeBaseEvent {
                     per = 1f
                 }
                 val alpha = (per * 255).toInt()
-//                Log.e("Tag", "alpha=$alpha--per=$per")
+                LogUtil.i("Tag", "alpha=$alpha--per=$per")
                 view_rl_top_bg.background.mutate().alpha = alpha
             }
         }

m-home/src/main/java/com/yidianling/home/event/IHomeBaseEvent.kt

@@ -2,9 +2,7 @@ package com.yidianling.home.event
 
 import android.support.v7.widget.RecyclerView
 import android.view.View
-import android.widget.ImageView
 import com.yidianling.home.model.bean.*
-import com.yidianling.home.ui.view.CouponDialog
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>

m-home/src/main/java/com/yidianling/home/model/bean/HomePagerDataBean.kt

@@ -66,7 +66,7 @@ class HomePagerDataBean() {
      */
     var headerBean: HomeHeaderBean? = null
     /**
-     * 模块分类 @see [com.yidianling.home.constract.YdlHomeViewHolderConstract]
+     * 模块分类 @see [com.yidianling.home.constract.HomeViewConfig]
      */
     var type: Int?= 0
 }

m-home/src/main/java/com/yidianling/home/model/bean/HomeTestBean.kt

@@ -4,8 +4,8 @@ package com.yidianling.home.model.bean
  * Created by xj on 2019/9/29.
  */
 class HomeTestBean: HomeItemBaseBean {
-    constructor():super(false)
-    constructor(isRealEmpty:Boolean):super(isRealEmpty)
+    constructor() : super(false)
+    constructor(isRealEmpty: Boolean) : super(isRealEmpty)
 
     /**
      * 分类数据

m-home/src/main/java/com/yidianling/home/presenter/BaseHomePresenterImpl.kt

@@ -9,8 +9,6 @@ import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.data.http.ThrowableConsumer
 import com.ydl.ydlcommon.mvp.base.BasePresenter
-import com.ydl.ydlcommon.mvp.base.IModel
-import com.ydl.ydlcommon.mvp.base.IView
 import com.ydl.ydlcommon.utils.SharedPreferencesEditor
 import com.ydl.ydlcommon.utils.YDLAsyncUtils
 import com.yidianling.common.tools.RxAppTool
@@ -19,10 +17,8 @@ import com.yidianling.home.model.bean.HomeAskBean
 import com.yidianling.home.model.bean.HomeItemBaseBean
 import com.yidianling.home.model.bean.HomePagerDataBean
 import com.yidianling.home.utils.HomeFileUtils
-import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
 
 abstract class  BaseHomePresenterImpl< V : IHomeBaseContract.View,M : IHomeBaseContract.Model>:
     BasePresenter< V, M>(), IHomeBaseContract.Presenter<V> {
@@ -80,25 +76,22 @@ abstract class  BaseHomePresenterImpl< V : IHomeBaseContract.View,M : IHomeBaseC
                 var cacheHomeData: String
 
                 //是否为新的数据结构
-                val isNewPageData = SharedPreferencesEditor.getString(IS_NEW_CACHE_HOME_PAGER_DATA)
                 val homeCacheVersion =
                     SharedPreferencesEditor.getString(HOME_PAGER_DATA_CACHE_VERISON)
                 val appVersionCode = RxAppTool.getAppVersionCode(BaseApp.getApp())
 
                 //版本更新后不使用上个版本的首页缓存
-                cacheHomeData = if (isNewPageData.isEmpty() || (!TextUtils.isEmpty(homeCacheVersion) && appVersionCode > homeCacheVersion.toInt())) {
+                cacheHomeData = if ((!TextUtils.isEmpty(homeCacheVersion) && appVersionCode > homeCacheVersion.toInt())) {
                     ""
                 } else {
                     //上次首页缓存数据
                     SharedPreferencesEditor.getString(CACHE_HOME_PAGER_DATA)
                 }
-
                 if (cacheHomeData.isEmpty()) {
                     //第一次安装使用本地临时数据
                     cacheHomeData =
                         String(HomeFileUtils.getAssertsFile(context, fileName)!!)
                 }
-
                 return cacheHomeData
             }
 

m-home/src/ydl/java/com/yidianling/home/constract/YdlHomeViewHolderConstract.kt → m-home/src/ydl/java/com/yidianling/home/constract/HomeViewConfig.kt

@@ -7,52 +7,64 @@ package com.yidianling.home.constract
  * @Company 壹点灵
  * @date 2019/02/13
  */
-class YdlHomeViewHolderConstract {
+class HomeViewConfig {
+
     companion object {
+        private var homeViewOrder = HomeViewOrder()
+
+        fun getOrder():HomeViewOrder{
+            return homeViewOrder
+        }
+
+        fun setOrder(order:HomeViewOrder){
+            this.homeViewOrder = order
+        }
+    }
+    
+    class HomeViewOrder{
         /**
-         * 顶部ViewPager与分类模块
+         * 顶部viewpager与分类模块
          */
-        val PAGER_BANNER_VIEW = 10001
+        var bannerIndex :Int? = 0
         /**
          * 顶部预约专家，即时倾诉，心理测试按钮模块
          */
-        val BUTTON_BANNER_VIEW = 10002
+        var buttonIndex :Int? = 1
         /**
          * 咨询模块
          */
-        val CONSULT_VIEW = 10003
+        var consultIndex :Int? = 2
         /**
          * 课程*成长模块
          */
-        val COURSE_VIEW = 10004
+        var courseIndex :Int? = 3
         /**
          * 倾诉*排解模块
          */
-        val CONFIDE_VIEW = 10005
+        var confideIndex :Int? = 4
         /**
          * 测试模块
          */
-        val TEST_VIEW = 10006
+        var testIndex :Int? = 5
         /**
          * 解忧*问答模块
          */
-        val ASSUAGE_GRIEF_VIEW = 10007
+        var dynamicIndex :Int?= 6
         /**
          * 壹点*冥想模块
          */
-        val MUSE_VIEW = 10008
+        var museIndex :Int?= 7
         /**
          * 心灵*电台模块
          */
-        val INTELLIGENT_VIEW = 10009
+        var fmIndex :Int?= 8
         /**
          * 文章*阅读模块
          */
-        val ARTICLE_VIEW = 10010
+        var articleIndex :Int? = 9
         /**
          * 底部提示语模块
          */
-        val FOOTER_VIEW = 10011
-
+        var footerIndex :Int? = 10
     }
 }
\ No newline at end of file

m-home/src/ydl/java/com/yidianling/home/event/HomeImpl.kt

@@ -14,7 +14,7 @@ import com.yidianling.home.constract.IHomeContract
  * @Company 壹点灵
  * @date 2019/02/13
  */
-class HomeImpl(context: Context, homeView: IHomeContract.View) : HomeBaseImpl(context, homeView), IHomeEvent {
+open class HomeImpl(context: Context, homeView: IHomeContract.View) : HomeBaseImpl(context, homeView), IHomeEvent {
     override fun museMoreClick(dataJson: String) {
         if (Utils.isFastClick()) {
             //防止连击

m-home/src/ydl/java/com/yidianling/home/listener/HomeConfideRecyleSuspendListener.kt

@@ -12,8 +12,8 @@ import android.widget.LinearLayout
 import com.yidianling.common.tools.RxDeviceTool
 import com.yidianling.common.tools.RxImageTool
 import com.yidianling.home.adapter.YdlHomeAdapter
+import com.yidianling.home.constract.HomeViewConfig
 import com.yidianling.home.constract.IHomeContract
-import com.yidianling.home.constract.YdlHomeViewHolderConstract
 
 /**
  * @author yuanwai
@@ -104,7 +104,7 @@ class HomeConfideRecyleSuspendListener : RecyclerView.OnScrollListener() {
         if (mCurrentPosition != manager.findFirstVisibleItemPosition() && manager.findFirstVisibleItemPosition() != -1) {
             mCurrentPosition = manager.findFirstVisibleItemPosition()
         }
-        if (adapter!!.getItemViewType(mCurrentPosition) == YdlHomeViewHolderConstract.CONFIDE_VIEW) {
+        if (adapter!!.getItemViewType(mCurrentPosition) == HomeViewConfig.getOrder().confideIndex) {
             val view = manager.findViewByPosition(mCurrentPosition)
             if (view != null) {
                 if (view is ViewGroup) {
@@ -127,7 +127,7 @@ class HomeConfideRecyleSuspendListener : RecyclerView.OnScrollListener() {
                     confideFilterView!!.visibility = View.INVISIBLE
                 }
             }
-        } else if (adapter!!.getItemViewType(mCurrentPosition) == YdlHomeViewHolderConstract.CONSULT_VIEW) {
+        } else if (adapter!!.getItemViewType(mCurrentPosition) == HomeViewConfig.getOrder().consultIndex) {
             val view = manager.findViewByPosition(mCurrentPosition)
             if (view != null) {
                 if (view is ViewGroup) {
@@ -150,7 +150,7 @@ class HomeConfideRecyleSuspendListener : RecyclerView.OnScrollListener() {
                     consultFilterView!!.visibility = View.INVISIBLE
                 }
             }
-        } else if (adapter!!.getItemViewType(mCurrentPosition) == YdlHomeViewHolderConstract.BUTTON_BANNER_VIEW) {
+        } else if (adapter!!.getItemViewType(mCurrentPosition) == HomeViewConfig.getOrder().buttonIndex) {
             if (excuteStartAnim) {
                 mHomeView?.startAnim()
                 excuteStartAnim = false
@@ -158,7 +158,7 @@ class HomeConfideRecyleSuspendListener : RecyclerView.OnScrollListener() {
             }
             confideFilterView?.visibility = View.INVISIBLE
             consultFilterView?.visibility = View.INVISIBLE
-        } else if (adapter!!.getItemViewType(mCurrentPosition) == YdlHomeViewHolderConstract.PAGER_BANNER_VIEW) {
+        } else if (adapter!!.getItemViewType(mCurrentPosition) == HomeViewConfig.getOrder().bannerIndex) {
             if (excuteEndAnim) {
                 mHomeView?.endAnim()
                 excuteEndAnim = false

m-home/src/ydl/java/com/yidianling/home/ui/view/HomeConsultView.kt

@@ -10,11 +10,11 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
+import com.yidianling.common.tools.LogUtil
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeConsultBean
 import com.yidianling.home.model.bean.HomeHeaderBean
-import com.yidianling.common.tools.LogUtil
 import kotlinx.android.synthetic.ydl.home_confide_view.view.*
 
 /**
@@ -117,10 +117,10 @@ class HomeConsultView(private val mContext: Context, private var homeEvent: IHom
             ll_content.removeAllViews()
             cacheInfoViewList?.clear()
             for (index in 0 until list!!.size) {
-                if (index > 2) {
-                    //只取前三条数据
-                    break
-                }
+//                if (index > 2) {
+//                    //只取前三条数据
+//                    break
+//                }
                 //数据大于缓存view数量，创建view
                 if (index > cacheInfoViewList!!.size - 1) {
                     val homeConsultItemView = createConsultInfoView()

m-home/src/ydl/res/drawable/home_background_home_pager_top.xml

@@ -5,7 +5,7 @@
     <item android:state_enabled="true">
         <shape>
             <corners android:radius="0dp"></corners>
-            <gradient android:endColor="#05cbfc" android:startColor="#3484da" />
+            <gradient android:endColor="@color/platform_main_gradient_end_color" android:startColor="@color/platform_main_gradient_start_color" />
             <stroke android:width="0dp" android:color="#bebebe" />
         </shape>
     </item>

m-home/src/ydl/res/drawable/home_common_title_gradient_back.xml

@@ -3,7 +3,7 @@
     android:shape="rectangle">
 
     <gradient
-        android:startColor="#1DA1F2"
-        android:endColor="#5CC8F7"/>
+        android:startColor="@color/platform_main_gradient_start_color"
+        android:endColor="@color/platform_main_gradient_end_color"/>
 
 </shape>
\ No newline at end of file

m-home/src/ydl/res/drawable/home_consult_chat_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+
+            <solid android:color="@color/platform_main_theme" />
+            <size
+                    android:width="132dp"
+                    android:height="132dp" />
+        </shape>
+    </item>
+    <item>
+        <bitmap
+                android:antialias="true"
+                android:gravity="center"
+                android:src="@drawable/home_consult_chat_ic"
+                android:tileMode="disabled" >
+
+        </bitmap>
+    </item>
+
+</layer-list>
\ No newline at end of file

m-home/src/ydl/res/drawable/home_dynamic_item_focus_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <solid
+        android:color="@color/platform_color_F7F7F7"/>
+
+    <corners android:radius="12dp" />
+</shape>

m-home/src/ydl/res/drawable/home_ic_add.xml

+<vector android:height="14dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="14dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/platform_main_theme" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>

m-home/src/ydl/res/drawable/home_ic_done.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/platform_main_theme"
+        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"
+            tools:ignore="VectorRaster" />
+</vector>

m-home/src/ydl/res/drawable/home_intelligent_top_view_recommend_back.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="#FFDD33" />
+    <solid android:color="@color/platform_specific_bg_color" />
 
     <corners android:topRightRadius="6dp"
         android:bottomLeftRadius="6dp" />

m-home/src/ydl/res/drawable/home_test_item_go_bg.xml

@@ -4,7 +4,7 @@
        android:shape="rectangle">
 
     <solid
-        android:color="#FFDD33"/>
+        android:color="@color/platform_specific_bg_color"/>
 
     <corners android:radius="12dp" />
 </shape>

m-home/src/ydl/res/layout/home_article_item_view.xml

@@ -4,16 +4,16 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:paddingLeft="@@dimen/platform_dp_15"
-    android:paddingRight="@@dimen/platform_dp_15"
-    android:paddingTop="@@dimen/platform_dp_15">
+    android:paddingLeft="@dimen/platform_dp_15"
+    android:paddingRight="@dimen/platform_dp_15"
+    android:paddingTop="@dimen/platform_dp_15">
 
     <android.support.v7.widget.CardView
         android:id="@+id/homeModuleArticleItemViewCardImg"
-        android:layout_width="@@dimen/platform_dp_127"
-        android:layout_height="@@dimen/platform_dp_88"
+        android:layout_width="@dimen/platform_dp_127"
+        android:layout_height="@dimen/platform_dp_88"
         android:layout_alignParentRight="true"
-        app:cardCornerRadius="@@dimen/platform_dp_6"
+        app:cardCornerRadius="@dimen/platform_dp_6"
         app:cardElevation="0dp">
         <ImageView
             android:layout_width="match_parent"
@@ -29,16 +29,16 @@
         android:layout_height="wrap_content"
         android:maxLines="2"
         android:ellipsize="end"
-        android:textSize="@@dimen/platform_dp_18"
+        android:textSize="@dimen/platform_dp_18"
         android:textStyle="bold"
         android:layout_marginTop="-2dp"
         android:textColor="@color/platform_color_222222"
         android:layout_alignParentTop="true"
-        android:lineSpacingExtra="@@dimen/platform_dp_1"
+        android:lineSpacingExtra="@dimen/platform_dp_1"
         tools:text="喧嚣的世界中，你的重要何以而来？喧嚣的世界中，你的重要何以而来？"
         android:layout_alignParentLeft="true"
         android:layout_toLeftOf="@+id/homeModuleArticleItemViewCardImg"
-        android:layout_marginRight="@@dimen/platform_dp_20"/>
+        android:layout_marginRight="@dimen/platform_dp_20"/>
 
     <TextView
         android:id="@+id/homeModuleArticleItemViewContent"
@@ -46,15 +46,15 @@
         android:layout_height="wrap_content"
         android:maxLines="2"
         android:ellipsize="end"
-        android:textSize="@@dimen/platform_dp_13"
-        android:layout_marginTop="@@dimen/platform_dp_4"
+        android:textSize="@dimen/platform_dp_13"
+        android:layout_marginTop="@dimen/platform_dp_4"
         android:textColor="@color/platform_color_666666"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/homeModuleArticleItemViewTitle"
-        android:lineSpacingExtra="@@dimen/platform_dp_3"
+        android:lineSpacingExtra="@dimen/platform_dp_3"
         tools:text="喧嚣的世界中，你的重要何以而来？当我伫立在我所伫立之处..."
         android:layout_toLeftOf="@+id/homeModuleArticleItemViewCardImg"
-        android:layout_marginRight="@@dimen/platform_dp_20"/>
+        android:layout_marginRight="@dimen/platform_dp_20"/>
 
     <LinearLayout
         android:id="@+id/homeModuleArticleItemViewBottomLayout"
@@ -62,12 +62,12 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:layout_below="@+id/homeModuleArticleItemViewCardImg"
-        android:layout_marginTop="@@dimen/platform_dp_16">
+        android:layout_marginTop="@dimen/platform_dp_16">
 
         <ImageView
             android:id="@+id/homeModuleArticleItemViewIcon"
-            android:layout_width="@@dimen/platform_dp_12"
-            android:layout_height="@@dimen/platform_dp_12"
+            android:layout_width="@dimen/platform_dp_12"
+            android:layout_height="@dimen/platform_dp_12"
             android:src="@drawable/home_article_item_icon"
             android:layout_alignParentLeft="true"/>
 
@@ -76,9 +76,9 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:textSize="@@dimen/platform_dp_12"
+            android:textSize="@dimen/platform_dp_12"
             android:textColor="@color/platform_color_242424"
-            android:layout_marginLeft="@@dimen/platform_dp_3"
+            android:layout_marginLeft="@dimen/platform_dp_3"
             android:textStyle="bold"
             tools:text="赵秀英"/>
 
@@ -87,15 +87,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             tools:text="3327"
-            android:textSize="@@dimen/platform_dp_12"
+            android:textSize="@dimen/platform_dp_12"
             android:textColor="@color/platform_color_242424"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="点赞"
-            android:textSize="@@dimen/platform_dp_11"
-            android:layout_marginRight="@@dimen/platform_dp_12"
+            android:textSize="@dimen/platform_dp_11"
+            android:layout_marginRight="@dimen/platform_dp_12"
             android:textColor="@color/platform_color_666666"/>
 
         <TextView
@@ -103,14 +103,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             tools:text="2656"
-            android:textSize="@@dimen/platform_dp_12"
+            android:textSize="@dimen/platform_dp_12"
             android:textColor="@color/platform_color_242424"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="浏览"
-            android:textSize="@@dimen/platform_dp_11"
+            android:textSize="@dimen/platform_dp_11"
             android:textColor="@color/platform_color_666666"/>
 
     </LinearLayout>
@@ -122,6 +122,6 @@
         android:background="@color/platform_color_EBEBEB"
         android:layout_centerInParent="true"
         android:layout_below="@+id/homeModuleArticleItemViewBottomLayout"
-        android:layout_marginTop="@@dimen/platform_dp_16"/>
+        android:layout_marginTop="@dimen/platform_dp_16"/>
 
 </RelativeLayout>

m-home/src/ydl/res/layout/home_assuage_grief_image_more_five_item_view.xml

@@ -92,13 +92,13 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentBottom="true"
                     android:layout_alignParentRight="true"
-                    android:layout_marginBottom="@@dimen/platform_dp_5"
-                    android:layout_marginRight="@@dimen/platform_dp_5"
+                    android:layout_marginBottom="@dimen/platform_dp_5"
+                    android:layout_marginRight="@dimen/platform_dp_5"
                     android:background="@drawable/home_assuage_grief_item_view_image_num_back"
                     android:gravity="center"
                     tools:text="9图"
                     android:textColor="@color/platform_color_242424"
-                    android:textSize="@@dimen/platform_dp_10" />
+                    android:textSize="@dimen/platform_dp_10" />
             </RelativeLayout>
         </LinearLayout>
 

m-home/src/ydl/res/layout/home_assuage_grief_image_under_four_item_view.xml

@@ -54,13 +54,13 @@
                     android:layout_height="14dp"
                     android:gravity="center"
                     tools:text="9图"
-                    android:textSize="@@dimen/platform_dp_10"
+                    android:textSize="@dimen/platform_dp_10"
                     android:textColor="@color/platform_color_242424"
                     android:background="@drawable/home_assuage_grief_item_view_image_num_back"
                     android:layout_alignParentBottom="true"
                     android:layout_alignParentRight="true"
-                    android:layout_marginRight="@@dimen/platform_dp_5"
-                    android:layout_marginBottom="@@dimen/platform_dp_5"/>
+                    android:layout_marginRight="@dimen/platform_dp_5"
+                    android:layout_marginBottom="@dimen/platform_dp_5"/>
             </RelativeLayout>
         </LinearLayout>
     </LinearLayout>

m-home/src/ydl/res/layout/home_consult_item_view.xml

@@ -21,7 +21,7 @@
         android:layout_alignTop="@+id/img_consult_head"
         android:layout_marginTop="@dimen/platform_dp_13"
         android:layout_marginEnd="@dimen/platform_dp_15"
-        android:background="@drawable/home_consult_chat"
+        android:background="@drawable/home_consult_chat_bg"
         android:gravity="center" />
 
     <LinearLayout

m-home/src/ydl/res/layout/home_fragment.xml

@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:cube_ptr="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/platform_white"
@@ -29,13 +30,13 @@
         <View
             android:id="@+id/view_rl_top_bg"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
+            android:layout_height="@dimen/platform_action_bar_height"
             android:background="@drawable/home_background_home_pager_top" />
 
         <RelativeLayout
             android:id="@+id/rl_top"
             android:layout_width="match_parent"
-            android:layout_height="48dp">
+            android:layout_height="@dimen/platform_action_bar_height">
 
             <LinearLayout
                 android:id="@+id/ll_top_function"
@@ -165,7 +166,7 @@
                             android:layout_marginLeft="8dp"
                             android:layout_weight="1"
                             android:gravity="center_vertical"
-                            android:text="@string/home_search_hint"
+                            tools:text="@string/home_search_hint"
                             android:textColor="#999999"
                             android:textSize="@dimen/platform_default_text_size_small"
                             android:textStyle="normal"

m-home/src/ydl/res/layout/home_test_item_view.xml

@@ -87,7 +87,7 @@
             android:gravity="center"
             android:text="去测试"
             android:textSize="12dp"
-            android:textColor="@color/platform_color_222222"
+            android:textColor="@color/platform_but_text_color_specific"
             android:textStyle="bold"/>
     </LinearLayout>
 

m-home/src/ydl/res/layout/home_test_top_item_view.xml

@@ -105,7 +105,7 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:text="每日一测"
-            android:textColor="@color/platform_color_242424"
+            android:textColor="@color/platform_but_text_color_specific"
             android:textSize="@dimen/platform_dp_12"
             android:textStyle="bold"/>
     </RelativeLayout>

ydl-platform/src/main/java/com/ydl/ydlcommon/data/PlatformRamImpl.kt

@@ -37,7 +37,7 @@ class PlatformRamImpl private constructor(): IPlatformRam {
             return@lazy channel!!
         }
 
-        channel = "$appFrom$channel"
+        channel = appFrom+"_"+channel
         channel ?: "android"
     }
 

ydl-platform/src/main/res/values/colors.xml

@@ -105,6 +105,9 @@
     <color name="platform_main_gradient_start_color">#1DA1F2</color>
     <color name="platform_main_gradient_end_color">#23B2FA</color>
 
+    <!--次级按钮背景，和背景冲突时使用，黄色基本不变-->
+    <color name="platform_specific_bg_color">#FFDD33</color>
+
     <!--  ============ 文字颜色 ============ -->
     <!--    一级类目，标题、点缀文字颜色-->
     <color name="platform_text_dark_color">#242424</color>
@@ -122,8 +125,7 @@
     <color name="platform_but_text_color_unselected">#242424</color>
     <color name="platform_but_text_color_selected">#1da1f2</color>
 
-    <color name="consultant_confirm_text_color">#242424</color>
-    <color name="consultant_filter_content_text_color_un">#555555</color>
-    <color name="consultant_filter_content_text_color_en">#242424</color>
+    <!--次级按钮字体颜色，和背景冲突时使用，黑色基本不变-->
+    <color name="platform_but_text_color_specific">#222222</color>
 
 </resources>