backup

config.gradle

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = true
+    dev_mode = false
 
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
@@ -9,8 +9,8 @@ ext {
             "m-consultant"    : "0.0.59.20",
             "m-fm"            : "0.0.30.00",
             "m-user"          : "0.0.60.20",
-            "m-home"          : "0.0.22.8",
-            "m-im"            : "0.0.18.20",
+            "m-home"          : "0.0.22.13",
+            "m-im"            : "0.0.18.10",
             "m-dynamic"       : "0.0.7.70",
             "m-article"       : "0.0.0.6",
 
@@ -33,7 +33,7 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.32",
+            "ydl-platform"    : "0.0.39.34",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.32",
@@ -114,7 +114,7 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.29",
+            "ydl-platform"    : "0.0.39.34",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.31",

m-home/src/main/java/com/yidianling/home/http/HomeBaseHttp.kt

@@ -4,6 +4,7 @@ import com.ydl.ydlcommon.data.http.BaseAPIResponse
 import com.ydl.ydlcommon.data.http.BaseResponse
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.modular.ModularServiceManager
+import com.ydl.ydlcommon.router.YdlCommonOut
 import com.ydl.ydlnet.YDLHttpUtils
 import com.yidianling.home.model.bean.*
 import com.yidianling.user.api.service.IUserService
@@ -76,7 +77,8 @@ class HomeBaseHttp {
     }
 
     //首页文章请求
-    fun getArticleData(perPageRows: String = "4"): Observable<BaseAPIResponse<HomeArticleBean>> {
+    fun getArticleData(): Observable<BaseAPIResponse<HomeArticleBean>> {
+        articleListSize = if (YdlCommonOut.getApp().packageName == "com.cxzapp.xinlizixun") "6" else "4"
         return getHomePagerApi().getArticleData(perPageRows = articleListSize)
     }
 
@@ -84,6 +86,7 @@ class HomeBaseHttp {
     fun getConsultData(goodType: String): Observable<BaseAPIResponse<HomeConsultBean>> {
         val loginBean = ModularServiceManager.provide(IUserService::class.java).getUserInfo()
         var userId = loginBean?.uid ?: ""
+        consultListSize = if (YdlCommonOut.getApp().packageName == "com.cxzapp.xinlizixun") "4" else "3"
         return getHomePagerApi().getConsultData(category = goodType, uid = userId,limit = consultListSize)
     }
 

m-home/src/main/java/com/yidianling/home/http/HomeBasePagerApi.kt

@@ -35,7 +35,7 @@ interface HomeBasePagerApi {
     @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
     fun getConsultData(
         @Query("categories") category: String,
-        @Query("limit") limit: String = if (YdlCommonOut.getApp().packageName == "com.cxzapp.xinlizixun") "4" else "3",
+        @Query("limit") limit: String = "3",
         @Query("page") page: String = "1",
         @Query("uid") uid: String,
         @Query("searchWord") searchWord: String = "",

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

@@ -168,7 +168,7 @@ class HomeAssuageGriefItemView(
                 homeModuleAssuageGriefViewHotViewVip.visibility = View.GONE
             }
 
-            homeModuleAssuageGriefViewHotViewCommentContent.text = commentBean.name?:""
+            homeModuleAssuageGriefViewHotViewCommentContent.text = commentBean.content?:""
 
         } else {
             homeModuleAssuageGriefViewComment.visibility = View.GONE

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

@@ -79,7 +79,7 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent:
             tv_consult_num.visibility = View.GONE
         } else {
             tv_consult_num.visibility = View.VISIBLE
-            tv_consult_num.text = "${bodyBean.zixunOrderNum}次咨询"
+            tv_consult_num.text = "咨询次数${bodyBean.zixunOrderNum}"
         }
     }
 

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

@@ -32,7 +32,13 @@ class HomeTestTopItemView(private val mContext: Context, private var homeEvent:
     fun updateData(bean: HomeTestItemBean) {
 
         homeModuleTestTopViewTitle.text = bean.name
-        homeModuleTestTopViewHits.text = bean.testNum.toString() + "已测"
+        var numStr = ""
+        if (bean.testNum >= 10000) {
+            numStr = String.format("%.1f", (bean.testNum / 10000.0)) + "万"
+        } else {
+            numStr = bean.testNum.toString()
+        }
+        homeModuleTestTopViewHits.text = numStr + "人已测"
 
         this.setOnClickListener {
             homeEvent?.testItemClick(bean.recommendLinkUrl)

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

@@ -54,8 +54,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="@dimen/platform_dp_12"
-        android:layout_marginTop="@dimen/platform_dp_16"
         android:visibility="gone"
+        android:layout_marginTop="@dimen/platform_dp_16"
         android:layout_marginLeft="@dimen/platform_dp_16"
         android:layout_marginRight="@dimen/platform_dp_16"
         android:background="@drawable/home_assuage_grief_item_view_tab_comment_back">
@@ -110,9 +110,10 @@
             android:layout_height="wrap_content"
             android:lineSpacingExtra="@dimen/platform_dp_4"
             tools:text="人生的旅途中，我们总是在不断的相遇和告别中前行。生活总会让我们经历着或多或少我们总是在不断的相遇和告别中前行我们总是在不断的相遇和告别中前行"
-            android:textSize="@dimen/platform_dp_13"
+            android:textSize="@dimen/platform_dp_15"
             android:textColor="@color/platform_color_666666"
             android:maxLines="2"
+            android:lineHeight="17.5dp"
             android:ellipsize="end"
             android:layout_marginTop="@dimen/platform_dp_6"
             android:layout_below="@+id/homeModuleAssuageGriefViewHotViewHeaderCard"

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

@@ -31,6 +31,7 @@
         android:textSize="@dimen/platform_dp_15"
         android:textColor="@color/platform_color_242424"
         android:textStyle="bold"
+        android:lineHeight="17dp"
         android:maxLines="2"
         android:ellipsize="end"
         android:layout_marginTop="12dp"