Merge branch 'feat/lp_4.3.91' into new_dev_4.3.91

# Conflicts:
#	config.gradle

config.gradle

@@ -9,9 +9,7 @@ ext {
             "m-consultant"    : "0.0.60.20",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.04",
-            "m-home"          : "0.0.23.18",
-            "m-im"            : "0.0.21.30",
-            "m-home"          : "0.0.23.35",
+            "m-home"          : "0.0.23.36",
             "m-im"            : "0.0.21.30",
             "m-dynamic"       : "0.0.7.35",
             "m-article"       : "0.0.0.10",
@@ -97,9 +95,7 @@ ext {
             "m-consultant"    : "0.0.60.20",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.04",
-            "m-home"          : "0.0.23.18",
-            "m-im"            : "0.0.21.30",
-            "m-home"          : "0.0.23.35",
+            "m-home"          : "0.0.23.36",
             "m-im"            : "0.0.21.30",
             "m-dynamic"       : "0.0.7.35",
             "m-article"       : "0.0.0.8",

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

@@ -33,8 +33,10 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
     fun setVisibilityFree(boolean: Boolean){
         if (boolean){
             qingsuGif.visibility=View.VISIBLE
+            homeModuleButtonBannerSecondTitle.text = "免费倾诉"
         }else{
             qingsuGif.visibility=View.GONE
+            homeModuleButtonBannerSecondTitle.text = "倾诉热线"
         }
     }
     private fun initView() {

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

@@ -53,7 +53,7 @@
             android:layout_height="wrap_content"
             android:textColor="@color/platform_color_FFFFFF"
             android:textSize="@dimen/platform_dp_12"
-            android:text="抑郁测量"/>
+            android:text="应有尽有"/>
     </RelativeLayout>
 
     <RelativeLayout
@@ -97,7 +97,7 @@
                     android:textStyle="bold"
                     android:textColor="@color/platform_color_FFFFFF"
                     android:textSize="@dimen/platform_dp_16"
-                    android:text="即时倾诉"/>
+                    android:text="倾诉热线"/>
 
                 <TextView
                     android:layout_below="@+id/homeModuleButtonBannerSecondTitle"
@@ -105,7 +105,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/platform_color_FFFFFF"
                     android:textSize="@dimen/platform_dp_12"
-                    android:text="24小时在线"/>
+                    android:text="温暖守护您"/>
             </RelativeLayout>
             <ImageView
                 android:layout_width="wrap_content"