优化早筛页面

moca/src/main/java/com/yingyangfly/moca/omputation/ComputationFragment.kt

@@ -397,9 +397,9 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                 binding.editResultOne.post {
                     if (questionOne) {
                         if (firstQuestion != null) {
-                            firstQuestion!!.inputString = binding.editResultOne.toString().trim()
+                            firstQuestion!!.inputString = binding.editResultOne.text.toString().trim()
                             firstQuestion!!.reviewId = firstQuestion!!.id
-                            firstQuestion!!.reviewAnswer = binding.editResultOne.toString().trim()
+                            firstQuestion!!.reviewAnswer = binding.editResultOne.text.toString().trim()
                             firstQuestion!!.correct = ""
                             questionsDao?.update(firstQuestion!!)
                             binding.editResultTwo.requestFocus()
@@ -413,9 +413,9 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                 } else {
                     binding.editResultTwo.post {
                         if (secondQuestion != null) {
-                            secondQuestion!!.inputString = binding.editResultTwo.toString().trim()
+                            secondQuestion!!.inputString = binding.editResultTwo.getText().toString().trim()
                             secondQuestion!!.reviewId = secondQuestion!!.id
-                            secondQuestion!!.reviewAnswer = binding.editResultTwo.toString().trim()
+                            secondQuestion!!.reviewAnswer = binding.editResultTwo.text.toString().trim()
                             secondQuestion!!.correct = ""
                             questionsDao?.update(secondQuestion!!)
                             binding.editResultThree.requestFocus()
@@ -429,9 +429,9 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                 } else {
                     binding.editResultThree.post {
                         if (thirdQuestion != null) {
-                            thirdQuestion!!.inputString = binding.editResultThree.toString().trim()
+                            thirdQuestion!!.inputString = binding.editResultThree.text.toString().trim()
                             thirdQuestion!!.reviewId = thirdQuestion!!.id
-                            thirdQuestion!!.reviewAnswer = binding.editResultThree.toString().trim()
+                            thirdQuestion!!.reviewAnswer = binding.editResultThree.text.toString().trim()
                             thirdQuestion!!.correct = ""
                             questionsDao?.update(thirdQuestion!!)
                             binding.editResultFour.requestFocus()
@@ -445,9 +445,9 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                 } else {
                     binding.editResultFour.post {
                         if (fourthQuestion != null) {
-                            fourthQuestion!!.inputString = binding.editResultFour.toString().trim()
+                            fourthQuestion!!.inputString = binding.editResultFour.text.toString().trim()
                             fourthQuestion!!.reviewId = fourthQuestion!!.id
-                            fourthQuestion!!.reviewAnswer = binding.editResultFour.toString().trim()
+                            fourthQuestion!!.reviewAnswer = binding.editResultFour.text.toString().trim()
                             fourthQuestion!!.correct = ""
                             questionsDao?.update(fourthQuestion!!)
                             binding.editResultFive.requestFocus()
@@ -461,9 +461,9 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                 } else {
                     binding.editResultFive.post {
                         if (fifthQuestion != null) {
-                            fifthQuestion!!.inputString = binding.editResultFive.toString().trim()
+                            fifthQuestion!!.inputString = binding.editResultFive.text.toString().trim()
                             fifthQuestion!!.reviewId = fifthQuestion!!.id
-                            fifthQuestion!!.reviewAnswer = binding.editResultFive.toString().trim()
+                            fifthQuestion!!.reviewAnswer = binding.editResultFive.text.toString().trim()
                             fifthQuestion!!.correct = ""
                             questionsDao?.update(fifthQuestion!!)
                             pageNext(view)

webview/src/main/java/com/yingyangfly/webview/BridgeWebActivity.kt

@@ -23,6 +23,7 @@ import com.yingyangfly.baselib.bean.MessageBean
 import com.yingyangfly.baselib.dialog.MessageDialog
 import com.yingyangfly.baselib.dialog.TaskFragment
 import com.yingyangfly.baselib.ext.click
+import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.JumpUtil
@@ -59,6 +60,9 @@ class BridgeWebActivity : AppCompatActivity() {
         initLiveData()
         if (showDialog) {
             showCoverDialog()
+            binding.ReturnHanzi.show(false)
+        }else{
+            binding.ReturnHanzi.show(true)
         }
     }
 

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

@@ -21,6 +21,7 @@
             <androidx.appcompat.widget.AppCompatImageView style="@style/back_image" />
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/ReturnHanzi"
                 style="@style/back_text"
                 android:textColor="@color/color_FF333333" />
         </LinearLayout>

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

@@ -54,7 +54,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</item>
     </style>