|
|
@@ -12,7 +12,6 @@ import com.tencent.imsdk.v2.V2TIMManager
|
|
|
import com.yingyang.home.R
|
|
|
import com.yingyang.home.databinding.ActivityHomeBinding
|
|
|
import com.yingyangfly.baselib.bean.Record
|
|
|
-import com.yingyangfly.baselib.db.VoicePlayerBean
|
|
|
import com.yingyangfly.baselib.dialog.TaskFragment
|
|
|
import com.yingyangfly.baselib.dialog.TipsDialog
|
|
|
import com.yingyangfly.baselib.ext.getEndAnimation
|
|
|
@@ -22,7 +21,6 @@ import com.yingyangfly.baselib.ext.toast
|
|
|
import com.yingyangfly.baselib.guideview.Guide
|
|
|
import com.yingyangfly.baselib.guideview.GuideBuilder
|
|
|
import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
|
|
|
-import com.yingyangfly.baselib.player.VoicePlayer
|
|
|
import com.yingyangfly.baselib.router.RouterUrlCommon
|
|
|
import com.yingyangfly.baselib.utils.AppUtil
|
|
|
import com.yingyangfly.baselib.utils.JumpUtil
|
|
|
@@ -58,16 +56,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
private var pageList = mutableListOf<Record>()
|
|
|
private val gameAdapter by lazy { GameAdapter() }
|
|
|
|
|
|
- // private var playVoice: PlayVoice? = null
|
|
|
- /**
|
|
|
- * 语音合成
|
|
|
- */
|
|
|
- private var voicePlayer: VoicePlayer? = null
|
|
|
-
|
|
|
override fun initViews() {
|
|
|
- voicePlayer = VoicePlayer.getInstance(mContext)
|
|
|
-// playVoice = PlayVoice()
|
|
|
-// playVoice?.setContext(mContext)
|
|
|
binding {
|
|
|
rvGame.layoutManager = GridLayoutManager(this@HomeActivity, 2)
|
|
|
rvGame.adapter = gameAdapter
|
|
|
@@ -79,7 +68,6 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
.leftBtnText("取消")
|
|
|
.rightBtnText("确定")
|
|
|
.leftClick({
|
|
|
-
|
|
|
}, true)
|
|
|
.rightClick({
|
|
|
jumpWebView(it, true)
|
|
|
@@ -296,8 +284,6 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
.not()
|
|
|
) {
|
|
|
User.saveTaskDialogStatus(User.getNowDay())
|
|
|
- speak(it.taskDesn)
|
|
|
-// playVoice?.speak(it.taskDesn)
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
@@ -308,8 +294,6 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
}
|
|
|
if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus()).not()) {
|
|
|
User.saveTaskDialogStatus(User.getNowDay())
|
|
|
- speak(it.taskDesn)
|
|
|
-// playVoice?.speak(it.taskDesn)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -320,58 +304,6 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
})
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 语音合成
|
|
|
- */
|
|
|
- private fun speak(taskDesn: String) {
|
|
|
- if (db != null) {
|
|
|
- val voicePlayerDao = db?.getVoicePlayerDao()
|
|
|
- if (voicePlayerDao != null) {
|
|
|
- val voicePlayerBean = voicePlayerDao.getVoicePlayerBean(taskDesn)
|
|
|
- if (voicePlayerBean != null) {
|
|
|
- if (voicePlayer != null) {
|
|
|
- voicePlayer?.play(voicePlayerBean.url) {
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- getVoiceUrl(taskDesn)
|
|
|
- }
|
|
|
- } else {
|
|
|
- getVoiceUrl(taskDesn)
|
|
|
- }
|
|
|
- } else {
|
|
|
- getVoiceUrl(taskDesn)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 获取声音url
|
|
|
- */
|
|
|
- private fun getVoiceUrl(taskDesn: String) {
|
|
|
- viewModel.getVoiceUrl(taskDesn, fail = {
|
|
|
- it.toast()
|
|
|
- }, success = {
|
|
|
- if (TextUtils.isEmpty(it).not()) {
|
|
|
- if (db != null) {
|
|
|
- val voicePlayerDao = db?.getVoicePlayerDao()
|
|
|
- if (voicePlayerDao != null) {
|
|
|
- val voicePlayerBean = VoicePlayerBean().apply {
|
|
|
- url = it
|
|
|
- words = taskDesn
|
|
|
- }
|
|
|
- voicePlayerDao.insert(voicePlayerBean)
|
|
|
- }
|
|
|
- }
|
|
|
- if (voicePlayer != null) {
|
|
|
- voicePlayer?.play(it) {
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 训练完成弹窗页面
|
|
|
*/
|
|
|
@@ -563,15 +495,6 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
guide.show(this)
|
|
|
}
|
|
|
|
|
|
- override fun onDestroy() {
|
|
|
- if (voicePlayer != null) {
|
|
|
- if (voicePlayer!!.isPlaying) {
|
|
|
- voicePlayer?.stop()
|
|
|
- }
|
|
|
- }
|
|
|
- super.onDestroy()
|
|
|
- }
|
|
|
-
|
|
|
@SuppressLint("ClickableViewAccessibility")
|
|
|
override fun onTouch(v: View, event: MotionEvent): Boolean {
|
|
|
when (event.action) {
|