From 5a6affcc2c1f045bda629bdf2c2dcf00c4decb9d Mon Sep 17 00:00:00 2001 From: Mori Atsushi Date: Wed, 23 May 2018 18:27:51 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20=E5=90=84fragment=E3=81=A7=E6=83=85?= =?UTF-8?q?=E5=A0=B1=E3=82=92=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 時々情報が取得できなくなっていたため --- .../cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt | 1 + .../android/syncpod/viewmodel/PlayListFragmentViewModel.kt | 1 + .../cyder/android/syncpod/viewmodel/RoomActivityViewModel.kt | 3 --- .../cyder/android/syncpod/viewmodel/VideoFragmentViewModel.kt | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt index 0d793822..0c83ff0f 100644 --- a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt +++ b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt @@ -47,6 +47,7 @@ class ChatFragmentViewModel @Inject constructor( .subscribe { chatViewModels.add(it) } + repository.getPastChats() } override fun onPause() { diff --git a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/PlayListFragmentViewModel.kt b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/PlayListFragmentViewModel.kt index 65863c9b..892a66a1 100644 --- a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/PlayListFragmentViewModel.kt +++ b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/PlayListFragmentViewModel.kt @@ -64,6 +64,7 @@ class PlayListFragmentViewModel @Inject constructor( .subscribe { isPlaying.set(it) } + repository.getPlayList() } override fun onPause() { diff --git a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/RoomActivityViewModel.kt b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/RoomActivityViewModel.kt index 0545c570..5369a559 100644 --- a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/RoomActivityViewModel.kt +++ b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/RoomActivityViewModel.kt @@ -34,8 +34,6 @@ class RoomActivityViewModel @Inject constructor( } override fun onResume() { - videoRepository.getNowPlayingVideo() - videoRepository.getPlayList() roomRepository.receiveForceExit() .takeUntil(onPauseSubject.toFlowable(BackpressureStrategy.LATEST)) .subscribe { @@ -48,7 +46,6 @@ class RoomActivityViewModel @Inject constructor( .subscribe { isVideoPlayerVisible.set(it) } - chatRepository.getPastChats() } override fun onPause() { diff --git a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/VideoFragmentViewModel.kt b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/VideoFragmentViewModel.kt index f8a7fb4b..a64367fb 100644 --- a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/VideoFragmentViewModel.kt +++ b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/VideoFragmentViewModel.kt @@ -51,6 +51,7 @@ class VideoFragmentViewModel @Inject constructor( override fun onResume() { observerWithInitPlayer() + videoRepository.getNowPlayingVideo() } override fun onPause() { From 7c08ccdc32fa6710ce4d7250e2e1437df6ffef41 Mon Sep 17 00:00:00 2001 From: Mori Atsushi Date: Wed, 23 May 2018 18:29:42 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[clear]=20=E3=83=AA=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=AF=E3=82=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../viewmodel/ChatFragmentViewModel.kt | 20 +++++++++------- .../viewmodel/PlayListFragmentViewModel.kt | 24 +++++++++++-------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt index 0c83ff0f..91d7e7df 100644 --- a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt +++ b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/ChatFragmentViewModel.kt @@ -28,6 +28,18 @@ class ChatFragmentViewModel @Inject constructor( } override fun onResume() { + observerWithInitPlayer() + repository.getPastChats() + } + + override fun onPause() { + onPauseSubject.onNext(INVOCATION) + } + + override fun onStop() { + } + + private fun observerWithInitPlayer() { repository.observePastChat .observeOn(AndroidSchedulers.mainThread()) .takeUntil(onPauseSubject.toFlowable(BackpressureStrategy.LATEST)) @@ -47,14 +59,6 @@ class ChatFragmentViewModel @Inject constructor( .subscribe { chatViewModels.add(it) } - repository.getPastChats() - } - - override fun onPause() { - onPauseSubject.onNext(INVOCATION) - } - - override fun onStop() { } private fun convertToViewModel(chats: List): List { diff --git a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/PlayListFragmentViewModel.kt b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/PlayListFragmentViewModel.kt index 892a66a1..7390d138 100644 --- a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/PlayListFragmentViewModel.kt +++ b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/PlayListFragmentViewModel.kt @@ -38,6 +38,20 @@ class PlayListFragmentViewModel @Inject constructor( } override fun onResume() { + observerWithInitPlayer() + repository.getPlayList() + } + + override fun onPause() { + onPauseSubject.onNext(INVOCATION) + } + + override fun onStop() { + } + + fun searchVideo() = navigator.navigateToSearchVideoActivity() + + private fun observerWithInitPlayer() { repository.playListObservable .takeUntil(onPauseSubject.toFlowable(BackpressureStrategy.LATEST)) .map { convertToViewModel(it) } @@ -64,18 +78,8 @@ class PlayListFragmentViewModel @Inject constructor( .subscribe { isPlaying.set(it) } - repository.getPlayList() - } - - override fun onPause() { - onPauseSubject.onNext(INVOCATION) } - override fun onStop() { - } - - fun searchVideo() = navigator.navigateToSearchVideoActivity() - private fun convertToViewModel(videos: List