Commit dd0109d2 by 刘鹏

Merge branch 'fix/lancet/meditation_share_fix' into 'release'

fix share meditation feat

See merge request app_android_lib/YDL-Component!218
parents ba07decb c5c5a16a
...@@ -478,8 +478,7 @@ class PlayMeditationActivity : BaseActivity() { ...@@ -478,8 +478,7 @@ class PlayMeditationActivity : BaseActivity() {
shareContent = mDesc, shareContent = mDesc,
shareUrl = mMediaUrl, shareUrl = mMediaUrl,
shareImageUrl = mMediaCoverUrl, shareImageUrl = mMediaCoverUrl,
miniId = "gh_c154608001f0", miniId = mMinProgramId!!,
// miniId = mMinProgramId!!,
miniPath = mMinProgramPath!! miniPath = mMinProgramPath!!
) )
} }
......
...@@ -49,11 +49,9 @@ class ShareMeditationDialog : DialogFragment() { ...@@ -49,11 +49,9 @@ class ShareMeditationDialog : DialogFragment() {
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View? {
val view = inflater.inflate(R.layout.layout_share_meditation_dialog, container) val view = inflater.inflate(R.layout.layout_share_meditation_dialog, container)
dialog?.setCanceledOnTouchOutside(true)
initView(view) initView(view)
return view return view
} }
......
...@@ -58,11 +58,9 @@ class ShareMeditationDialog : DialogFragment() { ...@@ -58,11 +58,9 @@ class ShareMeditationDialog : DialogFragment() {
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View? {
val view = inflater.inflate(R.layout.layout_share_meditation_dialog, container) val view = inflater.inflate(R.layout.layout_share_meditation_dialog, container)
dialog?.setCanceledOnTouchOutside(true)
initView(view) initView(view)
return view return view
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment