Skip to content

Y
YDL-Component-Medical
Commit 44424548 by 范玉宾
Options

Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' 

UI  WalkThrough

See merge request app_android_lib/YDL-Component!76
parents 34fae2a2 3a23de50
Showing with 109 additions and 88 deletions
config.gradle
......@@ -9,7 +9,7 @@ ext {
"m-consultant" : "0.0.60.25",
"m-fm" : "0.0.30.08",
"m-user" : "0.0.62.19",
"m-home" : "0.0.23.71",
"m-home" : "0.0.23.72",
"m-im" : "0.0.21.44",
"m-dynamic" : "0.0.7.73",
"m-article" : "0.0.0.10",
......@@ -94,7 +94,7 @@ ext {
"m-consultant" : "0.0.60.25",
"m-fm" : "0.0.30.08",
"m-user" : "0.0.62.19",
"m-home" : "0.0.23.71",
"m-home" : "0.0.23.72",
"m-im" : "0.0.21.44",
"m-dynamic" : "0.0.7.73",
"m-article" : "0.0.0.8",
......
m-home/src/main/java/com/yidianling/home/MeditationTypeAdapter.kt
package com.yidianling.home
//import com.ydl.ydlcommon.router.IYDLRouterConstant.Companion.ROUTER_MUSE_PLAY
import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.TextView
import androidx.cardview.widget.CardView
import androidx.recyclerview.widget.RecyclerView
import com.alibaba.android.arouter.launcher.ARouter
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydl_router.manager.YDLRouterParams
import com.ydl.ydlcommon.modular.ModularServiceManager
//import com.ydl.ydlcommon.router.IYDLRouterConstant.Companion.ROUTER_MUSE_PLAY
import com.ydl.ydlcommon.utils.Utils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.home.constants.HomeBIConstants
......@@ -58,9 +56,11 @@ class MeditationTypeAdapter(
when (holder) {
is MeditationTypeViewHolder -> {
holder.ivType?.let {
Glide.with(context)
.load(data?.get(position)?.coverImageUrl)
.thumbnail(0.1f)
.transition(DrawableTransitionOptions.withCrossFade())
.into(it)
}
......@@ -163,7 +163,7 @@ class MeditationTypeAdapter(
}
inner class MeditationTypeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
val cvLayout: CardView? = itemView.findViewById(R.id.card_view)
val cvLayout: FrameLayout? = itemView.findViewById(R.id.fl_layout)
val ivType: ImageView? = itemView.findViewById(R.id.iv_meditation_type)
val tvName: TextView? = itemView.findViewById(R.id.tv_meditation_type)
}
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeMuseView.kt
......@@ -61,7 +61,6 @@ class HomeMuseView(private val mContext: Context, private var homeEvent: IHomeEv
val moreLink = bean.mditationIndexInfo?.upperFloorMore
homeModuleMuseViewHomeCommonTitleView.setOnClickListener {
// homeEvent?.museMoreClick(Gson().toJson(bean))
if (Utils.isFastClick()) {
//防止连击
......@@ -75,8 +74,7 @@ class HomeMuseView(private val mContext: Context, private var homeEvent: IHomeEv
}
video_view?.setOnClickListener {
// homeEvent?.museMoreClick(Gson().toJson(bean))
fl_layout?.setOnClickListener {
if (Utils.isFastClick()) {
//防止连击
......@@ -124,6 +122,7 @@ class HomeMuseView(private val mContext: Context, private var homeEvent: IHomeEv
meditationTitles.add(it.comment)
}
view_pager.isUserInputEnabled = false
view_pager.adapter = MeditationViewPagerAdapter(mContext, bean)
tab_layout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
......
m-home/src/ydl/res/layout/home_muse_view.xml
......@@ -20,6 +20,7 @@
app:cardElevation="0dp">
<FrameLayout
android:id="@+id/fl_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -65,8 +66,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_marginBottom="20dp"
android:layout_height="170dp"
app:layout_constraintBottom_toBottomOf="parent"
android:orientation="vertical">
......@@ -74,11 +74,16 @@
android:id="@+id/tab_layout"
android:layout_width="200dp"
android:layout_height="40dp"
android:layout_marginBottom="14dp"
app:tabTextColor="#88FFFFFF"
app:tabSelectedTextColor="#FFFFFF"
style="@style/MeditationTabLayoutStyle" />
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginBottom="14dp"
android:background="#66FFFFFF"/>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/view_pager"
android:layout_width="match_parent"
......
m-home/src/ydl/res/layout/layout_meditation_entrance.xml
......@@ -3,13 +3,13 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="10dp"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_meditation_type"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingHorizontal="16dp"
android:clipToPadding="false"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
......
m-home/src/ydl/res/layout/layout_meditation_item.xml
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="6dp">
android:id="@+id/fl_layout"
android:layout_width="105dp"
android:layout_height="102dp"
android:layout_marginBottom="20dp"
android:layout_marginEnd="12dp">
<androidx.cardview.widget.CardView
android:id="@+id/card_view"
android:layout_width="105dp"
android:layout_height="102dp"
android:clipToPadding="false"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:cardCornerRadius="12dp"
app:cardCornerRadius="8dp"
app:cardElevation="0dp">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#88000000">
android:layout_height="match_parent">
<ImageView
android:id="@+id/iv_meditation_type"
android:layout_width="105dp"
android:layout_height="102dp"
android:scaleType="centerCrop"/>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"/>
android:background="#88000000"/>
<TextView
android:id="@+id/tv_meditation_type"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|start"
tools:text="溪流"
......@@ -39,11 +45,11 @@
android:ellipsize="end"
android:textColor="@color/white"
android:textSize="14sp"
android:layout_marginStart="6dp"
android:layout_marginBottom="5dp" />
android:layout_marginHorizontal="6dp"
android:layout_marginVertical="5dp" />
</FrameLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
</FrameLayout>
\ No newline at end of file
m-home/src/ydl/res/layout/layout_meditation_more_type.xml
......@@ -5,8 +5,7 @@
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:background="@color/baby_blue"
android:layout_marginHorizontal="6dp">
tools:background="@color/baby_blue">
<LinearLayout
android:id="@+id/ll_more_type"
......
m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt
......@@ -124,7 +124,7 @@ class PlayMeditationActivity : BaseActivity() {
}
override fun initDataAndEvent() {
StatusBarUtils.setWindowStatusBarColor(this, R.color.platform_main_theme)
StatusBarUtils.setTransparent(this)
}
private fun getData() {
......
m-muse/src/main/java/com/yidianling/muse/service/MeditationWindowService.kt
......@@ -21,6 +21,7 @@ import androidx.appcompat.widget.AppCompatSeekBar
import androidx.core.app.NotificationCompat
import androidx.lifecycle.LifecycleService
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.home.http.MuseHttp
......@@ -110,7 +111,7 @@ class MeditationWindowService : LifecycleService() {
gravity = Gravity.LEFT or Gravity.TOP
x = outMetrics.widthPixels /2 - width / 2
y = outMetrics.heightPixels - height * 2
y = outMetrics.heightPixels - dp2px(70F)
}
floatRootView =
LayoutInflater.from(this).inflate(R.layout.layout_meditation_play_float_view, null)
......
m-muse/src/main/res/drawable/bg_meditation_play_float.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp" />
<solid android:color="#99000000" />
</shape>
\ No newline at end of file
m-muse/src/main/res/drawable/bg_play_meditation_float_view.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="12dp"/>
<corners android:radius="4dp"/>
<solid android:color="#33E0E0E0"/>
</shape>
\ No newline at end of file
m-muse/src/main/res/drawable/icon_meditation_collected.xml
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
android:width="36dp"
android:height="36dp"
android:viewportWidth="36"
android:viewportHeight="36">
<path
android:pathData="M21.408,4C18.4904,4 16.4004,6.6075 15.4998,7.9867C14.5981,6.6075 12.5091,4 9.5915,4C5.4049,4 2,7.7419 2,12.3409C2,14.4914 3.4707,17.5744 5.256,19.1879C7.7255,22.3349 14.6683,28 15.5254,28C16.3976,28 23.1914,22.445 25.7056,19.2256C27.5222,17.5838 29,14.4966 29,12.3409C29,7.7419 25.5945,4 21.408,4"
android:pathData="M24.084,4.5C20.8017,4.5 18.4505,7.4335 17.4372,8.985C16.4228,7.4335 14.0727,4.5 10.7905,4.5C6.0805,4.5 2.25,8.7097 2.25,13.8835C2.25,16.3028 3.9045,19.7712 5.9129,21.5863C8.6912,25.1267 16.5018,31.5 17.466,31.5C18.4473,31.5 26.0903,25.2506 28.9188,21.6288C30.9625,19.7818 32.625,16.3087 32.625,13.8835C32.625,8.7096 28.7938,4.5 24.084,4.5"
android:strokeWidth="1"
android:fillColor="#FF675B"
android:fillType="nonZero"
android:strokeColor="#00000000">
<aapt:attr name="android:fillColor">
<gradient
android:startY="6.5185184"
android:startX="9.634766"
android:endY="22.049383"
android:endX="20.429688"
android:type="linear">
<item android:offset="0" android:color="#FFFFB5A5"/>
<item android:offset="1" android:color="#FFFF7366"/>
</gradient>
</aapt:attr>
</path>
android:strokeColor="#00000000"/>
</vector>
m-muse/src/main/res/drawable/icon_play_meditation_collect.xml
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
android:width="36dp"
android:height="36dp"
android:viewportWidth="36"
android:viewportHeight="36">
<path
android:pathData="M20.566,5C24.187,5 27.313,7.466 28.232,10.92C28.409,11.588 28.5,12.28 28.5,12.983C28.5,14.556 28.168,15.598 27.368,16.977C27.191,17.282 26.857,17.473 26.49,17.481C26.124,17.488 25.781,17.309 25.591,17.012C25.402,16.715 25.394,16.344 25.57,16.04C26.216,14.928 26.448,14.195 26.448,12.983C26.448,12.44 26.378,11.908 26.242,11.395C25.547,8.782 23.219,6.944 20.566,6.944C19.043,6.944 17.594,7.543 16.49,8.631C16.297,8.822 16.03,8.929 15.751,8.929C15.473,8.93 15.206,8.822 15.013,8.632C13.918,7.558 12.435,6.944 10.934,6.944C7.708,6.944 5.052,9.64 5.052,12.983C5.052,14.623 5.539,15.709 6.796,17.544C7.794,19.012 9.532,20.759 11.71,22.602C12.338,23.132 12.968,23.643 13.585,24.124L14.173,24.576L14.635,24.925L15.078,25.251L15.146,25.3C15.323,25.43 15.528,25.496 15.749,25.496C15.972,25.496 15.809,25.482 16.363,25.292C16.918,25.102 17.466,25.426 17.72,25.657C17.965,25.879 17.965,26.529 17.613,26.834C17.26,27.14 16.425,27.441 15.75,27.44C15.133,27.441 14.531,27.263 14.024,26.93L13.831,26.794L13.369,26.455L12.756,25.991C11.935,25.363 11.131,24.717 10.345,24.052C8.04,22.102 6.192,20.246 5.074,18.6C3.619,16.477 3,15.098 3,12.983C3,8.594 6.542,5 10.934,5C12.643,5 14.317,5.57 15.679,6.589L15.748,6.641L15.822,6.584C17.127,5.603 18.7,5.048 20.35,5.003L20.566,5Z"
android:pathData="M23.1364,5.625C27.2107,5.625 30.727,8.3997 31.7605,12.285C31.9603,13.0368 32.0625,13.8148 32.0625,14.6054C32.0625,16.3752 31.6893,17.5476 30.7891,19.0993C30.5904,19.4417 30.214,19.6576 29.8017,19.6657C29.3894,19.6738 29.0039,19.4729 28.7904,19.1386C28.5769,18.8043 28.5677,18.3874 28.7665,18.045C29.4926,16.7939 29.7543,15.9696 29.7543,14.6054C29.7543,13.9954 29.6752,13.3967 29.5222,12.8199C28.74,9.8796 26.1212,7.8123 23.1364,7.8123C21.4231,7.8123 19.7928,8.486 18.551,9.7102C18.3337,9.9242 18.0338,10.0453 17.7203,10.0455C17.4069,10.0458 17.1068,9.9252 16.8891,9.7115C15.6572,8.5022 13.9894,7.8123 12.3011,7.8123C8.6713,7.8123 5.6832,10.8445 5.6832,14.6054C5.6832,16.4508 6.2319,17.6726 7.6458,19.7373C8.7682,21.3884 10.7236,23.3539 13.1743,25.4268C13.8799,26.023 14.5895,26.5979 15.2833,27.1391L15.9441,27.6484L16.4644,28.0403L16.963,28.4071L17.0388,28.4621C17.2386,28.6083 17.4695,28.6833 17.7181,28.6833C17.9687,28.6833 17.7849,28.6676 18.4086,28.454C19.0322,28.2403 19.6488,28.6043 19.9351,28.8639C20.2112,29.1142 20.2112,29.8454 19.8146,30.1888C19.418,30.5322 18.478,30.8711 17.7188,30.87C17.0249,30.8714 16.3472,30.6712 15.7772,30.2963L15.5596,30.1432L15.0406,29.762L14.3501,29.2395C13.4273,28.5336 12.5229,27.8064 11.6377,27.0585C9.0446,24.865 6.9665,22.7764 5.7083,20.9247C4.0714,18.5362 3.375,16.9851 3.375,14.6054C3.375,9.6683 7.3596,5.625 12.3011,5.625C14.2235,5.625 16.1063,6.2668 17.639,7.4123L17.7161,7.4711L17.7999,7.4073C19.2679,6.3037 21.0379,5.6787 22.8937,5.6281L23.1364,5.625Z"
android:strokeWidth="0.6"
android:fillColor="#FFFFFF"
android:strokeColor="#FFFFFF"
android:fillType="nonZero"/>
<path
android:pathData="M25.403,21.32C25.97,21.32 26.436,21.816 26.459,22.445C26.482,23.073 26.055,23.61 25.49,23.662L25.403,23.666L19.357,23.666C18.79,23.666 18.324,23.17 18.301,22.541C18.278,21.913 18.705,21.376 19.27,21.324L19.357,21.32L25.403,21.32L25.403,21.32Z"
android:pathData="M28.5779,23.985C29.2159,23.9853 29.7402,24.5434 29.7665,25.2503C29.7927,25.9571 29.3116,26.5612 28.6758,26.6197L28.5779,26.6243L21.7771,26.6243C21.1391,26.6239 20.6148,26.0658 20.5885,25.359C20.5623,24.6521 21.0434,24.0481 21.6792,23.9895L21.7771,23.985L28.5779,23.985L28.5779,23.985Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M23.546,19.216L23.55,19.303L23.55,25.347C23.549,25.915 23.053,26.381 22.425,26.404C21.797,26.427 21.26,26 21.208,25.435L21.204,25.347L21.204,19.303C21.204,18.719 21.729,18.245 22.377,18.245C22.987,18.245 23.495,18.667 23.546,19.216Z"
android:pathData="M26.4888,21.6176L26.4934,21.7155L26.4934,28.5159C26.4931,29.1539 25.9349,29.6781 25.2281,29.7044C24.5212,29.7307 23.9172,29.2496 23.8586,28.6138L23.8541,28.5159L23.8541,21.7155C23.8541,21.0586 24.4453,20.5254 25.1737,20.5254C25.8604,20.5254 26.4323,21.0004 26.4888,21.6176Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
......
m-muse/src/main/res/drawable/icon_play_meditation_time_off.xml
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
android:width="36dp"
android:height="36dp"
android:viewportWidth="36"
android:viewportHeight="36">
<path
android:pathData="M18.654,1C19.129,1 19.515,1.372 19.515,1.83L19.515,2.662C19.515,3.12 19.129,3.492 18.654,3.492L17.793,3.492L17.793,5.156C17.793,5.177 17.782,5.196 17.78,5.217C24.4,5.875 29.325,11.417 28.983,17.825C28.642,24.234 23.154,29.261 16.5,29.261C9.846,29.261 4.358,24.234 4.017,17.825C3.675,11.417 8.6,5.875 15.22,5.217C15.22,5.196 15.207,5.177 15.207,5.156L15.207,3.494L14.346,3.494C14.118,3.494 13.898,3.407 13.736,3.251C13.575,3.095 13.484,2.884 13.484,2.664L13.484,1.83C13.484,1.372 13.869,1 14.344,1M16.679,8.05C13.218,8.005 9.999,9.755 8.255,12.632C6.511,15.509 6.511,19.067 8.255,21.944C9.999,24.821 13.218,26.572 16.679,26.526C21.93,26.458 26.15,22.342 26.15,17.288C26.15,12.235 21.93,8.119 16.679,8.05ZM16.93,10.973C17.406,10.973 17.791,11.345 17.791,11.803L17.791,16.79L21.24,16.79C21.716,16.79 22.101,17.161 22.101,17.62L22.101,18.452C22.101,18.911 21.716,19.282 21.24,19.284L16.068,19.284C15.839,19.284 15.621,19.197 15.459,19.041C15.298,18.885 15.207,18.674 15.207,18.454L15.207,11.801C15.207,11.343 15.592,10.971 16.068,10.971L16.929,10.971L16.93,10.973Z"
android:pathData="M20.9855,1.125C21.5204,1.125 21.9539,1.5431 21.9539,2.0588L21.9539,2.9946C21.9539,3.5103 21.5204,3.9284 20.9855,3.9284L20.0171,3.9284L20.0171,5.8C20.0171,5.8239 20.0048,5.8457 20.0027,5.8696C27.4495,6.6089 32.9901,12.8444 32.6062,20.0537C32.2224,27.263 26.0486,32.9185 18.5625,32.9185C11.0764,32.9185 4.9027,27.263 4.5188,20.0537C4.1349,12.8444 9.6755,6.6089 17.1223,5.8696C17.1223,5.8457 17.1079,5.8239 17.1079,5.8L17.1079,3.9304L16.1395,3.9304C15.8823,3.9309 15.6354,3.8328 15.4534,3.6576C15.2713,3.4824 15.169,3.2446 15.169,2.9966L15.169,2.0588C15.169,1.5431 15.6026,1.125 16.1374,1.125M18.7637,9.0562C14.87,9.0052 11.2493,10.9749 9.287,14.2115C7.3248,17.448 7.3248,21.4504 9.287,24.687C11.2493,27.9235 14.87,29.8932 18.7637,29.8423C24.6714,29.765 29.4184,25.1346 29.4184,19.4492C29.4184,13.7639 24.6714,9.1334 18.7637,9.0562ZM19.0467,12.3446C19.5815,12.3446 20.0151,12.7627 20.0151,13.2784L20.0151,18.8892L23.8948,18.8892C24.4305,18.8892 24.8632,19.3065 24.8632,19.8231L24.8632,20.7589C24.8632,21.2754 24.4305,21.6927 23.8948,21.6947L18.0762,21.6947C17.8194,21.6947 17.5731,21.5963 17.3915,21.4211C17.2099,21.246 17.1079,21.0085 17.1079,20.7608L17.1079,13.2765C17.1079,12.7607 17.5414,12.3426 18.0762,12.3426L19.0446,12.3426L19.0467,12.3446Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
......
m-muse/src/main/res/drawable/icon_pure_music_list.xml
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
android:width="36dp"
android:height="36dp"
android:viewportWidth="36"
android:viewportHeight="36">
<path
android:pathData="M5.4974,9.7329L22.7015,9.7329C22.9762,9.7329 23.1989,9.4787 23.1989,9.1653L23.1989,7.5675C23.1989,7.2551 22.9762,7 22.7015,7L5.4974,7C5.2227,7 5,7.2542 5,7.5675L5,9.1653C5,9.4778 5.2227,9.7329 5.4974,9.7329M5.4979,17.9315L18.8706,17.9315C19.1462,17.9315 19.3685,17.6773 19.3685,17.364L19.3685,15.7662C19.3685,15.4528 19.1462,15.1986 18.8706,15.1986L5.4987,15.1986C5.2232,15.1986 5.0009,15.4528 5.0009,15.7662L5.0009,17.364C5.0009,17.6773 5.2232,17.9315 5.4987,17.9315M14.0771,23.3973L5.5013,23.3973C5.2243,23.3973 5,23.6906 5,24.0531L5,25.4742C5,25.8368 5.2243,26.1301 5.5013,26.1301L14.0771,26.1301C14.3541,26.1301 14.5784,25.8368 14.5784,25.4742L14.5784,24.0531C14.5784,23.6906 14.3541,23.3973 14.0771,23.3973M27.5537,11.2257C25.3607,11.4482 23.6014,13.2989 23.5679,15.6311L23.5672,15.6311L23.5672,19.484C23.0651,19.2341 22.5141,19.1048 21.9559,19.1061C19.9407,19.1061 18.3294,20.7404 18.3294,22.7838C18.3294,24.8273 19.9407,26.4615 21.9559,26.4615C23.9703,26.4615 25.6493,24.8273 25.5816,22.7838L25.5816,15.6989C25.5816,14.457 26.4743,13.4436 27.6474,13.2722C27.8484,13.2445 27.9988,13.0693 28,12.8615L28,11.6379C27.9995,11.5207 27.9508,11.4092 27.8658,11.3307C27.7809,11.2523 27.6675,11.2141 27.5537,11.2257"
android:pathData="M6.1846,10.9495L25.5392,10.9495C25.8482,10.9495 26.0988,10.6636 26.0988,10.311L26.0988,8.5135C26.0988,8.162 25.8482,7.875 25.5392,7.875L6.1846,7.875C5.8756,7.875 5.625,8.1609 5.625,8.5135L5.625,10.311C5.625,10.6625 5.8756,10.9495 6.1846,10.9495M6.1851,20.1729L21.2294,20.1729C21.5394,20.1729 21.7895,19.887 21.7895,19.5345L21.7895,17.7369C21.7895,17.3844 21.5394,17.0985 21.2294,17.0985L6.1861,17.0985C5.8761,17.0985 5.626,17.3844 5.626,17.7369L5.626,19.5345C5.626,19.887 5.8761,20.1729 6.1861,20.1729M15.8367,26.3219L6.1889,26.3219C5.8773,26.3219 5.625,26.6519 5.625,27.0598L5.625,28.6585C5.625,29.0664 5.8773,29.3964 6.1889,29.3964L15.8367,29.3964C16.1483,29.3964 16.4007,29.0664 16.4007,28.6585L16.4007,27.0598C16.4007,26.6519 16.1483,26.3219 15.8367,26.3219M30.9979,12.6289C28.5308,12.8792 26.5515,14.9612 26.5139,17.5849L26.513,17.5849L26.513,21.9195C25.9483,21.6384 25.3283,21.493 24.7004,21.4944C22.4333,21.4944 20.6206,23.3329 20.6206,25.6318C20.6206,27.9307 22.4333,29.7692 24.7004,29.7692C26.9666,29.7692 28.8555,27.9307 28.7793,25.6318L28.7793,17.6612C28.7793,16.2641 29.7836,15.1241 31.1033,14.9312C31.3295,14.9 31.4987,14.703 31.5,14.4692L31.5,13.0927C31.4995,12.9608 31.4446,12.8354 31.3491,12.7471C31.2535,12.6588 31.126,12.6159 30.9979,12.6289"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
......
m-muse/src/main/res/layout/activity_play_meditation.xml
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
android:id="@+id/root_layout"
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="false"
android:background="#B3000000">
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#CC282E3F" />
<ImageView
android:id="@+id/iv_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"/>
android:scaleType="centerCrop" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
......@@ -23,7 +30,7 @@
android:layout_width="104dp"
android:layout_height="36dp"
android:layout_marginStart="16dp"
android:layout_marginTop="25dp"
android:layout_marginTop="5dp"
android:background="@drawable/bg_meditation_play_top"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
......@@ -111,7 +118,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5"/>
app:layout_constraintGuide_percent="0.5" />
<LinearLayout
android:id="@+id/ll_pure_music_time_off"
......@@ -139,7 +146,7 @@
android:gravity="center"
tools:text="56:32"
android:textSize="12sp"
android:textColor="@color/white"/>
android:textColor="@color/white" />
</LinearLayout>
......@@ -162,7 +169,8 @@
android:src="@drawable/icon_pure_music_list"
app:layout_constraintBottom_toTopOf="@id/seekbar_play_progress"
app:layout_constraintStart_toEndOf="@id/guide_line"
android:visibility="gone"/>
tools:visibility="visible"
android:visibility="gone" />
<ImageView
android:id="@+id/iv_time_off"
......@@ -173,7 +181,7 @@
android:src="@drawable/icon_play_meditation_time_off"
app:layout_constraintBottom_toTopOf="@id/seekbar_play_progress"
app:layout_constraintStart_toEndOf="@id/guide_line"
tools:visibility="gone"/>
tools:visibility="gone" />
<TextView
android:id="@+id/tv_time_off"
......@@ -185,7 +193,7 @@
android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@id/iv_time_off"
app:layout_constraintStart_toStartOf="@id/iv_time_off"
app:layout_constraintEnd_toEndOf="@id/iv_time_off"/>
app:layout_constraintEnd_toEndOf="@id/iv_time_off" />
</androidx.constraintlayout.widget.ConstraintLayout>
......
m-muse/src/main/res/layout/layout_meditation_play_float_view.xml
......@@ -2,9 +2,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/play_float_background"
android:background="@drawable/bg_meditation_play_float"
android:layout_marginHorizontal="16dp"
android:layout_marginBottom="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
......@@ -12,8 +11,7 @@
android:id="@+id/csl_root_layout"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="@drawable/bg_play_meditation_float_view"
tools:background="@drawable/play_float_background">
android:background="@drawable/bg_play_meditation_float_view">
<ImageView
android:id="@+id/iv_close"
......@@ -38,15 +36,22 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_close" >
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="8dp"
app:cardElevation="0dp">
<ImageView
android:id="@+id/iv_cover"
android:layout_width="40dp"
android:layout_height="40dp"
android:scaleType="centerCrop"
android:src="@drawable/platform_loading_logo"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_close" />
android:src="@drawable/platform_loading_logo" />
</androidx.cardview.widget.CardView>
<TextView
android:id="@+id/tv_title"
......@@ -75,7 +80,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
app:wheel_unreached_color="#FF282E3F"
app:wheel_unreached_color="#33FFFFFF"
app:wheel_reached_color="#FFFFFF"
app:wheel_unreached_width="2dp"
app:wheel_reached_width="2dp"/>
......
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