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

config.gradle

@@ -46,13 +46,14 @@ ext {
             "m-consultant"    : "0.0.52.1",
             "m-fm"            : "0.0.24.1",
             "m-user"          : "0.0.42.1",
-            "m-home"          : "0.0.13",
+            "m-home"          : "0.0.15",
             "m-im"            : "0.0.6",
             "m-dynamic"       : "0.0.2.2",
 
-            "m-muse"          : "0.0.22",
-            "m-tests"         : "0.0.17",
-            "m-course"        : "0.0.36",
+            //flutter升级会涉及到以下三个
+            "m-muse"          : "0.0.24",
+            "m-tests"         : "0.0.19",
+            "m-course"        : "0.0.38",
 
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.5",
@@ -76,7 +77,7 @@ ext {
             "ydl-media"       : "0.0.15.1",
             "ydl-pay"         : "0.0.12.1",
             "m-audioim"       : "0.0.41.1",
-            "ydl-flutter-base": "0.0.5.26",
+            "ydl-flutter-base": "0.0.5.28",
 
             //以下 几乎不会动
             "router"          : "0.0.1",
@@ -122,7 +123,7 @@ ext {
             "ydl-media"       : "0.0.15.1",
             "ydl-pay"         : "0.0.12.1",
             "m-audioim"       : "0.0.41.1",
-            "ydl-flutter-base": "0.0.5.26",
+            "ydl-flutter-base": "0.0.5.28",
 
             //以下 几乎不会动
             "router"          : "0.0.1",

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

@@ -54,6 +54,8 @@
             android:id="@+id/homeModuleButtonBannerFourth"
             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"
             android:gravity="center">
@@ -72,7 +74,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/homeModuleButtonBannerFourthTitle"
                 android:layout_marginTop="2dp"
-                android:text="心理体检"
+                android:text="专业权威"
                 android:textColor="@color/platform_color_444444"
                 android:textSize="@dimen/platform_dp_11" />
         </RelativeLayout>
@@ -111,8 +113,6 @@
             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_test_bt_bg">
 
@@ -124,7 +124,8 @@
                 android:paddingLeft="5dp"
                 android:paddingTop="1dp"
                 android:paddingRight="5dp"
-                android:paddingBottom="1dp"/>
+                android:paddingBottom="1dp"
+                android:visibility="gone" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -167,6 +168,5 @@
 
         </RelativeLayout>
 
-
     </LinearLayout>
 </LinearLayout>

ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt

@@ -3,6 +3,7 @@ package com.channel.ydl_flutter_base.plugin
 import android.text.TextUtils
 import com.channel.ydl_flutter_base.base.BaseFlutterFragment
 import com.ydl.burypointlib.BuryPointHelper
+import com.ydl.burypointlib.MD5Util
 import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.data.PlatformDataManager
 import com.ydl.ydlcommon.modular.ModularServiceManager
@@ -86,13 +87,13 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
                         field.isAccessible = true
                         val property = field.get(ownerClass)
                         if (property is Boolean && property) {
-                            BuryPointHelper.showEditDialog(mActivity, clickPath, null)
+                            BuryPointHelper.showEditDialog(mActivity, MD5Util.md5(clickPath), null)
                         }
                     } catch (e: Exception) {
 
                     }
 
-                    YdlBuryPointUtil.sendClick(clickPath)
+                    YdlBuryPointUtil.sendClick(MD5Util.md5(clickPath))
                 }
             }