首页资源重命名

m-home/build.gradle

@@ -2,6 +2,13 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'resTools' // 资源重命名插件
+
+// 配置资源重命名插件
+resConfig {
+    new_prefix = 'home_'  // 资源前缀
+    old_prefix = ''         // 老前缀，可为''空字符串
+}
 
 kapt {
     arguments {
@@ -50,12 +57,7 @@ android {
 
     sourceSets {
         main {
-            res.srcDirs = [
-                    'src/main/res',
-                    'src/main/res/layouts',
-                    'src/main/res/layouts/ydlhome', //壹点零用户版首页fragment所在xml
-                    'src/main/res/layouts/ydlhome/holder', //壹点零用户版首页fragment中列表ViewHolder所在xml
-            ]
+            res.srcDirs = ['src/main/res']
         }
     }
 

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

@@ -185,7 +185,7 @@ open class HomeBaseImpl : IHomeBaseEvent {
             return
         }
         var doctorName =
-            if (text != mContext?.resources?.getString(R.string.search_hint) && text != mContext?.resources?.getString(
+            if (text != mContext?.resources?.getString(R.string.home_search_hint) && text != mContext?.resources?.getString(
                     R.string.platform_search
                 )
             ) text else ""

m-home/src/main/res/values/strings.xml

-<resources>
-    <string name="app_name">m-home</string>
-    <string name="search_hint">搜索话题、咨询师姓名</string>
-</resources>
+<resources>
+    <string name="home_app_name">m-home</string>
+    <string name="home_search_hint">搜索话题、咨询师姓名</string>
+</resources>

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

@@ -131,7 +131,7 @@ class YdlHomeAdapter(private val mContext: Context,
             }
             //底部提示语模块
             else -> {
-                val view = mInflater.inflate(R.layout.home_module_footer_view, parent, false)
+                val view = mInflater.inflate(R.layout.home_footer_view, parent, false)
                 return FooterViewViewHolder(view)
             }
         }

m-home/src/xlzx/java/com/yidianling/home/dialog/ActivityDialog.kt

@@ -8,7 +8,7 @@ import com.ydl.webview.NewH5Activity
 import com.yidianling.home.R
 import com.ydl.ydl_image.module.GlideApp
 import com.ydl.ydl_router.manager.YDLRouterManager
-import kotlinx.android.synthetic.xlzx.dialog_activity.*
+import kotlinx.android.synthetic.xlzx.home_dialog_activity.*
 import java.lang.ref.WeakReference
 
 /**
@@ -33,7 +33,7 @@ class ActivityDialog : Dialog{
 
         window.setBackgroundDrawableResource(android.R.color.transparent)
 
-        setContentView(R.layout.dialog_activity)
+        setContentView(R.layout.home_dialog_activity)
 
         initView()
     }

m-home/src/xlzx/java/com/yidianling/home/dialog/ActivityGuideDialog.kt

@@ -7,7 +7,7 @@ import android.view.Window
 import com.ydl.ydl_image.module.GlideApp
 import com.ydl.ydlcommon.utils.DisplayUtils
 import com.yidianling.home.R
-import kotlinx.android.synthetic.xlzx.dialog_guide_activity.*
+import kotlinx.android.synthetic.xlzx.home_dialog_guide_activity.*
 import java.util.*
 
 /**
@@ -32,7 +32,7 @@ class ActivityGuideDialog : Dialog{
         requestWindowFeature(Window.FEATURE_NO_TITLE)
         window.setBackgroundDrawableResource(android.R.color.transparent)
 
-        setContentView(R.layout.dialog_guide_activity)
+        setContentView(R.layout.home_dialog_guide_activity)
 
         initView()
     }

m-home/src/xlzx/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt

@@ -33,11 +33,11 @@ import com.yidianling.home.presenter.HomePresenterImpl
 import com.yidianling.home.ui.utils.Double11ActivityManagerUtils
 import com.yidianling.home.ui.view.CouponDialog
 import com.yidianling.user.api.service.IUserService
-import kotlinx.android.synthetic.xlzx.fragment_home_module.*
-import kotlinx.android.synthetic.xlzx.layout_home_module_content.*
-import kotlinx.android.synthetic.xlzx.layout_home_module_head_bg.*
-import kotlinx.android.synthetic.xlzx.layout_home_module_input.*
-import kotlinx.android.synthetic.xlzx.layout_home_module_toolbar.*
+import kotlinx.android.synthetic.xlzx.home_fragment_home_module.*
+import kotlinx.android.synthetic.xlzx.home_layout_home_module_content.*
+import kotlinx.android.synthetic.xlzx.home_layout_home_module_head_bg.*
+import kotlinx.android.synthetic.xlzx.home_layout_home_module_input.*
+import kotlinx.android.synthetic.xlzx.home_layout_home_module_toolbar.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -73,7 +73,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
     private var scrollListner: HomeConfideRecyleSuspendListener? = null
 
     override fun layoutResId(): Int {
-        return R.layout.fragment_home_module
+        return R.layout.home_fragment_home_module
     }
 
     override fun initDataAndEvent() {
@@ -142,7 +142,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {//4.4以下不支持状态栏变色
             val statusBarHeight = StatusBarUtils.getStatusBarHeight(activity)
-            var homeTitleBarHeight = resources.getDimension(R.dimen.home_title_bar_height)
+            var homeTitleBarHeight = resources.getDimension(R.dimen.home_home_title_bar_height)
             val lp1 = view_search_toolbar_bg.layoutParams as RelativeLayout.LayoutParams
             lp1.height = (homeTitleBarHeight + statusBarHeight).toInt()
             view_search_toolbar_bg.layoutParams = lp1
@@ -281,7 +281,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
             for (item in cacheList) {
                 imageViews.add(item.imageUrl!!)
             }
-            banner_search.setImageLoader(GlideImageLoader(R.drawable.home_module_image_default_back))
+            banner_search.setImageLoader(GlideImageLoader(R.drawable.home_image_default_back))
                 .setImages(imageViews).start()
             banner_search.setOnBannerListener {
                 homeEvent?.bannerClick(cacheList!![it])

m-home/src/xlzx/java/com/yidianling/home/ui/view/CouponDialog.kt

@@ -7,7 +7,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import com.yidianling.home.R
 import com.yidianling.home.model.bean.CouponBean
-import kotlinx.android.synthetic.xlzx.dialog_coupon.*
+import kotlinx.android.synthetic.xlzx.home_dialog_coupon.*
 
 /**
  * @author jiucheng
@@ -43,7 +43,7 @@ class CouponDialog : Dialog {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.dialog_coupon)
+        setContentView(R.layout.home_dialog_coupon)
         setCanceledOnTouchOutside(false)
         window.setBackgroundDrawable(ColorDrawable())
         if (couponBean != null) {
@@ -86,7 +86,7 @@ class CouponDialog : Dialog {
                     title = "获得新优惠券"
                 }
                 ensureText = "立即领取"
-                iamge = R.drawable.coupon_receiver
+                iamge = R.drawable.home_coupon_receiver
             }
             STATUS_GET -> {
                 if (list!!.size > 1) {
@@ -95,7 +95,7 @@ class CouponDialog : Dialog {
                     title = "恭喜您，领取成功"
                 }
                 ensureText = "查看我的卡券"
-                iamge = R.drawable.coupon_success
+                iamge = R.drawable.home_coupon_success
             }
         }
         iv_title.setImageResource(iamge)

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeArticleItemView.kt

@@ -9,7 +9,7 @@ import com.ydl.ydl_image.manager.YDLImageCacheManager
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeArticleBean
-import kotlinx.android.synthetic.xlzx.home_module_article_item_view.view.*
+import kotlinx.android.synthetic.xlzx.home_article_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -31,7 +31,7 @@ class HomeArticleItemView(private val mContext: Context, private var homeEvent:
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_article_item_view, this)
+        View.inflate(mContext, R.layout.home_article_item_view, this)
     }
 
     fun updateData(bean: HomeArticleBean.Bean?) {

m-home/src/xlzx/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.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeArticleBean
-import kotlinx.android.synthetic.xlzx.home_module_article_view.view.*
+import kotlinx.android.synthetic.xlzx.home_article_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -33,7 +33,7 @@ class HomeArticleView(private val mContext: Context, private var homeEvent: IHom
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_article_view, this)
+        View.inflate(mContext, R.layout.home_article_view, this)
         homeModuleArticleViewHomeCommonTitleView.setTitle("文章·阅读")
         homeModuleArticleViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.articleMoreClick()

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeAssuageGriefImageItemView.kt

@@ -8,9 +8,9 @@ import com.ydl.ydl_image.manager.YDLImageCacheManager
 import com.yidianling.common.tools.RxDeviceTool
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
-import kotlinx.android.synthetic.xlzx.home_module_assuage_grief_image_more_five_item_view.view.*
-import kotlinx.android.synthetic.xlzx.home_module_assuage_grief_image_under_four_item_view.view.*
-import kotlinx.android.synthetic.xlzx.home_module_assuage_grief_image_under_two_item_view.view.*
+import kotlinx.android.synthetic.xlzx.home_assuage_grief_image_more_five_item_view.view.*
+import kotlinx.android.synthetic.xlzx.home_assuage_grief_image_under_four_item_view.view.*
+import kotlinx.android.synthetic.xlzx.home_assuage_grief_image_under_two_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -44,7 +44,7 @@ class HomeAssuageGriefImageItemView(
             layoutParams = params
             View.inflate(
                 mContext,
-                R.layout.home_module_assuage_grief_image_under_two_item_view,
+                R.layout.home_assuage_grief_image_under_two_item_view,
                 this
             )
 
@@ -61,7 +61,7 @@ class HomeAssuageGriefImageItemView(
             layoutParams = params
             View.inflate(
                 mContext,
-                R.layout.home_module_assuage_grief_image_under_four_item_view,
+                R.layout.home_assuage_grief_image_under_four_item_view,
                 this
             )
 
@@ -90,7 +90,7 @@ class HomeAssuageGriefImageItemView(
             layoutParams = params
             View.inflate(
                 mContext,
-                R.layout.home_module_assuage_grief_image_more_five_item_view,
+                R.layout.home_assuage_grief_image_more_five_item_view,
                 this
             )
 

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeAssuageGriefItemView.kt

@@ -22,7 +22,7 @@ import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeAskBean
 import com.yidianling.user.api.service.IUserService
-import kotlinx.android.synthetic.xlzx.home_module_assuage_grief_item_view.view.*
+import kotlinx.android.synthetic.xlzx.home_assuage_grief_item_view.view.*
 
 
 /**
@@ -56,7 +56,7 @@ class HomeAssuageGriefItemView(
             , (16 * RxDeviceTool.getScreenDensity(mContext)).toInt()
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_assuage_grief_item_view, this)
+        View.inflate(mContext, R.layout.home_assuage_grief_item_view, this)
 
 
     }
@@ -91,9 +91,9 @@ class HomeAssuageGriefItemView(
                 }
                 bean.isZan = if (bean.isZan == 1) 0 else 1
                 if (bean.isZan == 1) {
-                    homeModuleAssuageGriefViewZanState.setImageResource(R.drawable.home_module_assuage_grief_item_view_tab_warm_has_zan)
+                    homeModuleAssuageGriefViewZanState.setImageResource(R.drawable.home_assuage_grief_item_view_tab_warm_has_zan)
                 } else {
-                    homeModuleAssuageGriefViewZanState.setImageResource(R.drawable.home_module_assuage_grief_item_view_tab_warm)
+                    homeModuleAssuageGriefViewZanState.setImageResource(R.drawable.home_assuage_grief_item_view_tab_warm)
                 }
                 bean.zanCount = if (bean.isZan == 1) bean.zanCount + 1 else bean.zanCount - 1
                 homeModuleAssuageGriefViewZanCount.text = bean?.zanCount.toString()
@@ -148,9 +148,9 @@ class HomeAssuageGriefItemView(
          * 点赞
          */
         if (bean?.isZan == 1) {
-            homeModuleAssuageGriefViewZanState.setImageResource(R.drawable.home_module_assuage_grief_item_view_tab_warm_has_zan)
+            homeModuleAssuageGriefViewZanState.setImageResource(R.drawable.home_assuage_grief_item_view_tab_warm_has_zan)
         } else {
-            homeModuleAssuageGriefViewZanState.setImageResource(R.drawable.home_module_assuage_grief_item_view_tab_warm)
+            homeModuleAssuageGriefViewZanState.setImageResource(R.drawable.home_assuage_grief_item_view_tab_warm)
         }
 
         /**
@@ -206,7 +206,7 @@ class HomeAssuageGriefItemView(
             if (commentBean.userType == 2) {
                 setImage(
                     mContext, homeModuleAssuageGriefViewHotViewComment, "vip",
-                    R.drawable.home_module_assuage_grief_item_user_type_v,
+                    R.drawable.home_assuage_grief_item_user_type_v,
                     RxImageTool.dp2px(13f),
                     RxImageTool.dp2px(13f)
                 )

m-home/src/xlzx/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.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeAskBean
-import kotlinx.android.synthetic.xlzx.home_module_assuage_grief_view.view.*
+import kotlinx.android.synthetic.xlzx.home_assuage_grief_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -32,7 +32,7 @@ class HomeAssuageGriefView(private val mContext: Context, private var homeEvent:
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_assuage_grief_view, this)
+        View.inflate(mContext, R.layout.home_assuage_grief_view, this)
         homeModuleAssuageGriefViewHomeCommonTitleView.setTitle("解忧·问答")
         homeModuleAssuageGriefViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.askMoreClick()

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt

@@ -10,7 +10,7 @@ import com.yidianling.common.tools.RxImageTool
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeHeaderBean
-import kotlinx.android.synthetic.xlzx.home_module_button_banner_view.view.*
+import kotlinx.android.synthetic.xlzx.home_button_banner_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -52,7 +52,7 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_button_banner_view, this)
+        View.inflate(mContext, R.layout.home_button_banner_view, this)
 
 //        initButtonView()
 
@@ -101,7 +101,7 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
         lineParam.leftMargin = dp15
         lineParam.rightMargin = dp15
         lineView = View(context)
-        lineView!!.setBackgroundColor(resources.getColor(R.color.home_module_category_view_test_line))
+        lineView!!.setBackgroundColor(resources.getColor(R.color.home_category_view_test_line))
         lineView!!.layoutParams = lineParam
     }
 
@@ -122,7 +122,7 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
             )
             cutOffParams.height = RxImageTool.dip2px(10f)
             val cutOffView = View(context)
-            cutOffView.setBackgroundColor(resources.getColor(R.color.colorBg))
+            cutOffView.setBackgroundColor(resources.getColor(R.color.home_colorBg))
             cutOffView.layoutParams = cutOffParams
 
             ll_home_module_button.addView(cutOffView)

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeCommonTitleView.kt

@@ -5,7 +5,7 @@ import android.support.constraint.ConstraintLayout
 import android.util.AttributeSet
 import android.view.View
 import com.yidianling.home.R
-import kotlinx.android.synthetic.xlzx.home_module_common_title_view.view.*
+import kotlinx.android.synthetic.xlzx.home_common_title_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -21,7 +21,7 @@ class HomeCommonTitleView(private val mContext: Context, private val attributeSe
     }
 
     private fun initView() {
-        View.inflate(mContext, R.layout.home_module_common_title_view, this)
+        View.inflate(mContext, R.layout.home_common_title_view, this)
     }
 
     fun setTitle(title: String) {

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeConfideExpertInfoView.kt

@@ -15,7 +15,7 @@ import com.yidianling.home.event.HomeImpl
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.event.IHomeEvent
 import com.yidianling.home.model.bean.HomeConfideBean
-import kotlinx.android.synthetic.xlzx.home_module_confide_expert_info_view.view.*
+import kotlinx.android.synthetic.xlzx.home_confide_expert_info_view.view.*
 
 
 /**
@@ -43,7 +43,7 @@ class HomeConfideExpertInfoView(
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(context, R.layout.home_module_confide_expert_info_view, this)
+        View.inflate(context, R.layout.home_confide_expert_info_view, this)
     }
 
     fun setData(bean: HomeConfideBean.BodyBean?, position: Int, isLast: Boolean) {
@@ -131,16 +131,16 @@ class HomeConfideExpertInfoView(
     private fun setConfideButton(bodyBean: HomeConfideBean.BodyBean) {
         when (bodyBean.confideLine) {//1在线 2离线 3通话中  4继续倾诉
             1 -> {
-                tv_confide.setBackgroundResource(R.drawable.home_module_confide_line_1)
+                tv_confide.setBackgroundResource(R.drawable.home_confide_line_1)
             }
             2 -> {
-                tv_confide.setBackgroundResource(R.drawable.home_module_confide_line_2)
+                tv_confide.setBackgroundResource(R.drawable.home_confide_line_2)
             }
             3 -> {
-                tv_confide.setBackgroundResource(R.drawable.home_module_confide_line_3)
+                tv_confide.setBackgroundResource(R.drawable.home_confide_line_3)
             }
             4 -> {
-                tv_confide.setBackgroundResource(R.drawable.home_module_confide_line_4)
+                tv_confide.setBackgroundResource(R.drawable.home_confide_line_4)
             }
         }
         tv_confide.setOnClickListener {

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeConfideView.kt

@@ -16,7 +16,7 @@ import com.yidianling.home.event.HomeImpl
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeConfideBean
 import com.yidianling.home.model.bean.HomeHeaderBean
-import kotlinx.android.synthetic.xlzx.home_module_confide_view.view.*
+import kotlinx.android.synthetic.xlzx.home_confide_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -48,7 +48,7 @@ class HomeConfideView(private val mContext: Context, private var homeEvent: Home
         )
         layoutParams = params
         orientation = VERTICAL
-        View.inflate(mContext, R.layout.home_module_confide_view, this)
+        View.inflate(mContext, R.layout.home_confide_view, this)
         homeModuleConfideViewHomeCommonTitleView.setTitle("倾诉·排解")
         homeModuleConfideViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.confideMoreClick()

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeConsultItemView.kt

@@ -13,7 +13,7 @@ import com.yidianling.common.tools.RxImageTool
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeConsultBean
-import kotlinx.android.synthetic.xlzx.home_module_consult_item_view.view.*
+import kotlinx.android.synthetic.xlzx.home_consult_item_view.view.*
 
 /**
  * @author jiucheng
@@ -38,7 +38,7 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent:
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(context, R.layout.home_module_consult_item_view, this)
+        View.inflate(context, R.layout.home_consult_item_view, this)
     }
 
     fun setData(bean: HomeConsultBean.ListBean?, position: Int, isLast: Boolean, cateId: String?) {
@@ -121,7 +121,7 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent:
                 )
             )
             tv_consult_chat.background =
-                ContextCompat.getDrawable(context, R.drawable.home_module_consult_chat_bg)
+                ContextCompat.getDrawable(context, R.drawable.home_consult_chat_bg)
         } else {
             tv_consult_chat.text = bodyBean.chatBtnText
             tv_consult_chat.setTextColor(
@@ -131,7 +131,7 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent:
                 )
             )
             tv_consult_chat.background =
-                ContextCompat.getDrawable(context, R.drawable.home_module_consult_chat_rest_bg)
+                ContextCompat.getDrawable(context, R.drawable.home_consult_chat_rest_bg)
         }
         tv_consult_chat.setOnClickListener {
             homeEvent!!.consultChatClick(bodyBean.doctorUid.toString())

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

@@ -15,7 +15,7 @@ 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 kotlinx.android.synthetic.xlzx.home_module_confide_view.view.*
+import kotlinx.android.synthetic.xlzx.home_confide_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -47,7 +47,7 @@ class HomeConsultView(private val mContext: Context, private var homeEvent: IHom
         )
         layoutParams = params
         orientation = VERTICAL
-        View.inflate(mContext, R.layout.home_module_confide_view, this)
+        View.inflate(mContext, R.layout.home_confide_view, this)
         homeModuleConfideViewHomeCommonTitleView.setTitle("咨询·理解")
         homeModuleConfideViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.consultMoreClick()

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeCourseItemView.kt

@@ -8,7 +8,7 @@ import com.ydl.ydl_image.manager.YDLImageCacheManager
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeCourseBean
-import kotlinx.android.synthetic.xlzx.home_module_course_item_view.view.*
+import kotlinx.android.synthetic.xlzx.home_course_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -30,7 +30,7 @@ class HomeCourseItemView(private val mContext: Context, private var homeEvent: I
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_course_item_view, this)
+        View.inflate(mContext, R.layout.home_course_item_view, this)
     }
 
     /**

m-home/src/xlzx/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.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeCourseBean
-import kotlinx.android.synthetic.xlzx.home_module_course_view.view.*
+import kotlinx.android.synthetic.xlzx.home_course_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -32,7 +32,7 @@ class HomeCourseView(private val mContext: Context, private var homeEvent: IHome
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_course_view, this)
+        View.inflate(mContext, R.layout.home_course_view, this)
         homeModuleCourseViewHomeCommonTitleView.setTitle("课程·成长")
         homeModuleCourseViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.courseMreClick()

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeIntelligentItemView.kt

@@ -8,7 +8,7 @@ import com.yidianling.common.tools.RxImageTool
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeFMBean
-import kotlinx.android.synthetic.xlzx.home_module_intelligent_item_view.view.*
+import kotlinx.android.synthetic.xlzx.home_intelligent_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -35,7 +35,7 @@ class HomeIntelligentItemView(
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_intelligent_item_view, this)
+        View.inflate(mContext, R.layout.home_intelligent_item_view, this)
 
     }
 

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeIntelligentTopItemView.kt

@@ -9,7 +9,7 @@ import com.yidianling.common.tools.RxImageTool
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeFMBean
-import kotlinx.android.synthetic.xlzx.home_module_intelligent_top_item_view.view.*
+import kotlinx.android.synthetic.xlzx.home_intelligent_top_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -35,7 +35,7 @@ class HomeIntelligentTopItemView(
         var viewHeight = viewWidth * 143 / 345
         val params = LinearLayout.LayoutParams(viewWidth, viewHeight)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_intelligent_top_item_view, this)
+        View.inflate(mContext, R.layout.home_intelligent_top_item_view, this)
 
     }
 

m-home/src/xlzx/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.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeFMBean
-import kotlinx.android.synthetic.xlzx.home_module_intelligent_view.view.*
+import kotlinx.android.synthetic.xlzx.home_intelligent_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -32,7 +32,7 @@ class HomeIntelligentView(private val mContext: Context, private var homeEvent:
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_intelligent_view, this)
+        View.inflate(mContext, R.layout.home_intelligent_view, this)
         homeModuleIntelligentViewHomeCommonTitleView.setTitle("心灵·电台")
         homeModuleIntelligentViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.fmMoreClick()

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomePagerBannerCategoryView.kt

@@ -16,7 +16,7 @@ import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.event.IHomeEvent
 import com.yidianling.home.model.bean.HomeHeaderBean
-import kotlinx.android.synthetic.xlzx.home_module_pager_banner_category_view.view.*
+import kotlinx.android.synthetic.xlzx.home_pager_banner_category_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -89,7 +89,7 @@ class HomePagerBannerCategoryView(mContext: Context, homeEvent: IHomeBaseEvent)
      * 界面初始化
      */
     private fun initView() {
-        View.inflate(context, R.layout.home_module_pager_banner_category_view, this)
+        View.inflate(context, R.layout.home_pager_banner_category_view, this)
         val params = FrameLayout.LayoutParams(
             FrameLayout.LayoutParams.MATCH_PARENT,
             FrameLayout.LayoutParams.WRAP_CONTENT
@@ -277,7 +277,7 @@ class HomePagerBannerCategoryView(mContext: Context, homeEvent: IHomeBaseEvent)
         lineParam.rightMargin = dp15
         lineParam.topMargin = multiple * (imageViewWidth + dp8 + textViewHeight) + dp8
         lineView = View(context)
-        lineView!!.setBackgroundColor(resources.getColor(R.color.home_module_category_view_test_line))
+        lineView!!.setBackgroundColor(resources.getColor(R.color.home_category_view_test_line))
         lineView!!.layoutParams = lineParam
     }
 

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomePagerBannerRealView.kt

@@ -13,9 +13,9 @@ import android.widget.LinearLayout
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeHeaderBean
-import kotlinx.android.synthetic.xlzx.home_module_real_view_in.view.*
-import kotlinx.android.synthetic.xlzx.home_module_real_view_left.view.*
-import kotlinx.android.synthetic.xlzx.home_module_real_view_out.view.*
+import kotlinx.android.synthetic.xlzx.home_real_view_in.view.*
+import kotlinx.android.synthetic.xlzx.home_real_view_left.view.*
+import kotlinx.android.synthetic.xlzx.home_real_view_out.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -76,9 +76,9 @@ class HomePagerBannerRealView(mContext: Context, homeEvent: IHomeBaseEvent) :
             ViewGroup.LayoutParams.MATCH_PARENT,
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
-        View.inflate(context, R.layout.home_module_real_view_left, this)
-        view_out = View.inflate(context, R.layout.home_module_real_view_out, null)
-        view_in = View.inflate(context, R.layout.home_module_real_view_in, null)
+        View.inflate(context, R.layout.home_real_view_left, this)
+        view_out = View.inflate(context, R.layout.home_real_view_out, null)
+        view_in = View.inflate(context, R.layout.home_real_view_in, null)
         homeModuleRealViewLeftFrameLayout.addView(view_out)
         homeModuleRealViewLeftFrameLayout.addView(view_in)
         layoutParams = params
@@ -187,7 +187,7 @@ class HomePagerBannerRealView(mContext: Context, homeEvent: IHomeBaseEvent) :
         nameBuffer.append(bean?.contentBefore)
         nameBuffer.append(" ")
         nameBuffer.append(bean?.nickName)
-        nameBuffer.append(resources.getString(R.string.home_module_real_appoint))
+        nameBuffer.append(resources.getString(R.string.home_real_appoint))
         return nameBuffer.toString()
     }
 

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomePagerBannerView.kt

@@ -9,7 +9,7 @@ import com.yidianling.common.tools.RxDeviceTool
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeHeaderBean
-import kotlinx.android.synthetic.xlzx.home_module_pager_banner_view.view.*
+import kotlinx.android.synthetic.xlzx.home_pager_banner_view.view.*
 
 
 /**
@@ -36,7 +36,7 @@ class HomePagerBannerView(private val mContext: Context, private var homeEvent:
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_pager_banner_view, this)
+        View.inflate(mContext, R.layout.home_pager_banner_view, this)
 
         initBannerLayout()
 //        val addLayoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
@@ -92,7 +92,7 @@ class HomePagerBannerView(private val mContext: Context, private var homeEvent:
                 mImageViews.add(item.imageUrl!!)
             }
         }
-        homeModulePagerBannerViewBanner.setImageLoader(GlideImageLoader(R.drawable.home_module_image_default_back))
+        homeModulePagerBannerViewBanner.setImageLoader(GlideImageLoader(R.drawable.home_image_default_back))
             .setImages(mImageViews).start()
 
         homeModulePagerBannerViewBanner.setOnBannerListener {

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeTestItemView.kt

@@ -9,7 +9,7 @@ import com.yidianling.common.tools.RxImageTool
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeTestItemBean
-import kotlinx.android.synthetic.xlzx.home_module_test_item_view.view.*
+import kotlinx.android.synthetic.xlzx.home_test_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -34,7 +34,7 @@ class HomeTestItemView(private val mContext: Context, private var homeEvent: IHo
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_test_item_view, this)
+        View.inflate(mContext, R.layout.home_test_item_view, this)
 
     }
 

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeTestTopItemView.kt

@@ -11,7 +11,7 @@ import com.yidianling.common.tools.RxImageTool
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeTestItemBean
-import kotlinx.android.synthetic.xlzx.home_module_test_top_item_view.view.*
+import kotlinx.android.synthetic.xlzx.home_test_top_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -35,7 +35,7 @@ class HomeTestTopItemView(private val mContext: Context, private var homeEvent:
         var viewHeight = viewWidth * 143 / 345
         val params = LinearLayout.LayoutParams(viewWidth, viewHeight)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_test_top_item_view, this)
+        View.inflate(mContext, R.layout.home_test_top_item_view, this)
 
     }
 

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeTestView.kt

@@ -8,7 +8,7 @@ import com.yidianling.home.R
 import com.yidianling.home.event.HomeImpl
 import com.yidianling.home.event.IHomeEvent
 import com.yidianling.home.model.bean.HomeTestItemBean
-import kotlinx.android.synthetic.xlzx.home_module_test_view.view.*
+import kotlinx.android.synthetic.xlzx.home_test_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -29,7 +29,7 @@ class HomeTestView(private val mContext: Context, private var homeEvent: HomeImp
         orientation = VERTICAL
         val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_test_view, this)
+        View.inflate(mContext, R.layout.home_test_view, this)
         homeModuleIntelligentViewHomeCommonTitleView.setTitle("测试·分析")
         homeModuleIntelligentViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.testMoreClick()

m-home/src/xlzx/java/com/yidianling/home/ui/widget/HomeModuleCategoryView.kt

@@ -16,7 +16,7 @@ import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeHeaderBean
 import com.yidianling.home.ui.view.HomePagerBannerRealView
-import kotlinx.android.synthetic.xlzx.home_module_pager_banner_category_view.view.*
+import kotlinx.android.synthetic.xlzx.home_pager_banner_category_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -81,7 +81,7 @@ class HomeModuleCategoryView : FrameLayout {
      * 界面初始化
      */
     private fun initView() {
-        View.inflate(context, R.layout.home_module_pager_banner_category_view, this)
+        View.inflate(context, R.layout.home_pager_banner_category_view, this)
         val params = FrameLayout.LayoutParams(
             FrameLayout.LayoutParams.MATCH_PARENT,
             FrameLayout.LayoutParams.WRAP_CONTENT

m-home/src/xlzx/res/drawable/anim_confilde_play.xml → m-home/src/xlzx/res/drawable/home_anim_confilde_play.xml

-<?xml version="1.0" encoding="utf-8"?>
-<animation-list
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:oneshot="false"
-    >
-    <item
-        android:drawable="@drawable/confide_play_state_3"
-        android:duration="0"/>
-    <item
-        android:drawable="@drawable/confide_play_state_1"
-        android:duration="300"/>
-    <item
-        android:drawable="@drawable/confide_play_state_2"
-        android:duration="300"/>
-    <item
-        android:drawable="@drawable/confide_play_state_3"
-        android:duration="300"/>
-
-</animation-list>
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:oneshot="false"
+    >
+    <item
+        android:drawable="@drawable/home_confide_play_state_3"
+        android:duration="0"/>
+    <item
+        android:drawable="@drawable/home_confide_play_state_1"
+        android:duration="300"/>
+    <item
+        android:drawable="@drawable/home_confide_play_state_2"
+        android:duration="300"/>
+    <item
+        android:drawable="@drawable/home_confide_play_state_3"
+        android:duration="300"/>
+
+</animation-list>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_article_item_view.xml → m-home/src/xlzx/res/layout/home_article_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    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.support.v7.widget.CardView
-        android:id="@+id/homeModuleArticleItemViewCardImg"
-        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:cardElevation="0dp">
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            android:id="@+id/homeModuleArticleItemViewImg"
-            android:background="@drawable/home_module_image_default_back"/>
-    </android.support.v7.widget.CardView>
-
-    <TextView
-        android:id="@+id/homeModuleArticleItemViewTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxLines="2"
-        android:ellipsize="end"
-        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"
-        tools:text="喧嚣的世界中，你的重要何以而来？喧嚣的世界中，你的重要何以而来？"
-        android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@+id/homeModuleArticleItemViewCardImg"
-        android:layout_marginRight="@dimen/platform_dp_20"/>
-
-    <TextView
-        android:id="@+id/homeModuleArticleItemViewContent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxLines="2"
-        android:ellipsize="end"
-        android:textSize="@dimen/platform_dp_13"
-        android:layout_marginTop="@dimen/platform_dp_6"
-        android:textColor="@color/platform_color_666666"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/homeModuleArticleItemViewTitle"
-        android:lineSpacingExtra="@dimen/platform_dp_3"
-        tools:text="喧嚣的世界中，你的重要何以而来？当我伫立在我所伫立之处..."
-        android:layout_toLeftOf="@+id/homeModuleArticleItemViewCardImg"
-        android:layout_marginRight="@dimen/platform_dp_20"/>
-
-    <LinearLayout
-        android:id="@+id/homeModuleArticleItemViewBottomLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:layout_below="@+id/homeModuleArticleItemViewCardImg"
-        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:src="@drawable/home_module_article_item_icon"
-            android:layout_marginTop="1dp"
-            android:layout_alignParentLeft="true"/>
-
-        <TextView
-            android:id="@+id/homeModuleArticleItemViewAuthor"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:textSize="@dimen/platform_dp_12"
-            android:textColor="@color/platform_color_242424"
-            android:layout_marginLeft="@dimen/platform_dp_3"
-            android:textStyle="bold"
-            tools:text="赵秀英"/>
-
-        <TextView
-            android:id="@+id/homeModuleArticleItemViewGreatNum"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="3327"
-            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:textColor="@color/platform_color_666666"/>
-
-        <TextView
-            android:id="@+id/homeModuleArticleItemViewLookNum"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="2656"
-            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:textColor="@color/platform_color_666666"/>
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/homeModuleArticleItemViewBottomLine"
-        android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/platform_color_EBEBEB"
-        android:layout_centerInParent="true"
-        android:layout_below="@+id/homeModuleArticleItemViewBottomLayout"
-        android:layout_marginTop="@dimen/platform_dp_20"/>
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    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.support.v7.widget.CardView
+        android:id="@+id/homeModuleArticleItemViewCardImg"
+        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:cardElevation="0dp">
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:id="@+id/homeModuleArticleItemViewImg"
+            android:background="@drawable/home_image_default_back"/>
+    </android.support.v7.widget.CardView>
+
+    <TextView
+        android:id="@+id/homeModuleArticleItemViewTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="2"
+        android:ellipsize="end"
+        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"
+        tools:text="喧嚣的世界中，你的重要何以而来？喧嚣的世界中，你的重要何以而来？"
+        android:layout_alignParentLeft="true"
+        android:layout_toLeftOf="@+id/homeModuleArticleItemViewCardImg"
+        android:layout_marginRight="@dimen/platform_dp_20"/>
+
+    <TextView
+        android:id="@+id/homeModuleArticleItemViewContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:textSize="@dimen/platform_dp_13"
+        android:layout_marginTop="@dimen/platform_dp_6"
+        android:textColor="@color/platform_color_666666"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/homeModuleArticleItemViewTitle"
+        android:lineSpacingExtra="@dimen/platform_dp_3"
+        tools:text="喧嚣的世界中，你的重要何以而来？当我伫立在我所伫立之处..."
+        android:layout_toLeftOf="@+id/homeModuleArticleItemViewCardImg"
+        android:layout_marginRight="@dimen/platform_dp_20"/>
+
+    <LinearLayout
+        android:id="@+id/homeModuleArticleItemViewBottomLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_below="@+id/homeModuleArticleItemViewCardImg"
+        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:src="@drawable/home_article_item_icon"
+            android:layout_marginTop="1dp"
+            android:layout_alignParentLeft="true"/>
+
+        <TextView
+            android:id="@+id/homeModuleArticleItemViewAuthor"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/platform_dp_12"
+            android:textColor="@color/platform_color_242424"
+            android:layout_marginLeft="@dimen/platform_dp_3"
+            android:textStyle="bold"
+            tools:text="赵秀英"/>
+
+        <TextView
+            android:id="@+id/homeModuleArticleItemViewGreatNum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="3327"
+            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:textColor="@color/platform_color_666666"/>
+
+        <TextView
+            android:id="@+id/homeModuleArticleItemViewLookNum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="2656"
+            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:textColor="@color/platform_color_666666"/>
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/homeModuleArticleItemViewBottomLine"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/platform_color_EBEBEB"
+        android:layout_centerInParent="true"
+        android:layout_below="@+id/homeModuleArticleItemViewBottomLayout"
+        android:layout_marginTop="@dimen/platform_dp_20"/>
+
+</RelativeLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_assuage_grief_image_more_five_item_view.xml → m-home/src/xlzx/res/layout/home_assuage_grief_image_more_five_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="210"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-            <ImageView
-                android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewFirstImg"
-                android:scaleType="centerCrop"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="118"
-                android:background="@drawable/home_module_image_default_back"/>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="2"
-                android:background="@color/platform_color_FFFFFF"/>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="60">
-                <ImageView
-                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewThirdImg"
-                    android:scaleType="centerCrop"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="104"
-                    android:background="@drawable/home_module_image_default_back"/>
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="2"
-                    android:background="@color/platform_color_FFFFFF"/>
-                <ImageView
-                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewFourthImg"
-                    android:scaleType="centerCrop"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="104"
-                    android:background="@drawable/home_module_image_default_back"/>
-            </LinearLayout>
-        </LinearLayout>
-
-        <View
-            android:layout_width="0dp"
-            android:layout_weight="2"
-            android:layout_height="match_parent"
-            android:background="@color/platform_color_FFFFFF"/>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="103"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-            <ImageView
-                android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewSecondImg"
-                android:scaleType="centerCrop"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="118"
-                android:background="@drawable/home_module_image_default_back"/>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="2"
-                android:background="@color/platform_color_FFFFFF"/>
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="60">
-                <ImageView
-                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewFiveImg"
-                    android:scaleType="centerCrop"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/home_module_image_default_back"/>
-
-                <TextView
-                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewTag"
-                    android:layout_width="30dp"
-                    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:background="@drawable/home_module_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" />
-            </RelativeLayout>
-        </LinearLayout>
-
-    </LinearLayout>
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="210"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewFirstImg"
+                android:scaleType="centerCrop"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="118"
+                android:background="@drawable/home_image_default_back"/>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="2"
+                android:background="@color/platform_color_FFFFFF"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="60">
+                <ImageView
+                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewThirdImg"
+                    android:scaleType="centerCrop"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="104"
+                    android:background="@drawable/home_image_default_back"/>
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:background="@color/platform_color_FFFFFF"/>
+                <ImageView
+                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewFourthImg"
+                    android:scaleType="centerCrop"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="104"
+                    android:background="@drawable/home_image_default_back"/>
+            </LinearLayout>
+        </LinearLayout>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_weight="2"
+            android:layout_height="match_parent"
+            android:background="@color/platform_color_FFFFFF"/>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="103"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewSecondImg"
+                android:scaleType="centerCrop"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="118"
+                android:background="@drawable/home_image_default_back"/>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="2"
+                android:background="@color/platform_color_FFFFFF"/>
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="60">
+                <ImageView
+                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewFiveImg"
+                    android:scaleType="centerCrop"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/home_image_default_back"/>
+
+                <TextView
+                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewTag"
+                    android:layout_width="30dp"
+                    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: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" />
+            </RelativeLayout>
+        </LinearLayout>
+
+    </LinearLayout>
+
+</merge>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_assuage_grief_image_under_four_item_view.xml → m-home/src/xlzx/res/layout/home_assuage_grief_image_under_four_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-        <ImageView
-            android:id="@+id/homeModuleAssuageGriefUnderFourItemViewFirstImg"
-            android:layout_width="0dp"
-            android:layout_weight="156"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            android:background="@drawable/home_module_image_default_back"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_weight="2"
-            android:layout_height="match_parent"
-            android:background="@color/platform_color_FFFFFF"/>
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="157"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-            <ImageView
-                android:id="@+id/homeModuleAssuageGriefUnderFourItemViewSecondImg"
-                android:scaleType="centerCrop"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="88"
-                android:background="@drawable/home_module_image_default_back"/>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="2"
-                android:background="@color/platform_color_FFFFFF"/>
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="88"
-                android:background="@color/baby_blue">
-                <ImageView
-                    android:id="@+id/homeModuleAssuageGriefUnderFourItemViewThirdImg"
-                    android:scaleType="centerCrop"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/home_module_image_default_back"/>
-                <TextView
-                    android:id="@+id/homeModuleAssuageGriefUnderFourthItemViewTag"
-                    android:layout_width="30dp"
-                    android:layout_height="14dp"
-                    android:gravity="center"
-                    tools:text="9图"
-                    android:textSize="@dimen/platform_dp_10"
-                    android:textColor="@color/platform_color_242424"
-                    android:background="@drawable/home_module_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"/>
-            </RelativeLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+        <ImageView
+            android:id="@+id/homeModuleAssuageGriefUnderFourItemViewFirstImg"
+            android:layout_width="0dp"
+            android:layout_weight="156"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:background="@drawable/home_image_default_back"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_weight="2"
+            android:layout_height="match_parent"
+            android:background="@color/platform_color_FFFFFF"/>
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="157"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/homeModuleAssuageGriefUnderFourItemViewSecondImg"
+                android:scaleType="centerCrop"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="88"
+                android:background="@drawable/home_image_default_back"/>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="2"
+                android:background="@color/platform_color_FFFFFF"/>
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="88"
+                android:background="@color/baby_blue">
+                <ImageView
+                    android:id="@+id/homeModuleAssuageGriefUnderFourItemViewThirdImg"
+                    android:scaleType="centerCrop"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/home_image_default_back"/>
+                <TextView
+                    android:id="@+id/homeModuleAssuageGriefUnderFourthItemViewTag"
+                    android:layout_width="30dp"
+                    android:layout_height="14dp"
+                    android:gravity="center"
+                    tools:text="9图"
+                    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"/>
+            </RelativeLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+</merge>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_assuage_grief_image_under_two_item_view.xml → m-home/src/xlzx/res/layout/home_assuage_grief_image_under_two_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <ImageView
-            android:id="@+id/homeModuleAssuageGriefUnderTwoItemViewImg"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            android:background="@drawable/home_module_image_default_back"/>
-    </RelativeLayout>
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <ImageView
+            android:id="@+id/homeModuleAssuageGriefUnderTwoItemViewImg"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:background="@drawable/home_image_default_back"/>
+    </RelativeLayout>
+
+</merge>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_assuage_grief_item_view.xml → m-home/src/xlzx/res/layout/home_assuage_grief_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/homeModuleAssuageGriefViewChildLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/platform_dp_20"
-    android:paddingTop="@dimen/platform_dp_18"
-    android:paddingLeft="@dimen/platform_dp_15"
-    android:paddingRight="@dimen/platform_dp_15"
-    android:background="@drawable/home_module_view_shadow_bg">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/platform_dp_18">
-
-        <RelativeLayout
-            android:id="@+id/homeModuleAssuageGriefViewPersonCardView"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
-            android:background="@drawable/home_module_assuage_grief_stroke_line">
-            <android.support.v7.widget.CardView
-                android:layout_width="@dimen/platform_dp_36"
-                android:layout_height="@dimen/platform_dp_36"
-                app:cardCornerRadius="@dimen/platform_dp_18"
-                app:cardElevation="0dp"
-                android:layout_centerInParent="true">
-                <ImageView
-                    android:id="@+id/homeModuleAssuageGriefViewPersonImg"
-                    android:layout_width="@dimen/platform_dp_36"
-                    android:layout_height="@dimen/platform_dp_36"
-                    android:src="@drawable/platform_icon_country"
-                    android:scaleType="centerCrop"/>
-            </android.support.v7.widget.CardView>
-        </RelativeLayout>
-        <TextView
-            android:id="@+id/homeModuleAssuageGriefViewPersonName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="Zoe Miller"
-            android:textSize="@dimen/platform_dp_14"
-            android:textColor="@color/platform_color_242424"
-            android:textStyle="bold"
-            android:gravity="center"
-            android:layout_alignTop="@+id/homeModuleAssuageGriefViewPersonCardView"
-            android:layout_alignBottom="@+id/homeModuleAssuageGriefViewPersonCardView"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/homeModuleAssuageGriefViewPersonCardView"
-            android:layout_marginLeft="@dimen/platform_dp_8"
-            />
-        <TextView
-            android:id="@+id/homeModuleAssuageGriefViewTime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="今天 15：05"
-            android:textSize="@dimen/platform_dp_12"
-            android:textColor="@color/platform_color_999999"
-            android:layout_toRightOf="@+id/homeModuleAssuageGriefViewPersonCardView"
-            android:layout_alignBottom="@+id/homeModuleAssuageGriefViewPersonCardView"
-            android:layout_marginLeft="@dimen/platform_dp_8"
-            android:layout_marginBottom="0.5dp"
-            android:visibility="gone"/>
-        <RelativeLayout
-            android:id="@+id/homeModuleAssuageGriefItemViewIsFollow"
-            android:layout_width="@dimen/platform_dp_60"
-            android:layout_height="@dimen/platform_dp_24"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true">
-            <ImageView
-                android:id="@+id/homeModuleAssuageGriefItemViewFollow"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:src="@drawable/home_module_focus_en"
-                android:layout_centerInParent="true"/>
-
-            <ImageView
-                android:id="@+id/homeModuleAssuageGriefItemViewUnFollow"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:src="@drawable/home_module_focus_un"
-                android:layout_centerInParent="true"/>
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-
-
-    <!-- 标题，默认隐藏-->
-    <TextView
-        android:id="@+id/homeModuleAssuageGriefViewTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:textColor="@color/platform_color_242424"
-        android:textSize="@dimen/platform_dp_18"
-        android:layout_marginBottom="@dimen/platform_dp_6"
-        android:textStyle="bold"
-        tools:text="可是除了你，没人能左右我的情绪可是除了你，没人能左右我的情绪"/>
-
-    <TextView
-        android:id="@+id/homeModuleAssuageGriefViewContent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:maxLines="3"
-        android:ellipsize="end"
-        android:lineSpacingExtra="@dimen/platform_dp_5"
-        tools:text="在我空闲的时间里，我想起了许久没有联系的露娜，给她打了一通电话。我没有说很多，可她还是感觉出了我的不对劲，竟然不顾雪夜寒冷与路途遥远，一个多钟在我空闲的时间里，我想起了许久没有联系的露娜，给她打了一通电话。我没有说很多，可她还是感觉出了我的不对劲，竟然不顾雪夜寒冷与路途遥远，一个多钟..."
-        android:textSize="@dimen/platform_dp_13"
-        android:textColor="@color/platform_color_666666"/>
-
-    <!-- 评论内容，默认隐藏-->
-    <RelativeLayout
-        android:id="@+id/homeModuleAssuageGriefViewComment"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/platform_dp_12"
-        android:layout_marginTop="@dimen/platform_dp_16"
-        android:background="@drawable/home_module_assuage_grief_item_view_tab_back">
-
-        <ImageView
-            android:id="@+id/homeModuleAssuageGriefViewHotView"
-            android:layout_height="@dimen/platform_dp_14"
-            android:layout_width="@dimen/platform_dp_28"
-            android:src="@drawable/home_module_comment_hot_icon"/>
-
-        <TextView
-            android:id="@+id/homeModuleAssuageGriefViewHotViewComment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/platform_dp_15"
-            android:layout_marginLeft="@dimen/platform_dp_15"
-            tools:text="劳蘸酱："
-            android:textStyle="bold"
-            android:textSize="@dimen/platform_dp_13"
-            android:textColor="@color/platform_color_444444"
-            android:maxLines="2"
-            android:ellipsize="end"
-            android:layout_below="@+id/homeModuleAssuageGriefViewHotView"
-            android:layout_marginTop="@dimen/platform_dp_5"
-            />
-
-        <TextView
-            android:id="@+id/homeModuleAssuageGriefViewHotViewCommentContent"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/platform_dp_15"
-            android:layout_marginLeft="@dimen/platform_dp_15"
-            android:lineSpacingExtra="@dimen/platform_dp_4"
-            tools:text="劳蘸酱：人生的旅途中，我们总是在不断的相遇和告别中前行。生活总会让我们经历着或多或少我们总是在不断的相遇和告别中前行我们总是在不断的相遇和告别中前行"
-            android:textSize="@dimen/platform_dp_13"
-            android:textColor="@color/platform_color_444444"
-            android:maxLines="2"
-            android:ellipsize="end"
-            android:layout_below="@+id/homeModuleAssuageGriefViewHotView"
-            android:layout_marginTop="@dimen/platform_dp_5"
-            />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="@dimen/platform_dp_20">
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingLeft="@dimen/platform_dp_7"
-            android:paddingRight="@dimen/platform_dp_7"
-            android:paddingTop="@dimen/platform_dp_4"
-            android:paddingBottom="@dimen/platform_dp_4"
-            android:gravity="center_vertical"
-            android:background="@drawable/home_module_assuage_grief_item_view_tab_back">
-            <ImageView
-                android:layout_width="11.36dp"
-                android:layout_height="10.72dp"
-                android:src="@drawable/home_module_assuage_grief_item_view_tab_icon"/>
-            <TextView
-                android:id="@+id/homeModuleAssuageGriefViewTag"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="情感倾诉"
-                android:textColor="@color/platform_color_242424"
-                android:textSize="@dimen/platform_dp_12"
-                android:layout_marginLeft="@dimen/platform_dp_3"/>
-        </LinearLayout>
-        <View
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="0dp"/>
-        <ImageView
-            android:layout_width="@dimen/platform_dp_18"
-            android:layout_height="@dimen/platform_dp_18"
-            android:src="@drawable/home_module_assuage_grief_item_view_tab_comment"/>
-        <TextView
-            android:id="@+id/homeModuleAssuageGriefViewCommentsCount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="68"
-            android:textSize="@dimen/platform_dp_14"
-            android:textColor="@color/platform_color_242424"
-            android:layout_marginRight="@dimen/platform_dp_22"
-            android:layout_marginLeft="@dimen/platform_dp_5"/>
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/ll_zan"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <ImageView
-                android:id="@+id/homeModuleAssuageGriefViewZanState"
-                android:layout_width="@dimen/platform_dp_18"
-                android:layout_height="@dimen/platform_dp_18"
-                android:src="@drawable/home_module_assuage_grief_item_view_tab_warm"/>
-            <TextView
-                android:id="@+id/homeModuleAssuageGriefViewZanCount"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="987"
-                android:textSize="@dimen/platform_dp_14"
-                android:textColor="@color/platform_color_242424"
-                android:layout_marginLeft="@dimen/platform_dp_5"/>
-
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/homeModuleAssuageGriefViewChildLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/platform_dp_20"
+    android:paddingTop="@dimen/platform_dp_18"
+    android:paddingLeft="@dimen/platform_dp_15"
+    android:paddingRight="@dimen/platform_dp_15"
+    android:background="@drawable/home_view_shadow_bg">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/platform_dp_18">
+
+        <RelativeLayout
+            android:id="@+id/homeModuleAssuageGriefViewPersonCardView"
+            android:layout_width="38dp"
+            android:layout_height="38dp"
+            android:background="@drawable/home_assuage_grief_stroke_line">
+            <android.support.v7.widget.CardView
+                android:layout_width="@dimen/platform_dp_36"
+                android:layout_height="@dimen/platform_dp_36"
+                app:cardCornerRadius="@dimen/platform_dp_18"
+                app:cardElevation="0dp"
+                android:layout_centerInParent="true">
+                <ImageView
+                    android:id="@+id/homeModuleAssuageGriefViewPersonImg"
+                    android:layout_width="@dimen/platform_dp_36"
+                    android:layout_height="@dimen/platform_dp_36"
+                    android:src="@drawable/platform_icon_country"
+                    android:scaleType="centerCrop"/>
+            </android.support.v7.widget.CardView>
+        </RelativeLayout>
+        <TextView
+            android:id="@+id/homeModuleAssuageGriefViewPersonName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="Zoe Miller"
+            android:textSize="@dimen/platform_dp_14"
+            android:textColor="@color/platform_color_242424"
+            android:textStyle="bold"
+            android:gravity="center"
+            android:layout_alignTop="@+id/homeModuleAssuageGriefViewPersonCardView"
+            android:layout_alignBottom="@+id/homeModuleAssuageGriefViewPersonCardView"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@+id/homeModuleAssuageGriefViewPersonCardView"
+            android:layout_marginLeft="@dimen/platform_dp_8"
+            />
+        <TextView
+            android:id="@+id/homeModuleAssuageGriefViewTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="今天 15：05"
+            android:textSize="@dimen/platform_dp_12"
+            android:textColor="@color/platform_color_999999"
+            android:layout_toRightOf="@+id/homeModuleAssuageGriefViewPersonCardView"
+            android:layout_alignBottom="@+id/homeModuleAssuageGriefViewPersonCardView"
+            android:layout_marginLeft="@dimen/platform_dp_8"
+            android:layout_marginBottom="0.5dp"
+            android:visibility="gone"/>
+        <RelativeLayout
+            android:id="@+id/homeModuleAssuageGriefItemViewIsFollow"
+            android:layout_width="@dimen/platform_dp_60"
+            android:layout_height="@dimen/platform_dp_24"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true">
+            <ImageView
+                android:id="@+id/homeModuleAssuageGriefItemViewFollow"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@drawable/home_focus_en"
+                android:layout_centerInParent="true"/>
+
+            <ImageView
+                android:id="@+id/homeModuleAssuageGriefItemViewUnFollow"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@drawable/home_focus_un"
+                android:layout_centerInParent="true"/>
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+
+
+    <!-- 标题，默认隐藏-->
+    <TextView
+        android:id="@+id/homeModuleAssuageGriefViewTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:textColor="@color/platform_color_242424"
+        android:textSize="@dimen/platform_dp_18"
+        android:layout_marginBottom="@dimen/platform_dp_6"
+        android:textStyle="bold"
+        tools:text="可是除了你，没人能左右我的情绪可是除了你，没人能左右我的情绪"/>
+
+    <TextView
+        android:id="@+id/homeModuleAssuageGriefViewContent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxLines="3"
+        android:ellipsize="end"
+        android:lineSpacingExtra="@dimen/platform_dp_5"
+        tools:text="在我空闲的时间里，我想起了许久没有联系的露娜，给她打了一通电话。我没有说很多，可她还是感觉出了我的不对劲，竟然不顾雪夜寒冷与路途遥远，一个多钟在我空闲的时间里，我想起了许久没有联系的露娜，给她打了一通电话。我没有说很多，可她还是感觉出了我的不对劲，竟然不顾雪夜寒冷与路途遥远，一个多钟..."
+        android:textSize="@dimen/platform_dp_13"
+        android:textColor="@color/platform_color_666666"/>
+
+    <!-- 评论内容，默认隐藏-->
+    <RelativeLayout
+        android:id="@+id/homeModuleAssuageGriefViewComment"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/platform_dp_12"
+        android:layout_marginTop="@dimen/platform_dp_16"
+        android:background="@drawable/home_assuage_grief_item_view_tab_back">
+
+        <ImageView
+            android:id="@+id/homeModuleAssuageGriefViewHotView"
+            android:layout_height="@dimen/platform_dp_14"
+            android:layout_width="@dimen/platform_dp_28"
+            android:src="@drawable/home_comment_hot_icon"/>
+
+        <TextView
+            android:id="@+id/homeModuleAssuageGriefViewHotViewComment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/platform_dp_15"
+            android:layout_marginLeft="@dimen/platform_dp_15"
+            tools:text="劳蘸酱："
+            android:textStyle="bold"
+            android:textSize="@dimen/platform_dp_13"
+            android:textColor="@color/platform_color_444444"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:layout_below="@+id/homeModuleAssuageGriefViewHotView"
+            android:layout_marginTop="@dimen/platform_dp_5"
+            />
+
+        <TextView
+            android:id="@+id/homeModuleAssuageGriefViewHotViewCommentContent"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/platform_dp_15"
+            android:layout_marginLeft="@dimen/platform_dp_15"
+            android:lineSpacingExtra="@dimen/platform_dp_4"
+            tools:text="劳蘸酱：人生的旅途中，我们总是在不断的相遇和告别中前行。生活总会让我们经历着或多或少我们总是在不断的相遇和告别中前行我们总是在不断的相遇和告别中前行"
+            android:textSize="@dimen/platform_dp_13"
+            android:textColor="@color/platform_color_444444"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:layout_below="@+id/homeModuleAssuageGriefViewHotView"
+            android:layout_marginTop="@dimen/platform_dp_5"
+            />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="@dimen/platform_dp_20">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingLeft="@dimen/platform_dp_7"
+            android:paddingRight="@dimen/platform_dp_7"
+            android:paddingTop="@dimen/platform_dp_4"
+            android:paddingBottom="@dimen/platform_dp_4"
+            android:gravity="center_vertical"
+            android:background="@drawable/home_assuage_grief_item_view_tab_back">
+            <ImageView
+                android:layout_width="11.36dp"
+                android:layout_height="10.72dp"
+                android:src="@drawable/home_assuage_grief_item_view_tab_icon"/>
+            <TextView
+                android:id="@+id/homeModuleAssuageGriefViewTag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="情感倾诉"
+                android:textColor="@color/platform_color_242424"
+                android:textSize="@dimen/platform_dp_12"
+                android:layout_marginLeft="@dimen/platform_dp_3"/>
+        </LinearLayout>
+        <View
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="0dp"/>
+        <ImageView
+            android:layout_width="@dimen/platform_dp_18"
+            android:layout_height="@dimen/platform_dp_18"
+            android:src="@drawable/home_assuage_grief_item_view_tab_comment"/>
+        <TextView
+            android:id="@+id/homeModuleAssuageGriefViewCommentsCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="68"
+            android:textSize="@dimen/platform_dp_14"
+            android:textColor="@color/platform_color_242424"
+            android:layout_marginRight="@dimen/platform_dp_22"
+            android:layout_marginLeft="@dimen/platform_dp_5"/>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/ll_zan"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <ImageView
+                android:id="@+id/homeModuleAssuageGriefViewZanState"
+                android:layout_width="@dimen/platform_dp_18"
+                android:layout_height="@dimen/platform_dp_18"
+                android:src="@drawable/home_assuage_grief_item_view_tab_warm"/>
+            <TextView
+                android:id="@+id/homeModuleAssuageGriefViewZanCount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="987"
+                android:textSize="@dimen/platform_dp_14"
+                android:textColor="@color/platform_color_242424"
+                android:layout_marginLeft="@dimen/platform_dp_5"/>
+
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_button_banner_view.xml → m-home/src/xlzx/res/layout/home_button_banner_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/ll_home_module_button"
-    android:layout_width="match_parent"
-    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_marginTop="8dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:paddingBottom="20dp"
-        >
-
-
-        <RelativeLayout
-            android:id="@+id/homeModuleButtonBannerFirst"
-            android:layout_width="0dp"
-            android:layout_height="78dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_weight="1"
-            android:background="@drawable/home_module_dcotor_bt_bg"
-            android:gravity="center"
-            >
-
-            <TextView
-                android:id="@+id/homeModuleButtonBannerFirstTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="预约咨询"
-                android:textColor="@color/platform_black"
-                android:textSize="@dimen/platform_dp_16"
-                android:textStyle="bold"/>
-
-            <TextView
-                android:layout_marginTop="2dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/homeModuleButtonBannerFirstTitle"
-                android:text="1W+师资"
-                android:textColor="@color/platform_color_444444"
-                android:textSize="@dimen/platform_dp_11"/>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/homeModuleButtonBannerSecond"
-            android:layout_width="0dp"
-            android:layout_height="78dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_weight="1"
-            android:background="@drawable/home_module_listen_bt_bg"
-            >
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:paddingTop="1dp"
-                android:paddingBottom="1dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:background="@drawable/home_module_button_first_free_bg">
-            </RelativeLayout>
-
-            <LinearLayout
-                android:gravity="center_vertical"
-                android:layout_centerVertical="true"
-                android:orientation="vertical"
-                android:layout_gravity="center_horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                >
-
-                <LinearLayout
-                    android:layout_gravity="center"
-                    android:orientation="vertical"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    >
-
-                    <TextView
-                        android:layout_gravity="center"
-                        android:id="@+id/homeModuleButtonBannerSecondTitle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="即时倾诉"
-                        android:textColor="@color/platform_black"
-                        android:textSize="@dimen/platform_dp_16"
-                        android:textStyle="bold"/>
-
-                    <TextView
-                        android:layout_marginTop="2dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/homeModuleButtonBannerSecondTitle"
-                        android:text="专业解忧"
-                        android:textColor="@color/platform_color_444444"
-                        android:layout_centerVertical="true"
-                        android:textSize="@dimen/platform_dp_11"/>
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/homeModuleButtonBannerThird"
-            android:layout_width="0dp"
-            android:layout_height="78dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_weight="1"
-            android:background="@drawable/home_module_course_bt_bg"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/homeModuleButtonBannerThirdTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="心理课堂"
-                android:textColor="@color/platform_black"
-                android:textSize="@dimen/platform_dp_16"
-                android:textStyle="bold"/>
-
-            <TextView
-                android:layout_marginTop="2dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/homeModuleButtonBannerThirdTitle"
-                android:text="送28元礼包"
-                android:textColor="@color/platform_color_444444"
-                android:textSize="@dimen/platform_dp_11"/>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/homeModuleButtonBannerFourth"
-            android:layout_width="0dp"
-            android:layout_height="78dp"
-            android:layout_weight="1"
-            android:background="@drawable/home_module_test_bt_bg"
-            android:gravity="center"
-            >
-
-            <TextView
-                android:id="@+id/homeModuleButtonBannerFourthTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="心理测试"
-                android:textColor="@color/platform_black"
-                android:textSize="@dimen/platform_dp_16"
-                android:textStyle="bold"/>
-
-            <TextView
-                android:layout_marginTop="2dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/homeModuleButtonBannerFourthTitle"
-                android:text="专业权威"
-                android:textColor="@color/platform_color_444444"
-                android:textSize="@dimen/platform_dp_11"/>
-        </RelativeLayout>
-    </LinearLayout>
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ll_home_module_button"
+    android:layout_width="match_parent"
+    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_marginTop="8dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingBottom="20dp"
+        >
+
+
+        <RelativeLayout
+            android:id="@+id/homeModuleButtonBannerFirst"
+            android:layout_width="0dp"
+            android:layout_height="78dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_weight="1"
+            android:background="@drawable/home_dcotor_bt_bg"
+            android:gravity="center"
+            >
+
+            <TextView
+                android:id="@+id/homeModuleButtonBannerFirstTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="预约咨询"
+                android:textColor="@color/platform_black"
+                android:textSize="@dimen/platform_dp_16"
+                android:textStyle="bold"/>
+
+            <TextView
+                android:layout_marginTop="2dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/homeModuleButtonBannerFirstTitle"
+                android:text="1W+师资"
+                android:textColor="@color/platform_color_444444"
+                android:textSize="@dimen/platform_dp_11"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/homeModuleButtonBannerSecond"
+            android:layout_width="0dp"
+            android:layout_height="78dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_weight="1"
+            android:background="@drawable/home_listen_bt_bg"
+            >
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:paddingTop="1dp"
+                android:paddingBottom="1dp"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:background="@drawable/home_button_first_free_bg">
+            </RelativeLayout>
+
+            <LinearLayout
+                android:gravity="center_vertical"
+                android:layout_centerVertical="true"
+                android:orientation="vertical"
+                android:layout_gravity="center_horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                >
+
+                <LinearLayout
+                    android:layout_gravity="center"
+                    android:orientation="vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    >
+
+                    <TextView
+                        android:layout_gravity="center"
+                        android:id="@+id/homeModuleButtonBannerSecondTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="即时倾诉"
+                        android:textColor="@color/platform_black"
+                        android:textSize="@dimen/platform_dp_16"
+                        android:textStyle="bold"/>
+
+                    <TextView
+                        android:layout_marginTop="2dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/homeModuleButtonBannerSecondTitle"
+                        android:text="专业解忧"
+                        android:textColor="@color/platform_color_444444"
+                        android:layout_centerVertical="true"
+                        android:textSize="@dimen/platform_dp_11"/>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/homeModuleButtonBannerThird"
+            android:layout_width="0dp"
+            android:layout_height="78dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_weight="1"
+            android:background="@drawable/home_course_bt_bg"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/homeModuleButtonBannerThirdTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="心理课堂"
+                android:textColor="@color/platform_black"
+                android:textSize="@dimen/platform_dp_16"
+                android:textStyle="bold"/>
+
+            <TextView
+                android:layout_marginTop="2dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/homeModuleButtonBannerThirdTitle"
+                android:text="送28元礼包"
+                android:textColor="@color/platform_color_444444"
+                android:textSize="@dimen/platform_dp_11"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/homeModuleButtonBannerFourth"
+            android:layout_width="0dp"
+            android:layout_height="78dp"
+            android:layout_weight="1"
+            android:background="@drawable/home_test_bt_bg"
+            android:gravity="center"
+            >
+
+            <TextView
+                android:id="@+id/homeModuleButtonBannerFourthTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="心理测试"
+                android:textColor="@color/platform_black"
+                android:textSize="@dimen/platform_dp_16"
+                android:textStyle="bold"/>
+
+            <TextView
+                android:layout_marginTop="2dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/homeModuleButtonBannerFourthTitle"
+                android:text="专业权威"
+                android:textColor="@color/platform_color_444444"
+                android:textSize="@dimen/platform_dp_11"/>
+        </RelativeLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_common_title_view.xml → m-home/src/xlzx/res/layout/home_common_title_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:paddingTop="@dimen/platform_dp_24"
-    android:paddingBottom="@dimen/platform_dp_14">
-
-    <View
-        android:layout_width="0dp"
-        android:layout_height="5dp"
-        android:background="@drawable/home_module_common_title_gradient_back"
-        app:layout_constraintLeft_toLeftOf="@+id/homeModuleCommonTitleViewTitle"
-        app:layout_constraintRight_toRightOf="@+id/homeModuleCommonTitleViewTitle"
-        app:layout_constraintBottom_toBottomOf="@+id/homeModuleCommonTitleViewTitle"
-        android:layout_marginBottom="2dp"/>
-
-    <TextView
-        android:id="@+id/homeModuleCommonTitleViewTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingRight="@dimen/platform_dp_1"
-        tools:text="通用.标题"
-        android:textSize="24dp"
-        android:textStyle="bold"
-        android:textColor="@color/platform_color_333333"
-        android:layout_marginLeft="@dimen/platform_dp_15"
-        app:layout_constraintLeft_toLeftOf="parent"/>
-
-    <LinearLayout
-        android:layout_width="66dp"
-        android:layout_height="@dimen/platform_dp_24"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:layout_marginBottom="@dimen/platform_dp_3"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginRight="@dimen/platform_dp_15"
-        android:background="@drawable/home_module_show_more_line">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="更多"
-            android:layout_marginLeft="@dimen/platform_dp_2"
-            android:textColor="@color/platform_color_444444"
-            android:textSize="13sp"/>
-
-        <ImageView
-            android:layout_height="8dp"
-            android:layout_width="4dp"
-            android:src="@drawable/home_module_sale_arrow"
-            android:layout_marginLeft="3dp"/>
-
-    </LinearLayout>
-
-
-
-</android.support.constraint.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:paddingTop="@dimen/platform_dp_24"
+    android:paddingBottom="@dimen/platform_dp_14">
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="5dp"
+        android:background="@drawable/home_common_title_gradient_back"
+        app:layout_constraintLeft_toLeftOf="@+id/homeModuleCommonTitleViewTitle"
+        app:layout_constraintRight_toRightOf="@+id/homeModuleCommonTitleViewTitle"
+        app:layout_constraintBottom_toBottomOf="@+id/homeModuleCommonTitleViewTitle"
+        android:layout_marginBottom="2dp"/>
+
+    <TextView
+        android:id="@+id/homeModuleCommonTitleViewTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingRight="@dimen/platform_dp_1"
+        tools:text="通用.标题"
+        android:textSize="24dp"
+        android:textStyle="bold"
+        android:textColor="@color/platform_color_333333"
+        android:layout_marginLeft="@dimen/platform_dp_15"
+        app:layout_constraintLeft_toLeftOf="parent"/>
+
+    <LinearLayout
+        android:layout_width="66dp"
+        android:layout_height="@dimen/platform_dp_24"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:layout_marginBottom="@dimen/platform_dp_3"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginRight="@dimen/platform_dp_15"
+        android:background="@drawable/home_show_more_line">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="更多"
+            android:layout_marginLeft="@dimen/platform_dp_2"
+            android:textColor="@color/platform_color_444444"
+            android:textSize="13sp"/>
+
+        <ImageView
+            android:layout_height="8dp"
+            android:layout_width="4dp"
+            android:src="@drawable/home_sale_arrow"
+            android:layout_marginLeft="3dp"/>
+
+    </LinearLayout>
+
+
+
+</android.support.constraint.ConstraintLayout>

m-home/src/xlzx/res/layout/home_module_confide_expert_info_view.xml → m-home/src/xlzx/res/layout/home_confide_expert_info_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/img_head"
-        android:layout_width="70dp"
-        android:layout_height="70dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="21dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/platform_head_place_hold_pic"/>
-
-    <ImageView
-        android:id="@+id/iv_confide_voice"
-        android:layout_alignBottom="@id/img_head"
-        android:layout_alignRight="@id/img_head"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:src="@drawable/anim_confilde_play"
-        android:layout_alignEnd="@id/img_head"/>
-
-    <TextView
-        android:id="@+id/tv_confide"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:layout_alignTop="@+id/img_head"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/platform_dp_13"
-        android:layout_marginEnd="@dimen/platform_dp_15"
-        android:gravity="center"
-        android:background="@drawable/home_module_confide_line_1"
-        />
-
-    <LinearLayout
-        android:id="@+id/tv_name_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/img_head"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="-2dp"
-        android:layout_toEndOf="@+id/img_head"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/tv_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/platform_color_242424"
-            android:textSize="@dimen/platform_dp_16"
-            android:textStyle="bold"
-            tools:ignore="SpUsage"
-            tools:text="姚雨晴"/>
-
-        <ImageView
-            android:id="@+id/img_sex"
-            android:layout_width="13dp"
-            android:layout_height="13dp"
-            android:layout_marginStart="6dp"
-            android:layout_marginLeft="3dp"
-            android:background="@drawable/home_module_counselor"/>
-
-    </LinearLayout>
-
-    <com.ydl.ydlcommon.view.TagView
-        android:id="@+id/tag_view"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/platform_dp_16"
-        android:layout_below="@+id/tv_name_layout"
-        android:layout_marginStart="@dimen/platform_dp_16"
-        android:layout_marginTop="6dp"
-        android:layout_marginEnd="@dimen/platform_dp_10"
-        android:layout_toLeftOf="@+id/tv_confide"
-        android:layout_toEndOf="@+id/img_head"
-        android:orientation="horizontal"/>
-
-    <TextView
-        android:id="@+id/tv_confideNum"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_marginStart="@dimen/platform_dp_16"
-        android:layout_marginTop="5dp"
-        android:layout_toEndOf="@+id/img_head"
-        android:textColor="@color/platform_color_242424"
-        android:textSize="@dimen/platform_dp_12"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="8000"/>
-
-    <TextView
-        android:id="@+id/tv_tv_confideNumContent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="@dimen/platform_dp_12"
-        android:layout_toEndOf="@+id/tv_confideNum"
-        android:text="人向TA倾诉"
-        android:textColor="@color/platform_color_666666"
-        android:textSize="10sp"
-        tools:ignore="SpUsage"/>
-
-    <TextView
-        android:id="@+id/tv_Connection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_marginTop="5dp"
-        android:layout_toEndOf="@+id/tv_tv_confideNumContent"
-        android:textColor="@color/platform_color_242424"
-        android:textSize="@dimen/platform_dp_12"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="83%"/>
-
-    <TextView
-        android:id="@+id/tv_ConnectionContent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="@dimen/platform_dp_12"
-        android:layout_toEndOf="@+id/tv_Connection"
-        android:text="接通率"
-        android:textColor="@color/platform_color_666666"
-        android:textSize="10sp"
-        tools:ignore="SpUsage"/>
-
-    <TextView
-        android:id="@+id/tv_price"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tv_confideNum"
-        android:layout_marginStart="@dimen/platform_dp_16"
-        android:layout_marginTop="7dp"
-        android:layout_marginBottom="18dp"
-        android:layout_toEndOf="@+id/img_head"
-        android:gravity="bottom"
-        android:textColor="#FF5A4C"
-        android:textSize="@dimen/platform_dp_16"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="￥199"/>
-
-    <TextView
-        android:id="@+id/tv_price_tips"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/tv_price"
-        android:layout_marginLeft="2dp"
-        android:layout_marginBottom="2dp"
-        android:layout_toRightOf="@+id/tv_price"
-        android:gravity="center"
-        android:text="起"
-        android:textColor="@color/platform_color_666666"
-        android:textSize="@dimen/platform_dp_12"/>
-
-    <TextView
-        android:id="@+id/tvOriginalPrice"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/tv_price"
-        android:layout_alignBottom="@+id/tv_price"
-        android:layout_marginStart="@dimen/platform_dp_6"
-        android:layout_marginBottom="-1dp"
-        android:layout_toEndOf="@+id/tv_price_tips"
-        android:gravity="center"
-        android:textColor="@color/platform_color_666666"
-        android:textSize="@dimen/platform_dp_12"
-        tools:ignore="SpUsage"
-        tools:text="原价¥50"/>
-
-    <TextView
-        android:id="@+id/tvCoupon"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/platform_dp_15"
-        android:layout_alignTop="@+id/tv_price"
-        android:layout_alignBottom="@+id/tv_price"
-        android:layout_marginLeft="12dp"
-        android:layout_marginTop="3dp"
-        android:layout_marginBottom="2dp"
-        android:layout_toRightOf="@+id/tvOriginalPrice"
-        android:background="@drawable/home_module_confide_expert_info_coupon_background"
-        android:gravity="center"
-        android:paddingLeft="6dp"
-        android:paddingRight="6dp"
-        android:textColor="@color/platform_color_FF5A4C"
-        android:textSize="@dimen/platform_dp_10"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="立减￥30"/>
-
-    <View
-        android:id="@+id/view_line"
-        style="@style/platform_viewline"
-        android:layout_below="@+id/tv_price"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:background="@color/platform_color_EBEBEB"/>
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/img_head"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="21dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/platform_head_place_hold_pic"/>
+
+    <ImageView
+        android:id="@+id/iv_confide_voice"
+        android:layout_alignBottom="@id/img_head"
+        android:layout_alignRight="@id/img_head"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
+        android:src="@drawable/home_anim_confilde_play"
+        android:layout_alignEnd="@id/img_head"/>
+
+    <TextView
+        android:id="@+id/tv_confide"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_alignTop="@+id/img_head"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/platform_dp_13"
+        android:layout_marginEnd="@dimen/platform_dp_15"
+        android:gravity="center"
+        android:background="@drawable/home_confide_line_1"
+        />
+
+    <LinearLayout
+        android:id="@+id/tv_name_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/img_head"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="-2dp"
+        android:layout_toEndOf="@+id/img_head"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/platform_color_242424"
+            android:textSize="@dimen/platform_dp_16"
+            android:textStyle="bold"
+            tools:ignore="SpUsage"
+            tools:text="姚雨晴"/>
+
+        <ImageView
+            android:id="@+id/img_sex"
+            android:layout_width="13dp"
+            android:layout_height="13dp"
+            android:layout_marginStart="6dp"
+            android:layout_marginLeft="3dp"
+            android:background="@drawable/home_counselor"/>
+
+    </LinearLayout>
+
+    <com.ydl.ydlcommon.view.TagView
+        android:id="@+id/tag_view"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/platform_dp_16"
+        android:layout_below="@+id/tv_name_layout"
+        android:layout_marginStart="@dimen/platform_dp_16"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="@dimen/platform_dp_10"
+        android:layout_toLeftOf="@+id/tv_confide"
+        android:layout_toEndOf="@+id/img_head"
+        android:orientation="horizontal"/>
+
+    <TextView
+        android:id="@+id/tv_confideNum"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_marginStart="@dimen/platform_dp_16"
+        android:layout_marginTop="5dp"
+        android:layout_toEndOf="@+id/img_head"
+        android:textColor="@color/platform_color_242424"
+        android:textSize="@dimen/platform_dp_12"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="8000"/>
+
+    <TextView
+        android:id="@+id/tv_tv_confideNumContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="@dimen/platform_dp_12"
+        android:layout_toEndOf="@+id/tv_confideNum"
+        android:text="人向TA倾诉"
+        android:textColor="@color/platform_color_666666"
+        android:textSize="10sp"
+        tools:ignore="SpUsage"/>
+
+    <TextView
+        android:id="@+id/tv_Connection"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_marginTop="5dp"
+        android:layout_toEndOf="@+id/tv_tv_confideNumContent"
+        android:textColor="@color/platform_color_242424"
+        android:textSize="@dimen/platform_dp_12"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="83%"/>
+
+    <TextView
+        android:id="@+id/tv_ConnectionContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="@dimen/platform_dp_12"
+        android:layout_toEndOf="@+id/tv_Connection"
+        android:text="接通率"
+        android:textColor="@color/platform_color_666666"
+        android:textSize="10sp"
+        tools:ignore="SpUsage"/>
+
+    <TextView
+        android:id="@+id/tv_price"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_confideNum"
+        android:layout_marginStart="@dimen/platform_dp_16"
+        android:layout_marginTop="7dp"
+        android:layout_marginBottom="18dp"
+        android:layout_toEndOf="@+id/img_head"
+        android:gravity="bottom"
+        android:textColor="#FF5A4C"
+        android:textSize="@dimen/platform_dp_16"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="￥199"/>
+
+    <TextView
+        android:id="@+id/tv_price_tips"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/tv_price"
+        android:layout_marginLeft="2dp"
+        android:layout_marginBottom="2dp"
+        android:layout_toRightOf="@+id/tv_price"
+        android:gravity="center"
+        android:text="起"
+        android:textColor="@color/platform_color_666666"
+        android:textSize="@dimen/platform_dp_12"/>
+
+    <TextView
+        android:id="@+id/tvOriginalPrice"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/tv_price"
+        android:layout_alignBottom="@+id/tv_price"
+        android:layout_marginStart="@dimen/platform_dp_6"
+        android:layout_marginBottom="-1dp"
+        android:layout_toEndOf="@+id/tv_price_tips"
+        android:gravity="center"
+        android:textColor="@color/platform_color_666666"
+        android:textSize="@dimen/platform_dp_12"
+        tools:ignore="SpUsage"
+        tools:text="原价¥50"/>
+
+    <TextView
+        android:id="@+id/tvCoupon"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/platform_dp_15"
+        android:layout_alignTop="@+id/tv_price"
+        android:layout_alignBottom="@+id/tv_price"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="2dp"
+        android:layout_toRightOf="@+id/tvOriginalPrice"
+        android:background="@drawable/home_confide_expert_info_coupon_background"
+        android:gravity="center"
+        android:paddingLeft="6dp"
+        android:paddingRight="6dp"
+        android:textColor="@color/platform_color_FF5A4C"
+        android:textSize="@dimen/platform_dp_10"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="立减￥30"/>
+
+    <View
+        android:id="@+id/view_line"
+        style="@style/platform_viewline"
+        android:layout_below="@+id/tv_price"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:background="@color/platform_color_EBEBEB"/>
+
+</RelativeLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_confide_view.xml → m-home/src/xlzx/res/layout/home_confide_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto"
-       android:layout_width="match_parent"
-       android:layout_height="wrap_content"
-       android:orientation="vertical">
-
-    <com.yidianling.home.ui.view.HomeCommonTitleView
-        android:id="@+id/homeModuleConfideViewHomeCommonTitleView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        >
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="40dp"
-            android:layout_weight="1">
-
-            <android.support.design.widget.TabLayout
-                android:id="@+id/tab_layout"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                app:tabGravity="fill"
-                app:tabIndicatorHeight="0dp"
-                app:tabMode="scrollable"
-                app:tabSelectedTextColor="@color/platform_color_242424"
-                app:tabTextAppearance="@style/TabLayoutTextSize"
-                app:tabTextColor="#333"/>
-
-            <View
-                android:layout_alignParentRight="true"
-                android:background="@drawable/home_module_consult_head_border"
-                android:layout_width="20dp"
-                android:layout_height="match_parent"/>
-
-        </RelativeLayout>
-
-        <ImageView
-            android:layout_width="5dp"
-            android:layout_height="10dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:src="@drawable/home_module_sale_arrow"/>
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:id="@+id/ll_content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"/>
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:app="http://schemas.android.com/apk/res-auto"
+       android:layout_width="match_parent"
+       android:layout_height="wrap_content"
+       android:orientation="vertical">
+
+    <com.yidianling.home.ui.view.HomeCommonTitleView
+        android:id="@+id/homeModuleConfideViewHomeCommonTitleView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        >
+
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_weight="1">
+
+            <android.support.design.widget.TabLayout
+                android:id="@+id/tab_layout"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                app:tabGravity="fill"
+                app:tabIndicatorHeight="0dp"
+                app:tabMode="scrollable"
+                app:tabSelectedTextColor="@color/platform_color_242424"
+                app:tabTextAppearance="@style/TabLayoutTextSize"
+                app:tabTextColor="#333"/>
+
+            <View
+                android:layout_alignParentRight="true"
+                android:background="@drawable/home_consult_head_border"
+                android:layout_width="20dp"
+                android:layout_height="match_parent"/>
+
+        </RelativeLayout>
+
+        <ImageView
+            android:layout_width="5dp"
+            android:layout_height="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:src="@drawable/home_sale_arrow"/>
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:id="@+id/ll_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"/>
+
+</merge>

m-home/src/xlzx/res/layout/home_module_consult_item_view.xml → m-home/src/xlzx/res/layout/home_consult_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/platform_dp_15"
-    android:layout_marginRight="@dimen/platform_dp_15"
-    android:layout_marginBottom="@dimen/platform_dp_15"
-    android:background="@drawable/home_module_view_shadow_bg"
-    android:padding="@dimen/platform_dp_15"
-    >
-
-    <RelativeLayout
-        android:layout_centerVertical="true"
-        android:id="@+id/rl_consult_head"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        >
-        <View
-            android:layout_width="103dp"
-            android:layout_height="105dp"
-            android:background="@drawable/home_module_consult_head_border"
-            />
-        <android.support.v7.widget.CardView
-            android:layout_width="102dp"
-            android:layout_height="104dp"
-            android:layout_centerInParent="true"
-            app:cardCornerRadius="@dimen/platform_dp_4"
-            app:cardElevation="1dp">
-
-            <ImageView
-                android:id="@+id/img_consult_head"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="fitXY"/>
-
-        </android.support.v7.widget.CardView>
-
-
-    </RelativeLayout>
-
-
-    <LinearLayout
-        android:id="@+id/tv_name_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/rl_consult_head"
-        android:layout_marginStart="16dp"
-        android:layout_toEndOf="@+id/rl_consult_head"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/tv_consult_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/platform_color_242424"
-            android:textSize="@dimen/platform_dp_16"
-            android:textStyle="bold"
-            tools:ignore="SpUsage"
-            tools:text="姚雨晴"/>
-
-        <ImageView
-            android:id="@+id/img_sex"
-            android:layout_width="13dp"
-            android:layout_height="13dp"
-            android:layout_marginStart="6dp"
-            android:layout_marginLeft="3dp"
-            android:background="@drawable/home_module_counselor"/>
-
-    </LinearLayout>
-
-    <com.ydl.ydlcommon.view.TagView
-        android:id="@+id/tag_view"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/platform_dp_16"
-        android:layout_below="@+id/tv_name_layout"
-        android:layout_marginStart="@dimen/platform_dp_16"
-        android:layout_marginTop="6dp"
-        android:layout_marginEnd="@dimen/platform_dp_10"
-        android:layout_toEndOf="@+id/rl_consult_head"
-        android:orientation="horizontal"/>
-
-    <TextView
-        android:id="@+id/tv_tv_consult_num_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_alignLeft="@+id/tv_name_layout"
-        android:layout_marginTop="8dp"
-        android:text="咨询次数 "
-        android:textColor="@color/platform_color_666666"
-        android:textSize="10sp"
-        tools:ignore="SpUsage"/>
-
-    <TextView
-        android:id="@+id/tv_consult_num"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_marginTop="5dp"
-        android:layout_toRightOf="@+id/tv_tv_consult_num_content"
-        android:textColor="@color/platform_color_242424"
-        android:textSize="@dimen/platform_dp_12"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="8000"/>
-
-    <TextView
-        android:id="@+id/tv_feedback_rate_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_toRightOf="@+id/tv_consult_num"
-        android:layout_marginTop="8dp"
-        android:layout_marginLeft="12dp"
-        android:text="好评率 "
-        android:textColor="@color/platform_color_666666"
-        android:textSize="10sp"
-        tools:ignore="SpUsage"
-        />
-
-    <TextView
-        android:id="@+id/tv_feedback_rate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_toRightOf="@+id/tv_feedback_rate_content"
-        android:layout_marginTop="5dp"
-        android:textColor="@color/platform_color_242424"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="83%"/>
-
-    <TextView
-        android:id="@+id/tv_consult_price"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tv_consult_num"
-        android:layout_marginStart="@dimen/platform_dp_16"
-        android:layout_marginTop="7dp"
-        android:layout_toEndOf="@+id/rl_consult_head"
-        android:layout_alignBottom="@+id/rl_consult_head"
-        android:gravity="bottom"
-        android:textColor="#FF5A4C"
-        android:textSize="@dimen/platform_dp_16"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="￥199"
-        android:layout_marginBottom="2dp"
-        />
-
-    <TextView
-        android:id="@+id/tv_price_tips"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/tv_consult_price"
-        android:layout_marginLeft="2dp"
-        android:layout_marginBottom="2dp"
-        android:layout_toRightOf="@+id/tv_consult_price"
-        android:gravity="center"
-        android:text="起"
-        android:textColor="@color/platform_color_666666"
-        android:textSize="@dimen/platform_dp_12"/>
-
-    <TextView
-        android:id="@+id/tv_consult_chat"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/platform_dp_22"
-        android:layout_alignBottom="@+id/tv_consult_price"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/home_module_consult_chat_bg"
-        android:gravity="center"
-        android:paddingLeft="17dp"
-        android:paddingTop="3dp"
-        android:paddingRight="17dp"
-        android:paddingBottom="3dp"
-        android:text="私聊"
-        android:textColor="@color/platform_color_222222"
-        android:textSize="12sp"
-        android:textStyle="bold"/>
-
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/platform_dp_15"
+    android:layout_marginRight="@dimen/platform_dp_15"
+    android:layout_marginBottom="@dimen/platform_dp_15"
+    android:background="@drawable/home_view_shadow_bg"
+    android:padding="@dimen/platform_dp_15"
+    >
+
+    <RelativeLayout
+        android:layout_centerVertical="true"
+        android:id="@+id/rl_consult_head"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        >
+        <View
+            android:layout_width="103dp"
+            android:layout_height="105dp"
+            android:background="@drawable/home_consult_head_border"
+            />
+        <android.support.v7.widget.CardView
+            android:layout_width="102dp"
+            android:layout_height="104dp"
+            android:layout_centerInParent="true"
+            app:cardCornerRadius="@dimen/platform_dp_4"
+            app:cardElevation="1dp">
+
+            <ImageView
+                android:id="@+id/img_consult_head"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="fitXY"/>
+
+        </android.support.v7.widget.CardView>
+
+
+    </RelativeLayout>
+
+
+    <LinearLayout
+        android:id="@+id/tv_name_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/rl_consult_head"
+        android:layout_marginStart="16dp"
+        android:layout_toEndOf="@+id/rl_consult_head"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/tv_consult_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/platform_color_242424"
+            android:textSize="@dimen/platform_dp_16"
+            android:textStyle="bold"
+            tools:ignore="SpUsage"
+            tools:text="姚雨晴"/>
+
+        <ImageView
+            android:id="@+id/img_sex"
+            android:layout_width="13dp"
+            android:layout_height="13dp"
+            android:layout_marginStart="6dp"
+            android:layout_marginLeft="3dp"
+            android:background="@drawable/home_counselor"/>
+
+    </LinearLayout>
+
+    <com.ydl.ydlcommon.view.TagView
+        android:id="@+id/tag_view"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/platform_dp_16"
+        android:layout_below="@+id/tv_name_layout"
+        android:layout_marginStart="@dimen/platform_dp_16"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="@dimen/platform_dp_10"
+        android:layout_toEndOf="@+id/rl_consult_head"
+        android:orientation="horizontal"/>
+
+    <TextView
+        android:id="@+id/tv_tv_consult_num_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_alignLeft="@+id/tv_name_layout"
+        android:layout_marginTop="8dp"
+        android:text="咨询次数 "
+        android:textColor="@color/platform_color_666666"
+        android:textSize="10sp"
+        tools:ignore="SpUsage"/>
+
+    <TextView
+        android:id="@+id/tv_consult_num"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_marginTop="5dp"
+        android:layout_toRightOf="@+id/tv_tv_consult_num_content"
+        android:textColor="@color/platform_color_242424"
+        android:textSize="@dimen/platform_dp_12"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="8000"/>
+
+    <TextView
+        android:id="@+id/tv_feedback_rate_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_toRightOf="@+id/tv_consult_num"
+        android:layout_marginTop="8dp"
+        android:layout_marginLeft="12dp"
+        android:text="好评率 "
+        android:textColor="@color/platform_color_666666"
+        android:textSize="10sp"
+        tools:ignore="SpUsage"
+        />
+
+    <TextView
+        android:id="@+id/tv_feedback_rate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_toRightOf="@+id/tv_feedback_rate_content"
+        android:layout_marginTop="5dp"
+        android:textColor="@color/platform_color_242424"
+        android:textSize="12sp"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="83%"/>
+
+    <TextView
+        android:id="@+id/tv_consult_price"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_consult_num"
+        android:layout_marginStart="@dimen/platform_dp_16"
+        android:layout_marginTop="7dp"
+        android:layout_toEndOf="@+id/rl_consult_head"
+        android:layout_alignBottom="@+id/rl_consult_head"
+        android:gravity="bottom"
+        android:textColor="#FF5A4C"
+        android:textSize="@dimen/platform_dp_16"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="￥199"
+        android:layout_marginBottom="2dp"
+        />
+
+    <TextView
+        android:id="@+id/tv_price_tips"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/tv_consult_price"
+        android:layout_marginLeft="2dp"
+        android:layout_marginBottom="2dp"
+        android:layout_toRightOf="@+id/tv_consult_price"
+        android:gravity="center"
+        android:text="起"
+        android:textColor="@color/platform_color_666666"
+        android:textSize="@dimen/platform_dp_12"/>
+
+    <TextView
+        android:id="@+id/tv_consult_chat"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/platform_dp_22"
+        android:layout_alignBottom="@+id/tv_consult_price"
+        android:layout_alignParentRight="true"
+        android:background="@drawable/home_consult_chat_bg"
+        android:gravity="center"
+        android:paddingLeft="17dp"
+        android:paddingTop="3dp"
+        android:paddingRight="17dp"
+        android:paddingBottom="3dp"
+        android:text="私聊"
+        android:textColor="@color/platform_color_222222"
+        android:textSize="12sp"
+        android:textStyle="bold"/>
+
+
+</RelativeLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_course_item_view.xml → m-home/src/xlzx/res/layout/home_course_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/platform_dp_99"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_marginLeft="@dimen/platform_dp_15"
-    android:layout_marginRight="@dimen/platform_dp_15"
-    android:layout_marginBottom="@dimen/platform_dp_13"
-    android:layout_marginTop="@dimen/platform_dp_3"
-    android:padding="@dimen/platform_dp_15"
-    android:background="@drawable/home_module_view_shadow_bg">
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/homeModuleCourseItemViewImgCardView"
-        android:layout_width="127dp"
-        android:layout_height="69dp"
-        app:cardCornerRadius="6dp"
-        app:cardElevation="0dp">
-        <ImageView
-            android:id="@+id/homeModuleCourseItemViewImg"
-            android:layout_width="127dp"
-            android:layout_height="69dp"
-            android:scaleType="centerCrop"
-            android:src="@drawable/home_module_image_default_back"/>
-
-    </android.support.v7.widget.CardView>
-
-    <TextView
-        android:id="@+id/homeModuleCourseItemViewTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/homeModuleCourseItemViewImgCardView"
-        android:layout_marginLeft="@dimen/platform_dp_12"
-        android:textSize="@dimen/platform_dp_16"
-        android:textColor="@color/platform_color_242424"
-        android:textStyle="bold"
-        android:maxLines="2"
-        android:ellipsize="end"
-        android:layout_marginTop="-2dp"
-        tools:text="深度睡眠速效药丸丨帮你
-像婴儿般安稳入睡深度睡眠速效药丸丨帮你
-像婴儿般安稳入睡"/>
-    <TextView
-        android:id="@+id/homeModuleCourseItemViewFreePrice"
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="免费"
-        android:textSize="@dimen/platform_dp_15"
-        android:textStyle="bold"
-        android:textColor="@color/platform_color_34CD65"
-        android:layout_alignBottom="@+id/homeModuleCourseItemViewImgCardView"
-        android:layout_toRightOf="@+id/homeModuleCourseItemViewImgCardView"
-        android:layout_marginLeft="@dimen/platform_dp_12"/>
-    <RelativeLayout
-        android:id="@+id/homeModuleCourseItemViewExpensePriceHideView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/homeModuleCourseItemViewImgCardView"
-        android:layout_toRightOf="@+id/homeModuleCourseItemViewImgCardView"
-        android:layout_marginLeft="@dimen/platform_dp_12"
-        android:layout_marginBottom="-2dp">
-        <TextView
-            android:id="@+id/homeModuleCourseItemViewExpensePrice"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="￥688"
-            android:textStyle="bold"
-            android:textSize="16dp"
-            android:textColor="@color/platform_color_FF5A4C"/>
-    </RelativeLayout>
-    <TextView
-        android:id="@+id/homeModuleCourseItemViewPersonText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="人气"
-        android:textSize="@dimen/platform_dp_11"
-        android:gravity="center"
-        android:textColor="@color/platform_color_666666"
-        android:layout_alignParentRight="true"
-        android:layout_alignTop="@+id/homeModuleCourseItemViewExpensePriceHideView"
-        android:layout_alignBottom="@+id/homeModuleCourseItemViewExpensePriceHideView"
-        android:layout_marginBottom="-1dp"
-        />
-    <TextView
-        android:id="@+id/homeModuleCourseItemViewPersonNum"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        tools:text="3109"
-        android:textSize="@dimen/platform_dp_12"
-        android:textColor="@color/platform_color_242424"
-        android:layout_toLeftOf="@+id/homeModuleCourseItemViewPersonText"
-        android:layout_alignBottom="@+id/homeModuleCourseItemViewExpensePriceHideView"
-        android:layout_alignTop="@+id/homeModuleCourseItemViewExpensePriceHideView"
-        android:gravity="center"
-        android:layout_marginBottom="-1dp"
-        android:textStyle="bold"
-        />
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/platform_dp_99"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_marginLeft="@dimen/platform_dp_15"
+    android:layout_marginRight="@dimen/platform_dp_15"
+    android:layout_marginBottom="@dimen/platform_dp_13"
+    android:layout_marginTop="@dimen/platform_dp_3"
+    android:padding="@dimen/platform_dp_15"
+    android:background="@drawable/home_view_shadow_bg">
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/homeModuleCourseItemViewImgCardView"
+        android:layout_width="127dp"
+        android:layout_height="69dp"
+        app:cardCornerRadius="6dp"
+        app:cardElevation="0dp">
+        <ImageView
+            android:id="@+id/homeModuleCourseItemViewImg"
+            android:layout_width="127dp"
+            android:layout_height="69dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/home_image_default_back"/>
+
+    </android.support.v7.widget.CardView>
+
+    <TextView
+        android:id="@+id/homeModuleCourseItemViewTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/homeModuleCourseItemViewImgCardView"
+        android:layout_marginLeft="@dimen/platform_dp_12"
+        android:textSize="@dimen/platform_dp_16"
+        android:textColor="@color/platform_color_242424"
+        android:textStyle="bold"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:layout_marginTop="-2dp"
+        tools:text="深度睡眠速效药丸丨帮你
+像婴儿般安稳入睡深度睡眠速效药丸丨帮你
+像婴儿般安稳入睡"/>
+    <TextView
+        android:id="@+id/homeModuleCourseItemViewFreePrice"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="免费"
+        android:textSize="@dimen/platform_dp_15"
+        android:textStyle="bold"
+        android:textColor="@color/platform_color_34CD65"
+        android:layout_alignBottom="@+id/homeModuleCourseItemViewImgCardView"
+        android:layout_toRightOf="@+id/homeModuleCourseItemViewImgCardView"
+        android:layout_marginLeft="@dimen/platform_dp_12"/>
+    <RelativeLayout
+        android:id="@+id/homeModuleCourseItemViewExpensePriceHideView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/homeModuleCourseItemViewImgCardView"
+        android:layout_toRightOf="@+id/homeModuleCourseItemViewImgCardView"
+        android:layout_marginLeft="@dimen/platform_dp_12"
+        android:layout_marginBottom="-2dp">
+        <TextView
+            android:id="@+id/homeModuleCourseItemViewExpensePrice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="￥688"
+            android:textStyle="bold"
+            android:textSize="16dp"
+            android:textColor="@color/platform_color_FF5A4C"/>
+    </RelativeLayout>
+    <TextView
+        android:id="@+id/homeModuleCourseItemViewPersonText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="人气"
+        android:textSize="@dimen/platform_dp_11"
+        android:gravity="center"
+        android:textColor="@color/platform_color_666666"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@+id/homeModuleCourseItemViewExpensePriceHideView"
+        android:layout_alignBottom="@+id/homeModuleCourseItemViewExpensePriceHideView"
+        android:layout_marginBottom="-1dp"
+        />
+    <TextView
+        android:id="@+id/homeModuleCourseItemViewPersonNum"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="3109"
+        android:textSize="@dimen/platform_dp_12"
+        android:textColor="@color/platform_color_242424"
+        android:layout_toLeftOf="@+id/homeModuleCourseItemViewPersonText"
+        android:layout_alignBottom="@+id/homeModuleCourseItemViewExpensePriceHideView"
+        android:layout_alignTop="@+id/homeModuleCourseItemViewExpensePriceHideView"
+        android:gravity="center"
+        android:layout_marginBottom="-1dp"
+        android:textStyle="bold"
+        />
+</RelativeLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/dialog_coupon.xml → m-home/src/xlzx/res/layout/home_dialog_coupon.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="#00000000"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.CardView
-        android:layout_width="267dp"
-        android:layout_height="292dp"
-        app:cardCornerRadius="10dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="119dp"
-                android:background="@mipmap/coupon_background"
-                android:gravity="center_horizontal|center_vertical"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/iv_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:src="@drawable/coupon_receiver" />
-
-                <TextView
-                    android:id="@+id/tv_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="9dp"
-                    android:textColor="@color/platform_white"
-                    android:textSize="16sp"
-                    tools:text="恭喜您，领取成功" />
-
-            </LinearLayout>
-
-
-            <RelativeLayout
-                android:layout_width="227dp"
-                android:layout_height="90dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="-16dp"
-                android:background="@mipmap/cotent_backgroudn"
-                android:paddingLeft="14dp"
-                android:paddingRight="14dp"
-                android:paddingTop="16dp">
-
-
-                <TextView
-                    android:id="@+id/tv_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginRight="5dp"
-                    android:layout_toLeftOf="@+id/tv_money"
-                    android:textColor="#666666"
-                    android:textSize="14sp"
-                    tools:text="咨询优惠券咨询优惠券" />
-
-                <TextView
-                    android:id="@+id/tv_duration"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/tv_title"
-                    android:layout_marginTop="4dp"
-                    android:textColor="#999999"
-                    android:textSize="10sp"
-                    tools:text="有效期至2018-08-31" />
-
-                <TextView
-                    android:id="@+id/tv_money"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_toLeftOf="@+id/tv_unit"
-                    android:layout_toStartOf="@+id/tv_unit"
-                    android:textColor="@color/darkorange"
-                    android:textSize="25sp"
-                    android:textStyle="bold"
-                    tools:text="¥50" />
-
-                <TextView
-                    android:id="@+id/tv_unit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginTop="10dp"
-                    android:text="元"
-                    android:textColor="@color/darkorange"
-                    android:textSize="12sp" />
-
-                <TextView
-                    android:id="@+id/tv_limit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="10dp"
-                    android:textColor="#999999"
-                    android:textSize="10sp"
-                    tools:text="满500元可用" />
-
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/tv_ensure"
-                android:layout_width="192dp"
-                android:layout_height="42dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="30dp"
-                android:background="@drawable/background_coupon_button"
-                android:gravity="center"
-                android:textColor="@color/platform_white"
-                android:textSize="15sp"
-                tools:text="立即领取" />
-
-        </LinearLayout>
-
-    </android.support.v7.widget.CardView>
-
-    <ImageView
-        android:id="@+id/iv_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="37dp"
-        android:background="@drawable/pop_close"
-        android:padding="10dp" />
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#00000000"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.CardView
+        android:layout_width="267dp"
+        android:layout_height="292dp"
+        app:cardCornerRadius="10dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="119dp"
+                android:background="@mipmap/home_coupon_background"
+                android:gravity="center_horizontal|center_vertical"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/iv_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:src="@drawable/home_coupon_receiver" />
+
+                <TextView
+                    android:id="@+id/tv_status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="9dp"
+                    android:textColor="@color/platform_white"
+                    android:textSize="16sp"
+                    tools:text="恭喜您，领取成功" />
+
+            </LinearLayout>
+
+
+            <RelativeLayout
+                android:layout_width="227dp"
+                android:layout_height="90dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="-16dp"
+                android:background="@mipmap/home_cotent_backgroudn"
+                android:paddingLeft="14dp"
+                android:paddingRight="14dp"
+                android:paddingTop="16dp">
+
+
+                <TextView
+                    android:id="@+id/tv_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginRight="5dp"
+                    android:layout_toLeftOf="@+id/tv_money"
+                    android:textColor="#666666"
+                    android:textSize="14sp"
+                    tools:text="咨询优惠券咨询优惠券" />
+
+                <TextView
+                    android:id="@+id/tv_duration"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_title"
+                    android:layout_marginTop="4dp"
+                    android:textColor="#999999"
+                    android:textSize="10sp"
+                    tools:text="有效期至2018-08-31" />
+
+                <TextView
+                    android:id="@+id/tv_money"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_toLeftOf="@+id/tv_unit"
+                    android:layout_toStartOf="@+id/tv_unit"
+                    android:textColor="@color/darkorange"
+                    android:textSize="25sp"
+                    android:textStyle="bold"
+                    tools:text="¥50" />
+
+                <TextView
+                    android:id="@+id/tv_unit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="10dp"
+                    android:text="元"
+                    android:textColor="@color/darkorange"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:id="@+id/tv_limit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="10dp"
+                    android:textColor="#999999"
+                    android:textSize="10sp"
+                    tools:text="满500元可用" />
+
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/tv_ensure"
+                android:layout_width="192dp"
+                android:layout_height="42dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="30dp"
+                android:background="@drawable/home_background_coupon_button"
+                android:gravity="center"
+                android:textColor="@color/platform_white"
+                android:textSize="15sp"
+                tools:text="立即领取" />
+
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="37dp"
+        android:background="@drawable/home_pop_close"
+        android:padding="10dp" />
+</LinearLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/dialog_guide_activity.xml → m-home/src/xlzx/res/layout/home_dialog_guide_activity.xml

-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/c_body"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="#99000000">
-
-    <ImageView
-        android:id="@+id/img_activity"
-        android:layout_width="64dp"
-        android:layout_height="34dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"/>
-
-    <ImageView
-        android:id="@+id/img_line"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@mipmap/activity_guide"
-        app:layout_constraintTop_toBottomOf="@+id/img_activity"
-        app:layout_constraintLeft_toLeftOf="@+id/img_activity"
-        app:layout_constraintRight_toRightOf="@+id/img_activity"/>
-
-    <TextView
-        android:id="@+id/tv_content"
-        android:layout_width="wrap_content"
-        android:layout_height="24dp"
-        tools:text="这里可以进入双11活动哦"
-        app:layout_constraintBottom_toBottomOf="@+id/img_line"
-        app:layout_constraintLeft_toRightOf="@+id/img_line"
-        android:layout_marginLeft="14dp"
-        android:textSize="16dp"
-        android:textColor="@color/platform_white"/>
-
-
-</android.support.constraint.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/c_body"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="#99000000">
+
+    <ImageView
+        android:id="@+id/img_activity"
+        android:layout_width="64dp"
+        android:layout_height="34dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"/>
+
+    <ImageView
+        android:id="@+id/img_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/home_activity_guide"
+        app:layout_constraintTop_toBottomOf="@+id/img_activity"
+        app:layout_constraintLeft_toLeftOf="@+id/img_activity"
+        app:layout_constraintRight_toRightOf="@+id/img_activity"/>
+
+    <TextView
+        android:id="@+id/tv_content"
+        android:layout_width="wrap_content"
+        android:layout_height="24dp"
+        tools:text="这里可以进入双11活动哦"
+        app:layout_constraintBottom_toBottomOf="@+id/img_line"
+        app:layout_constraintLeft_toRightOf="@+id/img_line"
+        android:layout_marginLeft="14dp"
+        android:textSize="16dp"
+        android:textColor="@color/platform_white"/>
+
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/fragment_home_module.xml → m-home/src/xlzx/res/layout/home_fragment_home_module.xml

-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/home_swipe_refresh_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipChildren="false"
-    android:clipToPadding="false">
-
-    <android.support.design.widget.CoordinatorLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/colorBg"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        >
-
-        <android.support.design.widget.AppBarLayout
-            android:id="@+id/appbar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/colorBg"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            app:elevation="0dp">
-
-            <android.support.design.widget.CollapsingToolbarLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-
-                <include layout="@layout/layout_home_module_head_bg"/>
-
-                <include
-                    layout="@layout/layout_home_module_head_middle"/>
-
-                <android.support.v7.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/home_title_bar_height"
-                    android:alpha="0"
-                    android:background="@android:color/white"
-                    android:tag="toolbar"
-                    android:visibility="gone"
-                    app:layout_collapseMode="pin"
-                    app:popupTheme="@style/Widget.AppCompat.Toolbar"/>
-
-                <include layout="@layout/layout_home_module_toolbar"/>
-
-            </android.support.design.widget.CollapsingToolbarLayout>
-        </android.support.design.widget.AppBarLayout>
-
-        <include layout="@layout/layout_home_module_content"/>
-
-        <include layout="@layout/layout_home_module_input"/>
-
-    </android.support.design.widget.CoordinatorLayout>
-</android.support.v4.widget.SwipeRefreshLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.SwipeRefreshLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/home_swipe_refresh_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+
+    <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/home_colorBg"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        >
+
+        <android.support.design.widget.AppBarLayout
+            android:id="@+id/appbar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/home_colorBg"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:elevation="0dp">
+
+            <android.support.design.widget.CollapsingToolbarLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+
+                <include layout="@layout/home_layout_home_module_head_bg"/>
+
+                <include
+                    layout="@layout/home_layout_home_module_head_middle"/>
+
+                <android.support.v7.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/home_home_title_bar_height"
+                    android:alpha="0"
+                    android:background="@android:color/white"
+                    android:tag="toolbar"
+                    android:visibility="gone"
+                    app:layout_collapseMode="pin"
+                    app:popupTheme="@style/Widget.AppCompat.Toolbar"/>
+
+                <include layout="@layout/home_layout_home_module_toolbar"/>
+
+            </android.support.design.widget.CollapsingToolbarLayout>
+        </android.support.design.widget.AppBarLayout>
+
+        <include layout="@layout/home_layout_home_module_content"/>
+
+        <include layout="@layout/home_layout_home_module_input"/>
+
+    </android.support.design.widget.CoordinatorLayout>
+</android.support.v4.widget.SwipeRefreshLayout>

m-home/src/xlzx/res/layout/home_module_intelligent_item_view.xml → m-home/src/xlzx/res/layout/home_intelligent_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:paddingLeft="@dimen/platform_dp_15"
-    android:paddingRight="@dimen/platform_dp_15"
-    android:paddingTop="@dimen/platform_dp_8"
-    android:paddingBottom="@dimen/platform_dp_8">
-
-    <ImageView
-        android:id="@+id/iv_fm_play"
-        android:layout_height="@dimen/platform_dp_22"
-        android:layout_width="@dimen/platform_dp_22"
-        android:src="@drawable/home_module_intelligent_item_play_icon"
-        android:layout_marginRight="@dimen/platform_dp_7"/>
-
-    <TextView
-        android:id="@+id/homeModuleIntelligentItemViewTitle"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        tools:text="2018倒计时，这一年你过2018倒计时，这一年你过的…"
-        android:textSize="@dimen/platform_dp_16"
-        android:textColor="@color/platform_color_242424"
-        android:textStyle="bold"
-        android:layout_marginRight="@dimen/platform_dp_29"
-        android:maxLines="1"
-        android:ellipsize="end"/>
-
-    <TextView
-        android:id="@+id/homeModuleIntelligentItemViewHits"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        tools:text="3785"
-        android:textSize="@dimen/platform_dp_12"
-        android:textColor="@color/platform_color_666666"
-        android:maxLines="1"
-        android:ellipsize="end"/>
-
-    <ImageView
-        android:layout_height="@dimen/platform_dp_11"
-        android:layout_width="@dimen/platform_dp_12"
-        android:src="@drawable/home_module_intelligent_item_listen_icon"
-        android:layout_marginLeft="@dimen/platform_dp_4"/>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:paddingLeft="@dimen/platform_dp_15"
+    android:paddingRight="@dimen/platform_dp_15"
+    android:paddingTop="@dimen/platform_dp_8"
+    android:paddingBottom="@dimen/platform_dp_8">
+
+    <ImageView
+        android:id="@+id/iv_fm_play"
+        android:layout_height="@dimen/platform_dp_22"
+        android:layout_width="@dimen/platform_dp_22"
+        android:src="@drawable/home_intelligent_item_play_icon"
+        android:layout_marginRight="@dimen/platform_dp_7"/>
+
+    <TextView
+        android:id="@+id/homeModuleIntelligentItemViewTitle"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        tools:text="2018倒计时，这一年你过2018倒计时，这一年你过的…"
+        android:textSize="@dimen/platform_dp_16"
+        android:textColor="@color/platform_color_242424"
+        android:textStyle="bold"
+        android:layout_marginRight="@dimen/platform_dp_29"
+        android:maxLines="1"
+        android:ellipsize="end"/>
+
+    <TextView
+        android:id="@+id/homeModuleIntelligentItemViewHits"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="3785"
+        android:textSize="@dimen/platform_dp_12"
+        android:textColor="@color/platform_color_666666"
+        android:maxLines="1"
+        android:ellipsize="end"/>
+
+    <ImageView
+        android:layout_height="@dimen/platform_dp_11"
+        android:layout_width="@dimen/platform_dp_12"
+        android:src="@drawable/home_intelligent_item_listen_icon"
+        android:layout_marginLeft="@dimen/platform_dp_4"/>
+
+</LinearLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_intelligent_top_item_view.xml → m-home/src/xlzx/res/layout/home_intelligent_top_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/homeModuleIntelligentTopViewImageCardView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:cardCornerRadius="@dimen/platform_dp_7"
-        app:cardElevation="0dp">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/homeModuleIntelligentTopViewImage"
-                android:background="@drawable/home_module_image_default_back"
-                android:scaleType="centerCrop"/>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="45"/>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="55"
-                    android:background="@drawable/home_module_intelligent_gradient_back"/>
-            </LinearLayout>
-
-        </RelativeLayout>
-    </android.support.v7.widget.CardView>
-
-
-    <TextView
-        android:id="@+id/homeModuleIntelligentTopViewTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        tools:text="先结婚还是先买先结婚还是先买房"
-        android:textSize="@dimen/platform_dp_24"
-        android:textColor="@color/platform_color_FFFFFF"
-        android:textStyle="bold"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="@dimen/platform_dp_14"
-        android:layout_marginBottom="@dimen/platform_dp_35"
-        android:layout_marginRight="@dimen/platform_dp_115"
-        />
-
-    <LinearLayout
-        android:id="@+id/homeModuleIntelligentTopViewDescLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/platform_dp_18"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:paddingLeft="@dimen/platform_dp_10"
-        android:paddingRight="@dimen/platform_dp_10"
-        android:background="@drawable/home_module_intelligent_top_view_layout_back"
-        android:layout_alignLeft="@+id/homeModuleIntelligentTopViewTitle"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/platform_dp_14">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="主播/"
-            android:textColor="@color/platform_color_222222"
-            android:textSize="@dimen/platform_dp_12"
-            />
-        <TextView
-            android:id="@+id/homeModuleIntelligentTopViewAuthor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="花心月"
-            android:textColor="@color/platform_color_222222"
-            android:textSize="@dimen/platform_dp_12"
-            android:layout_marginBottom="0.5dp"
-            />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="收听/"
-            android:textColor="@color/platform_color_222222"
-            android:textSize="@dimen/platform_dp_12"
-            android:layout_marginLeft="@dimen/platform_dp_12"
-            />
-        <TextView
-            android:id="@+id/homeModuleIntelligentTopViewHits"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="2486"
-            android:textColor="@color/platform_color_222222"
-            android:textSize="@dimen/platform_dp_13"
-            android:layout_marginBottom="1dp"
-            />
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/iv_play_fm"
-        android:layout_width="@dimen/platform_dp_36"
-        android:layout_height="@dimen/platform_dp_36"
-        android:src="@drawable/home_module_intelligent_first_play_icon"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginRight="@dimen/platform_dp_14"
-        android:layout_marginBottom="16.5dp"/>
-
-    <RelativeLayout
-        android:layout_width="@dimen/platform_dp_64"
-        android:layout_height="@dimen/platform_dp_20"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/home_module_intelligent_top_view_recommend_back">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="每日推荐"
-            android:textColor="@color/platform_color_242424"
-            android:textSize="@dimen/platform_dp_12"
-            android:textStyle="bold"/>
-    </RelativeLayout>
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/homeModuleIntelligentTopViewImageCardView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:cardCornerRadius="@dimen/platform_dp_7"
+        app:cardElevation="0dp">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/homeModuleIntelligentTopViewImage"
+                android:background="@drawable/home_image_default_back"
+                android:scaleType="centerCrop"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="45"/>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="55"
+                    android:background="@drawable/home_intelligent_gradient_back"/>
+            </LinearLayout>
+
+        </RelativeLayout>
+    </android.support.v7.widget.CardView>
+
+
+    <TextView
+        android:id="@+id/homeModuleIntelligentTopViewTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="先结婚还是先买先结婚还是先买房"
+        android:textSize="@dimen/platform_dp_24"
+        android:textColor="@color/platform_color_FFFFFF"
+        android:textStyle="bold"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="@dimen/platform_dp_14"
+        android:layout_marginBottom="@dimen/platform_dp_35"
+        android:layout_marginRight="@dimen/platform_dp_115"
+        />
+
+    <LinearLayout
+        android:id="@+id/homeModuleIntelligentTopViewDescLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/platform_dp_18"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:paddingLeft="@dimen/platform_dp_10"
+        android:paddingRight="@dimen/platform_dp_10"
+        android:background="@drawable/home_intelligent_top_view_layout_back"
+        android:layout_alignLeft="@+id/homeModuleIntelligentTopViewTitle"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/platform_dp_14">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="主播/"
+            android:textColor="@color/platform_color_222222"
+            android:textSize="@dimen/platform_dp_12"
+            />
+        <TextView
+            android:id="@+id/homeModuleIntelligentTopViewAuthor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="花心月"
+            android:textColor="@color/platform_color_222222"
+            android:textSize="@dimen/platform_dp_12"
+            android:layout_marginBottom="0.5dp"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="收听/"
+            android:textColor="@color/platform_color_222222"
+            android:textSize="@dimen/platform_dp_12"
+            android:layout_marginLeft="@dimen/platform_dp_12"
+            />
+        <TextView
+            android:id="@+id/homeModuleIntelligentTopViewHits"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="2486"
+            android:textColor="@color/platform_color_222222"
+            android:textSize="@dimen/platform_dp_13"
+            android:layout_marginBottom="1dp"
+            />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/iv_play_fm"
+        android:layout_width="@dimen/platform_dp_36"
+        android:layout_height="@dimen/platform_dp_36"
+        android:src="@drawable/home_intelligent_first_play_icon"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="@dimen/platform_dp_14"
+        android:layout_marginBottom="16.5dp"/>
+
+    <RelativeLayout
+        android:layout_width="@dimen/platform_dp_64"
+        android:layout_height="@dimen/platform_dp_20"
+        android:layout_alignParentRight="true"
+        android:background="@drawable/home_intelligent_top_view_recommend_back">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="每日推荐"
+            android:textColor="@color/platform_color_242424"
+            android:textSize="@dimen/platform_dp_12"
+            android:textStyle="bold"/>
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_intelligent_view.xml → m-home/src/xlzx/res/layout/home_intelligent_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    >
-
-    <com.yidianling.home.ui.view.HomeCommonTitleView
-        android:id="@+id/homeModuleIntelligentViewHomeCommonTitleView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <LinearLayout
-        android:id="@+id/homeModuleIntelligentViewAddLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/platform_dp_15"
-        android:layout_marginRight="@dimen/platform_dp_15"
-        android:layout_marginTop="@dimen/platform_dp_2"
-        android:layout_marginBottom="@dimen/platform_dp_20"
-        android:background="@drawable/home_module_card_view_stroke"
-        android:orientation="vertical"></LinearLayout>
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    >
+
+    <com.yidianling.home.ui.view.HomeCommonTitleView
+        android:id="@+id/homeModuleIntelligentViewHomeCommonTitleView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:id="@+id/homeModuleIntelligentViewAddLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/platform_dp_15"
+        android:layout_marginRight="@dimen/platform_dp_15"
+        android:layout_marginTop="@dimen/platform_dp_2"
+        android:layout_marginBottom="@dimen/platform_dp_20"
+        android:background="@drawable/home_card_view_stroke"
+        android:orientation="vertical"></LinearLayout>
+
+</merge>
\ No newline at end of file

m-home/src/xlzx/res/layout/layout_home_module_head_bg.xml → m-home/src/xlzx/res/layout/home_layout_home_module_head_bg.xml

-<?xml version="1.0" encoding="utf-8"?>
-<com.yidianling.home.ui.scrollView.DisInterceptNestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/search_head_bg"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    app:layout_collapseMode="parallax"
-    app:layout_collapseParallaxMultiplier="0.8">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <com.ydl.ydlcommon.view.banner.Banner
-            android:id="@+id/banner_search"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/head_bg_height"
-            app:pa_indicator_different_width="14dp"
-            app:pa_indicator_drawable_selected="@drawable/home_module_banner_tip_select"
-            app:pa_indicator_drawable_unselected="@drawable/home_module_banner_tip_unselect"
-            app:pa_indicator_height="5dp"
-            app:pa_indicator_margin="1.25dp"
-            app:pa_is_selected_same_unselected="false"
-            android:scaleType="centerCrop"
-            android:tag="overScroll"
-            />
-
-        <ImageView
-            android:layout_alignBottom="@+id/banner_search"
-            android:layout_width="match_parent"
-            android:layout_height="16dp"
-            android:background="@drawable/home_module_arc_bg"/>
-
-    </RelativeLayout>
-
-
-
-</com.yidianling.home.ui.scrollView.DisInterceptNestedScrollView>
+<?xml version="1.0" encoding="utf-8"?>
+<com.yidianling.home.ui.scrollView.DisInterceptNestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/search_head_bg"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    app:layout_collapseMode="parallax"
+    app:layout_collapseParallaxMultiplier="0.8">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <com.ydl.ydlcommon.view.banner.Banner
+            android:id="@+id/banner_search"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/home_head_bg_height"
+            app:pa_indicator_different_width="14dp"
+            app:pa_indicator_drawable_selected="@drawable/home_banner_tip_select"
+            app:pa_indicator_drawable_unselected="@drawable/home_banner_tip_unselect"
+            app:pa_indicator_height="5dp"
+            app:pa_indicator_margin="1.25dp"
+            app:pa_is_selected_same_unselected="false"
+            android:scaleType="centerCrop"
+            android:tag="overScroll"
+            />
+
+        <ImageView
+            android:layout_alignBottom="@+id/banner_search"
+            android:layout_width="match_parent"
+            android:layout_height="16dp"
+            android:background="@drawable/home_arc_bg"/>
+
+    </RelativeLayout>
+
+
+
+</com.yidianling.home.ui.scrollView.DisInterceptNestedScrollView>
\ No newline at end of file

m-home/src/xlzx/res/layout/layout_home_module_head_middle.xml → m-home/src/xlzx/res/layout/home_layout_home_module_head_middle.xml

-<?xml version="1.0" encoding="utf-8"?>
-<com.yidianling.home.ui.scrollView.DisInterceptNestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/middle_but_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/head_bg_height"
-    android:background="@color/colorBg"
-    android:tag="middle_but_layout"
-    app:layout_collapseMode="parallax"
-    app:layout_collapseParallaxMultiplier="0.13">
-    <!--删除分类控件 by: haorui  -->
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <View
-            android:background="@color/platform_white"
-            android:layout_width="match_parent"
-            android:layout_height="44dp"/>
-    </RelativeLayout>
-
-    <!--<com.yidianling.home.ui.widget.HomeModuleCategoryView-->
-        <!--android:id="@+id/home_category_view"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--/>-->
-
-</com.yidianling.home.ui.scrollView.DisInterceptNestedScrollView>
+<?xml version="1.0" encoding="utf-8"?>
+<com.yidianling.home.ui.scrollView.DisInterceptNestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/middle_but_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/home_head_bg_height"
+    android:background="@color/home_colorBg"
+    android:tag="middle_but_layout"
+    app:layout_collapseMode="parallax"
+    app:layout_collapseParallaxMultiplier="0.13">
+    <!--删除分类控件 by: haorui  -->
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <View
+            android:background="@color/platform_white"
+            android:layout_width="match_parent"
+            android:layout_height="44dp"/>
+    </RelativeLayout>
+
+    <!--<com.yidianling.home.ui.widget.HomeModuleCategoryView-->
+        <!--android:id="@+id/home_category_view"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--/>-->
+
+</com.yidianling.home.ui.scrollView.DisInterceptNestedScrollView>
\ No newline at end of file

m-home/src/xlzx/res/layout/layout_home_module_input.xml → m-home/src/xlzx/res/layout/home_layout_home_module_input.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/ll_search"
-    android:layout_width="match_parent"
-    android:layout_height="35dp"
-    android:layout_marginLeft="35dp"
-    android:layout_marginRight="35dp"
-    android:tag="tag_search_input"
-    app:layout_anchor="@+id/middle_but_layout"
-    app:layout_anchorGravity="top"
-    android:focusable="true"
-    android:orientation="horizontal"
-    android:focusableInTouchMode="true"
-    >
-
-    <ImageView
-        android:id="@+id/img_ad"
-        android:layout_width="64dp"
-        android:layout_height="34dp"
-        android:layout_marginEnd="10dp"
-        android:visibility="gone" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <View
-            android:id="@+id/view_search_input_bg"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/bg_home_module_input"
-            android:tag="tag_search_input_bg"
-            />
-
-        <ImageView
-            android:id="@+id/iv_search_icon"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="10dp"
-            android:layout_width="14dp"
-            android:layout_height="14dp"
-            android:scaleType="centerCrop"
-            android:layout_centerVertical="true"
-            android:tag="tag_search_input_img"
-            android:src="@drawable/home_module_search"/>
-
-        <EditText
-            android:editable="false"
-            android:id="@+id/etSearch"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginRight="@dimen/platform_dp_10"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@id/iv_search_icon"
-            android:background="@null"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:hint="搜索专家姓名"
-            android:imeOptions="actionSearch"
-            android:singleLine="true"
-            android:textColor="@color/platform_color_444444"
-            android:textColorHint="#999999"
-            android:textCursorDrawable="@color/color_0CACF4"
-            android:tag="tag_search_input_edit"
-            android:textSize="12sp"
-            />
-    </RelativeLayout>
-
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/ll_search"
+    android:layout_width="match_parent"
+    android:layout_height="35dp"
+    android:layout_marginLeft="35dp"
+    android:layout_marginRight="35dp"
+    android:tag="tag_search_input"
+    app:layout_anchor="@+id/middle_but_layout"
+    app:layout_anchorGravity="top"
+    android:focusable="true"
+    android:orientation="horizontal"
+    android:focusableInTouchMode="true"
+    >
+
+    <ImageView
+        android:id="@+id/img_ad"
+        android:layout_width="64dp"
+        android:layout_height="34dp"
+        android:layout_marginEnd="10dp"
+        android:visibility="gone" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <View
+            android:id="@+id/view_search_input_bg"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/home_bg_home_module_input"
+            android:tag="tag_search_input_bg"
+            />
+
+        <ImageView
+            android:id="@+id/iv_search_icon"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="10dp"
+            android:layout_width="14dp"
+            android:layout_height="14dp"
+            android:scaleType="centerCrop"
+            android:layout_centerVertical="true"
+            android:tag="tag_search_input_img"
+            android:src="@drawable/home_search"/>
+
+        <EditText
+            android:editable="false"
+            android:id="@+id/etSearch"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginRight="@dimen/platform_dp_10"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@id/iv_search_icon"
+            android:background="@null"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:hint="搜索专家姓名"
+            android:imeOptions="actionSearch"
+            android:singleLine="true"
+            android:textColor="@color/platform_color_444444"
+            android:textColorHint="#999999"
+            android:textCursorDrawable="@color/home_color_0CACF4"
+            android:tag="tag_search_input_edit"
+            android:textSize="12sp"
+            />
+    </RelativeLayout>
+
+
+</LinearLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/layout_home_module_toolbar.xml → m-home/src/xlzx/res/layout/home_layout_home_module_toolbar.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/title_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:visibility="gone"
-    android:orientation="vertical"
-    app:layout_collapseMode="pin">
-
-
-    <View
-        android:id="@+id/view_search_toolbar_bg"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/home_title_bar_height"
-        android:background="#FFDD33"
-        android:tag="toolbar_bg"
-        />
-
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/title_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:visibility="gone"
+    android:orientation="vertical"
+    app:layout_collapseMode="pin">
+
+
+    <View
+        android:id="@+id/view_search_toolbar_bg"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/home_home_title_bar_height"
+        android:background="#FFDD33"
+        android:tag="toolbar_bg"
+        />
+
+
+</RelativeLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_pager_banner_view.xml → m-home/src/xlzx/res/layout/home_pager_banner_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto"
-       android:layout_width="match_parent"
-       android:layout_height="wrap_content">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="180dp"
-        >
-
-        <com.ydl.ydlcommon.view.banner.Banner
-            android:id="@+id/homeModulePagerBannerViewBanner"
-            android:layout_width="match_parent"
-            android:layout_height="180dp"
-            app:pa_indicator_different_width="14dp"
-            app:pa_indicator_drawable_selected="@drawable/home_module_banner_tip_select"
-            app:pa_indicator_drawable_unselected="@drawable/home_module_banner_tip_unselect"
-            app:pa_indicator_height="5dp"
-            app:pa_indicator_margin="1.25dp"
-            app:pa_is_selected_same_unselected="false"
-            android:background="@color/platform_color_444444"
-            />
-
-        <ImageView
-            android:layout_alignBottom="@+id/homeModulePagerBannerViewBanner"
-            android:layout_width="match_parent"
-            android:layout_height="15dp"
-            android:background="@drawable/home_module_arc_bg"/>
-
-    </RelativeLayout>
-
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:app="http://schemas.android.com/apk/res-auto"
+       android:layout_width="match_parent"
+       android:layout_height="wrap_content">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="180dp"
+        >
+
+        <com.ydl.ydlcommon.view.banner.Banner
+            android:id="@+id/homeModulePagerBannerViewBanner"
+            android:layout_width="match_parent"
+            android:layout_height="180dp"
+            app:pa_indicator_different_width="14dp"
+            app:pa_indicator_drawable_selected="@drawable/home_banner_tip_select"
+            app:pa_indicator_drawable_unselected="@drawable/home_banner_tip_unselect"
+            app:pa_indicator_height="5dp"
+            app:pa_indicator_margin="1.25dp"
+            app:pa_is_selected_same_unselected="false"
+            android:background="@color/platform_color_444444"
+            />
+
+        <ImageView
+            android:layout_alignBottom="@+id/homeModulePagerBannerViewBanner"
+            android:layout_width="match_parent"
+            android:layout_height="15dp"
+            android:background="@drawable/home_arc_bg"/>
+
+    </RelativeLayout>
+
+
+</merge>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_real_view_left.xml → m-home/src/xlzx/res/layout/home_real_view_left.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="horizontal"
-              android:paddingTop="10dp"
-              android:paddingBottom="10dp"
-    >
-
-    <ImageView
-        android:layout_width="60dp"
-        android:layout_height="18dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="15dp"
-        android:scaleType="centerCrop"
-        android:src="@drawable/home_module_near_icon"/>
-
-    <FrameLayout
-        android:id="@+id/homeModuleRealViewLeftFrameLayout"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"/>
-
-    <ImageView
-        android:layout_width="4dp"
-        android:layout_height="8dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginRight="15dp"
-        android:background="@drawable/home_module_sale_arrow"
-        />
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="horizontal"
+              android:paddingTop="10dp"
+              android:paddingBottom="10dp"
+    >
+
+    <ImageView
+        android:layout_width="60dp"
+        android:layout_height="18dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="15dp"
+        android:scaleType="centerCrop"
+        android:src="@drawable/home_near_icon"/>
+
+    <FrameLayout
+        android:id="@+id/homeModuleRealViewLeftFrameLayout"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"/>
+
+    <ImageView
+        android:layout_width="4dp"
+        android:layout_height="8dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="15dp"
+        android:background="@drawable/home_sale_arrow"
+        />
+</LinearLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_test_item_view.xml → m-home/src/xlzx/res/layout/home_test_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingTop="@dimen/platform_dp_8"
-        android:paddingBottom="@dimen/platform_dp_8"
-        >
-
-
-        <android.support.v7.widget.CardView
-            android:layout_width="70dp"
-            android:layout_height="50dp"
-            app:cardCornerRadius="@dimen/platform_dp_6"
-            app:cardElevation="0dp">
-
-            <ImageView
-                android:id="@+id/iv_test_item"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/home_module_image_default_back"
-                android:scaleType="centerCrop"/>
-        </android.support.v7.widget.CardView>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="12dp"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/tv_test_item_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textColor="@color/platform_color_242424"
-                android:textSize="@dimen/platform_dp_16"
-                android:textStyle="bold"
-                tools:text="2018倒计时，这一年你过2018倒计时，这一年你过的…"/>
-
-            <LinearLayout
-                android:id="@+id/homeModuleIntelligentTopViewDescLayout"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/platform_dp_18"
-                android:layout_marginTop="8dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingRight="@dimen/platform_dp_10">
-
-                <TextView
-                    android:id="@+id/tv_test_item_hit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/platform_color_444444"
-                    android:textSize="@dimen/platform_dp_12"
-                    android:textStyle="bold"
-                    tools:text="999"
-                    />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="人气"
-                    android:textColor="@color/platform_color_666666"
-                    android:textSize="@dimen/platform_dp_12"
-                    />
-
-                <TextView
-                    android:id="@+id/tv_tested_count"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/platform_dp_12"
-                    android:textColor="@color/platform_color_444444"
-                    android:textSize="@dimen/platform_dp_12"
-                    android:textStyle="bold"
-                    tools:text="2486"
-                    />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="人已测"
-                    android:textColor="@color/platform_color_666666"
-                    android:textSize="@dimen/platform_dp_12"
-                    />
-            </LinearLayout>
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="@dimen/platform_dp_32"
-            android:layout_height="@dimen/platform_dp_32"
-            android:background="@drawable/home_module_test_item_go_bg"
-            android:gravity="center"
-            android:text="GO"
-            android:textSize="13sp"
-            android:textColor="@color/platform_color_222222"
-            android:textStyle="bold"/>
-    </LinearLayout>
-
-    <View
-        android:visibility="gone"
-        android:layout_marginBottom="@dimen/platform_dp_12"
-        android:id="@+id/view_test_line"
-        style="@style/viewline"
-        android:layout_marginLeft="82dp"
-        android:background="@color/platform_color_EBEBEB"/>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingTop="@dimen/platform_dp_8"
+        android:paddingBottom="@dimen/platform_dp_8"
+        >
+
+
+        <android.support.v7.widget.CardView
+            android:layout_width="70dp"
+            android:layout_height="50dp"
+            app:cardCornerRadius="@dimen/platform_dp_6"
+            app:cardElevation="0dp">
+
+            <ImageView
+                android:id="@+id/iv_test_item"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/home_image_default_back"
+                android:scaleType="centerCrop"/>
+        </android.support.v7.widget.CardView>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="12dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_test_item_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="@color/platform_color_242424"
+                android:textSize="@dimen/platform_dp_16"
+                android:textStyle="bold"
+                tools:text="2018倒计时，这一年你过2018倒计时，这一年你过的…"/>
+
+            <LinearLayout
+                android:id="@+id/homeModuleIntelligentTopViewDescLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/platform_dp_18"
+                android:layout_marginTop="8dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingRight="@dimen/platform_dp_10">
+
+                <TextView
+                    android:id="@+id/tv_test_item_hit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/platform_color_444444"
+                    android:textSize="@dimen/platform_dp_12"
+                    android:textStyle="bold"
+                    tools:text="999"
+                    />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="人气"
+                    android:textColor="@color/platform_color_666666"
+                    android:textSize="@dimen/platform_dp_12"
+                    />
+
+                <TextView
+                    android:id="@+id/tv_tested_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/platform_dp_12"
+                    android:textColor="@color/platform_color_444444"
+                    android:textSize="@dimen/platform_dp_12"
+                    android:textStyle="bold"
+                    tools:text="2486"
+                    />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="人已测"
+                    android:textColor="@color/platform_color_666666"
+                    android:textSize="@dimen/platform_dp_12"
+                    />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="@dimen/platform_dp_32"
+            android:layout_height="@dimen/platform_dp_32"
+            android:background="@drawable/home_test_item_go_bg"
+            android:gravity="center"
+            android:text="GO"
+            android:textSize="13sp"
+            android:textColor="@color/platform_color_222222"
+            android:textStyle="bold"/>
+    </LinearLayout>
+
+    <View
+        android:visibility="gone"
+        android:layout_marginBottom="@dimen/platform_dp_12"
+        android:id="@+id/view_test_line"
+        style="@style/viewline"
+        android:layout_marginLeft="82dp"
+        android:background="@color/platform_color_EBEBEB"/>
+
+</LinearLayout>
\ No newline at end of file

m-home/src/xlzx/res/layout/home_module_test_top_item_view.xml → m-home/src/xlzx/res/layout/home_test_top_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/homeModuleIntelligentTopViewImageCardView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:cardCornerRadius="@dimen/platform_dp_7"
-        app:cardElevation="0dp">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:id="@+id/homeModuleIntelligentTopViewImage"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/home_module_image_default_back"
-                android:scaleType="centerCrop"/>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="45"/>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="55"
-                    android:background="@drawable/home_module_intelligent_gradient_back"/>
-            </LinearLayout>
-
-        </RelativeLayout>
-    </android.support.v7.widget.CardView>
-
-
-    <TextView
-        android:id="@+id/homeModuleIntelligentTopViewTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginLeft="@dimen/platform_dp_14"
-        android:layout_marginRight="@dimen/platform_dp_115"
-        android:layout_marginBottom="@dimen/platform_dp_35"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="@color/platform_color_FFFFFF"
-        android:textSize="@dimen/platform_dp_24"
-        android:textStyle="bold"
-        tools:text="先结婚还是先买先结婚还是先买房"
-        />
-
-    <LinearLayout
-        android:id="@+id/homeModuleIntelligentTopViewDescLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/platform_dp_18"
-        android:layout_alignLeft="@+id/homeModuleIntelligentTopViewTitle"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/platform_dp_14"
-        android:background="@drawable/home_module_test_top_view_layout_back"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="@dimen/platform_dp_10"
-        android:paddingRight="@dimen/platform_dp_10">
-
-        <TextView
-            android:id="@+id/homeModuleIntelligentTopViewAuthor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/platform_color_444444"
-            android:textSize="@dimen/platform_dp_12"
-            android:textStyle="bold"
-            tools:text="999"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="人气"
-            android:textColor="@color/platform_color_666666"
-            android:textSize="@dimen/platform_dp_12"
-            />
-
-        <TextView
-            android:id="@+id/homeModuleIntelligentTopViewHits"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/platform_dp_12"
-            android:textColor="@color/platform_color_444444"
-            android:textSize="@dimen/platform_dp_12"
-            android:textStyle="bold"
-            tools:text="2486"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="已测"
-            android:textColor="@color/platform_color_666666"
-            android:textSize="@dimen/platform_dp_12"
-            />
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="@dimen/platform_dp_64"
-        android:layout_height="@dimen/platform_dp_20"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/home_module_intelligent_top_view_recommend_back">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="每日一测"
-            android:textColor="@color/platform_color_242424"
-            android:textSize="@dimen/platform_dp_12"
-            android:textStyle="bold"/>
-    </RelativeLayout>
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/homeModuleIntelligentTopViewImageCardView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:cardCornerRadius="@dimen/platform_dp_7"
+        app:cardElevation="0dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/homeModuleIntelligentTopViewImage"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/home_image_default_back"
+                android:scaleType="centerCrop"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="45"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="55"
+                    android:background="@drawable/home_intelligent_gradient_back"/>
+            </LinearLayout>
+
+        </RelativeLayout>
+    </android.support.v7.widget.CardView>
+
+
+    <TextView
+        android:id="@+id/homeModuleIntelligentTopViewTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="@dimen/platform_dp_14"
+        android:layout_marginRight="@dimen/platform_dp_115"
+        android:layout_marginBottom="@dimen/platform_dp_35"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@color/platform_color_FFFFFF"
+        android:textSize="@dimen/platform_dp_24"
+        android:textStyle="bold"
+        tools:text="先结婚还是先买先结婚还是先买房"
+        />
+
+    <LinearLayout
+        android:id="@+id/homeModuleIntelligentTopViewDescLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/platform_dp_18"
+        android:layout_alignLeft="@+id/homeModuleIntelligentTopViewTitle"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/platform_dp_14"
+        android:background="@drawable/home_test_top_view_layout_back"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/platform_dp_10"
+        android:paddingRight="@dimen/platform_dp_10">
+
+        <TextView
+            android:id="@+id/homeModuleIntelligentTopViewAuthor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/platform_color_444444"
+            android:textSize="@dimen/platform_dp_12"
+            android:textStyle="bold"
+            tools:text="999"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="人气"
+            android:textColor="@color/platform_color_666666"
+            android:textSize="@dimen/platform_dp_12"
+            />
+
+        <TextView
+            android:id="@+id/homeModuleIntelligentTopViewHits"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/platform_dp_12"
+            android:textColor="@color/platform_color_444444"
+            android:textSize="@dimen/platform_dp_12"
+            android:textStyle="bold"
+            tools:text="2486"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="已测"
+            android:textColor="@color/platform_color_666666"
+            android:textSize="@dimen/platform_dp_12"
+            />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="@dimen/platform_dp_64"
+        android:layout_height="@dimen/platform_dp_20"
+        android:layout_alignParentRight="true"
+        android:background="@drawable/home_intelligent_top_view_recommend_back">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="每日一测"
+            android:textColor="@color/platform_color_242424"
+            android:textSize="@dimen/platform_dp_12"
+            android:textStyle="bold"/>
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file

m-home/src/xlzx/res/values/colors.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="home_module_category_view_test_line">#F0F0F0</color>
-    <color name="colorBg">#f5f5f5</color>
-    <color name="color_0CACF4">#0CACF4</color>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="home_category_view_test_line">#F0F0F0</color>
+    <color name="home_colorBg">#f5f5f5</color>
+    <color name="home_color_0CACF4">#0CACF4</color>
+</resources>
\ No newline at end of file

m-home/src/xlzx/res/values/dimens.xml

-<resources>
-    <dimen name="dp_60">60dp</dimen>
-    <dimen name="home_title_bar_height">48dp</dimen>
-    <dimen name="bg_height">300dp</dimen>
-    <dimen name="text_margin">16dp</dimen>
-    <dimen name="head_bg_height">180dp</dimen>
-    <dimen name="search_input_margin">160dp</dimen>
-    <!--分割线粗细-->
-    <dimen name="home_card_corner_radius">10dp</dimen>
-    <dimen name="home_card_elevation">2dp</dimen>
-</resources>
+<resources>
+    <dimen name="home_dp_60">60dp</dimen>
+    <dimen name="home_home_title_bar_height">48dp</dimen>
+    <dimen name="home_bg_height">300dp</dimen>
+    <dimen name="home_text_margin">16dp</dimen>
+    <dimen name="home_head_bg_height">180dp</dimen>
+    <dimen name="home_search_input_margin">160dp</dimen>
+    <!--分割线粗细-->
+    <dimen name="home_home_card_corner_radius">10dp</dimen>
+    <dimen name="home_home_card_elevation">2dp</dimen>
+</resources>

m-home/src/xlzx/res/values/strings.xml

-<resources>
-    <string name="app_name">home-module</string>
-    <string name="home_module_real_test_just">刚刚</string>
-    <string name="home_module_real_test">测试了</string>
-    <string name="home_module_real_appoint">预约了</string>
-</resources>
+<resources>
+    <string name="home_app_name">home-module</string>
+    <string name="home_real_test_just">刚刚</string>
+    <string name="home_real_test">测试了</string>
+    <string name="home_real_appoint">预约了</string>
+</resources>

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

@@ -154,7 +154,7 @@ class YdlHomeAdapter(private val mContext: Context,
             }
             //底部提示语模块
             else -> {
-                val view = mInflater.inflate(R.layout.home_module_footer_view, parent, false)
+                val view = mInflater.inflate(R.layout.home_footer_view, parent, false)
                 return FooterViewViewHolder(view)
             }
         }

m-home/src/ydl/java/com/yidianling/home/dialog/ActivityDialog.kt

@@ -8,7 +8,7 @@ import com.ydl.webview.NewH5Activity
 import com.ydl.ydl_image.module.GlideApp
 import com.ydl.ydl_router.manager.YDLRouterManager
 import com.yidianling.home.R
-import kotlinx.android.synthetic.ydl.dialog_activity.*
+import kotlinx.android.synthetic.ydl.home_dialog_activity.*
 import java.lang.ref.WeakReference
 
 /**
@@ -36,7 +36,7 @@ class ActivityDialog : Dialog {
 
         window.setBackgroundDrawableResource(android.R.color.transparent)
 
-        setContentView(R.layout.dialog_activity)
+        setContentView(R.layout.home_dialog_activity)
 
         initView()
     }

m-home/src/ydl/java/com/yidianling/home/dialog/ActivityGuideDialog.kt

@@ -6,7 +6,7 @@ import android.os.Bundle
 import android.view.Window
 import com.yidianling.home.R
 import com.ydl.ydl_image.module.GlideApp
-import kotlinx.android.synthetic.ydl.dialog_guide_activity.*
+import kotlinx.android.synthetic.ydl.home_dialog_guide_activity.*
 import java.util.*
 
 /**
@@ -30,7 +30,7 @@ class ActivityGuideDialog : Dialog {
         requestWindowFeature(Window.FEATURE_NO_TITLE)
         window.setBackgroundDrawableResource(android.R.color.transparent)
 
-        setContentView(R.layout.dialog_guide_activity)
+        setContentView(R.layout.home_dialog_guide_activity)
 
         initView()
     }

m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt

@@ -39,7 +39,7 @@ import com.yidianling.home.ui.view.CouponDialog
 import com.yidianling.home.ui.utils.Double11ActivityManagerUtils
 import com.yidianling.home.utils.HomeAnimUtils
 import com.yidianling.user.api.service.IUserService
-import kotlinx.android.synthetic.ydl.home_module_fragment.*
+import kotlinx.android.synthetic.ydl.home_fragment.*
 
 
 /**
@@ -85,7 +85,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
     private var searchContent: String = "搜索话题、咨询师姓名"
 
     override fun layoutResId(): Int {
-        return R.layout.home_module_fragment
+        return R.layout.home_fragment
     }
 
     override fun initDataAndEvent() {
@@ -159,7 +159,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
     private fun initStatus() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {//4.4以下不支持状态栏变色
             val statusBarHeight = StatusBarUtils.getStatusBarHeight(activity)
-            var homeTitleBarHeight = resources.getDimension(R.dimen.home_title_bar_height)
+            var homeTitleBarHeight = resources.getDimension(R.dimen.home_home_title_bar_height)
             val lp1 = view_rl_top_bg.layoutParams as RelativeLayout.LayoutParams
             lp1.height = (homeTitleBarHeight + statusBarHeight).toInt()
             view_rl_top_bg.layoutParams = lp1

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

@@ -7,7 +7,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import com.yidianling.home.R
 import com.yidianling.home.model.bean.CouponBean
-import kotlinx.android.synthetic.ydl.dialog_coupon.*
+import kotlinx.android.synthetic.ydl.home_dialog_coupon.*
 
 /**
  * @author jiucheng
@@ -43,7 +43,7 @@ class CouponDialog : Dialog {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.dialog_coupon)
+        setContentView(R.layout.home_dialog_coupon)
         setCanceledOnTouchOutside(false)
         window.setBackgroundDrawable(ColorDrawable())
         if (couponBean != null) {
@@ -86,7 +86,7 @@ class CouponDialog : Dialog {
                     title = "获得新优惠券"
                 }
                 ensureText = "立即领取"
-                iamge = R.drawable.coupon_receiver
+                iamge = R.drawable.home_coupon_receiver
             }
             STATUS_GET -> {
                 if (list!!.size > 1) {
@@ -95,7 +95,7 @@ class CouponDialog : Dialog {
                     title = "恭喜您，领取成功"
                 }
                 ensureText = "查看我的卡券"
-                iamge = R.drawable.coupon_success
+                iamge = R.drawable.home_coupon_success
             }
         }
         iv_title.setImageResource(iamge)

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

@@ -10,7 +10,7 @@ import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.event.IHomeEvent
 import com.yidianling.home.model.bean.HomeArticleBean
-import kotlinx.android.synthetic.ydl.home_module_article_item_view.view.*
+import kotlinx.android.synthetic.ydl.home_article_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -32,7 +32,7 @@ class HomeArticleItemView(private val mContext: Context, private var homeEvent:
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_article_item_view, this)
+        View.inflate(mContext, R.layout.home_article_item_view, this)
     }
 
     fun updateData(bean: HomeArticleBean.Bean?) {

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.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeArticleBean
-import kotlinx.android.synthetic.ydl.home_module_article_view.view.*
+import kotlinx.android.synthetic.ydl.home_article_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -29,7 +29,7 @@ class HomeArticleView(private val mContext: Context, private var homeEvent: IHom
         orientation = VERTICAL
         val params = RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_article_view, this)
+        View.inflate(mContext, R.layout.home_article_view, this)
         homeModuleArticleViewHomeCommonTitleView.setTitle("文章·阅读")
         homeModuleArticleViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.articleMoreClick()

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

@@ -8,9 +8,9 @@ import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.ydl.ydl_image.manager.YDLImageCacheManager
 import com.yidianling.common.tools.RxDeviceTool
-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.*
+import kotlinx.android.synthetic.ydl.home_assuage_grief_image_more_five_item_view.view.*
+import kotlinx.android.synthetic.ydl.home_assuage_grief_image_under_four_item_view.view.*
+import kotlinx.android.synthetic.ydl.home_assuage_grief_image_under_two_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -38,7 +38,7 @@ class HomeAssuageGriefImageItemView(private val mContext: Context, private val u
             params = LinearLayout.LayoutParams(viewWidth, viewHeight)
             params.bottomMargin = (20 * RxDeviceTool.getScreenDensity(mContext)).toInt()
             layoutParams = params
-            View.inflate(mContext, R.layout.home_module_assuage_grief_image_under_two_item_view, this)
+            View.inflate(mContext, R.layout.home_assuage_grief_image_under_two_item_view, this)
 
             YDLImageCacheManager.showImage(mContext, urlList[0], homeModuleAssuageGriefUnderTwoItemViewImg)
 
@@ -47,7 +47,7 @@ class HomeAssuageGriefImageItemView(private val mContext: Context, private val u
             params = LinearLayout.LayoutParams(viewWidth, viewHeight)
             params.bottomMargin = (20 * RxDeviceTool.getScreenDensity(mContext)).toInt()
             layoutParams = params
-            View.inflate(mContext, R.layout.home_module_assuage_grief_image_under_four_item_view, this)
+            View.inflate(mContext, R.layout.home_assuage_grief_image_under_four_item_view, this)
 
             YDLImageCacheManager.showImage(mContext, urlList[0], homeModuleAssuageGriefUnderFourItemViewFirstImg)
             YDLImageCacheManager.showImage(mContext, urlList[1], homeModuleAssuageGriefUnderFourItemViewSecondImg)
@@ -60,7 +60,7 @@ class HomeAssuageGriefImageItemView(private val mContext: Context, private val u
             params = LinearLayout.LayoutParams(viewWidth, viewHeight)
             params.bottomMargin = (20 * RxDeviceTool.getScreenDensity(mContext)).toInt()
             layoutParams = params
-            View.inflate(mContext, R.layout.home_module_assuage_grief_image_more_five_item_view, this)
+            View.inflate(mContext, R.layout.home_assuage_grief_image_more_five_item_view, this)
 
             YDLImageCacheManager.showImage(mContext, urlList[0], homeModuleAssuageGriefUnderFiveItemViewFirstImg)
             YDLImageCacheManager.showImage(mContext, urlList[1], homeModuleAssuageGriefUnderFiveItemViewSecondImg)

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

@@ -23,7 +23,7 @@ import com.ydl.ydlcommon.utils.Utils
 import com.yidianling.common.tools.RxDeviceTool
 import com.yidianling.common.tools.RxImageTool
 import com.yidianling.user.api.service.IUserService
-import kotlinx.android.synthetic.ydl.home_module_assuage_grief_item_view.view.*
+import kotlinx.android.synthetic.ydl.home_assuage_grief_item_view.view.*
 
 
 /**
@@ -49,7 +49,7 @@ class HomeAssuageGriefItemView(private val mContext: Context, private var homeEv
                 , (15 * RxDeviceTool.getScreenDensity(mContext)).toInt()
                 , (16 * RxDeviceTool.getScreenDensity(mContext)).toInt())
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_assuage_grief_item_view, this)
+        View.inflate(mContext, R.layout.home_assuage_grief_item_view, this)
 
 
     }
@@ -199,7 +199,7 @@ class HomeAssuageGriefItemView(private val mContext: Context, private var homeEv
             // userType为2 ，专家
             if (commentBean.userType == 2) {
                 setImage(mContext, homeModuleAssuageGriefViewHotViewComment, "vip",
-                        R.drawable.home_module_assuage_grief_item_user_type_v,
+                        R.drawable.home_assuage_grief_item_user_type_v,
                         RxImageTool.dp2px(13f),
                         RxImageTool.dp2px(13f))
             }

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.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeAskBean
-import kotlinx.android.synthetic.ydl.home_module_assuage_grief_view.view.*
+import kotlinx.android.synthetic.ydl.home_assuage_grief_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -28,7 +28,7 @@ class HomeAssuageGriefView(private val mContext: Context, private var homeEvent:
         orientation = VERTICAL
         val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_assuage_grief_view, this)
+        View.inflate(mContext, R.layout.home_assuage_grief_view, this)
         homeModuleAssuageGriefViewHomeCommonTitleView.setTitle("解忧·问答")
         homeModuleAssuageGriefViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.askMoreClick()

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

@@ -8,7 +8,7 @@ import android.widget.LinearLayout
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.common.tools.RxDeviceTool
-import kotlinx.android.synthetic.ydl.home_module_button_banner_view.view.*
+import kotlinx.android.synthetic.ydl.home_button_banner_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -28,7 +28,7 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
     private fun initView() {
         val params = RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_button_banner_view, this)
+        View.inflate(mContext, R.layout.home_button_banner_view, this)
 
         initButtonView()
 

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.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeHeaderBean
 import com.yidianling.common.tools.RxImageTool
-import kotlinx.android.synthetic.ydl.home_module_category_container.view.*
+import kotlinx.android.synthetic.ydl.home_category_container.view.*
 
 
 /**
@@ -24,8 +24,8 @@ class HomeCategoryContainer(private val mContext: Context, private var homeEvent
     private var mHomeCategoryAdapter: HomeCategoryAdapter? = null
     private var indicatorImages: MutableList<ImageView>? = ArrayList()
 
-    private var mIndicatorSelectedResId = R.drawable.home_module_category_tip_select
-    private var mIndicatorUnselectedResId = R.drawable.home_module_category_tip_unselect
+    private var mIndicatorSelectedResId = R.drawable.home_category_tip_select
+    private var mIndicatorUnselectedResId = R.drawable.home_category_tip_unselect
 
     private var lastPosition = 0
     private var count = 0
@@ -43,7 +43,7 @@ class HomeCategoryContainer(private val mContext: Context, private var homeEvent
     }
 
     private fun initView() {
-        View.inflate(mContext, R.layout.home_module_category_container, this)
+        View.inflate(mContext, R.layout.home_category_container, this)
         initViewPager()
     }
 

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

@@ -5,7 +5,7 @@ import android.support.constraint.ConstraintLayout
 import android.util.AttributeSet
 import android.view.View
 import com.yidianling.home.R
-import kotlinx.android.synthetic.ydl.home_module_common_title_view.view.*
+import kotlinx.android.synthetic.ydl.home_common_title_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -21,7 +21,7 @@ class HomeCommonTitleView(private val mContext: Context, private val attributeSe
     }
 
     private fun initView() {
-        View.inflate(mContext, R.layout.home_module_common_title_view, this)
+        View.inflate(mContext, R.layout.home_common_title_view, this)
     }
 
     fun setTitle(title: String) {

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.ydl.home_module_confide_expert_info_view.view.*
+import kotlinx.android.synthetic.ydl.home_confide_expert_info_view.view.*
 
 /**
  * @author jiucheng
@@ -34,7 +34,7 @@ class HomeConfideExpertInfoView(private var mContext: Context, private var homeE
     private fun initView() {
         var params = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(context, R.layout.home_module_confide_expert_info_view, this)
+        View.inflate(context, R.layout.home_confide_expert_info_view, this)
     }
 
     fun setData(bean: HomeConfideBean.BodyBean?, position: Int, isLast: Boolean) {
@@ -114,16 +114,16 @@ class HomeConfideExpertInfoView(private var mContext: Context, private var homeE
     private fun setConfideButton(bodyBean: HomeConfideBean.BodyBean) {
         when (bodyBean.confideLine) {//1在线 2离线 3通话中  4继续倾诉
             1 -> {
-                tv_confide.setBackgroundResource(R.drawable.home_module_confide_line_1)
+                tv_confide.setBackgroundResource(R.drawable.home_confide_line_1)
             }
             2 -> {
-                tv_confide.setBackgroundResource(R.drawable.home_module_confide_line_2)
+                tv_confide.setBackgroundResource(R.drawable.home_confide_line_2)
             }
             3 -> {
-                tv_confide.setBackgroundResource(R.drawable.home_module_confide_line_3)
+                tv_confide.setBackgroundResource(R.drawable.home_confide_line_3)
             }
             4 -> {
-                tv_confide.setBackgroundResource(R.drawable.home_module_confide_line_4)
+                tv_confide.setBackgroundResource(R.drawable.home_confide_line_4)
             }
         }
         tv_confide.setOnClickListener {

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

@@ -15,7 +15,7 @@ import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeConfideBean
 import com.yidianling.home.model.bean.HomeHeaderBean
 import com.yidianling.common.tools.LogUtil
-import kotlinx.android.synthetic.ydl.home_module_confide_view.view.*
+import kotlinx.android.synthetic.ydl.home_confide_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -43,7 +43,7 @@ class HomeConfideView(private val mContext: Context, private var homeEvent: IHom
         val params = RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
         orientation = VERTICAL
-        View.inflate(mContext, R.layout.home_module_confide_view, this)
+        View.inflate(mContext, R.layout.home_confide_view, this)
         homeModuleConfideViewHomeCommonTitleView.setTitle("倾诉·排解")
         homeModuleConfideViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.confideMoreClick()

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

@@ -13,7 +13,7 @@ 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 kotlinx.android.synthetic.ydl.home_module_consult_item_view.view.*
+import kotlinx.android.synthetic.ydl.home_consult_item_view.view.*
 
 /**
  * @author jiucheng
@@ -34,7 +34,7 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent:
     private fun initView() {
         val params = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(context, R.layout.home_module_consult_item_view, this)
+        View.inflate(context, R.layout.home_consult_item_view, this)
     }
 
     fun setData(bean: HomeConsultBean.ListBean?, position: Int, isLast: Boolean,cateId : String?) {

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

@@ -15,7 +15,7 @@ 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_module_confide_view.view.*
+import kotlinx.android.synthetic.ydl.home_confide_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -48,7 +48,7 @@ class HomeConsultView(private val mContext: Context, private var homeEvent: IHom
         val params = RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
         orientation = VERTICAL
-        View.inflate(mContext, R.layout.home_module_confide_view, this)
+        View.inflate(mContext, R.layout.home_confide_view, this)
         homeModuleConfideViewHomeCommonTitleView.setTitle("咨询·理解")
         homeModuleConfideViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.consultMoreClick()

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.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeCourseBean
 import com.ydl.ydl_image.manager.YDLImageCacheManager
-import kotlinx.android.synthetic.ydl.home_module_course_item_view.view.*
+import kotlinx.android.synthetic.ydl.home_course_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -26,7 +26,7 @@ class HomeCourseItemView(private val mContext: Context, private var homeEvent: I
     private fun initView() {
         val params = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_course_item_view, this)
+        View.inflate(mContext, R.layout.home_course_item_view, this)
     }
 
     /**

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.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeCourseBean
-import kotlinx.android.synthetic.ydl.home_module_course_view.view.*
+import kotlinx.android.synthetic.ydl.home_course_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -28,7 +28,7 @@ class HomeCourseView(private val mContext: Context, private var homeEvent: IHome
         orientation = VERTICAL
         val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_course_view, this)
+        View.inflate(mContext, R.layout.home_course_view, this)
         homeModuleCourseViewHomeCommonTitleView.setTitle("课程·成长")
         homeModuleCourseViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.courseMreClick()

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.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeFMBean
 import com.yidianling.common.tools.RxImageTool
-import kotlinx.android.synthetic.ydl.home_module_intelligent_item_view.view.*
+import kotlinx.android.synthetic.ydl.home_intelligent_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -29,7 +29,7 @@ class HomeIntelligentItemView(private val mContext: Context, private var homeEve
         orientation = VERTICAL
         params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_intelligent_item_view, this)
+        View.inflate(mContext, R.layout.home_intelligent_item_view, this)
 
     }
 

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.ydl.home_module_intelligent_top_item_view.view.*
+import kotlinx.android.synthetic.ydl.home_intelligent_top_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -34,7 +34,7 @@ class HomeIntelligentTopItemView(private val mContext: Context, private var home
         var viewHeight = viewWidth * 143 / 345
         val params = LinearLayout.LayoutParams(viewWidth, viewHeight)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_intelligent_top_item_view, this)
+        View.inflate(mContext, R.layout.home_intelligent_top_item_view, this)
 
     }
 

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.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeFMBean
-import kotlinx.android.synthetic.ydl.home_module_intelligent_view.view.*
+import kotlinx.android.synthetic.ydl.home_intelligent_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -28,7 +28,7 @@ class HomeIntelligentView(private val mContext: Context, private var homeEvent:
         orientation = VERTICAL
         val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_intelligent_view, this)
+        View.inflate(mContext, R.layout.home_intelligent_view, this)
         homeModuleIntelligentViewHomeCommonTitleView.setTitle("心灵·电台")
         homeModuleIntelligentViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.fmMoreClick()

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

@@ -10,7 +10,7 @@ import com.google.gson.Gson
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeEvent
 import com.yidianling.home.model.bean.MuseModuleBean
-import kotlinx.android.synthetic.ydl.home_module_muse_view.view.*
+import kotlinx.android.synthetic.ydl.home_muse_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -36,7 +36,7 @@ class HomeMuseView(private val mContext: Context, private var homeEvent: IHomeEv
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_muse_view, this)
+        View.inflate(mContext, R.layout.home_muse_view, this)
         homeModuleMuseViewHomeCommonTitleView.setTitle("助眠·冥想")
     }
 

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

@@ -15,7 +15,7 @@ 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 kotlinx.android.synthetic.ydl.home_module_pager_banner_category_view.view.*
+import kotlinx.android.synthetic.ydl.home_pager_banner_category_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -80,7 +80,7 @@ class HomePagerBannerCategoryItemView(mContext: Context, homeEvent: IHomeBaseEve
      * 界面初始化
      */
     private fun initView() {
-        View.inflate(context, R.layout.home_module_pager_banner_category_view, this)
+        View.inflate(context, R.layout.home_pager_banner_category_view, this)
         val params = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT)
 //        params.topMargin = ScreenUtil.screenHeight * (356f / 750f).toInt()
         layoutParams = params
@@ -242,7 +242,7 @@ class HomePagerBannerCategoryItemView(mContext: Context, homeEvent: IHomeBaseEve
         lineParam.rightMargin = dp15
         lineParam.topMargin = multiple * (imageViewWidth + dp8 + textViewHeight) + dp8
         lineView = View(context)
-        lineView!!.setBackgroundColor(resources.getColor(R.color.home_module_category_view_test_line))
+        lineView!!.setBackgroundColor(resources.getColor(R.color.home_category_view_test_line))
         lineView!!.layoutParams = lineParam
     }
 

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

@@ -15,9 +15,9 @@ import com.yidianling.consultant.constants.HomeBIConstants
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeHeaderBean
-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.*
+import kotlinx.android.synthetic.ydl.home_real_view_in.view.*
+import kotlinx.android.synthetic.ydl.home_real_view_left.view.*
+import kotlinx.android.synthetic.ydl.home_real_view_out.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -74,9 +74,9 @@ class HomePagerBannerRealView(mContext : Context,homeEvent : IHomeBaseEvent) : L
     private fun initView() {
         orientation = HORIZONTAL
         var params = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.WRAP_CONTENT)
-        View.inflate(context, R.layout.home_module_real_view_left, this)
-        view_out = View.inflate(context, R.layout.home_module_real_view_out,null)
-        view_in = View.inflate(context, R.layout.home_module_real_view_in,null)
+        View.inflate(context, R.layout.home_real_view_left, this)
+        view_out = View.inflate(context, R.layout.home_real_view_out,null)
+        view_in = View.inflate(context, R.layout.home_real_view_in,null)
         homeModuleRealViewLeftFrameLayout.addView(view_out)
         homeModuleRealViewLeftFrameLayout.addView(view_in)
         layoutParams = params
@@ -185,7 +185,7 @@ class HomePagerBannerRealView(mContext : Context,homeEvent : IHomeBaseEvent) : L
         nameBuffer.append(bean?.contentBefore)
         nameBuffer.append(" ")
         nameBuffer.append(bean?.nickName)
-        nameBuffer.append(resources.getString(R.string.home_module_real_appoint))
+        nameBuffer.append(resources.getString(R.string.home_real_appoint))
         return nameBuffer.toString()
     }
 

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

@@ -12,7 +12,7 @@ import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeHeaderBean
 import com.yidianling.common.tools.RxDeviceTool
 import com.yidianling.common.tools.RxImageTool
-import kotlinx.android.synthetic.ydl.home_module_pager_banner_view.view.*
+import kotlinx.android.synthetic.ydl.home_pager_banner_view.view.*
 
 
 /**
@@ -38,7 +38,7 @@ class HomePagerBannerView(private val mContext: Context, private var homeEvent:
         var screenWidth = RxDeviceTool.getScreenWidth(mContext)
         val params = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_pager_banner_view, this)
+        View.inflate(mContext, R.layout.home_pager_banner_view, this)
 
         initBannerLayout()
 //        val addLayoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
@@ -114,7 +114,7 @@ class HomePagerBannerView(private val mContext: Context, private var homeEvent:
                 mImageViews.add(item.imageUrl!!)
             }
         }
-        homeModulePagerBannerViewBanner.setImageLoader(GlideImageLoader(R.drawable.home_module_image_default_back)).setImages(mImageViews).start()
+        homeModulePagerBannerViewBanner.setImageLoader(GlideImageLoader(R.drawable.home_image_default_back)).setImages(mImageViews).start()
 
         homeModulePagerBannerViewBanner.setOnBannerListener {
             if (it < cacheList?.size) {

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

@@ -9,7 +9,7 @@ import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeTestItemBean
 import com.ydl.ydl_image.manager.YDLImageCacheManager
 import com.yidianling.common.tools.RxImageTool
-import kotlinx.android.synthetic.ydl.home_module_test_item_view.view.*
+import kotlinx.android.synthetic.ydl.home_test_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -30,7 +30,7 @@ class HomeTestItemView(private val mContext: Context, private var homeEvent: IHo
         orientation = VERTICAL
         params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_test_item_view, this)
+        View.inflate(mContext, R.layout.home_test_item_view, this)
 
     }
 

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.ydl.home_module_test_top_item_view.view.*
+import kotlinx.android.synthetic.ydl.home_test_top_item_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -34,7 +34,7 @@ class HomeTestTopItemView(private val mContext: Context, private var homeEvent:
         var viewHeight = viewWidth * 143 / 345
         val params = LinearLayout.LayoutParams(viewWidth, viewHeight)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_test_top_item_view, this)
+        View.inflate(mContext, R.layout.home_test_top_item_view, this)
 
     }
 

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.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeTestItemBean
-import kotlinx.android.synthetic.ydl.home_module_test_view.view.*
+import kotlinx.android.synthetic.ydl.home_test_view.view.*
 
 /**
  * @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
@@ -28,7 +28,7 @@ class HomeTestView(private val mContext: Context, private var homeEvent: IHomeBa
         orientation = VERTICAL
         val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(mContext, R.layout.home_module_test_view, this)
+        View.inflate(mContext, R.layout.home_test_view, this)
         homeModuleIntelligentViewHomeCommonTitleView.setTitle("测试·分析")
         homeModuleIntelligentViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.testMoreClick()

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

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    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.support.v7.widget.CardView
-        android:id="@+id/homeModuleArticleItemViewCardImg"
-        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:cardElevation="0dp">
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            android:id="@+id/homeModuleArticleItemViewImg"
-            android:background="@drawable/home_module_image_default_back"/>
-    </android.support.v7.widget.CardView>
-
-    <TextView
-        android:id="@+id/homeModuleArticleItemViewTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxLines="2"
-        android:ellipsize="end"
-        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"
-        tools:text="喧嚣的世界中，你的重要何以而来？喧嚣的世界中，你的重要何以而来？"
-        android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@+id/homeModuleArticleItemViewCardImg"
-        android:layout_marginRight="@@dimen/platform_dp_20"/>
-
-    <TextView
-        android:id="@+id/homeModuleArticleItemViewContent"
-        android:layout_width="wrap_content"
-        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:textColor="@color/platform_color_666666"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/homeModuleArticleItemViewTitle"
-        android:lineSpacingExtra="@@dimen/platform_dp_3"
-        tools:text="喧嚣的世界中，你的重要何以而来？当我伫立在我所伫立之处..."
-        android:layout_toLeftOf="@+id/homeModuleArticleItemViewCardImg"
-        android:layout_marginRight="@@dimen/platform_dp_20"/>
-
-    <LinearLayout
-        android:id="@+id/homeModuleArticleItemViewBottomLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:layout_below="@+id/homeModuleArticleItemViewCardImg"
-        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:src="@drawable/home_module_article_item_icon"
-            android:layout_alignParentLeft="true"/>
-
-        <TextView
-            android:id="@+id/homeModuleArticleItemViewAuthor"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:textSize="@@dimen/platform_dp_12"
-            android:textColor="@color/platform_color_242424"
-            android:layout_marginLeft="@@dimen/platform_dp_3"
-            android:textStyle="bold"
-            tools:text="赵秀英"/>
-
-        <TextView
-            android:id="@+id/homeModuleArticleItemViewGreatNum"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="3327"
-            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:textColor="@color/platform_color_666666"/>
-
-        <TextView
-            android:id="@+id/homeModuleArticleItemViewLookNum"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="2656"
-            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:textColor="@color/platform_color_666666"/>
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/homeModuleArticleItemViewBottomLine"
-        android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/platform_color_EBEBEB"
-        android:layout_centerInParent="true"
-        android:layout_below="@+id/homeModuleArticleItemViewBottomLayout"
-        android:layout_marginTop="@@dimen/platform_dp_16"/>
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    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.support.v7.widget.CardView
+        android:id="@+id/homeModuleArticleItemViewCardImg"
+        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:cardElevation="0dp">
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:id="@+id/homeModuleArticleItemViewImg"
+            android:background="@drawable/home_image_default_back"/>
+    </android.support.v7.widget.CardView>
+
+    <TextView
+        android:id="@+id/homeModuleArticleItemViewTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="2"
+        android:ellipsize="end"
+        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"
+        tools:text="喧嚣的世界中，你的重要何以而来？喧嚣的世界中，你的重要何以而来？"
+        android:layout_alignParentLeft="true"
+        android:layout_toLeftOf="@+id/homeModuleArticleItemViewCardImg"
+        android:layout_marginRight="@@dimen/platform_dp_20"/>
+
+    <TextView
+        android:id="@+id/homeModuleArticleItemViewContent"
+        android:layout_width="wrap_content"
+        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:textColor="@color/platform_color_666666"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/homeModuleArticleItemViewTitle"
+        android:lineSpacingExtra="@@dimen/platform_dp_3"
+        tools:text="喧嚣的世界中，你的重要何以而来？当我伫立在我所伫立之处..."
+        android:layout_toLeftOf="@+id/homeModuleArticleItemViewCardImg"
+        android:layout_marginRight="@@dimen/platform_dp_20"/>
+
+    <LinearLayout
+        android:id="@+id/homeModuleArticleItemViewBottomLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_below="@+id/homeModuleArticleItemViewCardImg"
+        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:src="@drawable/home_article_item_icon"
+            android:layout_alignParentLeft="true"/>
+
+        <TextView
+            android:id="@+id/homeModuleArticleItemViewAuthor"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:textSize="@@dimen/platform_dp_12"
+            android:textColor="@color/platform_color_242424"
+            android:layout_marginLeft="@@dimen/platform_dp_3"
+            android:textStyle="bold"
+            tools:text="赵秀英"/>
+
+        <TextView
+            android:id="@+id/homeModuleArticleItemViewGreatNum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="3327"
+            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:textColor="@color/platform_color_666666"/>
+
+        <TextView
+            android:id="@+id/homeModuleArticleItemViewLookNum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="2656"
+            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:textColor="@color/platform_color_666666"/>
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/homeModuleArticleItemViewBottomLine"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/platform_color_EBEBEB"
+        android:layout_centerInParent="true"
+        android:layout_below="@+id/homeModuleArticleItemViewBottomLayout"
+        android:layout_marginTop="@@dimen/platform_dp_16"/>
+
+</RelativeLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="210"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-            <ImageView
-                android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewFirstImg"
-                android:scaleType="centerCrop"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="118"
-                android:background="@drawable/home_module_image_default_back"/>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="2"
-                android:background="@color/platform_color_FFFFFF"/>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="60">
-                <ImageView
-                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewThirdImg"
-                    android:scaleType="centerCrop"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="104"
-                    android:background="@drawable/home_module_image_default_back"/>
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="2"
-                    android:background="@color/platform_color_FFFFFF"/>
-                <ImageView
-                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewFourthImg"
-                    android:scaleType="centerCrop"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="104"
-                    android:background="@drawable/home_module_image_default_back"/>
-            </LinearLayout>
-        </LinearLayout>
-
-        <View
-            android:layout_width="0dp"
-            android:layout_weight="2"
-            android:layout_height="match_parent"
-            android:background="@color/platform_color_FFFFFF"/>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="103"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-            <ImageView
-                android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewSecondImg"
-                android:scaleType="centerCrop"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="118"
-                android:background="@drawable/home_module_image_default_back"/>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="2"
-                android:background="@color/platform_color_FFFFFF"/>
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="60">
-                <ImageView
-                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewFiveImg"
-                    android:scaleType="centerCrop"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/home_module_image_default_back"/>
-
-                <TextView
-                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewTag"
-                    android:layout_width="30dp"
-                    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:background="@drawable/home_module_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" />
-            </RelativeLayout>
-        </LinearLayout>
-
-    </LinearLayout>
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="210"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewFirstImg"
+                android:scaleType="centerCrop"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="118"
+                android:background="@drawable/home_image_default_back"/>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="2"
+                android:background="@color/platform_color_FFFFFF"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="60">
+                <ImageView
+                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewThirdImg"
+                    android:scaleType="centerCrop"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="104"
+                    android:background="@drawable/home_image_default_back"/>
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:background="@color/platform_color_FFFFFF"/>
+                <ImageView
+                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewFourthImg"
+                    android:scaleType="centerCrop"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="104"
+                    android:background="@drawable/home_image_default_back"/>
+            </LinearLayout>
+        </LinearLayout>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_weight="2"
+            android:layout_height="match_parent"
+            android:background="@color/platform_color_FFFFFF"/>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="103"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewSecondImg"
+                android:scaleType="centerCrop"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="118"
+                android:background="@drawable/home_image_default_back"/>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="2"
+                android:background="@color/platform_color_FFFFFF"/>
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="60">
+                <ImageView
+                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewFiveImg"
+                    android:scaleType="centerCrop"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/home_image_default_back"/>
+
+                <TextView
+                    android:id="@+id/homeModuleAssuageGriefUnderFiveItemViewTag"
+                    android:layout_width="30dp"
+                    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: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" />
+            </RelativeLayout>
+        </LinearLayout>
+
+    </LinearLayout>
+
+</merge>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-        <ImageView
-            android:id="@+id/homeModuleAssuageGriefUnderFourItemViewFirstImg"
-            android:layout_width="0dp"
-            android:layout_weight="156"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            android:background="@drawable/home_module_image_default_back"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_weight="2"
-            android:layout_height="match_parent"
-            android:background="@color/platform_color_FFFFFF"/>
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="157"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-            <ImageView
-                android:id="@+id/homeModuleAssuageGriefUnderFourItemViewSecondImg"
-                android:scaleType="centerCrop"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="88"
-                android:background="@drawable/home_module_image_default_back"/>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="2"
-                android:background="@color/platform_color_FFFFFF"/>
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="88"
-                android:background="#1da1f2">
-                <ImageView
-                    android:id="@+id/homeModuleAssuageGriefUnderFourItemViewThirdImg"
-                    android:scaleType="centerCrop"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/home_module_image_default_back"/>
-                <TextView
-                    android:id="@+id/homeModuleAssuageGriefUnderFourthItemViewTag"
-                    android:layout_width="30dp"
-                    android:layout_height="14dp"
-                    android:gravity="center"
-                    tools:text="9图"
-                    android:textSize="@@dimen/platform_dp_10"
-                    android:textColor="@color/platform_color_242424"
-                    android:background="@drawable/home_module_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"/>
-            </RelativeLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+        <ImageView
+            android:id="@+id/homeModuleAssuageGriefUnderFourItemViewFirstImg"
+            android:layout_width="0dp"
+            android:layout_weight="156"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:background="@drawable/home_image_default_back"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_weight="2"
+            android:layout_height="match_parent"
+            android:background="@color/platform_color_FFFFFF"/>
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="157"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/homeModuleAssuageGriefUnderFourItemViewSecondImg"
+                android:scaleType="centerCrop"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="88"
+                android:background="@drawable/home_image_default_back"/>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="2"
+                android:background="@color/platform_color_FFFFFF"/>
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="88"
+                android:background="#1da1f2">
+                <ImageView
+                    android:id="@+id/homeModuleAssuageGriefUnderFourItemViewThirdImg"
+                    android:scaleType="centerCrop"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/home_image_default_back"/>
+                <TextView
+                    android:id="@+id/homeModuleAssuageGriefUnderFourthItemViewTag"
+                    android:layout_width="30dp"
+                    android:layout_height="14dp"
+                    android:gravity="center"
+                    tools:text="9图"
+                    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"/>
+            </RelativeLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+</merge>
\ No newline at end of file

m-home/src/ydl/res/layout/home_module_assuage_grief_image_under_two_item_view.xml → m-home/src/ydl/res/layout/home_assuage_grief_image_under_two_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <ImageView
-            android:id="@+id/homeModuleAssuageGriefUnderTwoItemViewImg"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            android:background="@drawable/home_module_image_default_back"/>
-    </RelativeLayout>
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <ImageView
+            android:id="@+id/homeModuleAssuageGriefUnderTwoItemViewImg"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:background="@drawable/home_image_default_back"/>
+    </RelativeLayout>
+
+</merge>
\ No newline at end of file

m-home/src/ydl/res/layout/home_module_assuage_grief_item_view.xml → m-home/src/ydl/res/layout/home_assuage_grief_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/homeModuleAssuageGriefViewChildLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="@@dimen/platform_dp_20"
-    android:paddingTop="@@dimen/platform_dp_18"
-    android:paddingLeft="@@dimen/platform_dp_15"
-    android:paddingRight="@@dimen/platform_dp_15"
-    android:background="@drawable/home_module_card_view_stroke">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@@dimen/platform_dp_18">
-
-        <RelativeLayout
-            android:id="@+id/homeModuleAssuageGriefViewPersonCardView"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
-            android:background="@drawable/home_module_assuage_grief_stroke_line">
-            <android.support.v7.widget.CardView
-                android:layout_width="@@dimen/platform_dp_36"
-                android:layout_height="@@dimen/platform_dp_36"
-                app:cardCornerRadius="@@dimen/platform_dp_18"
-                app:cardElevation="0dp"
-                android:layout_centerInParent="true">
-                <ImageView
-                    android:id="@+id/homeModuleAssuageGriefViewPersonImg"
-                    android:layout_width="@@dimen/platform_dp_36"
-                    android:layout_height="@@dimen/platform_dp_36"
-                    android:src="@drawable/platform_head_place_hold_pic"
-                    android:scaleType="centerCrop"/>
-            </android.support.v7.widget.CardView>
-        </RelativeLayout>
-        <TextView
-            android:id="@+id/homeModuleAssuageGriefViewPersonName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="Zoe Miller"
-            android:textSize="@@dimen/platform_dp_14"
-            android:layout_alignTop="@+id/homeModuleAssuageGriefViewPersonCardView"
-            android:textColor="@color/platform_color_242424"
-            android:textStyle="bold"
-            android:gravity="center_vertical"
-            android:layout_alignBottom="@+id/homeModuleAssuageGriefViewPersonCardView"
-            android:layout_toRightOf="@+id/homeModuleAssuageGriefViewPersonCardView"
-            android:layout_marginLeft="@@dimen/platform_dp_8"
-            />
-        <TextView
-            android:id="@+id/homeModuleAssuageGriefViewTime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="今天 15：05"
-            android:textSize="@@dimen/platform_dp_12"
-            android:textColor="@color/platform_color_999999"
-            android:layout_toRightOf="@+id/homeModuleAssuageGriefViewPersonCardView"
-            android:layout_alignBottom="@+id/homeModuleAssuageGriefViewPersonCardView"
-            android:layout_marginLeft="@@dimen/platform_dp_8"
-            android:layout_marginBottom="0.5dp"
-            android:visibility="gone"/>
-        <RelativeLayout
-            android:id="@+id/homeModuleAssuageGriefItemViewIsFollow"
-            android:layout_width="@@dimen/platform_dp_60"
-            android:layout_height="@@dimen/platform_dp_24"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true">
-            <ImageView
-                android:id="@+id/homeModuleAssuageGriefItemViewFollow"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:src="@drawable/home_module_assuage_grief_item_view_follow"
-                android:layout_centerInParent="true"/>
-            <ImageView
-                android:id="@+id/homeModuleAssuageGriefItemViewUnFollow"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:src="@drawable/home_module_assuage_grief_item_view_unfollow"
-                android:layout_centerInParent="true"/>
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-
-
-    <!-- 标题，默认隐藏-->
-    <TextView
-        android:id="@+id/homeModuleAssuageGriefViewTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:textColor="@color/platform_color_242424"
-        android:textSize="@@dimen/platform_dp_18"
-        android:layout_marginBottom="@@dimen/platform_dp_6"
-        android:textStyle="bold"
-        tools:text="可是除了你，没人能左右我的情绪可是除了你，没人能左右我的情绪"/>
-
-    <TextView
-        android:id="@+id/homeModuleAssuageGriefViewContent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:maxLines="3"
-        android:ellipsize="end"
-        android:lineSpacingExtra="@@dimen/platform_dp_5"
-        tools:text="在我空闲的时间里，我想起了许久没有联系的露娜，给她打了一通电话。我没有说很多，可她还是感觉出了我的不对劲，竟然不顾雪夜寒冷与路途遥远，一个多钟在我空闲的时间里，我想起了许久没有联系的露娜，给她打了一通电话。我没有说很多，可她还是感觉出了我的不对劲，竟然不顾雪夜寒冷与路途遥远，一个多钟..."
-        android:textSize="@@dimen/platform_dp_13"
-        android:textColor="@color/platform_color_666666"/>
-
-    <!-- 评论内容，默认隐藏-->
-    <RelativeLayout
-        android:id="@+id/homeModuleAssuageGriefViewComment"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@@dimen/platform_dp_12"
-        android:layout_marginTop="@@dimen/platform_dp_16"
-        android:background="@drawable/home_module_assuage_grief_item_view_tab_back">
-
-        <ImageView
-            android:id="@+id/homeModuleAssuageGriefViewHotView"
-            android:layout_height="@@dimen/platform_dp_14"
-            android:layout_width="@@dimen/platform_dp_28"
-            android:src="@drawable/home_module_comment_hot_icon"/>
-
-        <TextView
-            android:id="@+id/homeModuleAssuageGriefViewHotViewComment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="@@dimen/platform_dp_15"
-            android:layout_marginLeft="@@dimen/platform_dp_15"
-            tools:text="劳蘸酱："
-            android:textStyle="bold"
-            android:textSize="@@dimen/platform_dp_13"
-            android:textColor="@color/platform_color_444444"
-            android:maxLines="2"
-            android:ellipsize="end"
-            android:layout_below="@+id/homeModuleAssuageGriefViewHotView"
-            android:layout_marginTop="@@dimen/platform_dp_5"
-            />
-
-        <TextView
-            android:id="@+id/homeModuleAssuageGriefViewHotViewCommentContent"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="@@dimen/platform_dp_15"
-            android:layout_marginLeft="@@dimen/platform_dp_15"
-            android:lineSpacingExtra="@@dimen/platform_dp_4"
-            tools:text="劳蘸酱：人生的旅途中，我们总是在不断的相遇和告别中前行。生活总会让我们经历着或多或少我们总是在不断的相遇和告别中前行我们总是在不断的相遇和告别中前行"
-            android:textSize="@@dimen/platform_dp_13"
-            android:textColor="@color/platform_color_444444"
-            android:maxLines="2"
-            android:ellipsize="end"
-            android:layout_below="@+id/homeModuleAssuageGriefViewHotView"
-            android:layout_marginTop="@@dimen/platform_dp_5"
-            />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="@@dimen/platform_dp_20">
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingLeft="@@dimen/platform_dp_7"
-            android:paddingRight="@@dimen/platform_dp_7"
-            android:paddingTop="@@dimen/platform_dp_4"
-            android:paddingBottom="@@dimen/platform_dp_4"
-            android:gravity="center_vertical"
-            android:background="@drawable/home_module_assuage_grief_item_view_tab_back">
-            <ImageView
-                android:layout_width="11.36dp"
-                android:layout_height="10.72dp"
-                android:src="@drawable/home_module_assuage_grief_item_view_tab_icon"/>
-            <TextView
-                android:id="@+id/homeModuleAssuageGriefViewTag"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="情感倾诉"
-                android:textColor="@color/platform_color_242424"
-                android:textSize="@@dimen/platform_dp_12"
-                android:layout_marginLeft="@@dimen/platform_dp_3"/>
-        </LinearLayout>
-        <View
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="0dp"/>
-        <ImageView
-            android:layout_width="@@dimen/platform_dp_18"
-            android:layout_height="@@dimen/platform_dp_18"
-            android:src="@drawable/home_module_assuage_grief_item_view_tab_comment"/>
-        <TextView
-            android:id="@+id/homeModuleAssuageGriefViewCommentsCount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="68"
-            android:textSize="@@dimen/platform_dp_14"
-            android:textColor="@color/platform_color_242424"
-            android:layout_marginRight="@@dimen/platform_dp_22"
-            android:layout_marginLeft="@@dimen/platform_dp_5"/>
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/ll_zan"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <ImageView
-                android:id="@+id/homeModuleAssuageGriefViewIsNotZan"
-                android:layout_width="@@dimen/platform_dp_18"
-                android:layout_height="@@dimen/platform_dp_18"
-                android:src="@drawable/home_module_assuage_grief_item_view_tab_warm"/>
-            <com.airbnb.lottie.LottieAnimationView
-                android:id="@+id/homeModuleAssuageGriefViewIsZan"
-                android:layout_width="@@dimen/platform_dp_18"
-                android:layout_height="@@dimen/platform_dp_18"
-                app:lottie_imageAssetsFolder="images"
-                app:lottie_fileName="hug.json"
-                android:visibility="gone"
-                android:scaleType="centerCrop"/>
-            <TextView
-                android:id="@+id/homeModuleAssuageGriefViewZanCount"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="987"
-                android:textSize="@@dimen/platform_dp_14"
-                android:textColor="@color/platform_color_242424"
-                android:layout_marginLeft="@@dimen/platform_dp_5"/>
-
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/homeModuleAssuageGriefViewChildLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@@dimen/platform_dp_20"
+    android:paddingTop="@@dimen/platform_dp_18"
+    android:paddingLeft="@@dimen/platform_dp_15"
+    android:paddingRight="@@dimen/platform_dp_15"
+    android:background="@drawable/home_card_view_stroke">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@@dimen/platform_dp_18">
+
+        <RelativeLayout
+            android:id="@+id/homeModuleAssuageGriefViewPersonCardView"
+            android:layout_width="38dp"
+            android:layout_height="38dp"
+            android:background="@drawable/home_assuage_grief_stroke_line">
+            <android.support.v7.widget.CardView
+                android:layout_width="@@dimen/platform_dp_36"
+                android:layout_height="@@dimen/platform_dp_36"
+                app:cardCornerRadius="@@dimen/platform_dp_18"
+                app:cardElevation="0dp"
+                android:layout_centerInParent="true">
+                <ImageView
+                    android:id="@+id/homeModuleAssuageGriefViewPersonImg"
+                    android:layout_width="@@dimen/platform_dp_36"
+                    android:layout_height="@@dimen/platform_dp_36"
+                    android:src="@drawable/platform_head_place_hold_pic"
+                    android:scaleType="centerCrop"/>
+            </android.support.v7.widget.CardView>
+        </RelativeLayout>
+        <TextView
+            android:id="@+id/homeModuleAssuageGriefViewPersonName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="Zoe Miller"
+            android:textSize="@@dimen/platform_dp_14"
+            android:layout_alignTop="@+id/homeModuleAssuageGriefViewPersonCardView"
+            android:textColor="@color/platform_color_242424"
+            android:textStyle="bold"
+            android:gravity="center_vertical"
+            android:layout_alignBottom="@+id/homeModuleAssuageGriefViewPersonCardView"
+            android:layout_toRightOf="@+id/homeModuleAssuageGriefViewPersonCardView"
+            android:layout_marginLeft="@@dimen/platform_dp_8"
+            />
+        <TextView
+            android:id="@+id/homeModuleAssuageGriefViewTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="今天 15：05"
+            android:textSize="@@dimen/platform_dp_12"
+            android:textColor="@color/platform_color_999999"
+            android:layout_toRightOf="@+id/homeModuleAssuageGriefViewPersonCardView"
+            android:layout_alignBottom="@+id/homeModuleAssuageGriefViewPersonCardView"
+            android:layout_marginLeft="@@dimen/platform_dp_8"
+            android:layout_marginBottom="0.5dp"
+            android:visibility="gone"/>
+        <RelativeLayout
+            android:id="@+id/homeModuleAssuageGriefItemViewIsFollow"
+            android:layout_width="@@dimen/platform_dp_60"
+            android:layout_height="@@dimen/platform_dp_24"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true">
+            <ImageView
+                android:id="@+id/homeModuleAssuageGriefItemViewFollow"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@drawable/home_assuage_grief_item_view_follow"
+                android:layout_centerInParent="true"/>
+            <ImageView
+                android:id="@+id/homeModuleAssuageGriefItemViewUnFollow"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@drawable/home_assuage_grief_item_view_unfollow"
+                android:layout_centerInParent="true"/>
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+
+
+    <!-- 标题，默认隐藏-->
+    <TextView
+        android:id="@+id/homeModuleAssuageGriefViewTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:textColor="@color/platform_color_242424"
+        android:textSize="@@dimen/platform_dp_18"
+        android:layout_marginBottom="@@dimen/platform_dp_6"
+        android:textStyle="bold"
+        tools:text="可是除了你，没人能左右我的情绪可是除了你，没人能左右我的情绪"/>
+
+    <TextView
+        android:id="@+id/homeModuleAssuageGriefViewContent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxLines="3"
+        android:ellipsize="end"
+        android:lineSpacingExtra="@@dimen/platform_dp_5"
+        tools:text="在我空闲的时间里，我想起了许久没有联系的露娜，给她打了一通电话。我没有说很多，可她还是感觉出了我的不对劲，竟然不顾雪夜寒冷与路途遥远，一个多钟在我空闲的时间里，我想起了许久没有联系的露娜，给她打了一通电话。我没有说很多，可她还是感觉出了我的不对劲，竟然不顾雪夜寒冷与路途遥远，一个多钟..."
+        android:textSize="@@dimen/platform_dp_13"
+        android:textColor="@color/platform_color_666666"/>
+
+    <!-- 评论内容，默认隐藏-->
+    <RelativeLayout
+        android:id="@+id/homeModuleAssuageGriefViewComment"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@@dimen/platform_dp_12"
+        android:layout_marginTop="@@dimen/platform_dp_16"
+        android:background="@drawable/home_assuage_grief_item_view_tab_back">
+
+        <ImageView
+            android:id="@+id/homeModuleAssuageGriefViewHotView"
+            android:layout_height="@@dimen/platform_dp_14"
+            android:layout_width="@@dimen/platform_dp_28"
+            android:src="@drawable/home_comment_hot_icon"/>
+
+        <TextView
+            android:id="@+id/homeModuleAssuageGriefViewHotViewComment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@@dimen/platform_dp_15"
+            android:layout_marginLeft="@@dimen/platform_dp_15"
+            tools:text="劳蘸酱："
+            android:textStyle="bold"
+            android:textSize="@@dimen/platform_dp_13"
+            android:textColor="@color/platform_color_444444"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:layout_below="@+id/homeModuleAssuageGriefViewHotView"
+            android:layout_marginTop="@@dimen/platform_dp_5"
+            />
+
+        <TextView
+            android:id="@+id/homeModuleAssuageGriefViewHotViewCommentContent"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@@dimen/platform_dp_15"
+            android:layout_marginLeft="@@dimen/platform_dp_15"
+            android:lineSpacingExtra="@@dimen/platform_dp_4"
+            tools:text="劳蘸酱：人生的旅途中，我们总是在不断的相遇和告别中前行。生活总会让我们经历着或多或少我们总是在不断的相遇和告别中前行我们总是在不断的相遇和告别中前行"
+            android:textSize="@@dimen/platform_dp_13"
+            android:textColor="@color/platform_color_444444"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:layout_below="@+id/homeModuleAssuageGriefViewHotView"
+            android:layout_marginTop="@@dimen/platform_dp_5"
+            />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="@@dimen/platform_dp_20">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingLeft="@@dimen/platform_dp_7"
+            android:paddingRight="@@dimen/platform_dp_7"
+            android:paddingTop="@@dimen/platform_dp_4"
+            android:paddingBottom="@@dimen/platform_dp_4"
+            android:gravity="center_vertical"
+            android:background="@drawable/home_assuage_grief_item_view_tab_back">
+            <ImageView
+                android:layout_width="11.36dp"
+                android:layout_height="10.72dp"
+                android:src="@drawable/home_assuage_grief_item_view_tab_icon"/>
+            <TextView
+                android:id="@+id/homeModuleAssuageGriefViewTag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="情感倾诉"
+                android:textColor="@color/platform_color_242424"
+                android:textSize="@@dimen/platform_dp_12"
+                android:layout_marginLeft="@@dimen/platform_dp_3"/>
+        </LinearLayout>
+        <View
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="0dp"/>
+        <ImageView
+            android:layout_width="@@dimen/platform_dp_18"
+            android:layout_height="@@dimen/platform_dp_18"
+            android:src="@drawable/home_assuage_grief_item_view_tab_comment"/>
+        <TextView
+            android:id="@+id/homeModuleAssuageGriefViewCommentsCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="68"
+            android:textSize="@@dimen/platform_dp_14"
+            android:textColor="@color/platform_color_242424"
+            android:layout_marginRight="@@dimen/platform_dp_22"
+            android:layout_marginLeft="@@dimen/platform_dp_5"/>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/ll_zan"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <ImageView
+                android:id="@+id/homeModuleAssuageGriefViewIsNotZan"
+                android:layout_width="@@dimen/platform_dp_18"
+                android:layout_height="@@dimen/platform_dp_18"
+                android:src="@drawable/home_assuage_grief_item_view_tab_warm"/>
+            <com.airbnb.lottie.LottieAnimationView
+                android:id="@+id/homeModuleAssuageGriefViewIsZan"
+                android:layout_width="@@dimen/platform_dp_18"
+                android:layout_height="@@dimen/platform_dp_18"
+                app:lottie_imageAssetsFolder="images"
+                app:lottie_fileName="hug.json"
+                android:visibility="gone"
+                android:scaleType="centerCrop"/>
+            <TextView
+                android:id="@+id/homeModuleAssuageGriefViewZanCount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="987"
+                android:textSize="@@dimen/platform_dp_14"
+                android:textColor="@color/platform_color_242424"
+                android:layout_marginLeft="@@dimen/platform_dp_5"/>
+
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file

m-home/src/ydl/res/layout/home_module_button_banner_view.xml → m-home/src/ydl/res/layout/home_button_banner_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="horizontal"
-    android:gravity="center_horizontal"
-    android:paddingLeft="@dimen/platform_dp_8"
-    android:paddingRight="@dimen/platform_dp_8">
-
-    <RelativeLayout
-        android:id="@+id/homeModuleButtonBannerFirst"
-        android:layout_width="80dp"
-        android:layout_height="78dp"
-        android:background="@drawable/home_module_button_banner_first_img_new"
-        android:gravity="center">
-        <TextView
-            android:id="@+id/homeModuleButtonBannerFirstTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textColor="@color/platform_color_FFFFFF"
-            android:textSize="@dimen/platform_dp_16"
-            android:text="心理咨询"/>
-        <TextView
-            android:layout_below="@+id/homeModuleButtonBannerFirstTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/platform_color_FFFFFF"
-            android:textSize="@dimen/platform_dp_12"
-            android:text="1W+师资"/>
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/homeModuleButtonBannerSecond"
-        android:layout_width="80dp"
-        android:layout_height="78dp"
-        android:background="@drawable/home_module_confide_free_icon"
-        android:gravity="center">
-        <TextView
-            android:id="@+id/homeModuleButtonBannerSecondTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textColor="@color/platform_color_FFFFFF"
-            android:textSize="@dimen/platform_dp_16"
-            android:text="即时倾诉"/>
-        <TextView
-            android:layout_below="@+id/homeModuleButtonBannerSecondTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/platform_color_FFFFFF"
-            android:textSize="@dimen/platform_dp_12"
-            android:text="24小时在线"/>
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/homeModuleButtonBannerThird"
-        android:layout_width="80dp"
-        android:layout_height="78dp"
-        android:orientation="vertical"
-        android:background="@drawable/home_module_button_banner_third_img_new"
-        android:gravity="center">
-        <TextView
-            android:id="@+id/homeModuleButtonBannerThirdTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textColor="@color/platform_color_FFFFFF"
-            android:textSize="@dimen/platform_dp_16"
-            android:text="心理课堂"/>
-        <TextView
-            android:layout_below="@+id/homeModuleButtonBannerThirdTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/platform_color_FFFFFF"
-            android:textSize="@dimen/platform_dp_12"
-            android:text="送28元礼包"/>
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/homeModuleButtonBannerFourth"
-        android:layout_width="80dp"
-        android:layout_height="78dp"
-        android:background="@drawable/home_module_button_banner_fourth_img_new"
-        android:gravity="center">
-        <TextView
-            android:id="@+id/homeModuleButtonBannerFourthTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textColor="@color/platform_color_FFFFFF"
-            android:textSize="@dimen/platform_dp_16"
-            android:text="心理测试"/>
-        <TextView
-            android:layout_below="@+id/homeModuleButtonBannerFourthTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/platform_color_FFFFFF"
-            android:textSize="@dimen/platform_dp_12"
-            android:text="抑郁测量"/>
-    </RelativeLayout>
-
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:gravity="center_horizontal"
+    android:paddingLeft="@dimen/platform_dp_8"
+    android:paddingRight="@dimen/platform_dp_8">
+
+    <RelativeLayout
+        android:id="@+id/homeModuleButtonBannerFirst"
+        android:layout_width="80dp"
+        android:layout_height="78dp"
+        android:background="@drawable/home_button_banner_first_img_new"
+        android:gravity="center">
+        <TextView
+            android:id="@+id/homeModuleButtonBannerFirstTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:textColor="@color/platform_color_FFFFFF"
+            android:textSize="@dimen/platform_dp_16"
+            android:text="心理咨询"/>
+        <TextView
+            android:layout_below="@+id/homeModuleButtonBannerFirstTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/platform_color_FFFFFF"
+            android:textSize="@dimen/platform_dp_12"
+            android:text="1W+师资"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/homeModuleButtonBannerSecond"
+        android:layout_width="80dp"
+        android:layout_height="78dp"
+        android:background="@drawable/home_confide_free_icon"
+        android:gravity="center">
+        <TextView
+            android:id="@+id/homeModuleButtonBannerSecondTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:textColor="@color/platform_color_FFFFFF"
+            android:textSize="@dimen/platform_dp_16"
+            android:text="即时倾诉"/>
+        <TextView
+            android:layout_below="@+id/homeModuleButtonBannerSecondTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/platform_color_FFFFFF"
+            android:textSize="@dimen/platform_dp_12"
+            android:text="24小时在线"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/homeModuleButtonBannerThird"
+        android:layout_width="80dp"
+        android:layout_height="78dp"
+        android:orientation="vertical"
+        android:background="@drawable/home_button_banner_third_img_new"
+        android:gravity="center">
+        <TextView
+            android:id="@+id/homeModuleButtonBannerThirdTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:textColor="@color/platform_color_FFFFFF"
+            android:textSize="@dimen/platform_dp_16"
+            android:text="心理课堂"/>
+        <TextView
+            android:layout_below="@+id/homeModuleButtonBannerThirdTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/platform_color_FFFFFF"
+            android:textSize="@dimen/platform_dp_12"
+            android:text="送28元礼包"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/homeModuleButtonBannerFourth"
+        android:layout_width="80dp"
+        android:layout_height="78dp"
+        android:background="@drawable/home_button_banner_fourth_img_new"
+        android:gravity="center">
+        <TextView
+            android:id="@+id/homeModuleButtonBannerFourthTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:textColor="@color/platform_color_FFFFFF"
+            android:textSize="@dimen/platform_dp_16"
+            android:text="心理测试"/>
+        <TextView
+            android:layout_below="@+id/homeModuleButtonBannerFourthTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/platform_color_FFFFFF"
+            android:textSize="@dimen/platform_dp_12"
+            android:text="抑郁测量"/>
+    </RelativeLayout>
+
+
+</LinearLayout>
\ No newline at end of file

m-home/src/ydl/res/layout/home_module_common_title_view.xml → m-home/src/ydl/res/layout/home_common_title_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:paddingTop="@dimen/platform_dp_24"
-    android:paddingBottom="@dimen/platform_dp_14">
-
-    <View
-        android:layout_width="0dp"
-        android:layout_height="@dimen/platform_dp_7"
-        android:background="@drawable/home_module_common_title_gradient_back"
-        app:layout_constraintLeft_toLeftOf="@+id/homeModuleCommonTitleViewTitle"
-        app:layout_constraintRight_toRightOf="@+id/homeModuleCommonTitleViewTitle"
-        app:layout_constraintBottom_toBottomOf="@+id/homeModuleCommonTitleViewTitle"
-        android:layout_marginBottom="2dp"/>
-
-    <TextView
-        android:id="@+id/homeModuleCommonTitleViewTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingRight="@dimen/platform_dp_1"
-        tools:text="通用.标题"
-        android:textSize="24dp"
-        android:textStyle="bold"
-        android:textColor="@color/platform_color_333333"
-        android:layout_marginLeft="@dimen/platform_dp_15"
-        app:layout_constraintLeft_toLeftOf="parent"/>
-
-    <LinearLayout
-        android:layout_width="@dimen/platform_dp_60"
-        android:layout_height="@dimen/platform_dp_24"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:layout_marginBottom="@dimen/platform_dp_3"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginRight="@dimen/platform_dp_15"
-        android:background="@drawable/home_module_show_more_line">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="更多"
-            android:textStyle="bold"
-            android:layout_marginLeft="@dimen/platform_dp_2"
-            android:textColor="@color/platform_color_242424"
-            android:textSize="@dimen/platform_dp_13"/>
-
-        <ImageView
-            android:layout_height="@dimen/platform_dp_10"
-            android:layout_width="@dimen/platform_dp_6"
-            android:src="@drawable/home_module_common_more_icon"
-            android:layout_marginLeft="3dp"/>
-
-    </LinearLayout>
-
-
-
-</android.support.constraint.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:paddingTop="@dimen/platform_dp_24"
+    android:paddingBottom="@dimen/platform_dp_14">
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="@dimen/platform_dp_7"
+        android:background="@drawable/home_common_title_gradient_back"
+        app:layout_constraintLeft_toLeftOf="@+id/homeModuleCommonTitleViewTitle"
+        app:layout_constraintRight_toRightOf="@+id/homeModuleCommonTitleViewTitle"
+        app:layout_constraintBottom_toBottomOf="@+id/homeModuleCommonTitleViewTitle"
+        android:layout_marginBottom="2dp"/>
+
+    <TextView
+        android:id="@+id/homeModuleCommonTitleViewTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingRight="@dimen/platform_dp_1"
+        tools:text="通用.标题"
+        android:textSize="24dp"
+        android:textStyle="bold"
+        android:textColor="@color/platform_color_333333"
+        android:layout_marginLeft="@dimen/platform_dp_15"
+        app:layout_constraintLeft_toLeftOf="parent"/>
+
+    <LinearLayout
+        android:layout_width="@dimen/platform_dp_60"
+        android:layout_height="@dimen/platform_dp_24"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:layout_marginBottom="@dimen/platform_dp_3"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginRight="@dimen/platform_dp_15"
+        android:background="@drawable/home_show_more_line">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="更多"
+            android:textStyle="bold"
+            android:layout_marginLeft="@dimen/platform_dp_2"
+            android:textColor="@color/platform_color_242424"
+            android:textSize="@dimen/platform_dp_13"/>
+
+        <ImageView
+            android:layout_height="@dimen/platform_dp_10"
+            android:layout_width="@dimen/platform_dp_6"
+            android:src="@drawable/home_common_more_icon"
+            android:layout_marginLeft="3dp"/>
+
+    </LinearLayout>
+
+
+
+</android.support.constraint.ConstraintLayout>

m-home/src/ydl/res/layout/home_module_confide_expert_info_view.xml → m-home/src/ydl/res/layout/home_confide_expert_info_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/img_head"
-        android:layout_width="70dp"
-        android:layout_height="70dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="21dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/platform_head_place_hold_pic" />
-
-    <TextView
-        android:id="@+id/tv_confide"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignTop="@+id/img_head"
-        android:layout_marginTop="@dimen/platform_dp_13"
-        android:layout_marginEnd="@dimen/platform_dp_15"
-        android:gravity="center" />
-
-    <LinearLayout
-        android:id="@+id/tv_name_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:layout_marginStart="16dp"
-        android:layout_alignTop="@+id/img_head"
-        android:layout_marginTop="-2dp"
-        android:layout_toEndOf="@+id/img_head">
-
-        <TextView
-            android:id="@+id/tv_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/platform_color_242424"
-            android:textSize="@dimen/platform_dp_16"
-            android:textStyle="bold"
-            tools:ignore="SpUsage"
-            tools:text="姚雨晴" />
-
-        <ImageView
-            android:id="@+id/img_sex"
-            android:layout_width="13dp"
-            android:layout_height="13dp"
-            android:layout_marginStart="6dp"
-            android:layout_marginLeft="3dp"
-            android:background="@drawable/home_module_counselor" />
-
-    </LinearLayout>
-
-    <com.ydl.ydlcommon.view.TagView
-        android:id="@+id/tag_view"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/platform_dp_16"
-        android:layout_below="@+id/tv_name_layout"
-        android:layout_marginStart="@dimen/platform_dp_16"
-        android:layout_marginTop="6dp"
-        android:layout_marginEnd="@dimen/platform_dp_10"
-        android:layout_toEndOf="@+id/img_head"
-        android:orientation="horizontal" />
-
-    <TextView
-        android:id="@+id/tv_confideNum"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_marginStart="@dimen/platform_dp_16"
-        android:layout_marginTop="7dp"
-        android:layout_toEndOf="@+id/img_head"
-        android:textColor="@color/platform_color_242424"
-        android:textSize="@dimen/platform_dp_12"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="8000" />
-
-    <TextView
-        android:id="@+id/tv_tv_confideNumContent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_marginTop="7dp"
-        android:layout_marginEnd="@dimen/platform_dp_12"
-        android:layout_toEndOf="@+id/tv_confideNum"
-        android:text="向TA倾诉"
-        android:textColor="@color/platform_color_666666"
-        android:textSize="@dimen/platform_dp_11"
-        tools:ignore="SpUsage" />
-
-    <TextView
-        android:id="@+id/tv_Connection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_marginTop="7dp"
-        android:layout_toEndOf="@+id/tv_tv_confideNumContent"
-        android:textColor="@color/platform_color_242424"
-        android:textSize="@dimen/platform_dp_12"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="83%" />
-
-    <TextView
-        android:id="@+id/tv_ConnectionContent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_marginTop="7dp"
-        android:layout_marginEnd="@dimen/platform_dp_12"
-        android:layout_toEndOf="@+id/tv_Connection"
-        android:text="接通率"
-        android:textColor="@color/platform_color_666666"
-        android:textSize="@dimen/platform_dp_11"
-        tools:ignore="SpUsage" />
-
-    <TextView
-        android:id="@+id/tv_price"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tv_confideNum"
-        android:layout_marginStart="@dimen/platform_dp_16"
-        android:layout_marginTop="7dp"
-        android:layout_marginBottom="18dp"
-        android:layout_toEndOf="@+id/img_head"
-        android:gravity="bottom"
-        android:textColor="#FF5A4C"
-        android:textSize="@dimen/platform_dp_16"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="￥199" />
-
-    <TextView
-        android:id="@+id/tv_price_tips"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/tv_price"
-        android:layout_marginBottom="2dp"
-        android:layout_marginLeft="2dp"
-        android:layout_toRightOf="@+id/tv_price"
-        android:gravity="center"
-        android:text="元/次"
-        android:textColor="@color/platform_color_666666"
-        android:textSize="@dimen/platform_dp_12"/>
-
-    <TextView
-        android:id="@+id/tvOriginalPrice"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/tv_price"
-        android:layout_alignBottom="@+id/tv_price"
-        android:layout_marginStart="@dimen/platform_dp_6"
-        android:layout_toEndOf="@+id/tv_price_tips"
-        android:layout_marginBottom="-1dp"
-        android:gravity="center"
-        android:textColor="@color/platform_color_666666"
-        android:textSize="@dimen/platform_dp_12"
-        tools:ignore="SpUsage"
-        tools:text="原价¥50" />
-
-    <TextView
-        android:id="@+id/tvCoupon"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/platform_dp_15"
-        android:layout_alignTop="@+id/tv_price"
-        android:layout_alignBottom="@+id/tv_price"
-        android:layout_marginLeft="12dp"
-        android:layout_marginTop="3dp"
-        android:layout_marginBottom="2dp"
-        android:layout_toRightOf="@+id/tvOriginalPrice"
-        android:background="@drawable/home_module_confide_expert_info_coupon_background"
-        android:gravity="center"
-        android:paddingLeft="6dp"
-        android:paddingRight="6dp"
-        android:textColor="@color/platform_color_FF5A4C"
-        android:textSize="@dimen/platform_dp_10"
-        tools:ignore="SpUsage"
-        android:textStyle="bold"
-        tools:text="立减￥30" />
-
-    <View
-        android:id="@+id/view_line"
-        style="@style/viewline"
-        android:layout_below="@+id/tv_price"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:background="@color/platform_color_EBEBEB" />
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/img_head"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="21dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/platform_head_place_hold_pic" />
+
+    <TextView
+        android:id="@+id/tv_confide"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignTop="@+id/img_head"
+        android:layout_marginTop="@dimen/platform_dp_13"
+        android:layout_marginEnd="@dimen/platform_dp_15"
+        android:gravity="center" />
+
+    <LinearLayout
+        android:id="@+id/tv_name_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_marginStart="16dp"
+        android:layout_alignTop="@+id/img_head"
+        android:layout_marginTop="-2dp"
+        android:layout_toEndOf="@+id/img_head">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/platform_color_242424"
+            android:textSize="@dimen/platform_dp_16"
+            android:textStyle="bold"
+            tools:ignore="SpUsage"
+            tools:text="姚雨晴" />
+
+        <ImageView
+            android:id="@+id/img_sex"
+            android:layout_width="13dp"
+            android:layout_height="13dp"
+            android:layout_marginStart="6dp"
+            android:layout_marginLeft="3dp"
+            android:background="@drawable/home_counselor" />
+
+    </LinearLayout>
+
+    <com.ydl.ydlcommon.view.TagView
+        android:id="@+id/tag_view"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/platform_dp_16"
+        android:layout_below="@+id/tv_name_layout"
+        android:layout_marginStart="@dimen/platform_dp_16"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="@dimen/platform_dp_10"
+        android:layout_toEndOf="@+id/img_head"
+        android:orientation="horizontal" />
+
+    <TextView
+        android:id="@+id/tv_confideNum"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_marginStart="@dimen/platform_dp_16"
+        android:layout_marginTop="7dp"
+        android:layout_toEndOf="@+id/img_head"
+        android:textColor="@color/platform_color_242424"
+        android:textSize="@dimen/platform_dp_12"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="8000" />
+
+    <TextView
+        android:id="@+id/tv_tv_confideNumContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_marginTop="7dp"
+        android:layout_marginEnd="@dimen/platform_dp_12"
+        android:layout_toEndOf="@+id/tv_confideNum"
+        android:text="向TA倾诉"
+        android:textColor="@color/platform_color_666666"
+        android:textSize="@dimen/platform_dp_11"
+        tools:ignore="SpUsage" />
+
+    <TextView
+        android:id="@+id/tv_Connection"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_marginTop="7dp"
+        android:layout_toEndOf="@+id/tv_tv_confideNumContent"
+        android:textColor="@color/platform_color_242424"
+        android:textSize="@dimen/platform_dp_12"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="83%" />
+
+    <TextView
+        android:id="@+id/tv_ConnectionContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_marginTop="7dp"
+        android:layout_marginEnd="@dimen/platform_dp_12"
+        android:layout_toEndOf="@+id/tv_Connection"
+        android:text="接通率"
+        android:textColor="@color/platform_color_666666"
+        android:textSize="@dimen/platform_dp_11"
+        tools:ignore="SpUsage" />
+
+    <TextView
+        android:id="@+id/tv_price"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_confideNum"
+        android:layout_marginStart="@dimen/platform_dp_16"
+        android:layout_marginTop="7dp"
+        android:layout_marginBottom="18dp"
+        android:layout_toEndOf="@+id/img_head"
+        android:gravity="bottom"
+        android:textColor="#FF5A4C"
+        android:textSize="@dimen/platform_dp_16"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="￥199" />
+
+    <TextView
+        android:id="@+id/tv_price_tips"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/tv_price"
+        android:layout_marginBottom="2dp"
+        android:layout_marginLeft="2dp"
+        android:layout_toRightOf="@+id/tv_price"
+        android:gravity="center"
+        android:text="元/次"
+        android:textColor="@color/platform_color_666666"
+        android:textSize="@dimen/platform_dp_12"/>
+
+    <TextView
+        android:id="@+id/tvOriginalPrice"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/tv_price"
+        android:layout_alignBottom="@+id/tv_price"
+        android:layout_marginStart="@dimen/platform_dp_6"
+        android:layout_toEndOf="@+id/tv_price_tips"
+        android:layout_marginBottom="-1dp"
+        android:gravity="center"
+        android:textColor="@color/platform_color_666666"
+        android:textSize="@dimen/platform_dp_12"
+        tools:ignore="SpUsage"
+        tools:text="原价¥50" />
+
+    <TextView
+        android:id="@+id/tvCoupon"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/platform_dp_15"
+        android:layout_alignTop="@+id/tv_price"
+        android:layout_alignBottom="@+id/tv_price"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="2dp"
+        android:layout_toRightOf="@+id/tvOriginalPrice"
+        android:background="@drawable/home_confide_expert_info_coupon_background"
+        android:gravity="center"
+        android:paddingLeft="6dp"
+        android:paddingRight="6dp"
+        android:textColor="@color/platform_color_FF5A4C"
+        android:textSize="@dimen/platform_dp_10"
+        tools:ignore="SpUsage"
+        android:textStyle="bold"
+        tools:text="立减￥30" />
+
+    <View
+        android:id="@+id/view_line"
+        style="@style/viewline"
+        android:layout_below="@+id/tv_price"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:background="@color/platform_color_EBEBEB" />
+
+</RelativeLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/img_consult_head"
-        android:layout_width="70dp"
-        android:layout_height="70dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="21dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/platform_head_place_hold_pic" />
-
-    <TextView
-        android:id="@+id/tv_consult_chat"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:layout_alignParentEnd="true"
-        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_module_consult_chat"
-        android:gravity="center" />
-
-    <LinearLayout
-        android:id="@+id/tv_name_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:layout_marginStart="16dp"
-        android:layout_alignTop="@+id/img_consult_head"
-        android:layout_marginTop="-2dp"
-        android:layout_toEndOf="@+id/img_consult_head">
-
-        <TextView
-            android:id="@+id/tv_consult_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/platform_color_242424"
-            android:textSize="@dimen/platform_dp_16"
-            android:textStyle="bold"
-            tools:ignore="SpUsage"
-            tools:text="姚雨晴" />
-
-        <ImageView
-            android:id="@+id/img_sex"
-            android:layout_width="13dp"
-            android:layout_height="13dp"
-            android:layout_marginStart="6dp"
-            android:layout_marginLeft="3dp"
-            android:background="@drawable/home_module_counselor" />
-
-    </LinearLayout>
-
-    <com.ydl.ydlcommon.view.TagView
-        android:id="@+id/tag_view"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/platform_dp_16"
-        android:layout_below="@+id/tv_name_layout"
-        android:layout_marginStart="@dimen/platform_dp_16"
-        android:layout_marginTop="6dp"
-        android:layout_marginEnd="@dimen/platform_dp_10"
-        android:layout_toEndOf="@+id/img_consult_head"
-        android:orientation="horizontal" />
-
-    <TextView
-        android:id="@+id/tv_tv_consult_num_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_alignLeft="@+id/tv_name_layout"
-        android:layout_marginTop="7dp"
-        android:text="咨询次数 "
-        android:textColor="@color/platform_color_666666"
-        android:textSize="@dimen/platform_dp_11"
-        tools:ignore="SpUsage" />
-
-    <TextView
-        android:id="@+id/tv_consult_num"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_marginTop="5dp"
-        android:textColor="@color/platform_color_242424"
-        android:layout_toRightOf="@+id/tv_tv_consult_num_content"
-        android:textSize="@dimen/platform_dp_13"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="8000" />
-
-    <TextView
-        android:id="@+id/tv_feedback_rate_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_marginTop="7dp"
-        android:layout_marginLeft="12dp"
-        android:layout_toRightOf="@+id/tv_consult_num"
-        android:text="好评率 "
-        android:textColor="@color/platform_color_666666"
-        android:textSize="@dimen/platform_dp_11"
-        tools:ignore="SpUsage" />
-
-    <TextView
-        android:id="@+id/tv_feedback_rate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tag_view"
-        android:layout_marginTop="5dp"
-        android:layout_toRightOf="@+id/tv_feedback_rate_content"
-        android:textColor="@color/platform_color_242424"
-        android:textSize="@dimen/platform_dp_12"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="83%" />
-
-
-
-    <TextView
-        android:id="@+id/tv_price"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tv_consult_num"
-        android:layout_marginStart="@dimen/platform_dp_16"
-        android:layout_marginTop="7dp"
-        android:layout_marginBottom="18dp"
-        android:layout_toEndOf="@+id/img_consult_head"
-        android:gravity="bottom"
-        android:textColor="#FF5A4C"
-        android:textSize="@dimen/platform_dp_16"
-        android:textStyle="bold"
-        tools:ignore="SpUsage"
-        tools:text="￥199" />
-
-    <TextView
-        android:id="@+id/tv_consult_price"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/tv_price"
-        android:layout_marginBottom="2dp"
-        android:layout_marginLeft="2dp"
-        android:layout_toRightOf="@+id/tv_price"
-        android:gravity="center"
-        android:text="起"
-        android:textColor="@color/platform_color_666666"
-        android:textSize="@dimen/platform_dp_12" />
-
-    <View
-        android:id="@+id/view_line"
-        style="@style/viewline"
-        android:layout_below="@+id/tv_price"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:background="@color/platform_color_EBEBEB" />
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/img_consult_head"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="21dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/platform_head_place_hold_pic" />
+
+    <TextView
+        android:id="@+id/tv_consult_chat"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_alignParentEnd="true"
+        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:gravity="center" />
+
+    <LinearLayout
+        android:id="@+id/tv_name_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_marginStart="16dp"
+        android:layout_alignTop="@+id/img_consult_head"
+        android:layout_marginTop="-2dp"
+        android:layout_toEndOf="@+id/img_consult_head">
+
+        <TextView
+            android:id="@+id/tv_consult_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/platform_color_242424"
+            android:textSize="@dimen/platform_dp_16"
+            android:textStyle="bold"
+            tools:ignore="SpUsage"
+            tools:text="姚雨晴" />
+
+        <ImageView
+            android:id="@+id/img_sex"
+            android:layout_width="13dp"
+            android:layout_height="13dp"
+            android:layout_marginStart="6dp"
+            android:layout_marginLeft="3dp"
+            android:background="@drawable/home_counselor" />
+
+    </LinearLayout>
+
+    <com.ydl.ydlcommon.view.TagView
+        android:id="@+id/tag_view"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/platform_dp_16"
+        android:layout_below="@+id/tv_name_layout"
+        android:layout_marginStart="@dimen/platform_dp_16"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="@dimen/platform_dp_10"
+        android:layout_toEndOf="@+id/img_consult_head"
+        android:orientation="horizontal" />
+
+    <TextView
+        android:id="@+id/tv_tv_consult_num_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_alignLeft="@+id/tv_name_layout"
+        android:layout_marginTop="7dp"
+        android:text="咨询次数 "
+        android:textColor="@color/platform_color_666666"
+        android:textSize="@dimen/platform_dp_11"
+        tools:ignore="SpUsage" />
+
+    <TextView
+        android:id="@+id/tv_consult_num"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_marginTop="5dp"
+        android:textColor="@color/platform_color_242424"
+        android:layout_toRightOf="@+id/tv_tv_consult_num_content"
+        android:textSize="@dimen/platform_dp_13"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="8000" />
+
+    <TextView
+        android:id="@+id/tv_feedback_rate_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_marginTop="7dp"
+        android:layout_marginLeft="12dp"
+        android:layout_toRightOf="@+id/tv_consult_num"
+        android:text="好评率 "
+        android:textColor="@color/platform_color_666666"
+        android:textSize="@dimen/platform_dp_11"
+        tools:ignore="SpUsage" />
+
+    <TextView
+        android:id="@+id/tv_feedback_rate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tag_view"
+        android:layout_marginTop="5dp"
+        android:layout_toRightOf="@+id/tv_feedback_rate_content"
+        android:textColor="@color/platform_color_242424"
+        android:textSize="@dimen/platform_dp_12"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="83%" />
+
+
+
+    <TextView
+        android:id="@+id/tv_price"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_consult_num"
+        android:layout_marginStart="@dimen/platform_dp_16"
+        android:layout_marginTop="7dp"
+        android:layout_marginBottom="18dp"
+        android:layout_toEndOf="@+id/img_consult_head"
+        android:gravity="bottom"
+        android:textColor="#FF5A4C"
+        android:textSize="@dimen/platform_dp_16"
+        android:textStyle="bold"
+        tools:ignore="SpUsage"
+        tools:text="￥199" />
+
+    <TextView
+        android:id="@+id/tv_consult_price"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/tv_price"
+        android:layout_marginBottom="2dp"
+        android:layout_marginLeft="2dp"
+        android:layout_toRightOf="@+id/tv_price"
+        android:gravity="center"
+        android:text="起"
+        android:textColor="@color/platform_color_666666"
+        android:textSize="@dimen/platform_dp_12" />
+
+    <View
+        android:id="@+id/view_line"
+        style="@style/viewline"
+        android:layout_below="@+id/tv_price"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:background="@color/platform_color_EBEBEB" />
+
+</RelativeLayout>
\ No newline at end of file

m-home/src/ydl/res/layout/home_module_course_item_view.xml → m-home/src/ydl/res/layout/home_course_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/platform_dp_99"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_marginLeft="@dimen/platform_dp_15"
-    android:layout_marginRight="@dimen/platform_dp_15"
-    android:layout_marginBottom="@dimen/platform_dp_13"
-    android:layout_marginTop="@dimen/platform_dp_3"
-    android:padding="@dimen/platform_dp_15"
-    android:background="@drawable/home_module_card_view_stroke">
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/homeModuleCourseItemViewImgCardView"
-        android:layout_width="127dp"
-        android:layout_height="69dp"
-        app:cardCornerRadius="6dp"
-        app:cardElevation="0dp">
-        <ImageView
-            android:id="@+id/homeModuleCourseItemViewImg"
-            android:layout_width="127dp"
-            android:layout_height="69dp"
-            android:scaleType="centerCrop"
-            android:src="@drawable/home_module_image_default_back"/>
-
-    </android.support.v7.widget.CardView>
-
-    <TextView
-        android:id="@+id/homeModuleCourseItemViewTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/homeModuleCourseItemViewImgCardView"
-        android:layout_marginLeft="@dimen/platform_dp_12"
-        android:textSize="@dimen/platform_dp_16"
-        android:textColor="@color/platform_color_242424"
-        android:textStyle="bold"
-        android:maxLines="2"
-        android:ellipsize="end"
-        android:layout_marginTop="-2dp"
-        tools:text="深度睡眠速效药丸丨帮你
-像婴儿般安稳入睡深度睡眠速效药丸丨帮你
-像婴儿般安稳入睡"/>
-    <TextView
-        android:id="@+id/homeModuleCourseItemViewFreePrice"
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="免费"
-        android:textSize="@dimen/platform_dp_15"
-        android:textStyle="bold"
-        android:textColor="@color/platform_color_34CD65"
-        android:layout_alignBottom="@+id/homeModuleCourseItemViewImgCardView"
-        android:layout_toRightOf="@+id/homeModuleCourseItemViewImgCardView"
-        android:layout_marginLeft="@dimen/platform_dp_12"/>
-    <RelativeLayout
-        android:id="@+id/homeModuleCourseItemViewExpensePriceHideView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/homeModuleCourseItemViewImgCardView"
-        android:layout_toRightOf="@+id/homeModuleCourseItemViewImgCardView"
-        android:layout_marginLeft="@dimen/platform_dp_12"
-        android:layout_marginBottom="-2dp">
-        <TextView
-            android:id="@+id/homeModuleCourseItemViewExpensePrice"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="￥688"
-            android:textStyle="bold"
-            android:textSize="16dp"
-            android:textColor="@color/platform_color_FF5A4C"/>
-    </RelativeLayout>
-    <TextView
-        android:id="@+id/homeModuleCourseItemViewPersonText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="人气"
-        android:textSize="@dimen/platform_dp_11"
-        android:gravity="center"
-        android:textColor="@color/platform_color_666666"
-        android:layout_alignParentRight="true"
-        android:layout_alignTop="@+id/homeModuleCourseItemViewExpensePriceHideView"
-        android:layout_alignBottom="@+id/homeModuleCourseItemViewExpensePriceHideView"
-        android:layout_marginBottom="-1dp"/>
-    <TextView
-        android:id="@+id/homeModuleCourseItemViewPersonNum"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        tools:text="3109"
-        android:textSize="@dimen/platform_dp_12"
-        android:textColor="@color/platform_color_242424"
-        android:layout_toLeftOf="@+id/homeModuleCourseItemViewPersonText"
-        android:layout_alignBottom="@+id/homeModuleCourseItemViewExpensePriceHideView"
-        android:layout_alignTop="@+id/homeModuleCourseItemViewExpensePriceHideView"
-        android:gravity="center"
-        android:layout_marginBottom="-1dp"/>
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/platform_dp_99"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_marginLeft="@dimen/platform_dp_15"
+    android:layout_marginRight="@dimen/platform_dp_15"
+    android:layout_marginBottom="@dimen/platform_dp_13"
+    android:layout_marginTop="@dimen/platform_dp_3"
+    android:padding="@dimen/platform_dp_15"
+    android:background="@drawable/home_card_view_stroke">
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/homeModuleCourseItemViewImgCardView"
+        android:layout_width="127dp"
+        android:layout_height="69dp"
+        app:cardCornerRadius="6dp"
+        app:cardElevation="0dp">
+        <ImageView
+            android:id="@+id/homeModuleCourseItemViewImg"
+            android:layout_width="127dp"
+            android:layout_height="69dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/home_image_default_back"/>
+
+    </android.support.v7.widget.CardView>
+
+    <TextView
+        android:id="@+id/homeModuleCourseItemViewTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/homeModuleCourseItemViewImgCardView"
+        android:layout_marginLeft="@dimen/platform_dp_12"
+        android:textSize="@dimen/platform_dp_16"
+        android:textColor="@color/platform_color_242424"
+        android:textStyle="bold"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:layout_marginTop="-2dp"
+        tools:text="深度睡眠速效药丸丨帮你
+像婴儿般安稳入睡深度睡眠速效药丸丨帮你
+像婴儿般安稳入睡"/>
+    <TextView
+        android:id="@+id/homeModuleCourseItemViewFreePrice"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="免费"
+        android:textSize="@dimen/platform_dp_15"
+        android:textStyle="bold"
+        android:textColor="@color/platform_color_34CD65"
+        android:layout_alignBottom="@+id/homeModuleCourseItemViewImgCardView"
+        android:layout_toRightOf="@+id/homeModuleCourseItemViewImgCardView"
+        android:layout_marginLeft="@dimen/platform_dp_12"/>
+    <RelativeLayout
+        android:id="@+id/homeModuleCourseItemViewExpensePriceHideView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/homeModuleCourseItemViewImgCardView"
+        android:layout_toRightOf="@+id/homeModuleCourseItemViewImgCardView"
+        android:layout_marginLeft="@dimen/platform_dp_12"
+        android:layout_marginBottom="-2dp">
+        <TextView
+            android:id="@+id/homeModuleCourseItemViewExpensePrice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="￥688"
+            android:textStyle="bold"
+            android:textSize="16dp"
+            android:textColor="@color/platform_color_FF5A4C"/>
+    </RelativeLayout>
+    <TextView
+        android:id="@+id/homeModuleCourseItemViewPersonText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="人气"
+        android:textSize="@dimen/platform_dp_11"
+        android:gravity="center"
+        android:textColor="@color/platform_color_666666"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@+id/homeModuleCourseItemViewExpensePriceHideView"
+        android:layout_alignBottom="@+id/homeModuleCourseItemViewExpensePriceHideView"
+        android:layout_marginBottom="-1dp"/>
+    <TextView
+        android:id="@+id/homeModuleCourseItemViewPersonNum"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="3109"
+        android:textSize="@dimen/platform_dp_12"
+        android:textColor="@color/platform_color_242424"
+        android:layout_toLeftOf="@+id/homeModuleCourseItemViewPersonText"
+        android:layout_alignBottom="@+id/homeModuleCourseItemViewExpensePriceHideView"
+        android:layout_alignTop="@+id/homeModuleCourseItemViewExpensePriceHideView"
+        android:gravity="center"
+        android:layout_marginBottom="-1dp"/>
+</RelativeLayout>
\ No newline at end of file

m-home/src/ydl/res/layout/dialog_coupon.xml → m-home/src/ydl/res/layout/home_dialog_coupon.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="#00000000"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.CardView
-        android:layout_width="267dp"
-        android:layout_height="292dp"
-        app:cardCornerRadius="10dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="119dp"
-                android:background="@mipmap/coupon_background"
-                android:gravity="center_horizontal|center_vertical"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/iv_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:src="@drawable/coupon_receiver" />
-
-                <TextView
-                    android:id="@+id/tv_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="9dp"
-                    android:textColor="@color/white"
-                    android:textSize="16sp"
-                    tools:text="恭喜您，领取成功" />
-
-            </LinearLayout>
-
-
-            <RelativeLayout
-                android:layout_width="227dp"
-                android:layout_height="90dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="-16dp"
-                android:background="@mipmap/cotent_backgroudn"
-                android:paddingLeft="14dp"
-                android:paddingRight="14dp"
-                android:paddingTop="16dp">
-
-
-                <TextView
-                    android:id="@+id/tv_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginRight="5dp"
-                    android:layout_toLeftOf="@+id/tv_money"
-                    android:textColor="#666666"
-                    android:textSize="14sp"
-                    tools:text="咨询优惠券咨询优惠券" />
-
-                <TextView
-                    android:id="@+id/tv_duration"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/tv_title"
-                    android:layout_marginTop="4dp"
-                    android:textColor="#999999"
-                    android:textSize="10sp"
-                    tools:text="有效期至2018-08-31" />
-
-                <TextView
-                    android:id="@+id/tv_money"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_toLeftOf="@+id/tv_unit"
-                    android:layout_toStartOf="@+id/tv_unit"
-                    android:textColor="#FF8C00"
-                    android:textSize="25sp"
-                    android:textStyle="bold"
-                    tools:text="¥50" />
-
-                <TextView
-                    android:id="@+id/tv_unit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginTop="10dp"
-                    android:text="元"
-                    android:textColor="#FF8C00"
-                    android:textSize="12sp" />
-
-                <TextView
-                    android:id="@+id/tv_limit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="10dp"
-                    android:textColor="#999999"
-                    android:textSize="10sp"
-                    tools:text="满500元可用" />
-
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/tv_ensure"
-                android:layout_width="192dp"
-                android:layout_height="42dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="30dp"
-                android:background="@drawable/background_coupon_button"
-                android:gravity="center"
-                android:textColor="@color/white"
-                android:textSize="15sp"
-                tools:text="立即领取" />
-
-        </LinearLayout>
-
-    </android.support.v7.widget.CardView>
-
-    <ImageView
-        android:id="@+id/iv_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="37dp"
-        android:background="@drawable/pop_close"
-        android:padding="10dp" />
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#00000000"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.CardView
+        android:layout_width="267dp"
+        android:layout_height="292dp"
+        app:cardCornerRadius="10dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="119dp"
+                android:background="@mipmap/home_coupon_background"
+                android:gravity="center_horizontal|center_vertical"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/iv_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:src="@drawable/home_coupon_receiver" />
+
+                <TextView
+                    android:id="@+id/tv_status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="9dp"
+                    android:textColor="@color/white"
+                    android:textSize="16sp"
+                    tools:text="恭喜您，领取成功" />
+
+            </LinearLayout>
+
+
+            <RelativeLayout
+                android:layout_width="227dp"
+                android:layout_height="90dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="-16dp"
+                android:background="@mipmap/home_cotent_backgroudn"
+                android:paddingLeft="14dp"
+                android:paddingRight="14dp"
+                android:paddingTop="16dp">
+
+
+                <TextView
+                    android:id="@+id/tv_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginRight="5dp"
+                    android:layout_toLeftOf="@+id/tv_money"
+                    android:textColor="#666666"
+                    android:textSize="14sp"
+                    tools:text="咨询优惠券咨询优惠券" />
+
+                <TextView
+                    android:id="@+id/tv_duration"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_title"
+                    android:layout_marginTop="4dp"
+                    android:textColor="#999999"
+                    android:textSize="10sp"
+                    tools:text="有效期至2018-08-31" />
+
+                <TextView
+                    android:id="@+id/tv_money"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_toLeftOf="@+id/tv_unit"
+                    android:layout_toStartOf="@+id/tv_unit"
+                    android:textColor="#FF8C00"
+                    android:textSize="25sp"
+                    android:textStyle="bold"
+                    tools:text="¥50" />
+
+                <TextView
+                    android:id="@+id/tv_unit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="10dp"
+                    android:text="元"
+                    android:textColor="#FF8C00"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:id="@+id/tv_limit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="10dp"
+                    android:textColor="#999999"
+                    android:textSize="10sp"
+                    tools:text="满500元可用" />
+
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/tv_ensure"
+                android:layout_width="192dp"
+                android:layout_height="42dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="30dp"
+                android:background="@drawable/home_background_coupon_button"
+                android:gravity="center"
+                android:textColor="@color/white"
+                android:textSize="15sp"
+                tools:text="立即领取" />
+
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="37dp"
+        android:background="@drawable/home_pop_close"
+        android:padding="10dp" />
+</LinearLayout>
\ No newline at end of file

m-home/src/ydl/res/layout/dialog_guide_activity.xml → m-home/src/ydl/res/layout/home_dialog_guide_activity.xml

-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/c_body"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="#99000000">
-
-    <ImageView
-        android:id="@+id/img_activity"
-        android:layout_width="64dp"
-        android:layout_height="34dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="7dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"/>
-
-    <ImageView
-        android:id="@+id/img_line"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@mipmap/activity_guide"
-        app:layout_constraintTop_toBottomOf="@+id/img_activity"
-        app:layout_constraintLeft_toLeftOf="@+id/img_activity"
-        app:layout_constraintRight_toRightOf="@+id/img_activity"/>
-
-    <TextView
-        android:id="@+id/tv_content"
-        android:layout_width="wrap_content"
-        android:layout_height="24dp"
-        tools:text="这里可以进入双11活动哦"
-        app:layout_constraintBottom_toBottomOf="@+id/img_line"
-        app:layout_constraintLeft_toRightOf="@+id/img_line"
-        android:layout_marginLeft="14dp"
-        android:textSize="16dp"
-        android:textColor="@color/platform_white"/>
-
-
-</android.support.constraint.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/c_body"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="#99000000">
+
+    <ImageView
+        android:id="@+id/img_activity"
+        android:layout_width="64dp"
+        android:layout_height="34dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="7dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"/>
+
+    <ImageView
+        android:id="@+id/img_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/home_activity_guide"
+        app:layout_constraintTop_toBottomOf="@+id/img_activity"
+        app:layout_constraintLeft_toLeftOf="@+id/img_activity"
+        app:layout_constraintRight_toRightOf="@+id/img_activity"/>
+
+    <TextView
+        android:id="@+id/tv_content"
+        android:layout_width="wrap_content"
+        android:layout_height="24dp"
+        tools:text="这里可以进入双11活动哦"
+        app:layout_constraintBottom_toBottomOf="@+id/img_line"
+        app:layout_constraintLeft_toRightOf="@+id/img_line"
+        android:layout_marginLeft="14dp"
+        android:textSize="16dp"
+        android:textColor="@color/platform_white"/>
+
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/platform_white"
-    android:orientation="vertical">
-
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/home_swipe_refresh_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/home_module_fragment_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/platform_white"
-            android:divider="@null"
-            android:overScrollMode="never"/>
-    </android.support.v4.widget.SwipeRefreshLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <View
-            android:id="@+id/view_rl_top_bg"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:background="@drawable/background_home_pager_top" />
-
-        <RelativeLayout
-            android:id="@+id/rl_top"
-            android:layout_width="match_parent"
-            android:layout_height="48dp">
-
-            <LinearLayout
-                android:id="@+id/ll_top_function"
-                android:layout_width="match_parent"
-                android:layout_height="34dp"
-                android:layout_marginTop="7dp"
-                android:layout_marginBottom="5dp"
-                android:paddingRight="10dp"
-                android:gravity="center_vertical|right"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/tv_consult"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical"
-                    android:text="咨询"
-                    android:layout_marginLeft="@dimen/platform_dp_16"
-                    android:textColor="@color/platform_white"
-                    android:textSize="@dimen/platform_dp_16"
-                    android:textStyle="bold"
-                    cube_ptr:ignore="SpUsage"/>
-
-                <TextView
-                    android:id="@+id/tv_confide"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/platform_dp_16"
-                    android:gravity="center_vertical"
-                    android:text="倾诉"
-                    android:textColor="@color/platform_white"
-                    android:textSize="@dimen/platform_dp_16"
-                    android:textStyle="bold"
-                    cube_ptr:ignore="SpUsage"/>
-
-                <TextView
-                    android:id="@+id/tv_course"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/platform_dp_16"
-                    android:gravity="center_vertical"
-                    android:text="课程"
-                    android:textColor="@color/platform_white"
-                    android:textSize="@dimen/platform_dp_16"
-                    android:textStyle="bold"
-                    cube_ptr:ignore="SpUsage"/>
-
-                <TextView
-                    android:id="@+id/tv_test"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/platform_dp_16"
-                    android:gravity="center_vertical"
-                    android:text="测评"
-                    android:textColor="@color/platform_white"
-                    android:textSize="@dimen/platform_dp_16"
-                    android:textStyle="bold"
-                    cube_ptr:ignore="SpUsage"/>
-
-                <RelativeLayout
-                    android:id="@+id/rl_backTop"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/platform_dp_18">
-
-                    <ImageView
-                        android:id="@+id/imgTop"
-                        android:layout_width="14dp"
-                        android:layout_height="9dp"
-                        android:layout_centerHorizontal="true"
-                        android:background="@drawable/home_module_back_top"/>
-
-                    <TextView
-                        android:id="@+id/tv_returnTop"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_below="@+id/imgTop"
-                        android:gravity="center"
-                        android:text="回顶部"
-                        android:textColor="@color/platform_white"
-                        android:textSize="@dimen/platform_dp_9"/>
-                </RelativeLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="34dp"
-                android:layout_marginLeft="15dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginRight="15dp"
-                android:layout_marginBottom="5dp"
-                android:id="@+id/rl_search"
-                android:orientation="horizontal">
-                <ImageView
-                    android:id="@+id/img_ad"
-                    android:layout_width="64dp"
-                    android:layout_height="34dp"
-                    android:layout_marginRight="10dp"
-                    android:visibility="gone"/>
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-                    <View
-                        android:id="@+id/view_search_input_bg"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="@drawable/bg_home_search_input"
-                        android:tag="tag_search_input_bg"/>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:id="@+id/iv_search_icon"
-                            android:layout_width="12dp"
-                            android:layout_height="12dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginLeft="12dp"
-                            android:src="@drawable/icon_search"/>
-
-                        <TextView
-                            android:id="@+id/home_tv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_marginLeft="8dp"
-                            android:layout_weight="1"
-                            android:gravity="center_vertical"
-                            android:text="@string/search_hint"
-                            android:textColor="#999999"
-                            android:textSize="@dimen/platform_default_text_size_small"
-                            android:textStyle="normal"
-                            android:typeface="sans"/>
-
-                    </LinearLayout>
-                </RelativeLayout>
-
-            </LinearLayout>
-            <ImageView
-                android:id="@+id/home_service_call"
-                android:layout_width="@dimen/platform_dp_34"
-                android:layout_height="@dimen/platform_dp_34"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="7dp"
-                android:layout_marginRight="12dp"
-                android:layout_toRightOf="@+id/rl_search"
-                android:background="?android:attr/selectableItemBackground"
-                android:contentDescription="@null"
-                android:src="@drawable/home_module_search_phone"
-                android:visibility="gone" />
-
-        </RelativeLayout>
-
-
-        <LinearLayout
-            android:id="@+id/ll_layout"
-            android:layout_width="match_parent"
-            android:layout_height="41dp"
-            android:layout_below="@+id/rl_top"
-            android:orientation="vertical"
-            android:visibility="gone"
-            >
-
-            <android.support.design.widget.TabLayout
-                android:id="@+id/tab_layout"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:background="@color/platform_white"
-                android:visibility="visible"
-                app:tabGravity="fill"
-                app:tabIndicatorHeight="0dp"
-                app:tabMode="scrollable"
-                app:tabSelectedTextColor="@color/platform_color_242424"
-                app:tabTextAppearance="@style/TabLayoutTextSize"
-                app:tabTextColor="#333"/>
-
-            <View style="@style/viewline"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_consultLayout"
-            android:layout_width="match_parent"
-            android:layout_height="41dp"
-            android:layout_below="@+id/rl_top"
-            android:orientation="vertical"
-            android:visibility="gone">
-
-            <android.support.design.widget.TabLayout
-                android:id="@+id/tab_consultLayout"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:background="@color/platform_white"
-                android:visibility="visible"
-                app:tabGravity="fill"
-                app:tabIndicatorHeight="0dp"
-                app:tabMode="scrollable"
-                app:tabSelectedTextColor="@color/platform_color_242424"
-                app:tabTextAppearance="@style/TabLayoutTextSize"
-                app:tabTextColor="#333"/>
-
-            <View style="@style/viewline"/>
-        </LinearLayout>
-    </RelativeLayout>
-</FrameLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/platform_white"
+    android:orientation="vertical">
+
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/home_swipe_refresh_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/home_module_fragment_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/platform_white"
+            android:divider="@null"
+            android:overScrollMode="never"/>
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <View
+            android:id="@+id/view_rl_top_bg"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:background="@drawable/home_background_home_pager_top" />
+
+        <RelativeLayout
+            android:id="@+id/rl_top"
+            android:layout_width="match_parent"
+            android:layout_height="48dp">
+
+            <LinearLayout
+                android:id="@+id/ll_top_function"
+                android:layout_width="match_parent"
+                android:layout_height="34dp"
+                android:layout_marginTop="7dp"
+                android:layout_marginBottom="5dp"
+                android:paddingRight="10dp"
+                android:gravity="center_vertical|right"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tv_consult"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:text="咨询"
+                    android:layout_marginLeft="@dimen/platform_dp_16"
+                    android:textColor="@color/platform_white"
+                    android:textSize="@dimen/platform_dp_16"
+                    android:textStyle="bold"
+                    cube_ptr:ignore="SpUsage"/>
+
+                <TextView
+                    android:id="@+id/tv_confide"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/platform_dp_16"
+                    android:gravity="center_vertical"
+                    android:text="倾诉"
+                    android:textColor="@color/platform_white"
+                    android:textSize="@dimen/platform_dp_16"
+                    android:textStyle="bold"
+                    cube_ptr:ignore="SpUsage"/>
+
+                <TextView
+                    android:id="@+id/tv_course"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/platform_dp_16"
+                    android:gravity="center_vertical"
+                    android:text="课程"
+                    android:textColor="@color/platform_white"
+                    android:textSize="@dimen/platform_dp_16"
+                    android:textStyle="bold"
+                    cube_ptr:ignore="SpUsage"/>
+
+                <TextView
+                    android:id="@+id/tv_test"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/platform_dp_16"
+                    android:gravity="center_vertical"
+                    android:text="测评"
+                    android:textColor="@color/platform_white"
+                    android:textSize="@dimen/platform_dp_16"
+                    android:textStyle="bold"
+                    cube_ptr:ignore="SpUsage"/>
+
+                <RelativeLayout
+                    android:id="@+id/rl_backTop"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/platform_dp_18">
+
+                    <ImageView
+                        android:id="@+id/imgTop"
+                        android:layout_width="14dp"
+                        android:layout_height="9dp"
+                        android:layout_centerHorizontal="true"
+                        android:background="@drawable/home_back_top"/>
+
+                    <TextView
+                        android:id="@+id/tv_returnTop"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_below="@+id/imgTop"
+                        android:gravity="center"
+                        android:text="回顶部"
+                        android:textColor="@color/platform_white"
+                        android:textSize="@dimen/platform_dp_9"/>
+                </RelativeLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="34dp"
+                android:layout_marginLeft="15dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginBottom="5dp"
+                android:id="@+id/rl_search"
+                android:orientation="horizontal">
+                <ImageView
+                    android:id="@+id/img_ad"
+                    android:layout_width="64dp"
+                    android:layout_height="34dp"
+                    android:layout_marginRight="10dp"
+                    android:visibility="gone"/>
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+                    <View
+                        android:id="@+id/view_search_input_bg"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@drawable/home_bg_home_search_input"
+                        android:tag="tag_search_input_bg"/>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/iv_search_icon"
+                            android:layout_width="12dp"
+                            android:layout_height="12dp"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="12dp"
+                            android:src="@drawable/home_icon_search"/>
+
+                        <TextView
+                            android:id="@+id/home_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="8dp"
+                            android:layout_weight="1"
+                            android:gravity="center_vertical"
+                            android:text="@string/search_hint"
+                            android:textColor="#999999"
+                            android:textSize="@dimen/platform_default_text_size_small"
+                            android:textStyle="normal"
+                            android:typeface="sans"/>
+
+                    </LinearLayout>
+                </RelativeLayout>
+
+            </LinearLayout>
+            <ImageView
+                android:id="@+id/home_service_call"
+                android:layout_width="@dimen/platform_dp_34"
+                android:layout_height="@dimen/platform_dp_34"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="7dp"
+                android:layout_marginRight="12dp"
+                android:layout_toRightOf="@+id/rl_search"
+                android:background="?android:attr/selectableItemBackground"
+                android:contentDescription="@null"
+                android:src="@drawable/home_search_phone"
+                android:visibility="gone" />
+
+        </RelativeLayout>
+
+
+        <LinearLayout
+            android:id="@+id/ll_layout"
+            android:layout_width="match_parent"
+            android:layout_height="41dp"
+            android:layout_below="@+id/rl_top"
+            android:orientation="vertical"
+            android:visibility="gone"
+            >
+
+            <android.support.design.widget.TabLayout
+                android:id="@+id/tab_layout"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:background="@color/platform_white"
+                android:visibility="visible"
+                app:tabGravity="fill"
+                app:tabIndicatorHeight="0dp"
+                app:tabMode="scrollable"
+                app:tabSelectedTextColor="@color/platform_color_242424"
+                app:tabTextAppearance="@style/TabLayoutTextSize"
+                app:tabTextColor="#333"/>
+
+            <View style="@style/viewline"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_consultLayout"
+            android:layout_width="match_parent"
+            android:layout_height="41dp"
+            android:layout_below="@+id/rl_top"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <android.support.design.widget.TabLayout
+                android:id="@+id/tab_consultLayout"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:background="@color/platform_white"
+                android:visibility="visible"
+                app:tabGravity="fill"
+                app:tabIndicatorHeight="0dp"
+                app:tabMode="scrollable"
+                app:tabSelectedTextColor="@color/platform_color_242424"
+                app:tabTextAppearance="@style/TabLayoutTextSize"
+                app:tabTextColor="#333"/>
+
+            <View style="@style/viewline"/>
+        </LinearLayout>
+    </RelativeLayout>
+</FrameLayout>
\ No newline at end of file

m-home/src/ydl/res/layout/home_module_intelligent_item_view.xml → m-home/src/ydl/res/layout/home_intelligent_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:paddingLeft="@dimen/platform_dp_15"
-    android:paddingRight="@dimen/platform_dp_15"
-    android:paddingTop="@dimen/platform_dp_8"
-    android:paddingBottom="@dimen/platform_dp_8">
-
-    <ImageView
-        android:id="@+id/iv_fm_play"
-        android:layout_height="@dimen/platform_dp_22"
-        android:layout_width="@dimen/platform_dp_22"
-        android:src="@drawable/home_module_intelligent_item_play_icon"
-        android:layout_marginRight="@dimen/platform_dp_7"/>
-
-    <TextView
-        android:id="@+id/homeModuleIntelligentItemViewTitle"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        tools:text="2018倒计时，这一年你过2018倒计时，这一年你过的…"
-        android:textSize="@dimen/platform_dp_16"
-        android:textColor="@color/platform_color_242424"
-        android:textStyle="bold"
-        android:layout_marginRight="@dimen/platform_dp_29"
-        android:maxLines="1"
-        android:ellipsize="end"/>
-
-    <TextView
-        android:id="@+id/homeModuleIntelligentItemViewHits"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        tools:text="3785"
-        android:textSize="@dimen/platform_dp_12"
-        android:textColor="@color/platform_color_666666"
-        android:maxLines="1"
-        android:ellipsize="end"/>
-
-    <ImageView
-        android:layout_height="@dimen/platform_dp_11"
-        android:layout_width="@dimen/platform_dp_12"
-        android:src="@drawable/home_module_intelligent_item_listen_icon"
-        android:layout_marginLeft="@dimen/platform_dp_4"/>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:paddingLeft="@dimen/platform_dp_15"
+    android:paddingRight="@dimen/platform_dp_15"
+    android:paddingTop="@dimen/platform_dp_8"
+    android:paddingBottom="@dimen/platform_dp_8">
+
+    <ImageView
+        android:id="@+id/iv_fm_play"
+        android:layout_height="@dimen/platform_dp_22"
+        android:layout_width="@dimen/platform_dp_22"
+        android:src="@drawable/home_intelligent_item_play_icon"
+        android:layout_marginRight="@dimen/platform_dp_7"/>
+
+    <TextView
+        android:id="@+id/homeModuleIntelligentItemViewTitle"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        tools:text="2018倒计时，这一年你过2018倒计时，这一年你过的…"
+        android:textSize="@dimen/platform_dp_16"
+        android:textColor="@color/platform_color_242424"
+        android:textStyle="bold"
+        android:layout_marginRight="@dimen/platform_dp_29"
+        android:maxLines="1"
+        android:ellipsize="end"/>
+
+    <TextView
+        android:id="@+id/homeModuleIntelligentItemViewHits"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="3785"
+        android:textSize="@dimen/platform_dp_12"
+        android:textColor="@color/platform_color_666666"
+        android:maxLines="1"
+        android:ellipsize="end"/>
+
+    <ImageView
+        android:layout_height="@dimen/platform_dp_11"
+        android:layout_width="@dimen/platform_dp_12"
+        android:src="@drawable/home_intelligent_item_listen_icon"
+        android:layout_marginLeft="@dimen/platform_dp_4"/>
+
+</LinearLayout>
\ No newline at end of file

m-home/src/ydl/res/layout/home_module_intelligent_top_item_view.xml → m-home/src/ydl/res/layout/home_intelligent_top_item_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/homeModuleIntelligentTopViewImageCardView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:cardCornerRadius="@dimen/platform_dp_7"
-        app:cardElevation="0dp">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/homeModuleIntelligentTopViewImage"
-                android:background="@drawable/home_module_image_default_back"
-                android:scaleType="centerCrop"/>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="45"/>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="55"
-                    android:background="@drawable/home_module_intelligent_gradient_back"/>
-            </LinearLayout>
-
-        </RelativeLayout>
-    </android.support.v7.widget.CardView>
-
-
-    <TextView
-        android:id="@+id/homeModuleIntelligentTopViewTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        tools:text="先结婚还是先买先结婚还是先买房"
-        android:textSize="@dimen/platform_dp_24"
-        android:textColor="@color/platform_color_FFFFFF"
-        android:textStyle="bold"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="@dimen/platform_dp_14"
-        android:layout_marginBottom="@dimen/platform_dp_35"
-        android:layout_marginRight="@dimen/platform_dp_115"
-        />
-
-    <LinearLayout
-        android:id="@+id/homeModuleIntelligentTopViewDescLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/platform_dp_18"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:paddingLeft="@dimen/platform_dp_10"
-        android:paddingRight="@dimen/platform_dp_10"
-        android:background="@drawable/home_module_intelligent_top_view_layout_back"
-        android:layout_alignLeft="@+id/homeModuleIntelligentTopViewTitle"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/platform_dp_14">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="主播/"
-            android:textColor="@color/platform_color_222222"
-            android:textSize="@dimen/platform_dp_12"
-            />
-        <TextView
-            android:id="@+id/homeModuleIntelligentTopViewAuthor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="花心月"
-            android:textColor="@color/platform_color_222222"
-            android:textSize="@dimen/platform_dp_12"
-            android:layout_marginBottom="0.5dp"
-            />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="收听/"
-            android:textColor="@color/platform_color_222222"
-            android:textSize="@dimen/platform_dp_12"
-            android:layout_marginLeft="@dimen/platform_dp_12"
-            />
-        <TextView
-            android:id="@+id/homeModuleIntelligentTopViewHits"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="2486"
-            android:textColor="@color/platform_color_222222"
-            android:textSize="@dimen/platform_dp_13"
-            android:layout_marginBottom="1dp"
-            />
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/iv_play_fm"
-        android:layout_width="@dimen/platform_dp_36"
-        android:layout_height="@dimen/platform_dp_36"
-        android:src="@drawable/home_module_intelligent_first_play_icon"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginRight="@dimen/platform_dp_14"
-        android:layout_marginBottom="16.5dp"/>
-
-    <RelativeLayout
-        android:layout_width="@dimen/platform_dp_64"
-        android:layout_height="@dimen/platform_dp_20"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/home_module_intelligent_top_view_recommend_back">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="每日推荐"
-            android:textColor="@color/platform_color_242424"
-            android:textSize="@dimen/platform_dp_12"
-            android:textStyle="bold"/>
-    </RelativeLayout>
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/homeModuleIntelligentTopViewImageCardView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:cardCornerRadius="@dimen/platform_dp_7"
+        app:cardElevation="0dp">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/homeModuleIntelligentTopViewImage"
+                android:background="@drawable/home_image_default_back"
+                android:scaleType="centerCrop"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="45"/>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="55"
+                    android:background="@drawable/home_intelligent_gradient_back"/>
+            </LinearLayout>
+
+        </RelativeLayout>
+    </android.support.v7.widget.CardView>
+
+
+    <TextView
+        android:id="@+id/homeModuleIntelligentTopViewTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="先结婚还是先买先结婚还是先买房"
+        android:textSize="@dimen/platform_dp_24"
+        android:textColor="@color/platform_color_FFFFFF"
+        android:textStyle="bold"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="@dimen/platform_dp_14"
+        android:layout_marginBottom="@dimen/platform_dp_35"
+        android:layout_marginRight="@dimen/platform_dp_115"
+        />
+
+    <LinearLayout
+        android:id="@+id/homeModuleIntelligentTopViewDescLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/platform_dp_18"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:paddingLeft="@dimen/platform_dp_10"
+        android:paddingRight="@dimen/platform_dp_10"
+        android:background="@drawable/home_intelligent_top_view_layout_back"
+        android:layout_alignLeft="@+id/homeModuleIntelligentTopViewTitle"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/platform_dp_14">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="主播/"
+            android:textColor="@color/platform_color_222222"
+            android:textSize="@dimen/platform_dp_12"
+            />
+        <TextView
+            android:id="@+id/homeModuleIntelligentTopViewAuthor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="花心月"
+            android:textColor="@color/platform_color_222222"
+            android:textSize="@dimen/platform_dp_12"
+            android:layout_marginBottom="0.5dp"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="收听/"
+            android:textColor="@color/platform_color_222222"
+            android:textSize="@dimen/platform_dp_12"
+            android:layout_marginLeft="@dimen/platform_dp_12"
+            />
+        <TextView
+            android:id="@+id/homeModuleIntelligentTopViewHits"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="2486"
+            android:textColor="@color/platform_color_222222"
+            android:textSize="@dimen/platform_dp_13"
+            android:layout_marginBottom="1dp"
+            />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/iv_play_fm"
+        android:layout_width="@dimen/platform_dp_36"
+        android:layout_height="@dimen/platform_dp_36"
+        android:src="@drawable/home_intelligent_first_play_icon"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="@dimen/platform_dp_14"
+        android:layout_marginBottom="16.5dp"/>
+
+    <RelativeLayout
+        android:layout_width="@dimen/platform_dp_64"
+        android:layout_height="@dimen/platform_dp_20"
+        android:layout_alignParentRight="true"
+        android:background="@drawable/home_intelligent_top_view_recommend_back">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="每日推荐"
+            android:textColor="@color/platform_color_242424"
+            android:textSize="@dimen/platform_dp_12"
+            android:textStyle="bold"/>
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file

m-home/src/ydl/res/layout/home_module_intelligent_view.xml → m-home/src/ydl/res/layout/home_intelligent_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    >
-
-    <com.yidianling.home.ui.view.HomeCommonTitleView
-        android:id="@+id/homeModuleIntelligentViewHomeCommonTitleView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <LinearLayout
-        android:id="@+id/homeModuleIntelligentViewAddLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/platform_dp_15"
-        android:layout_marginRight="@dimen/platform_dp_15"
-        android:layout_marginTop="@dimen/platform_dp_2"
-        android:layout_marginBottom="@dimen/platform_dp_20"
-        android:background="@drawable/home_module_card_view_stroke"
-        android:orientation="vertical"></LinearLayout>
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    >
+
+    <com.yidianling.home.ui.view.HomeCommonTitleView
+        android:id="@+id/homeModuleIntelligentViewHomeCommonTitleView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:id="@+id/homeModuleIntelligentViewAddLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/platform_dp_15"
+        android:layout_marginRight="@dimen/platform_dp_15"
+        android:layout_marginTop="@dimen/platform_dp_2"
+        android:layout_marginBottom="@dimen/platform_dp_20"
+        android:background="@drawable/home_card_view_stroke"
+        android:orientation="vertical"></LinearLayout>
+
+</merge>
\ No newline at end of file

m-home/src/ydl/res/layout/home_module_muse_view.xml → m-home/src/ydl/res/layout/home_muse_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    tools:parentTag="android.widget.LinearLayout">
-
-    <com.yidianling.home.ui.view.HomeCommonTitleView
-        android:id="@+id/homeModuleMuseViewHomeCommonTitleView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="88dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <android.support.v7.widget.CardView
-            android:id="@+id/muse_first"
-            android:layout_width="0dp"
-            android:layout_height="78dp"
-            android:layout_marginLeft="@dimen/platform_dp_15"
-            android:layout_marginRight="5dp"
-            android:layout_weight="1"
-            app:cardElevation="0dp"
-            app:cardCornerRadius="@dimen/platform_dp_4">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/muse_first_img" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="13dp"
-                    android:gravity="center_vertical"
-                    android:layout_marginRight="@dimen/platform_dp_15"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/muse_first_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="深度睡眠"
-                        android:maxLines="1"
-                        android:ellipsize="end"
-                        android:textColor="@color/platform_black"
-                        android:textSize="@dimen/platform_dp_16" />
-
-                    <ImageView
-                        android:layout_width="18dp"
-                        android:layout_height="@dimen/platform_dp_18"
-                        android:layout_marginLeft="@dimen/platform_dp_4"
-                        android:src="@drawable/muse_play" />
-                </LinearLayout>
-            </RelativeLayout>
-        </android.support.v7.widget.CardView>
-
-        <android.support.v7.widget.CardView
-            android:id="@+id/muse_second"
-            android:layout_width="0dp"
-            android:layout_height="78dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="@dimen/platform_dp_15"
-            android:layout_weight="1"
-            app:cardElevation="0dp"
-            app:cardCornerRadius="@dimen/platform_dp_4">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <com.airbnb.lottie.LottieAnimationView
-                    android:id="@+id/muse_animation_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:lottie_autoPlay="true"
-                    app:lottie_loop="true"
-                    app:lottie_imageAssetsFolder="images"
-                    app:lottie_fileName="pinna.json"
-                    android:scaleType="centerCrop"/>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginRight="@dimen/platform_dp_15"
-                    android:layout_marginTop="13dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/muse_second_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="节奏调整"
-                        android:maxLines="1"
-                        android:ellipsize="end"
-                        android:textColor="@color/platform_black"
-                        android:textSize="@dimen/platform_dp_16" />
-
-                    <ImageView
-                        android:layout_width="18dp"
-                        android:layout_height="@dimen/platform_dp_18"
-                        android:layout_marginLeft="@dimen/platform_dp_4"
-                        android:src="@drawable/muse_play" />
-                </LinearLayout>
-            </RelativeLayout>
-        </android.support.v7.widget.CardView>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="88dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <android.support.v7.widget.CardView
-            android:id="@+id/muse_third"
-            android:layout_width="0dp"
-            android:layout_height="78dp"
-            android:layout_marginLeft="@dimen/platform_dp_15"
-            android:layout_marginRight="5dp"
-            android:layout_weight="1"
-            app:cardElevation="0dp"
-            app:cardCornerRadius="@dimen/platform_dp_4">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/muse_third_img" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginRight="@dimen/platform_dp_15"
-                    android:layout_marginTop="13dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/muse_third_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="身体扫描"
-                        android:maxLines="1"
-                        android:ellipsize="end"
-                        android:textColor="@color/platform_black"
-                        android:textSize="@dimen/platform_dp_16"/>
-
-                    <ImageView
-                        android:layout_width="18dp"
-                        android:layout_height="@dimen/platform_dp_18"
-                        android:layout_marginLeft="@dimen/platform_dp_4"
-                        android:src="@drawable/muse_play" />
-                </LinearLayout>
-            </RelativeLayout>
-        </android.support.v7.widget.CardView>
-
-        <android.support.v7.widget.CardView
-            android:id="@+id/muse_forth"
-            android:layout_width="0dp"
-            android:layout_height="78dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="@dimen/platform_dp_15"
-            android:layout_weight="1"
-            app:cardElevation="0dp"
-            app:cardCornerRadius="@dimen/platform_dp_4">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/muse_fouth_img" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginRight="@dimen/platform_dp_15"
-                    android:layout_marginTop="13dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/muse_forth_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="压力缓冲"
-                        android:maxLines="1"
-                        android:ellipsize="end"
-                        android:textColor="@color/platform_black"
-                        android:textSize="@dimen/platform_dp_16" />
-
-                    <ImageView
-                        android:layout_width="18dp"
-                        android:layout_height="@dimen/platform_dp_18"
-                        android:layout_marginLeft="@dimen/platform_dp_4"
-                        android:src="@drawable/muse_play" />
-                </LinearLayout>
-            </RelativeLayout>
-        </android.support.v7.widget.CardView>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/platform_dp_7"
-        android:orientation="horizontal"
-        android:paddingLeft="6.5dp"
-        android:paddingRight="6.5dp"
-        android:layout_marginBottom="16dp">
-
-        <RelativeLayout
-            android:id="@+id/sleeps_first"
-            android:layout_width="0dp"
-            android:layout_height="80dp"
-            android:layout_weight="1">
-
-            <com.ydl.ydlcommon.view.widgets.RoundImageView
-                android:layout_width="72dp"
-                android:layout_height="72dp"
-                android:scaleType="centerCrop"
-                android:src="@drawable/muse_circle_first"
-                android:layout_centerInParent="true"
-                app:pa_type="pa_circle"></com.ydl.ydlcommon.view.widgets.RoundImageView>
-
-            <TextView
-                android:id="@+id/sleeps_first_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:text="篝火"
-                android:textColor="@color/platform_black"
-                android:textSize="@dimen/platform_dp_14"
-                android:textStyle="bold" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/sleeps_second"
-            android:layout_width="0dp"
-            android:layout_height="80dp"
-            android:layout_weight="1">
-
-            <com.ydl.ydlcommon.view.widgets.RoundImageView
-                android:layout_width="72dp"
-                android:layout_height="72dp"
-                android:scaleType="centerCrop"
-                android:src="@drawable/muse_circle_second"
-                android:layout_centerInParent="true"
-                app:pa_type="pa_circle"></com.ydl.ydlcommon.view.widgets.RoundImageView>
-
-            <TextView
-                android:id="@+id/sleeps_second_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:text="溪流"
-                android:textColor="@color/platform_black"
-                android:textSize="@dimen/platform_dp_14"
-                android:textStyle="bold" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/sleeps_third"
-            android:layout_width="0dp"
-            android:layout_height="80dp"
-            android:layout_weight="1">
-
-            <com.ydl.ydlcommon.view.widgets.RoundImageView
-                android:layout_width="72dp"
-                android:layout_height="72dp"
-                android:scaleType="centerCrop"
-                android:src="@drawable/muse_circle_third"
-                android:layout_centerInParent="true"
-                app:pa_type="pa_circle"></com.ydl.ydlcommon.view.widgets.RoundImageView>
-
-            <TextView
-                android:id="@+id/sleeps_third_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:text="风声"
-                android:textColor="@color/platform_black"
-                android:textSize="@dimen/platform_dp_14"
-                android:textStyle="bold" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/sleeps_forth"
-            android:layout_width="0dp"
-            android:layout_height="80dp"
-            android:layout_weight="1">
-
-            <com.ydl.ydlcommon.view.widgets.RoundImageView
-                android:layout_width="72dp"
-                android:layout_height="72dp"
-                android:scaleType="centerCrop"
-                android:src="@drawable/muse_circle_fouth"
-                android:layout_centerInParent="true"
-                app:pa_type="pa_circle"></com.ydl.ydlcommon.view.widgets.RoundImageView>
-
-            <TextView
-                android:id="@+id/sleeps_forth_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:text="落雨"
-                android:textColor="@color/platform_black"
-                android:textSize="@dimen/platform_dp_14"
-                android:textStyle="bold" />
-        </RelativeLayout>
-    </LinearLayout>
-
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    tools:parentTag="android.widget.LinearLayout">
+
+    <com.yidianling.home.ui.view.HomeCommonTitleView
+        android:id="@+id/homeModuleMuseViewHomeCommonTitleView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="88dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/muse_first"
+            android:layout_width="0dp"
+            android:layout_height="78dp"
+            android:layout_marginLeft="@dimen/platform_dp_15"
+            android:layout_marginRight="5dp"
+            android:layout_weight="1"
+            app:cardElevation="0dp"
+            app:cardCornerRadius="@dimen/platform_dp_4">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/home_muse_first_img" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginTop="13dp"
+                    android:gravity="center_vertical"
+                    android:layout_marginRight="@dimen/platform_dp_15"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/muse_first_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="深度睡眠"
+                        android:maxLines="1"
+                        android:ellipsize="end"
+                        android:textColor="@color/platform_black"
+                        android:textSize="@dimen/platform_dp_16" />
+
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:layout_height="@dimen/platform_dp_18"
+                        android:layout_marginLeft="@dimen/platform_dp_4"
+                        android:src="@drawable/home_muse_play" />
+                </LinearLayout>
+            </RelativeLayout>
+        </android.support.v7.widget.CardView>
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/muse_second"
+            android:layout_width="0dp"
+            android:layout_height="78dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="@dimen/platform_dp_15"
+            android:layout_weight="1"
+            app:cardElevation="0dp"
+            app:cardCornerRadius="@dimen/platform_dp_4">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <com.airbnb.lottie.LottieAnimationView
+                    android:id="@+id/muse_animation_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:lottie_autoPlay="true"
+                    app:lottie_loop="true"
+                    app:lottie_imageAssetsFolder="images"
+                    app:lottie_fileName="pinna.json"
+                    android:scaleType="centerCrop"/>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="@dimen/platform_dp_15"
+                    android:layout_marginTop="13dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/muse_second_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="节奏调整"
+                        android:maxLines="1"
+                        android:ellipsize="end"
+                        android:textColor="@color/platform_black"
+                        android:textSize="@dimen/platform_dp_16" />
+
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:layout_height="@dimen/platform_dp_18"
+                        android:layout_marginLeft="@dimen/platform_dp_4"
+                        android:src="@drawable/home_muse_play" />
+                </LinearLayout>
+            </RelativeLayout>
+        </android.support.v7.widget.CardView>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="88dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/muse_third"
+            android:layout_width="0dp"
+            android:layout_height="78dp"
+            android:layout_marginLeft="@dimen/platform_dp_15"
+            android:layout_marginRight="5dp"
+            android:layout_weight="1"
+            app:cardElevation="0dp"
+            app:cardCornerRadius="@dimen/platform_dp_4">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/home_muse_third_img" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="@dimen/platform_dp_15"
+                    android:layout_marginTop="13dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/muse_third_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="身体扫描"
+                        android:maxLines="1"
+                        android:ellipsize="end"
+                        android:textColor="@color/platform_black"
+                        android:textSize="@dimen/platform_dp_16"/>
+
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:layout_height="@dimen/platform_dp_18"
+                        android:layout_marginLeft="@dimen/platform_dp_4"
+                        android:src="@drawable/home_muse_play" />
+                </LinearLayout>
+            </RelativeLayout>
+        </android.support.v7.widget.CardView>
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/muse_forth"
+            android:layout_width="0dp"
+            android:layout_height="78dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="@dimen/platform_dp_15"
+            android:layout_weight="1"
+            app:cardElevation="0dp"
+            app:cardCornerRadius="@dimen/platform_dp_4">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/home_muse_fouth_img" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="@dimen/platform_dp_15"
+                    android:layout_marginTop="13dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/muse_forth_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="压力缓冲"
+                        android:maxLines="1"
+                        android:ellipsize="end"
+                        android:textColor="@color/platform_black"
+                        android:textSize="@dimen/platform_dp_16" />
+
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:layout_height="@dimen/platform_dp_18"
+                        android:layout_marginLeft="@dimen/platform_dp_4"
+                        android:src="@drawable/home_muse_play" />
+                </LinearLayout>
+            </RelativeLayout>
+        </android.support.v7.widget.CardView>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/platform_dp_7"
+        android:orientation="horizontal"
+        android:paddingLeft="6.5dp"
+        android:paddingRight="6.5dp"
+        android:layout_marginBottom="16dp">
+
+        <RelativeLayout
+            android:id="@+id/sleeps_first"
+            android:layout_width="0dp"
+            android:layout_height="80dp"
+            android:layout_weight="1">
+
+            <com.ydl.ydlcommon.view.widgets.RoundImageView
+                android:layout_width="72dp"
+                android:layout_height="72dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/home_muse_circle_first"
+                android:layout_centerInParent="true"
+                app:pa_type="pa_circle"></com.ydl.ydlcommon.view.widgets.RoundImageView>
+
+            <TextView
+                android:id="@+id/sleeps_first_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text="篝火"
+                android:textColor="@color/platform_black"
+                android:textSize="@dimen/platform_dp_14"
+                android:textStyle="bold" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/sleeps_second"
+            android:layout_width="0dp"
+            android:layout_height="80dp"
+            android:layout_weight="1">
+
+            <com.ydl.ydlcommon.view.widgets.RoundImageView
+                android:layout_width="72dp"
+                android:layout_height="72dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/home_muse_circle_second"
+                android:layout_centerInParent="true"
+                app:pa_type="pa_circle"></com.ydl.ydlcommon.view.widgets.RoundImageView>
+
+            <TextView
+                android:id="@+id/sleeps_second_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text="溪流"
+                android:textColor="@color/platform_black"
+                android:textSize="@dimen/platform_dp_14"
+                android:textStyle="bold" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/sleeps_third"
+            android:layout_width="0dp"
+            android:layout_height="80dp"
+            android:layout_weight="1">
+
+            <com.ydl.ydlcommon.view.widgets.RoundImageView
+                android:layout_width="72dp"
+                android:layout_height="72dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/home_muse_circle_third"
+                android:layout_centerInParent="true"
+                app:pa_type="pa_circle"></com.ydl.ydlcommon.view.widgets.RoundImageView>
+
+            <TextView
+                android:id="@+id/sleeps_third_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text="风声"
+                android:textColor="@color/platform_black"
+                android:textSize="@dimen/platform_dp_14"
+                android:textStyle="bold" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/sleeps_forth"
+            android:layout_width="0dp"
+            android:layout_height="80dp"
+            android:layout_weight="1">
+
+            <com.ydl.ydlcommon.view.widgets.RoundImageView
+                android:layout_width="72dp"
+                android:layout_height="72dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/home_muse_circle_fouth"
+                android:layout_centerInParent="true"
+                app:pa_type="pa_circle"></com.ydl.ydlcommon.view.widgets.RoundImageView>
+
+            <TextView
+                android:id="@+id/sleeps_forth_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text="落雨"
+                android:textColor="@color/platform_black"
+                android:textSize="@dimen/platform_dp_14"
+                android:textStyle="bold" />
+        </RelativeLayout>
+    </LinearLayout>
+
+
+</merge>
\ No newline at end of file

m-home/src/ydl/res/layout/home_module_pager_banner_view.xml → m-home/src/ydl/res/layout/home_pager_banner_view.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    >
-
-    <com.ydl.ydlcommon.view.banner.Banner
-        android:id="@+id/homeModulePagerBannerViewBanner"
-        android:layout_width="match_parent"
-        android:layout_height="180dp"
-        app:pa_indicator_different_width="14dp"
-        app:pa_indicator_drawable_selected="@drawable/home_module_banner_tip_select"
-        app:pa_indicator_drawable_unselected="@drawable/home_module_banner_tip_unselect"
-        app:pa_indicator_height="5dp"
-        app:pa_indicator_margin="1.25dp"
-        app:pa_is_selected_same_unselected="false"/>
-
-    <LinearLayout
-        android:id="@+id/homeModulePagerBannerViewAddLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="175dp"
-        android:background="@drawable/home_category_bg"
-        android:orientation="vertical"
-        android:paddingTop="20dp">
-
-    </LinearLayout>
-
-</RelativeLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    >
+
+    <com.ydl.ydlcommon.view.banner.Banner
+        android:id="@+id/homeModulePagerBannerViewBanner"
+        android:layout_width="match_parent"
+        android:layout_height="180dp"
+        app:pa_indicator_different_width="14dp"
+        app:pa_indicator_drawable_selected="@drawable/home_banner_tip_select"
+        app:pa_indicator_drawable_unselected="@drawable/home_banner_tip_unselect"
+        app:pa_indicator_height="5dp"
+        app:pa_indicator_margin="1.25dp"
+        app:pa_is_selected_same_unselected="false"/>
+
+    <LinearLayout
+        android:id="@+id/homeModulePagerBannerViewAddLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="175dp"
+        android:background="@drawable/home_home_category_bg"
+        android:orientation="vertical"
+        android:paddingTop="20dp">
+
+    </LinearLayout>
+
+</RelativeLayout>
+

m-home/src/ydl/res/layout/home_module_real_view_left.xml → m-home/src/ydl/res/layout/home_real_view_left.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:background="@drawable/home_module_sale_info_view_bg"
-    android:paddingRight="@dimen/platform_dp_10"
-    android:paddingTop="@dimen/platform_dp_10"
-    android:paddingBottom="@dimen/platform_dp_10"
-    android:paddingLeft="@dimen/platform_dp_14"
-    android:layout_marginLeft="15dp"
-    android:layout_marginRight="15dp"
-    android:layout_marginTop="13dp"
-    android:layout_marginBottom="15dp">
-
-    <ImageView
-        android:layout_width="13dp"
-        android:layout_height="15dp"
-        android:layout_gravity="center_vertical"
-        android:scaleType="centerCrop"
-        android:src="@drawable/home_module_category_bottom_real_img"/>
-
-    <FrameLayout
-        android:id="@+id/homeModuleRealViewLeftFrameLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="@drawable/home_sale_info_view_bg"
+    android:paddingRight="@dimen/platform_dp_10"
+    android:paddingTop="@dimen/platform_dp_10"
+    android:paddingBottom="@dimen/platform_dp_10"
+    android:paddingLeft="@dimen/platform_dp_14"
+    android:layout_marginLeft="15dp"
+    android:layout_marginRight="15dp"
+    android:layout_marginTop="13dp"
+    android:layout_marginBottom="15dp">
+
+    <ImageView
+        android:layout_width="13dp"
+        android:layout_height="15dp"
+        android:layout_gravity="center_vertical"
+        android:scaleType="centerCrop"
+        android:src="@drawable/home_category_bottom_real_img"/>
+
+    <FrameLayout
+        android:id="@+id/homeModuleRealViewLeftFrameLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingTop="@dimen/platform_dp_8"
-        android:paddingBottom="@dimen/platform_dp_8"
-        >
-
-
-        <android.support.v7.widget.CardView
-            android:layout_width="70dp"
-            android:layout_height="50dp"
-            app:cardCornerRadius="@dimen/platform_dp_6"
-            app:cardElevation="0dp">
-
-            <ImageView
-                android:id="@+id/iv_test_item"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/home_module_image_default_back"
-                android:scaleType="centerCrop"/>
-        </android.support.v7.widget.CardView>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="12dp"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/tv_test_item_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textColor="@color/platform_color_242424"
-                android:textSize="@dimen/platform_dp_16"
-                android:textStyle="bold"
-                tools:text="2018倒计时，这一年你过2018倒计时，这一年你过的…"/>
-
-            <LinearLayout
-                android:id="@+id/homeModuleIntelligentTopViewDescLayout"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/platform_dp_18"
-                android:layout_marginTop="8dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingRight="@dimen/platform_dp_10">
-
-                <TextView
-                    android:id="@+id/tv_test_item_hit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/platform_color_444444"
-                    android:textSize="@dimen/platform_dp_12"
-                    android:textStyle="bold"
-                    tools:text="999"
-                    />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="人气"
-                    android:textColor="@color/platform_color_666666"
-                    android:textSize="@dimen/platform_dp_12"
-                    />
-
-                <TextView
-                    android:id="@+id/tv_tested_count"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/platform_dp_12"
-                    android:textColor="@color/platform_color_444444"
-                    android:textSize="@dimen/platform_dp_12"
-                    android:textStyle="bold"
-                    tools:text="2486"
-                    />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="人已测"
-                    android:textColor="@color/platform_color_666666"
-                    android:textSize="@dimen/platform_dp_12"
-                    />
-            </LinearLayout>
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="62dp"
-            android:layout_height="@dimen/platform_dp_24"
-            android:background="@drawable/home_module_test_item_go_bg"
-            android:gravity="center"
-            android:text="去测试"
-            android:textSize="12dp"
-            android:textColor="@color/platform_color_222222"
-            android:textStyle="bold"/>
-    </LinearLayout>
-
-    <View
-        android:visibility="gone"
-        android:layout_marginBottom="@dimen/platform_dp_12"
-        android:id="@+id/view_test_line"
-        style="@style/viewline"
-        android:layout_marginLeft="82dp"
-        android:background="@color/platform_color_EBEBEB"/>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingTop="@dimen/platform_dp_8"
+        android:paddingBottom="@dimen/platform_dp_8"
+        >
+
+
+        <android.support.v7.widget.CardView
+            android:layout_width="70dp"
+            android:layout_height="50dp"
+            app:cardCornerRadius="@dimen/platform_dp_6"
+            app:cardElevation="0dp">
+
+            <ImageView
+                android:id="@+id/iv_test_item"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/home_image_default_back"
+                android:scaleType="centerCrop"/>
+        </android.support.v7.widget.CardView>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="12dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_test_item_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="@color/platform_color_242424"
+                android:textSize="@dimen/platform_dp_16"
+                android:textStyle="bold"
+                tools:text="2018倒计时，这一年你过2018倒计时，这一年你过的…"/>
+
+            <LinearLayout
+                android:id="@+id/homeModuleIntelligentTopViewDescLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/platform_dp_18"
+                android:layout_marginTop="8dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingRight="@dimen/platform_dp_10">
+
+                <TextView
+                    android:id="@+id/tv_test_item_hit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/platform_color_444444"
+                    android:textSize="@dimen/platform_dp_12"
+                    android:textStyle="bold"
+                    tools:text="999"
+                    />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="人气"
+                    android:textColor="@color/platform_color_666666"
+                    android:textSize="@dimen/platform_dp_12"
+                    />
+
+                <TextView
+                    android:id="@+id/tv_tested_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/platform_dp_12"
+                    android:textColor="@color/platform_color_444444"
+                    android:textSize="@dimen/platform_dp_12"
+                    android:textStyle="bold"
+                    tools:text="2486"
+                    />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="人已测"
+                    android:textColor="@color/platform_color_666666"
+                    android:textSize="@dimen/platform_dp_12"
+                    />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="62dp"
+            android:layout_height="@dimen/platform_dp_24"
+            android:background="@drawable/home_test_item_go_bg"
+            android:gravity="center"
+            android:text="去测试"
+            android:textSize="12dp"
+            android:textColor="@color/platform_color_222222"
+            android:textStyle="bold"/>
+    </LinearLayout>
+
+    <View
+        android:visibility="gone"
+        android:layout_marginBottom="@dimen/platform_dp_12"
+        android:id="@+id/view_test_line"
+        style="@style/viewline"
+        android:layout_marginLeft="82dp"
+        android:background="@color/platform_color_EBEBEB"/>
+
+</LinearLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/homeModuleIntelligentTopViewImageCardView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:cardCornerRadius="@dimen/platform_dp_7"
-        app:cardElevation="0dp">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:id="@+id/homeModuleIntelligentTopViewImage"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/home_module_image_default_back"
-                android:scaleType="centerCrop"/>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="45"/>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="55"
-                    android:background="@drawable/home_module_intelligent_gradient_back"/>
-            </LinearLayout>
-
-        </RelativeLayout>
-    </android.support.v7.widget.CardView>
-
-
-    <TextView
-        android:id="@+id/homeModuleIntelligentTopViewTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginLeft="@dimen/platform_dp_14"
-        android:layout_marginRight="@dimen/platform_dp_115"
-        android:layout_marginBottom="67dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="@color/platform_color_FFFFFF"
-        android:textSize="@dimen/platform_dp_24"
-        android:textStyle="bold"
-        tools:text="先结婚还是先买先结婚还是先买房"
-        />
-
-    <LinearLayout
-        android:id="@+id/homeModuleIntelligentTopViewDescLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/platform_dp_18"
-        android:layout_alignLeft="@+id/homeModuleIntelligentTopViewTitle"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="43dp"
-        android:background="@drawable/home_module_test_top_view_layout_back"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="@dimen/platform_dp_10"
-        android:paddingRight="@dimen/platform_dp_10">
-
-        <TextView
-            android:id="@+id/homeModuleIntelligentTopViewAuthor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/platform_color_444444"
-            android:textSize="@dimen/platform_dp_12"
-            android:textStyle="bold"
-            tools:text="999"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="人气"
-            android:textColor="@color/platform_color_666666"
-            android:textSize="@dimen/platform_dp_12"
-            />
-
-        <TextView
-            android:id="@+id/homeModuleIntelligentTopViewHits"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/platform_dp_12"
-            android:textColor="@color/platform_color_444444"
-            android:textSize="@dimen/platform_dp_12"
-            android:textStyle="bold"
-            tools:text="2486"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="已测"
-            android:textColor="@color/platform_color_666666"
-            android:textSize="@dimen/platform_dp_12"
-            />
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="@dimen/platform_dp_64"
-        android:layout_height="@dimen/platform_dp_20"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/home_module_intelligent_top_view_recommend_back">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="每日一测"
-            android:textColor="@color/platform_color_242424"
-            android:textSize="@dimen/platform_dp_12"
-            android:textStyle="bold"/>
-    </RelativeLayout>
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/homeModuleIntelligentTopViewImageCardView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:cardCornerRadius="@dimen/platform_dp_7"
+        app:cardElevation="0dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/homeModuleIntelligentTopViewImage"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/home_image_default_back"
+                android:scaleType="centerCrop"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="45"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="55"
+                    android:background="@drawable/home_intelligent_gradient_back"/>
+            </LinearLayout>
+
+        </RelativeLayout>
+    </android.support.v7.widget.CardView>
+
+
+    <TextView
+        android:id="@+id/homeModuleIntelligentTopViewTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="@dimen/platform_dp_14"
+        android:layout_marginRight="@dimen/platform_dp_115"
+        android:layout_marginBottom="67dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@color/platform_color_FFFFFF"
+        android:textSize="@dimen/platform_dp_24"
+        android:textStyle="bold"
+        tools:text="先结婚还是先买先结婚还是先买房"
+        />
+
+    <LinearLayout
+        android:id="@+id/homeModuleIntelligentTopViewDescLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/platform_dp_18"
+        android:layout_alignLeft="@+id/homeModuleIntelligentTopViewTitle"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="43dp"
+        android:background="@drawable/home_test_top_view_layout_back"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/platform_dp_10"
+        android:paddingRight="@dimen/platform_dp_10">
+
+        <TextView
+            android:id="@+id/homeModuleIntelligentTopViewAuthor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/platform_color_444444"
+            android:textSize="@dimen/platform_dp_12"
+            android:textStyle="bold"
+            tools:text="999"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="人气"
+            android:textColor="@color/platform_color_666666"
+            android:textSize="@dimen/platform_dp_12"
+            />
+
+        <TextView
+            android:id="@+id/homeModuleIntelligentTopViewHits"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/platform_dp_12"
+            android:textColor="@color/platform_color_444444"
+            android:textSize="@dimen/platform_dp_12"
+            android:textStyle="bold"
+            tools:text="2486"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="已测"
+            android:textColor="@color/platform_color_666666"
+            android:textSize="@dimen/platform_dp_12"
+            />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="@dimen/platform_dp_64"
+        android:layout_height="@dimen/platform_dp_20"
+        android:layout_alignParentRight="true"
+        android:background="@drawable/home_intelligent_top_view_recommend_back">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="每日一测"
+            android:textColor="@color/platform_color_242424"
+            android:textSize="@dimen/platform_dp_12"
+            android:textStyle="bold"/>
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file

m-home/src/ydl/res/values/colors.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="home_module_category_view_test_line">#F0F0F0</color>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="home_category_view_test_line">#F0F0F0</color>
+</resources>
\ No newline at end of file

m-home/src/ydl/res/values/dimens.xml

-<?xml version="1.0" encoding="UTF-8" ?>
-<resources>
-    <!--分割线粗细-->
-    <dimen name="home_title_bar_height">54dp</dimen>
-</resources>
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <!--分割线粗细-->
+    <dimen name="home_home_title_bar_height">54dp</dimen>
+</resources>

m-home/src/ydl/res/values/strings.xml

-<resources>
-    <string name="app_name">home-module</string>
-    <string name="home_module_real_appoint">预约了</string>
-</resources>
+<resources>
+    <string name="home_app_name">home-module</string>
+    <string name="home_real_appoint">预约了</string>
+</resources>