提交人：jtm

提交内容：部分bug fix

BusinessCommon/src/main/res/drawable/bg_evaluate_button.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#EE8F08"/>
+    <corners android:radius="@dimen/convert_80px"/>
+
+</shape>

BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailActivity.kt

@@ -198,6 +198,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             navigateTo(Screens.Cook.COOK_EVALUATE) {
                 withString("recipeId", recipeNumber)
             }
+            binding.clFuncMore.setGone()
         }
         binding.tvMoreDelete.setOnClickListener {
             binding.clFuncMore.setGone()

BusinessStep/src/main/java/com/develop/step/viewmodel/CookDetailViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.scopeNetLife
 import com.blankj.utilcode.util.FileUtils
+import com.blankj.utilcode.util.GsonUtils
 import com.blankj.utilcode.util.ToastUtils
 import com.blankj.utilcode.util.ZipUtils
 import com.develop.base.ext.fromJson
@@ -199,7 +200,8 @@ class CookDetailViewModel : BaseViewModel() {
                 return
             }
             val jsonContent = FileKit.readFileToString(jsonFile)
-            val contentData = SerializationConverter.jsonDecoder.decodeFromString(jsonContent) as RecipeDataConfig
+
+            val contentData = GsonUtils.fromJson(jsonContent, RecipeDataConfig::class.java)
             contentData.resetAllCodes()
             FoodDataProvider.getDatabase().runInTransaction {
                 FoodDataProvider.getDatabase().recipeDao().apply {

BusinessStep/src/main/res/layout/activity_cook_evaluate.xml

@@ -6,17 +6,29 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#1A1A1A"
+        android:textSize="@dimen/convert_36px"
+        android:text="GRADE"
+        android:layout_marginTop="@dimen/convert_68px"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
     <TextView
         android:id="@+id/tv_good"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="#FFA627"
-        android:textSize="@dimen/convert_108px"
+        android:textSize="@dimen/convert_60px"
         android:text="@string/bad"
-        android:layout_marginTop="@dimen/convert_248px"
+        android:layout_marginTop="@dimen/convert_12px"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toBottomOf="@+id/tv_title"/>
 
     <LinearLayout
         android:id="@+id/ll_stars"
@@ -24,81 +36,82 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center_vertical"
-        android:layout_marginTop="@dimen/convert_105px"
+        android:layout_marginTop="@dimen/convert_10px"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_good">
 
         <ImageView
             android:id="@+id/iv_star1"
-            android:layout_width="@dimen/convert_81px"
-            android:layout_height="@dimen/convert_75px"
+            android:layout_width="@dimen/convert_45px"
+            android:layout_height="@dimen/convert_45px"
             android:src="@drawable/ic_star_unselected"
             app:tint="@color/detail_star_tint2"
             tools:tint="#f4a12e"/>
 
         <ImageView
             android:id="@+id/iv_star2"
-            android:layout_width="@dimen/convert_81px"
-            android:layout_height="@dimen/convert_75px"
+            android:layout_width="@dimen/convert_45px"
+            android:layout_height="@dimen/convert_45px"
             android:src="@drawable/ic_star_unselected"
             app:tint="@color/detail_star_tint2"
             tools:tint="#f4a12e"
-            android:layout_marginStart="@dimen/convert_39px"/>
+            android:layout_marginStart="@dimen/convert_25px"/>
 
         <ImageView
             android:id="@+id/iv_star3"
-            android:layout_width="@dimen/convert_81px"
-            android:layout_height="@dimen/convert_75px"
+            android:layout_width="@dimen/convert_45px"
+            android:layout_height="@dimen/convert_45px"
             android:src="@drawable/ic_star_unselected"
             app:tint="@color/detail_star_tint2"
             tools:tint="#f4a12e"
-            android:layout_marginStart="@dimen/convert_39px"/>
+            android:layout_marginStart="@dimen/convert_25px"/>
 
         <ImageView
             android:id="@+id/iv_star4"
-            android:layout_width="@dimen/convert_81px"
-            android:layout_height="@dimen/convert_75px"
+            android:layout_width="@dimen/convert_45px"
+            android:layout_height="@dimen/convert_45px"
             android:src="@drawable/ic_star_unselected"
             app:tint="@color/detail_star_tint2"
             tools:tint="#f4a12e"
-            android:layout_marginStart="@dimen/convert_39px"/>
+            android:layout_marginStart="@dimen/convert_25px"/>
 
         <ImageView
             android:id="@+id/iv_star5"
-            android:layout_width="@dimen/convert_81px"
-            android:layout_height="@dimen/convert_75px"
+            android:layout_width="@dimen/convert_45px"
+            android:layout_height="@dimen/convert_45px"
             android:src="@drawable/ic_star_unselected"
             app:tint="@color/detail_star_tint2"
             tools:tint="#f4a12e"
-            android:layout_marginStart="@dimen/convert_39px"/>
+            android:layout_marginStart="@dimen/convert_25px"/>
 
     </LinearLayout>
 
     <EditText
         android:imeOptions="actionDone"
         android:id="@+id/et_content"
-        android:layout_width="@dimen/convert_930px"
-        android:layout_height="@dimen/convert_389px"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/convert_193px"
+        android:layout_marginHorizontal="@dimen/convert_60px"
         android:background="@drawable/bg_evaluate_content"
-        android:layout_marginTop="@dimen/convert_84px"
-        android:padding="@dimen/convert_53px"
+        android:layout_marginTop="@dimen/convert_23px"
+        android:padding="@dimen/convert_25px"
         android:hint="@string/enter_what_you_want_to_say"
         android:gravity="start"
-        android:textColor="#000000"
-        android:textColorHint="#6B6B6B"
-        android:textSize="@dimen/convert_39px"
+        android:textColor="#A3A3A2"
+        android:textColorHint="#A3A3A2"
+        android:textSize="@dimen/convert_30px"
         app:layout_constraintTop_toBottomOf="@+id/ll_stars"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
     <ImageView
         android:id="@+id/view_close"
-        android:layout_width="@dimen/convert_90px"
-        android:layout_height="@dimen/convert_90px"
+        android:layout_width="@dimen/convert_60px"
+        android:layout_height="@dimen/convert_60px"
         android:src="@drawable/ic_cancel"
         app:tint="#FFA627"
-        android:padding="@dimen/convert_16px"
+        android:padding="@dimen/convert_8px"
         android:layout_marginStart="@dimen/convert_45px"
         android:layout_marginTop="@dimen/convert_45px"
         app:layout_constraintStart_toStartOf="parent"
@@ -106,15 +119,15 @@
 
     <TextView
         android:id="@+id/tv_ok"
-        android:layout_width="@dimen/convert_930px"
-        android:layout_height="@dimen/convert_120px"
-        android:layout_marginTop="@dimen/convert_143px"
-        android:background="@drawable/bg_tare_button"
+        android:layout_width="@dimen/convert_160px"
+        android:layout_height="@dimen/convert_98px"
+        android:background="@drawable/bg_evaluate_button"
         android:gravity="center"
         android:textColor="#fff"
         android:text="@string/ok"
-        app:layout_constraintTop_toBottomOf="@+id/et_content"
-        app:layout_constraintStart_toStartOf="parent"
+        android:textSize="@dimen/convert_36px"
+        android:layout_margin="@dimen/convert_42px"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

BusinessStep/src/main/res/layout/item_cook_controller.xml

@@ -395,7 +395,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/convert_160px">
+        android:layout_marginTop="@dimen/convert_120px">
 
         <View
             android:layout_width="@dimen/convert_110px"

libThirdPart/build.gradle

@@ -73,5 +73,6 @@ dependencies {
     //屏幕适配
     api "me.jessyan:autosize:1.2.1"
     api 'com.github.bumptech.glide:glide:4.12.0'
+    api 'com.google.code.gson:gson:2.8.9'
 
 }