Merge remote-tracking branch 'origin/release' into release

config.gradle

@@ -13,7 +13,7 @@ ext {
             "m-im"            : "0.0.21.67",
             "m-dynamic"       : "0.0.7.80",
             "m-article"       : "0.0.0.10",
-            "m-muse"          : "0.0.28.85",
+            "m-muse"          : "0.0.28.87",
             "m-tests"         : "0.0.24.24",
             "m-course"        : "0.0.43.39",
             //-------------- 功能组件 --------------
@@ -23,7 +23,7 @@ ext {
             "ydl-platform"    : "0.0.41.51",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.39.01",
+            "ydl-webview"     : "0.0.39.03",
             "ydl-media"       : "0.0.21.52",
             "ydl-pay"         : "0.0.18.21",
             "m-audioim"       : "0.0.49.30.23",
@@ -96,7 +96,7 @@ ext {
             "m-im"            : "0.0.21.67",
             "m-dynamic"       : "0.0.7.80",
             "m-article"       : "0.0.0.10",
-            "m-muse"          : "0.0.28.85",
+            "m-muse"          : "0.0.28.87",
             "m-tests"         : "0.0.24.24",
             "m-course"        : "0.0.43.39",
             //-------------- 功能组件 --------------
@@ -108,7 +108,7 @@ ext {
 
 
             //第二步 若干
-            "ydl-webview"     : "0.0.39.01",
+            "ydl-webview"     : "0.0.39.03",
             "ydl-media"       : "0.0.21.52",
             "ydl-pay"         : "0.0.18.21",
             "m-audioim"       : "0.0.49.30.23",

m-muse/src/main/java/com/yidianling/muse/widget/ShareMeditationDialog.kt

@@ -11,6 +11,7 @@ import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.fragment.app.DialogFragment
 import com.bumptech.glide.Glide
 import com.umeng.socialize.bean.SHARE_MEDIA
@@ -31,6 +32,8 @@ class ShareMeditationDialog : DialogFragment() {
     private var llQQZone: LinearLayout? = null
     private var llQQFriend: LinearLayout? = null
 
+    private var cslLayout: ConstraintLayout?=null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, R.style.share_meditation_dialog)
@@ -50,14 +53,12 @@ class ShareMeditationDialog : DialogFragment() {
         savedInstanceState: Bundle?
     ): View? {
         val view = inflater.inflate(R.layout.layout_share_meditation_dialog, container)
-        dialog?.setCanceledOnTouchOutside(true)
         initView(view)
         return view
     }
 
     private fun initView(view: View?) {
 
-
         val shareImageUrl = arguments?.getString(KEY_SHARE_IMAGE_URL) ?: ""
         val shareTitle = arguments?.getString(KEY_SHARE_TITLE) ?: ""
         val shareContent = arguments?.getString(KEY_SHARE_CONTENT) ?: ""
@@ -80,6 +81,11 @@ class ShareMeditationDialog : DialogFragment() {
         llSave = view?.findViewById(R.id.ll_save_picture)
         llQQZone = view?.findViewById(R.id.ll_qq_zone)
         llQQFriend = view?.findViewById(R.id.ll_qq_friend)
+        cslLayout = view?.findViewById(R.id.csl_root_layout)
+
+        cslLayout?.setOnClickListener {
+            dismiss()
+        }
 
         llWeChat?.setOnClickListener {
             ShareUtils.shareSmailWeixin(

ydl-webview/src/main/java/com/ydl/view/ShareMeditationDialog.kt

@@ -40,6 +40,8 @@ class ShareMeditationDialog : DialogFragment() {
     private var tvQQFriend: TextView? = null
     private var tvCancel: TextView? = null
 
+    private var cslLayout:ConstraintLayout?=null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, R.style.share_meditation_dialog)
@@ -59,7 +61,6 @@ class ShareMeditationDialog : DialogFragment() {
         savedInstanceState: Bundle?
     ): View? {
         val view = inflater.inflate(R.layout.layout_share_meditation_dialog, container)
-        dialog?.setCanceledOnTouchOutside(true)
         initView(view)
         return view
     }
@@ -75,6 +76,7 @@ class ShareMeditationDialog : DialogFragment() {
         val miniPath = arguments?.getString(KEY_SHARE_MINI_PATH)
 
         llRootLayout = view?.findViewById(R.id.csl_share_layout)
+        cslLayout = view?.findViewById(R.id.csl_root_layout)
 
         llWeChat = view?.findViewById(R.id.ll_wechat_friend)
         llCircleOfFriends = view?.findViewById(R.id.ll_wechat_circle_of_friends)
@@ -95,6 +97,10 @@ class ShareMeditationDialog : DialogFragment() {
 
         updateUI(isDarkMode == true)
 
+        cslLayout?.setOnClickListener {
+            dismiss()
+        }
+
         llWeChat?.setOnClickListener {
             ShareUtils.shareSmailWeixin(
                 activity as Activity,