Skip to content

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

UI WalkThrough part3

parent cb5eb26f
Showing with 33 additions and 19 deletions
app/src/main/java/com/ydl/component/service/web/WVClickAbstractListener.java
......@@ -326,7 +326,9 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
@Override
public void switchDownRefresh(H5JsBean.H5JsCmd.Params params) {
if (mContext != null && mContext instanceof NewH5Activity) {
((NewH5Activity) mContext).hasShowDownRefresh(params.getSwitch());
}
}
@Override
......
config.gradle
......@@ -9,12 +9,12 @@ ext {
"m-consultant" : "0.0.60.25",
"m-fm" : "0.0.30.08",
"m-user" : "0.0.62.24",
"m-home" : "0.0.23.77",
"m-home" : "0.0.23.78",
"m-im" : "0.0.21.44",
"m-dynamic" : "0.0.7.73",
"m-article" : "0.0.0.10",
"m-muse" : "0.0.28.59",
"m-muse" : "0.0.28.61",
"m-tests" : "0.0.24.18",
"m-course" : "0.0.43.37",
......@@ -94,12 +94,12 @@ ext {
"m-consultant" : "0.0.60.25",
"m-fm" : "0.0.30.08",
"m-user" : "0.0.62.24",
"m-home" : "0.0.23.77",
"m-home" : "0.0.23.78",
"m-im" : "0.0.21.44",
"m-dynamic" : "0.0.7.73",
"m-article" : "0.0.0.8",
"m-muse" : "0.0.28.59",
"m-muse" : "0.0.28.61",
"m-tests" : "0.0.24.18",
"m-course" : "0.0.43.37",
//-------------- 业务模块 API 层 --------------
......
m-home/src/ydl/res/layout/home_muse_view.xml
......@@ -22,7 +22,8 @@
<FrameLayout
android:id="@+id/fl_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@drawable/bg_meditation_video">
<com.yidianling.home.widget.AdaptiveVideoView
android:id="@+id/video_view"
......@@ -34,6 +35,7 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/bg_meditation_video"/>
<androidx.constraintlayout.widget.ConstraintLayout
......@@ -72,12 +74,14 @@
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="200dp"
android:layout_width="wrap_content"
android:layout_height="40dp"
app:tabTextColor="#88FFFFFF"
app:tabSelectedTextColor="#FFFFFF"
app:tabBackground="@color/transparent"
app:tabRippleColor="@color/transparent"
app:tabMode="auto"
app:tabIndicatorFullWidth="false"
style="@style/MeditationTabLayoutStyle" />
<View
......
m-muse/src/main/java/com/yidianling/muse/helper/FloatViewTouchListener.kt
......@@ -34,6 +34,6 @@ class FloatViewTouchListener(val wl: WindowManager.LayoutParams, val windowManag
}
}
return false
return true
}
}
\ No newline at end of file
m-muse/src/main/java/com/yidianling/muse/service/MeditationWindowService.kt
......@@ -72,8 +72,6 @@ class MeditationWindowService : LifecycleService() {
private var mObservable: Observable<Long>? = null
private var mObserver: Observer<Long>? = null
private lateinit var mSeekBar : AppCompatSeekBar
private var currentMediaId:Long? = null
override fun onCreate() {
......@@ -89,8 +87,6 @@ class MeditationWindowService : LifecycleService() {
}
}
mSeekBar = AppCompatSeekBar(this)
EventBus.getDefault().register(this)
}
......@@ -112,7 +108,7 @@ class MeditationWindowService : LifecycleService() {
gravity = Gravity.LEFT or Gravity.TOP
x = outMetrics.widthPixels /2 - width / 2
y = outMetrics.heightPixels - dp2px(70F)
y = outMetrics.heightPixels - dp2px(140F)
}
floatRootView =
LayoutInflater.from(this).inflate(R.layout.layout_meditation_play_float_view, null)
......@@ -153,9 +149,6 @@ class MeditationWindowService : LifecycleService() {
}
}
mSeekBar.progress = 2
mSeekBar.max = event.meditation?.duration?.toInt()?:0
}
private fun updateFloatView(meditation: MeditationPlayModuleBean.MeditationDetail) {
......@@ -164,7 +157,21 @@ class MeditationWindowService : LifecycleService() {
MediaPlayerManager.getInstance(this)?.setMediaId(currentMediaId)
mMediaPlayer = MediaPlayerManager.getInstance(this)?.getMediaPlayer()
floatRootView?.setOnClickListener {
tvTitle?.setOnClickListener {
//悬浮窗暂停点击事件
ActionCountUtils.count(MuseBIConstants.YDL_MUSE_MEDITATION_WINDOW_CLICK,"")
val intent = Intent(this, PlayMeditationActivity::class.java)
intent.putExtra("MEDIA_ID", meditation.mediaId)
intent.putExtra("MEDITATION_ID", meditation.meditationId)
intent.putExtra("MEDITATION_TYPE", meditation.meditationType)
intent.putExtra("MEDIA_COVER_URL", meditation.coverImageUrl)
intent.putExtra("MEDIA_URL", meditation.mediaUrl)
intent.flags = FLAG_ACTIVITY_NEW_TASK
startActivity(intent)
}
ivCover?.setOnClickListener {
//悬浮窗暂停点击事件
ActionCountUtils.count(MuseBIConstants.YDL_MUSE_MEDITATION_WINDOW_CLICK,"")
......
m-muse/src/main/res/layout/activity_play_meditation.xml
......@@ -141,7 +141,7 @@
android:id="@+id/tv_time_off_pure_music"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="5dp"
android:gravity="center"
tools:text="56:32"
android:textSize="12sp"
......@@ -186,7 +186,7 @@
android:id="@+id/tv_time_off"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="5dp"
tools:text="56:32"
android:textSize="12sp"
android:textColor="@color/white"
......
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