Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

config.gradle

@@ -45,9 +45,9 @@ ext {
 
             "m-confide"       : "0.0.29",
             "m-consultant"    : "0.0.42",
-            "m-course"        : "0.0.29",
+            "m-course"        : "0.0.30",
             "m-fm"            : "0.0.21",
-            "m-muse"          : "0.0.18",
+            "m-muse"          : "0.0.19",
             "m-tests"         : "0.0.12",
             "m-user"          : "0.0.34",
 
@@ -251,7 +251,7 @@ ext {
             "ydl-utils"                    : "com.ydl:ydl-utils:${ydlCompileVersion["ydl-utils"]}",
 
             //flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
-            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.15@aar",
+            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.16@aar",
 
             //基础组件 <<--- 先发这个，发完改这里的版本号
             "ydl-platform"                 : "com.ydl:ydl-platform:${ydlCompileVersion["ydl-platform"]}@aar",

m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListContainerActivity.kt

@@ -139,7 +139,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
             filter_layout.setTextColor(
                 ContextCompat.getColor(
                     this@CourseListContainerActivity,
-                    R.color.course_color_1DA1F2
+                    R.color.main_theme
                 )
             )
         } else {
@@ -233,7 +233,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
                         classify_layout.setTextColor(
                             ContextCompat.getColor(
                                 this@CourseListContainerActivity,
-                                R.color.course_color_1DA1F2
+                                R.color.main_theme
                             )
                         )
                     } else {
@@ -330,7 +330,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
                     classify_layout.setTextColor(
                         ContextCompat.getColor(
                             this@CourseListContainerActivity,
-                            R.color.course_color_1DA1F2
+                            R.color.main_theme
                         )
                     )
                 } else {
@@ -352,7 +352,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
             classify_layout.setTextColor(
                 ContextCompat.getColor(
                     this@CourseListContainerActivity,
-                    R.color.course_color_1DA1F2
+                    R.color.main_theme
                 )
             )
             classify_layout.setCompoundDrawablesWithIntrinsicBounds(
@@ -399,7 +399,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
                     filter_layout.setTextColor(
                         ContextCompat.getColor(
                             this@CourseListContainerActivity,
-                            R.color.course_color_1DA1F2
+                            R.color.main_theme
                         )
                     )
                 } else {
@@ -421,7 +421,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
             filter_layout.setTextColor(
                 ContextCompat.getColor(
                     this@CourseListContainerActivity,
-                    R.color.course_color_1DA1F2
+                    R.color.main_theme
                 )
             )
             filter_layout.setCompoundDrawablesWithIntrinsicBounds(
@@ -642,7 +642,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
                     classify_layout.setTextColor(
                         ContextCompat.getColor(
                             this@CourseListContainerActivity,
-                            R.color.course_color_1DA1F2
+                            R.color.main_theme
                         )
                     )
                 } else {
@@ -689,7 +689,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
                     filter_layout.setTextColor(
                         ContextCompat.getColor(
                             this@CourseListContainerActivity,
-                            R.color.course_color_1DA1F2
+                            R.color.main_theme
                         )
                     )
                 } else {