Bläddra i källkod

1.优化代码

王鹏鹏 2 år sedan
förälder
incheckning
cf66a822d4

+ 6 - 2
.idea/misc.xml

@@ -477,6 +477,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_training_content_details.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/layout_empty.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/spinner_list_item.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/drawable/bg_dialog_ring.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/drawable/bg_game_background_settlement.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/drawable/bg_game_loading.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/drawable/bg_game_progressbar_selector.xml" value="0.151" />
@@ -523,10 +524,13 @@
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_count_down.xml" value="0.5676056338028169" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_exit_game.xml" value="0.2" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_game_loading.xml" value="0.23697916666666666" />
-        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_game_result.xml" value="0.4" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_game_result.xml" value="0.2" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/item_game_result.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/drawable/bg_btn_doctor_details.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/drawable/bg_pay_order.xml" value="0.147" />
+        <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/drawable/bg_payment_unselected.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/drawable/selector_agreement_checkbox.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/drawable/selector_evaluate_checkbox.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_consultation_record.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_consultation_request.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_consultation_sheet.xml" value="0.23697916666666666" />
@@ -538,7 +542,7 @@
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/item_consultation.xml" value="0.8" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/item_consultation_data.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/item_consultation_record.xml" value="0.536" />
-        <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/item_evaluate.xml" value="0.8" />
+        <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/item_evaluate.xml" value="0.46697566628041715" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/item_recommend_doctor.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/item_search_doctor.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/home/src/main/res/drawable/bg_home_task_btn.xml" value="0.151" />

+ 2 - 0
game/src/main/java/com/yingyangfly/game/play/PlayGameActivity.kt

@@ -580,6 +580,8 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         runOnUiThread {
             runOnUiThread {
                 if (TextUtils.equals("A", playClass)) {
+                    val score: Int = gameTotalScore.toInt() + gameDataBean.curLevelScore.toInt()
+                    gameTotalScore = score.toString()
                     showCompletionTrainingDialog(gameDataBean)
                 } else {
                     if (TextUtils.equals("2", isPass)) {

+ 10 - 3
healthconsultation/src/main/java/com/yingyang/healthconsultation/adapter/EvaluateAdapter.kt

@@ -1,11 +1,12 @@
 package com.yingyang.healthconsultation.adapter
 
 import android.annotation.SuppressLint
+import android.text.TextUtils
 import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.databinding.ItemEvaluateBinding
 import com.yingyang.healthconsultation.entity.EvaluateRecordsBean
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
-import com.yingyangfly.baselib.ext.timeFormat
+import com.yingyangfly.baselib.ext.show
 
 /**
  * 评价列表
@@ -22,8 +23,14 @@ class EvaluateAdapter(override val layoutId: Int = R.layout.item_evaluate) :
         binding.data = item
         val index = position + 1
         binding.tvTitle.text = "匿名用户$index"
-        binding.ratingBar.rating = item.value.toFloat()
-        binding.ratingBar.numStars = item.value.toInt()
+        if (TextUtils.isEmpty(item.value).not()) {
+            val score = item.value.toInt()
+            binding.checkboxFive.show(score > 4)
+            binding.checkboxFour.show(score > 3)
+            binding.checkboxThree.show(score > 2)
+            binding.checkboxTwo.show(score > 1)
+            binding.checkboxOne.show(score > 0)
+        }
         binding.tvTime.text = item.createTime
 
     }

+ 5 - 0
healthconsultation/src/main/res/drawable/selector_evaluate_checkbox.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingDefaultResource,ResourceName">
+    <item android:drawable="@mipmap/icon_star_selected" android:state_checked="true" />
+    <item android:drawable="@mipmap/icon_star_unselected" android:state_checked="false" />
+</selector>

+ 55 - 9
healthconsultation/src/main/res/layout/item_evaluate.xml

@@ -26,20 +26,66 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.appcompat.widget.AppCompatRatingBar
-            android:id="@+id/ratingBar"
-            style="@style/MyRadingStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+        <CheckBox
+            android:id="@+id/checkboxOne"
+            android:layout_width="@dimen/divider_32px"
+            android:layout_height="@dimen/divider_32px"
             android:layout_marginStart="@dimen/divider_31px"
-            android:isIndicator="true"
-            android:numStars="5"
-            android:stepSize="1.0"
+            android:background="@mipmap/icon_star_selected"
+            android:button="@null"
+            android:enabled="false"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@+id/tvTitle"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <CheckBox
+            android:id="@+id/checkboxTwo"
+            android:layout_width="@dimen/divider_32px"
+            android:layout_height="@dimen/divider_32px"
+            android:layout_marginStart="@dimen/divider_2px"
+            android:background="@mipmap/icon_star_selected"
+            android:button="@null"
+            android:enabled="false"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/checkboxOne"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <CheckBox
+            android:id="@+id/checkboxThree"
+            android:layout_width="@dimen/divider_32px"
+            android:layout_height="@dimen/divider_32px"
+            android:layout_marginStart="@dimen/divider_2px"
+            android:background="@mipmap/icon_star_selected"
+            android:button="@null"
+            android:enabled="false"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/checkboxTwo"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <CheckBox
+            android:id="@+id/checkboxFour"
+            android:layout_width="@dimen/divider_32px"
+            android:layout_height="@dimen/divider_32px"
+            android:layout_marginStart="@dimen/divider_2px"
+            android:background="@mipmap/icon_star_selected"
+            android:button="@null"
+            android:enabled="false"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/checkboxThree"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <CheckBox
+            android:id="@+id/checkboxFive"
+            android:layout_width="@dimen/divider_32px"
+            android:layout_height="@dimen/divider_32px"
+            android:layout_marginStart="@dimen/divider_2px"
+            android:background="@mipmap/icon_star_selected"
+            android:button="@null"
+            android:enabled="false"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/checkboxFour"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvTime"
             android:layout_width="wrap_content"