优化

baselib/build.gradle

@@ -38,8 +38,8 @@ android {
 
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"4463350aea\""
-            buildConfigField "String", "API_URL", "\"http://192.168.0.118:8112\""
-//            buildConfigField "String", "API_URL", "\"http://yaorongtest.yaorongmedical.com/hcp-large-api\""
+//            buildConfigField "String", "API_URL", "\"http://192.168.0.118:8112\""
+            buildConfigField "String", "API_URL", "\"http://yaorongtest.yaorongmedical.com/hcp-large-api\""
 //            buildConfigField "String", "API_URL", "\"https://yaorong.yaorongmedical.com/hcp-large-api\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }

baselib/src/main/java/com/yingyangfly/baselib/bean/SpeechSynthesis.kt

@@ -0,0 +1,6 @@
+package com.yingyangfly.baselib.bean
+
+class SpeechSynthesis {
+    var sed: String = "5"
+    var voiceMsg: String = ""
+}

baselib/src/main/java/com/yingyangfly/baselib/dialog/AnswerJudgmentFragment.kt

@@ -11,6 +11,7 @@ import androidx.fragment.app.DialogFragment
 import com.gyf.immersionbar.BarHide
 import com.gyf.immersionbar.ktx.immersionBar
 import com.yingyangfly.baselib.R
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.utils.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.ViewTool
@@ -75,7 +76,10 @@ class AnswerJudgmentFragment : DialogFragment(), View.OnTouchListener {
      * 播放语音合成内容
      */
     private fun speak(taskDesn: String) {
-        LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, taskDesn)
+        val speechSynthesis = SpeechSynthesis().apply{
+            voiceMsg = taskDesn
+        }
+        LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, speechSynthesis)
     }
 
     override fun dismiss() {

baselib/src/main/java/com/yingyangfly/baselib/dialog/TaskFragment.kt

@@ -15,6 +15,7 @@ import com.bumptech.glide.Glide
 import com.gyf.immersionbar.BarHide
 import com.gyf.immersionbar.ktx.immersionBar
 import com.yingyangfly.baselib.R
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.utils.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
@@ -95,7 +96,10 @@ class TaskFragment : DialogFragment(), View.OnTouchListener {
      * 播放语音合成内容
      */
     private fun speak(taskDesn: String) {
-        LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, taskDesn)
+        val speechSynthesis = SpeechSynthesis().apply{
+            voiceMsg = taskDesn
+        }
+        LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, speechSynthesis)
     }
 
     @SuppressLint("ClickableViewAccessibility")

baselib/src/main/java/com/yingyangfly/baselib/dialog/TipsDialog.kt

@@ -10,6 +10,7 @@ import androidx.fragment.app.FragmentManager
 import com.gyf.immersionbar.BarHide
 import com.gyf.immersionbar.ktx.immersionBar
 import com.yingyangfly.baselib.R
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.ext.setTextColorResource
 import com.yingyangfly.baselib.ext.show
