组件发布、补充 Home 文本自定义逻辑

config.gradle

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = true
+    dev_mode = false
 
+    ydlPublishVersion = [
+            // -------------- 业务模块 --------------
+            //第三步 若干
+            "m-confide"       : "0.0.48.23",
+            "m-consultant"    : "0.0.59.10",
+            "m-fm"            : "0.0.29.9",
+            "m-user"          : "0.0.60.4",
+            "m-home"          : "0.0.22.3",
+            "m-im"            : "0.0.18.3",
+            "m-dynamic"       : "0.0.7.7",
+
+            "m-muse"          : "0.0.28.12",
+            "m-tests"         : "0.0.24.4",
+            "m-course"        : "0.0.42.3",
+
+            //-------------- 业务模块 API 层 --------------
+            "m-audioim-api"   : "0.0.6",
+            "m-confide-api"   : "0.0.2.1",
+            "m-consultant-api": "0.0.5.2",
+            "m-course-api"    : "0.0.3.6",
+            "m-fm-api"        : "0.0.3",
+            "m-muse-api"      : "0.0.1",
+            "m-tests-api"     : "0.0.2",
+            "m-user-api"      : "0.0.10.15",
+            "m-home-api"      : "0.0.4.1",
+            "m-im-api"        : "0.0.12.19",
+            "m-dynamic-api"   : "0.0.3.7",
+            //-------------- 功能组件 --------------
+
+            //第一步
+            "ydl-platform"    : "0.0.39.26",
+
+            //第二步 若干
+            "ydl-webview"     : "0.0.38.31",
+            "ydl-media"       : "0.0.21.6",
+            "ydl-pay"         : "0.0.18.9",
+            "m-audioim"       : "0.0.49.2",
+            "ydl-flutter-base": "0.0.14.14",
+
+            //以下 几乎不会动
+            "router"          : "0.0.1",
+            "ydl-net"         : "0.0.3.1",
+            "ydl-utils"       : "0.0.3.1",
+    ]
     ydl_app = [
             appName      : "心理咨询壹点灵",
             applicationId: "com.cxzapp.yidianling",
@@ -39,51 +83,7 @@ ext {
     ]
 
 
-    ydlPublishVersion = [
-            // -------------- 业务模块 --------------
-            //第三步 若干
-            "m-confide"       : "0.0.48.22",
-            "m-consultant"    : "0.0.59.8",
-            "m-fm"            : "0.0.29.3",
-            "m-user"          : "0.0.60.3",
-            "m-home"          : "0.0.22.2",
-            "m-im"            : "0.0.18.1",
-            "m-dynamic"       : "0.0.7.6",
-
-            "m-muse"          : "0.0.28.11",
-            "m-tests"         : "0.0.24.3",
-            "m-course"        : "0.0.42.2",
-
-            //-------------- 业务模块 API 层 --------------
-            "m-audioim-api"   : "0.0.6",
-            "m-confide-api"   : "0.0.2.1",
-            "m-consultant-api": "0.0.5.2",
-            "m-course-api"    : "0.0.3.6",
-            "m-fm-api"        : "0.0.3",
-            "m-muse-api"      : "0.0.1",
-            "m-tests-api"     : "0.0.2",
-            "m-user-api"      : "0.0.10.15",
-            "m-home-api"      : "0.0.4.1",
-            "m-im-api"        : "0.0.12.19",
-            "m-dynamic-api"   : "0.0.3.7",
-            //-------------- 功能组件 --------------
-
-            //第一步
-            "ydl-platform"    : "0.0.39.16",
-            //第二步 若干
-
-            "ydl-webview"     : "0.0.38.29",
-            "ydl-media"       : "0.0.21.4",
-            "ydl-pay"         : "0.0.18.7",
-            "m-audioim"       : "0.0.49.0",
-            "ydl-flutter-base": "0.0.14.12",
 
-            //以下 几乎不会动
-            "router"          : "0.0.1",
-            "ydl-net"         : "0.0.3.1",
-            "ydl-utils"       : "0.0.3.1",
-    ]
-    
 
     ydlCompileVersion = [
             // -------------- 业务模块 --------------
@@ -115,14 +115,14 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.24",
-            //第二步 若干
+            "ydl-platform"    : "0.0.39.26",
 
-            "ydl-webview"     : "0.0.38.29",
-            "ydl-media"       : "0.0.21.4",
-            "ydl-pay"         : "0.0.18.7",
-            "m-audioim"       : "0.0.49.0",
-            "ydl-flutter-base": "0.0.14.7",
+            //第二步 若干
+            "ydl-webview"     : "0.0.38.31",
+            "ydl-media"       : "0.0.21.6",
+            "ydl-pay"         : "0.0.18.9",
+            "m-audioim"       : "0.0.49.2",
+            "ydl-flutter-base": "0.0.14.14",
 
             //以下 几乎不会动
             "router"          : "0.0.1",
@@ -270,7 +270,7 @@ ext {
 
             //flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
             "ydl-flutter-base"             : "com.ydl:ydl-flutter-base:${ydlCompileVersion["ydl-flutter-base"]}", //组件化项目中的flutter base模块
-            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.18.9@aar", //flutter aar
+            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.18.6@aar", //flutter aar
             "ydl-flutter-sp"               : "com.ydl:ydl-flutter-sp:0.0.2@aar", //flutter 缓存 aar
 
             //基础组件 <<--- 先发这个，发完改这里的版本号

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt

@@ -78,11 +78,15 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
         initData()
 
         val ffrom = PlatformDataManager.getRam().getChannelName()
-        if (!TextUtils.isEmpty(ffrom) && ffrom.startsWith("ATK_7") && ffrom.endsWith("huawei")) {
+        if (!TextUtils.isEmpty(ffrom) &&
+            (ffrom.startsWith("ATK_7") && ffrom.endsWith("huawei"))||
+            (ffrom.startsWith("ATK_android_yyjlcs"))
+        ) {
             rl_hot_fix_for_huawei.visibility = View.GONE
         } else {
             rl_hot_fix_for_huawei.visibility = View.VISIBLE
         }
+
     }
 
     override fun initDataAndEventLazy() {

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

@@ -103,6 +103,8 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
     }
 
     private fun initView() {
+
+
         home_swipe_refresh_layout.setOnRefreshListener(this)
         home_swipe_refresh_layout.setColorSchemeColors(
             ContextCompat.getColor(

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

@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import com.yidianling.home.R
+import com.yidianling.home.constract.HomeViewConfig
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeArticleBean
 import kotlinx.android.synthetic.ydl.home_article_view.view.*
@@ -30,7 +31,7 @@ class HomeArticleView(private val mContext: Context, private var homeEvent: IHom
         val params = RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
         View.inflate(mContext, R.layout.home_article_view, this)
-        homeModuleArticleViewHomeCommonTitleView.setTitle("文章·阅读")
+        homeModuleArticleViewHomeCommonTitleView.setTitle(HomeViewConfig.getOrder().articleTitle)
         homeModuleArticleViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.articleMoreClick()
         }

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

@@ -5,6 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import com.yidianling.home.R
+import com.yidianling.home.constract.HomeViewConfig
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeAskBean
 import kotlinx.android.synthetic.ydl.home_assuage_grief_view.view.*
@@ -29,7 +30,7 @@ class HomeAssuageGriefView(private val mContext: Context, private var homeEvent:
         val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
         View.inflate(mContext, R.layout.home_assuage_grief_view, this)
-        homeModuleAssuageGriefViewHomeCommonTitleView.setTitle("解忧·问答")
+        homeModuleAssuageGriefViewHomeCommonTitleView.setTitle(HomeViewConfig.getOrder().dynamicTitle)
         homeModuleAssuageGriefViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.askMoreClick()
         }

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

@@ -10,11 +10,12 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
+import com.yidianling.common.tools.LogUtil
 import com.yidianling.home.R
+import com.yidianling.home.constract.HomeViewConfig
 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_confide_view.view.*
 
 /**
@@ -44,7 +45,7 @@ class HomeConfideView(private val mContext: Context, private var homeEvent: IHom
         layoutParams = params
         orientation = VERTICAL
         View.inflate(mContext, R.layout.home_confide_view, this)
-        homeModuleConfideViewHomeCommonTitleView.setTitle("倾诉·排解")
+        homeModuleConfideViewHomeCommonTitleView.setTitle(HomeViewConfig.getOrder().confideTitle)
         homeModuleConfideViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.confideMoreClick()
         }

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

@@ -12,6 +12,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import com.yidianling.common.tools.LogUtil
 import com.yidianling.home.R
+import com.yidianling.home.constract.HomeViewConfig
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeConsultBean
 import com.yidianling.home.model.bean.HomeHeaderBean
@@ -49,7 +50,7 @@ class HomeConsultView(private val mContext: Context, private var homeEvent: IHom
         layoutParams = params
         orientation = VERTICAL
         View.inflate(mContext, R.layout.home_confide_view, this)
-        homeModuleConfideViewHomeCommonTitleView.setTitle("咨询·理解")
+        homeModuleConfideViewHomeCommonTitleView.setTitle(HomeViewConfig.getOrder().consultTitle)
         homeModuleConfideViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.consultMoreClick()
         }

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

@@ -5,6 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import com.yidianling.home.R
+import com.yidianling.home.constract.HomeViewConfig
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeCourseBean
 import kotlinx.android.synthetic.ydl.home_course_view.view.*
@@ -29,7 +30,7 @@ class HomeCourseView(private val mContext: Context, private var homeEvent: IHome
         val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
         View.inflate(mContext, R.layout.home_course_view, this)
-        homeModuleCourseViewHomeCommonTitleView.setTitle("学习·成长")
+        homeModuleCourseViewHomeCommonTitleView.setTitle(HomeViewConfig.getOrder().courseTitle)
         homeModuleCourseViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.courseMreClick()
         }

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

@@ -5,6 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import com.yidianling.home.R
+import com.yidianling.home.constract.HomeViewConfig
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeFMBean
 import kotlinx.android.synthetic.ydl.home_intelligent_view.view.*
@@ -29,7 +30,7 @@ class HomeIntelligentView(private val mContext: Context, private var homeEvent:
         val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
         View.inflate(mContext, R.layout.home_intelligent_view, this)
-        homeModuleIntelligentViewHomeCommonTitleView.setTitle("心灵·电台")
+        homeModuleIntelligentViewHomeCommonTitleView.setTitle(HomeViewConfig.getOrder().fmTitle)
         homeModuleIntelligentViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.fmMoreClick()
         }

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

@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import com.google.gson.Gson
 import com.yidianling.home.R
+import com.yidianling.home.constract.HomeViewConfig
 import com.yidianling.home.event.IHomeEvent
 import com.yidianling.home.model.bean.MuseModuleBean
 import kotlinx.android.synthetic.ydl.home_muse_view.view.*
@@ -37,7 +38,7 @@ class HomeMuseView(private val mContext: Context, private var homeEvent: IHomeEv
         )
         layoutParams = params
         View.inflate(mContext, R.layout.home_muse_view, this)
-        homeModuleMuseViewHomeCommonTitleView.setTitle("助眠·冥想")
+        homeModuleMuseViewHomeCommonTitleView.setTitle(HomeViewConfig.getOrder().museTitle)
     }
 
     fun initData(bean: MuseModuleBean?) {

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

@@ -5,6 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import com.yidianling.home.R
+import com.yidianling.home.constract.HomeViewConfig
 import com.yidianling.home.event.IHomeBaseEvent
 import com.yidianling.home.model.bean.HomeTestItemBean
 import kotlinx.android.synthetic.ydl.home_test_view.view.*
@@ -29,7 +30,7 @@ class HomeTestView(private val mContext: Context, private var homeEvent: IHomeBa
         val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
         View.inflate(mContext, R.layout.home_test_view, this)
-        homeModuleIntelligentViewHomeCommonTitleView.setTitle("测试·分析")
+        homeModuleIntelligentViewHomeCommonTitleView.setTitle(HomeViewConfig.getOrder().testsTitle)
         homeModuleIntelligentViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.testMoreClick()
         }