Merge branch 'release' into d/v4.0.51_xlzx

config.gradle

@@ -5,7 +5,7 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.50.16",
+            "m-confide"       : "0.0.50.18",
             "m-consultant"    : "0.0.60.27",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.26",
@@ -94,7 +94,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.50.16",
+            "m-confide"       : "0.0.50.18",
             "m-consultant"    : "0.0.60.27",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.26",

m-confide/src/main/java/com/ydl/confide/intro/IntroAdapter.kt

@@ -91,6 +91,7 @@ internal class IntroAdapter(
             val lastCheck = context.getSharedPreferences("temp_test", Context.MODE_PRIVATE).getLong(keySp, 0)
             val duration = System.currentTimeMillis() - lastCheck
             if (duration < 24 * 60 * 60 * 1000) {
+                hasAgreePlayWithoutWiFi = true
                 return
             }
             val dialog = CommonDialog.create(context)
@@ -114,6 +115,7 @@ internal class IntroAdapter(
                 .setLeftButton_color(R.color.platform_but_text_color_selected)
                 .setRightButton_color(R.color.platform_text_bright_color)
                 .setRightClick("取消") {
+                    hasAgreePlayWithoutWiFi = false
                     for (entry in videoViews.entries) {
                         val value = entry.value
                         if (value.canPause()) {