@@ -111,7 +112,10 @@ class TipsDialog(val builder: TipDialogBuilder) : DialogFragment() {
      * 播放语音合成内容
      */
     private fun speak(taskDesn: String) {
-        LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, taskDesn)
+        val speechSynthesis = SpeechSynthesis().apply{
+            voiceMsg = taskDesn
+        }
+        LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, speechSynthesis)
     }
 
     class TipDialogBuilder {

config.gradle

@@ -13,7 +13,7 @@ ext {
             applicationId    : "com.yingyangfly",
             minSdkVersion    : 26,
             targetSdkVersion : 28,
-            versionCode      : 8,
+            versionCode      : 9,
             versionName      : "1.0.0.1",
     ]
     //androidx配置

evaluation/src/main/java/com/yingyangfly/evaluation/hospital/HospitalActivity.kt

@@ -8,6 +8,7 @@ import android.view.MotionEvent
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.bumptech.glide.Glide
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.bean.def.PermissionList
 import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.db.VoicePlayerBean
@@ -80,8 +81,8 @@ class HospitalActivity : BaseTvMVVMActivity<ActivityHospitalBinding, HospitalVie
 
     private fun initLiveData() {
         //语音合成
-        LiveEventBusUtil.observer<String>(this, RxBusCodes.SPEECHSYNTHESIS) {
-            if (TextUtils.isEmpty(it).not()) {
+        LiveEventBusUtil.observer<SpeechSynthesis>(this, RxBusCodes.SPEECHSYNTHESIS) {
+            if (TextUtils.isEmpty(it.voiceMsg).not()) {
                 speak(it)
             }
         }
@@ -99,11 +100,11 @@ class HospitalActivity : BaseTvMVVMActivity<ActivityHospitalBinding, HospitalVie
     /**
      * 语音合成
      */
-    private fun speak(desn: String) {
+    private fun speak(desn: SpeechSynthesis) {
         if (db != null) {
             val voicePlayerDao = db?.getVoicePlayerDao()
             if (voicePlayerDao != null) {
-                val voicePlayerBean = voicePlayerDao.getVoicePlayerBean(desn)
+                val voicePlayerBean = voicePlayerDao.getVoicePlayerBean(desn.voiceMsg)
                 if (voicePlayerBean != null && voicePlayer != null) {
                     voicePlayer?.play(voicePlayerBean.url) {}
                 } else {
@@ -120,7 +121,7 @@ class HospitalActivity : BaseTvMVVMActivity<ActivityHospitalBinding, HospitalVie
     /**
      * 获取声音url
      */
-    private fun getVoiceUrl(taskDesn: String) {
+    private fun getVoiceUrl(taskDesn: SpeechSynthesis) {
         viewModel.getVoiceUrl(taskDesn, fail = {}, success = {
             if (TextUtils.isEmpty(it).not()) {
                 if (db != null) {
@@ -128,7 +129,7 @@ class HospitalActivity : BaseTvMVVMActivity<ActivityHospitalBinding, HospitalVie
                     if (voicePlayerDao != null) {
                         val voicePlayerBean = VoicePlayerBean().apply {
                             url = it
-                            words = taskDesn
+                            words = taskDesn.voiceMsg
                         }
                         voicePlayerDao.insert(voicePlayerBean)
                     }

evaluation/src/main/java/com/yingyangfly/evaluation/hospital/HospitalViewModel.kt

@@ -1,6 +1,7 @@
 package com.yingyangfly.evaluation.hospital
 
 import com.yingyangfly.baselib.bean.HospitalBean
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.bean.UserInfoBean
 import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.mvvm.BaseViewModel
@@ -90,7 +91,7 @@ class HospitalViewModel : BaseViewModel() {
      * 获取声音url
      */
     fun getVoiceUrl(
-        msg: String,
+        msg: SpeechSynthesis,
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: String?) -> Unit)? = null,
     ) = launchFlow(false) {

evaluation/src/main/java/com/yingyangfly/evaluation/net/EvaluationApiService.kt

@@ -2,6 +2,7 @@ package com.yingyangfly.evaluation.net
 
 import com.yingyangfly.baselib.bean.HospitalBean
 import com.yingyangfly.baselib.bean.QuestionRecordsListBean
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.bean.UserInfoBean
 import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.net.BaseResp
@@ -98,7 +99,7 @@ interface EvaluationApiService {
      */
     @POST("app/video/getVoiceUrl")
     suspend fun getVoiceUrl(
-        @Query("voiceMsg") voiceMsg: String
+        @Body speechSynthesis: SpeechSynthesis
     ): BaseResp<String>
 
     /**

evaluation/src/main/res/layout/activity_bridge_web.xml

@@ -18,11 +18,11 @@
             style="@style/back_layout"
             tools:ignore="MissingConstraints">
 
-            <androidx.appcompat.widget.AppCompatImageView style="@style/back_image" />
+            <androidx.appcompat.widget.AppCompatImageView style="@style/back_image_1" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/back_text"
-                android:textColor="@color/color_FF333333" />
+<!--            <androidx.appcompat.widget.AppCompatTextView-->
+<!--                style="@style/back_text"-->
+<!--                android:textColor="@color/color_FF333333" />-->
         </LinearLayout>
 
     </FrameLayout>

evaluation/src/main/res/values/styles.xml

@@ -66,7 +66,7 @@
     <style name="back_image" tools:ignore="ResourceName">
         <item name="android:layout_width">@dimen/divider_43px</item>
         <item name="android:layout_height">@dimen/divider_43px</item>
-        <item name="android:layout_marginStart">@dimen/divider_65px</item>
+        <item name="android:layout_marginStart">@dimen/divider_45px</item>
         <item name="android:layout_marginTop">@dimen/divider_30px</item>
         <item name="android:background">@mipmap/icon_back_01</item>
     </style>
@@ -74,9 +74,9 @@
     <style name="back_image_1" tools:ignore="ResourceName">
         <item name="android:layout_width">@dimen/divider_50px</item>
         <item name="android:layout_height">@dimen/divider_50px</item>
-        <item name="android:layout_marginStart">@dimen/divider_45px</item>
+        <item name="android:layout_marginStart">@dimen/divider_25px</item>
         <item name="android:layout_marginTop">@dimen/divider_30px</item>
-        <item name="android:background">@mipmap/icon_back_01</item>
+        <item name="android:background">@mipmap/icon_back</item>
     </style>
 
     <style name="back_text_1" parent="layout_properties_self_adaption" tools:ignore="ResourceName">

mmse/src/main/java/com/yingyangfly/mmse/fragment/JudgmentRecordFragment.kt

@@ -10,6 +10,7 @@ import androidx.navigation.Navigation
 import com.yingyang.mmse.R
 import com.yingyang.mmse.databinding.FragmentJudgmentRecordBinding
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
@@ -104,9 +105,12 @@ class JudgmentRecordFragment : BaseFragment<FragmentJudgmentRecordBinding>(), Vi
                     }
                     R.id.soundImage -> {
                         if (question != null) {
+                            val speechSynthesis = SpeechSynthesis().apply{
+                                voiceMsg = question?.reviewItem!!
+                            }
                             LiveEventBusUtil.send(
                                 RxBusCodes.SPEECHSYNTHESIS,
-                                question?.reviewItem!!
+                                speechSynthesis
                             )
                         }
                     }

mmse/src/main/java/com/yingyangfly/mmse/fragment/RecordActionFragment.kt

@@ -9,6 +9,7 @@ import androidx.navigation.Navigation
 import com.yingyang.mmse.R
 import com.yingyang.mmse.databinding.FragmentRecordActionBinding
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.utils.LiveEventBusUtil
@@ -99,7 +100,10 @@ class RecordActionFragment : BaseFragment<FragmentRecordActionBinding>(), View.O
                         val stringBuffer = StringBuffer()
                         stringBuffer.append(firstWord).append(",").append(secondWord).append(",")
                             .append(thirdWord)
-                        LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, stringBuffer.toString())
+                        val speechSynthesis = SpeechSynthesis().apply{
+                            voiceMsg = stringBuffer.toString()
+                        }
+                        LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, speechSynthesis)
                     }
                 }
             }

mmse/src/main/java/com/yingyangfly/mmse/fragment/SoundRecordFragment.kt

@@ -9,6 +9,7 @@ import androidx.navigation.Navigation
 import com.yingyang.mmse.R
 import com.yingyang.mmse.databinding.FragmentSoundRecordBinding
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.utils.LiveEventBusUtil
@@ -102,7 +103,11 @@ class SoundRecordFragment : BaseFragment<FragmentSoundRecordBinding>(), View.OnT
                         val stringBuffer = StringBuffer()
                         stringBuffer.append(firstWord).append(",").append(secondWord).append(",")
                             .append(thirdWord)
-                        LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, stringBuffer.toString())
+
+                        val speechSynthesis = SpeechSynthesis().apply{
+                            voiceMsg = stringBuffer.toString()
+                        }
+                        LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, speechSynthesis)
                     }
                 }
             }

moca/src/main/java/com/yingyangfly/moca/fragment/MiniCogInitializeFragment.kt

@@ -9,6 +9,7 @@ import androidx.navigation.Navigation
 import com.yingyang.moca.R
 import com.yingyang.moca.databinding.FragmentMiniCogInitializeBinding
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
@@ -79,7 +80,10 @@ class MiniCogInitializeFragment : BaseFragment<FragmentMiniCogInitializeBinding>
                     }
                     R.id.imagePlay -> {
                         if (questionsBean != null) {
-                            LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, questionsBean?.reviewDesc!!)
+                            val speechSynthesis = SpeechSynthesis().apply{
+                                voiceMsg = questionsBean?.reviewDesc!!
+                            }
+                            LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, speechSynthesis)
                         }
                     }
                 }

moca/src/main/java/com/yingyangfly/moca/listenspeak/ListenSpeakFragment.kt

@@ -9,6 +9,7 @@ import androidx.navigation.Navigation
 import com.yingyang.moca.R
 import com.yingyang.moca.databinding.FragmentListenSpeakBinding
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
@@ -88,7 +89,10 @@ class ListenSpeakFragment : BaseFragment<FragmentListenSpeakBinding>(),
                     }
                     R.id.imagePlay -> {
                         if (questionsBean != null) {
-                            LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, questionsBean?.reviewDesc!!)
+                            val speechSynthesis = SpeechSynthesis().apply{
+                                voiceMsg = questionsBean?.reviewDesc!!
+                            }
+                            LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, speechSynthesis)
                         }
                     }
                 }

moca/src/main/java/com/yingyangfly/moca/memorizenumbers/MemorizeNumbersFragment.kt

@@ -9,6 +9,7 @@ import androidx.navigation.Navigation
 import com.yingyang.moca.R
 import com.yingyang.moca.databinding.FragmentMemorizeNumbersBinding
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
@@ -98,7 +99,11 @@ class MemorizeNumbersFragment : BaseFragment<FragmentMemorizeNumbersBinding>(),
                     }
                     R.id.imagePlay -> {
                         if (question != null) {
-                            LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, question?.reviewDesc!!)
+                            val speechSynthesis = SpeechSynthesis().apply{
+                                voiceMsg = question?.reviewDesc!!
+                                sed = "1"
+                            }
+                            LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, speechSynthesis)
                         }
                     }
                 }

moca/src/main/java/com/yingyangfly/moca/record/ListenRecordFragment.kt

@@ -9,6 +9,7 @@ import androidx.navigation.Navigation
 import com.yingyang.moca.R
 import com.yingyang.moca.databinding.FragmentListenRecordBinding
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.utils.LiveEventBusUtil
@@ -120,7 +121,10 @@ class ListenRecordFragment : BaseFragment<FragmentListenRecordBinding>(),
                                 stringBuffer.append(","+it)
                             }
                         }
-                        LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, stringBuffer.toString())
+                        val speechSynthesis = SpeechSynthesis().apply{
+                            voiceMsg = stringBuffer.toString()
+                        }
+                        LiveEventBusUtil.send(RxBusCodes.SPEECHSYNTHESIS, speechSynthesis)
                     }
                 }
             }

ncse/src/main/java/com/yingyangfly/ncse/fragment/ListenAndRepeatFragment.kt

@@ -8,6 +8,7 @@ import android.view.View
 import androidx.core.os.bundleOf
 import androidx.navigation.Navigation
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.bean.SpeechSynthesis
 import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
@@ -118,9 +119,12 @@ class ListenAndRepeatFragment : BaseFragment<FragmentListenAndRepeatBinding>(),V
                     }
                     R.id.soundImage -> {
                         if (question != null) {
+                            val speechSynthesis = SpeechSynthesis().apply{
+                                voiceMsg = question?.reviewItem!!
+                            }
                             LiveEventBusUtil.send(
                                 RxBusCodes.SPEECHSYNTHESIS,
-                                question?.reviewItem!!
+                                speechSynthesis
                             )
                         }
                     }