011更新代码

BusinessCommon/src/main/java/com/develop/common/widget/FoodContentView.kt

@@ -173,9 +173,16 @@ class FoodContentView : ConstraintLayout {
                                 CURRENT_USER_ID, foodId
                             )
                         }
-                        if (!mIsHistoryList) {
+
+                        /**
+                         * 不知道之前为什么写这个代码，现在011客户反馈
+                         * 在历史记录界面收藏或者取消收藏食谱，回到食谱列表没有状态修改估注掉代码
+                         * */
+//                        if (!mIsHistoryList) {
+//                            EventBus.getDefault().post(RefreshLikeDataEvent(false, foodId))
+//                        }
                             EventBus.getDefault().post(RefreshLikeDataEvent(false, foodId))
-                        }
+
 
                     } else {
                         isLike = true
@@ -185,9 +192,13 @@ class FoodContentView : ConstraintLayout {
                                 UserFavoriteRecipes(CURRENT_USER_ID, foodId)
                             )
                         }
-                        if (!mIsHistoryList) {
-                            EventBus.getDefault().post(RefreshLikeDataEvent(true, foodId))
-                        }
+
+
+//                        if (!mIsHistoryList) {
+//                            EventBus.getDefault().post(RefreshLikeDataEvent(true, foodId))
+//                        }
+
+                        EventBus.getDefault().post(RefreshLikeDataEvent(true, foodId))
                     }
                 }
             }

BusinessCommon/src/main/java/com/develop/common/widget/NewsLayout.kt

@@ -9,6 +9,7 @@ import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.recyclerview.widget.RecyclerView
+import com.develop.base.ext.getSN
 import com.develop.base.ext.load
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.updateText
@@ -70,6 +71,10 @@ class NewsLayout : RelativeLayout {
 
         }.models = dataList
         binding.tvNotice.updateText("${context.getString(R.string.notice)}")
+        if (getSN().startsWith("011")){
+            binding.ivNotify.setBackgroundResource(R.drawable.ic_notify_011_gray)
+        }
+
     }
 
 

BusinessCommon/src/main/res/drawable/bg_evaluate_button_night.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="#E03E52"/>
+    <corners android:radius="@dimen/convert_80px"/>
+
+</shape>

BusinessCommon/src/main/res/layout/cook_card_view.xml

@@ -19,20 +19,23 @@
         android:id="@+id/tv_change_value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/convert_15px"
-        android:layout_marginEnd="@dimen/convert_21px"
+        android:maxWidth="@dimen/convert_240px"
+        android:layout_marginLeft="@dimen/convert_20px"
+        android:layout_marginRight="@dimen/convert_20px"
+        android:layout_marginStart="@dimen/convert_20px"
+        android:layout_marginEnd="@dimen/convert_20px"
         android:layout_marginBottom="@dimen/convert_8px"
-        android:includeFontPadding="false"
-        tools:text="00:60"
-        android:textColor="@color/panel_unselected"
-        android:textSize="@dimen/convert_40px"
         android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
+        android:includeFontPadding="false"
         android:marqueeRepeatLimit="marquee_forever"
         android:singleLine="true"
+        android:textColor="@color/panel_unselected"
+        android:textSize="@dimen/convert_40px"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.93"
+        tools:text="00:60"
+        />
 
     <ImageView
         android:id="@+id/view_icon"

BusinessCommon/src/main/res/values-pl/strings.xml

@@ -198,7 +198,7 @@
     <string name="ready_in">Czas przygotowania:</string>
     <string name="jar">SŁOIK</string>
     <string name="serving_sizes">Wielkość porcji</string>
-    <string name="score">Wynik</string>
+    <string name="score">Ocena</string>
     <string name="share">Udostępnij</string>
     <string name="delete">Usuń</string>
     <string name="recipe_update_tips">Znaleziono łącznie {{num}} przepisów. Czy chcesz je pobrać?</string>

BusinessMain/src/main/java/com/develop/main/ui/HomeActivity.kt

@@ -415,13 +415,13 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
          * */
         if (event.devInfo.resetZero.toInt() == 1 && event.devInfo.resetZero.toInt() != isResetZero) {
 
-
+        var modeName = if (getSN().startsWith("011"))  resources.getString(com.develop.common.R.string.citrus_juicer_011) else resources.getString(com.develop.common.R.string.citrus_juicer)
             navigateTo(Screens.Cook.COOK_MODES) {
                 val bundle = Bundle()
                 bundle.putString(MODE_TYPE, WorkModes.CITRUS_JUICER)
                 bundle.putString(
                     "mode_name",
-                    resources.getString(com.develop.common.R.string.citrus_juicer)
+                   modeName
                 )
                 with(bundle)
             }

BusinessMain/src/main/java/com/develop/main/viewmodel/HomeViewModel.kt

@@ -491,7 +491,7 @@ class HomeViewModel : BaseViewModel() {
         var hotWordList: MutableList<String> = mutableListOf()
         val type: Type = object : TypeToken<List<String>>() {}.type
         var lang = MMkvUtils.getString(CURRENT_LANGUAGE) ?:"EN"
-        val hotWordJson = MMkvUtils.getString("HistoryWords") ?: ""
+        val hotWordJson = MMkvUtils.getString("HistoryWords-$lang") ?: ""
 
         var commonDataList: MutableList<CommonSearchItem> = mutableListOf()
         val commonWordJson = MMkvUtils.getString("CommonWords-$lang") ?: ""
@@ -519,12 +519,13 @@ class HomeViewModel : BaseViewModel() {
         if (!hotWordList.contains(hotWord)) {
             hotWordList.add(hotWord)
         }
-        MMkvUtils.save("HistoryWords", Gson().toJson(hotWordList))
+        MMkvUtils.save("HistoryWords-$lang", Gson().toJson(hotWordList))
     }
 
     fun getHistoryWords(): MutableList<String> {
         var historyDataList: MutableList<String> = mutableListOf()
-        val hotWordJson = MMkvUtils.getString("HistoryWords") ?: ""
+        var lang = MMkvUtils.getString(CURRENT_LANGUAGE) ?:"EN"
+        val hotWordJson = MMkvUtils.getString("HistoryWords-$lang") ?: ""
         if (hotWordJson.isNotEmpty()) {
             val type: Type = object : TypeToken<List<String>>() {}.type
             historyDataList = Gson().fromJson(hotWordJson, type)

BusinessMain/src/main/res/layout/item_filter_and_sort_view.xml

@@ -13,7 +13,7 @@
         android:layout_centerVertical="true"
         android:background="@drawable/ic_check" />
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <com.develop.common.widget.MarqueeTextView
         android:id="@+id/tv_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -22,7 +22,12 @@
         android:textColor="@color/sort_filter_name"
         android:layout_toStartOf="@id/iv_check"
         android:gravity="center_vertical"
-        android:textSize="@dimen/convert_30px" />
+        android:textSize="@dimen/convert_30px"
+        android:ellipsize="marquee"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:singleLine="true"
+
+        />
 
     <View
         android:layout_width="match_parent"

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

@@ -81,6 +81,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     private var is062 = false
     private var is011 = false
     private var isResetZero = -1  //初始扭橙的值
+    private var sn = getSN()
     private val shareQRCodeDialog by lazy {
         ShareQRCodeDialog()
     }
@@ -160,11 +161,11 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             binding.tvEasy.visibility = View.VISIBLE
         }
 
-        if (getSN().startsWith("033F") || getSN().startsWith("033G")) {
+        if (sn.startsWith("033F") || sn.startsWith("033G")) {
             binding.startLayout.visibility = View.INVISIBLE
             binding.tvMoreScore.visibility = View.GONE
         }
-        if (getSN().startsWith("017A") || getSN().startsWith("062A")) {
+        if (sn.startsWith("017A") || sn.startsWith("062A")) {
             binding.tvJarCount.visibility = View.VISIBLE
         } else {
             binding.tvJarCount.visibility = View.INVISIBLE
@@ -239,7 +240,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             it.add(binding.viewIcon1)
             it.add(binding.viewIcon2)
             it.add(binding.tvFoodTime)
-            if (!(getSN().startsWith("033F") || getSN().startsWith("033G"))) {
+            if (!(sn.startsWith("033F") || sn.startsWith("033G"))) {
                 it.add(binding.startLayout)
             }
         }
@@ -253,10 +254,12 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         } else {
             binding.tvMoreDelete.setGone()
         }
-        if (getSN().startsWith("010F")) {
+        if (sn.startsWith("010F")||sn.startsWith("011")) {
             binding.tvMoreShare.setGone()
         }
+        if (sn.startsWith("011")){
 
+        }
     }
 
     private fun initListener() {

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

@@ -7,6 +7,9 @@ import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
 import com.blankj.utilcode.util.KeyboardUtils
+import com.develop.base.ext.getSN
+import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.setGone
 import com.develop.base.scop.safeGlobalScope
 import com.develop.base.util.GlobalToast
 import com.develop.common.data_repo.FoodDataProvider
@@ -31,7 +34,7 @@ class CookEvaluateActivity : CommonBindingActivity<ActivityCookEvaluateBinding>(
     }
 
     private val starViews = mutableListOf<View>()
-
+    private var sn = getSN()
     @JvmField
     @Autowired(name = "recipeId")
     var recipeId = ""
@@ -84,6 +87,10 @@ class CookEvaluateActivity : CommonBindingActivity<ActivityCookEvaluateBinding>(
             finish()
         }
 
+        if (sn.startsWith("011")){
+            binding.etContent.visibility = View.INVISIBLE
+            binding.tvGood.visibility = View.INVISIBLE
+        }
 
 //        safeGlobalScope.launch(Dispatchers.IO) {
 //            val userTag = FoodDataProvider.getUserDatabase().userInfoDao().queryUserTag(
@@ -150,7 +157,13 @@ class CookEvaluateActivity : CommonBindingActivity<ActivityCookEvaluateBinding>(
 
     private fun selectStar(count: Int) {
         if (!binding.tvOk.isEnabled){
-            binding.tvOk.background = resources.getDrawable(R.drawable.bg_evaluate_button)
+            if (isNightTheme()){
+                binding.tvOk.background = resources.getDrawable(R.drawable.bg_evaluate_button_night)
+
+            }else{
+                binding.tvOk.background = resources.getDrawable(R.drawable.bg_evaluate_button)
+
+            }
             binding.tvOk.isEnabled = true
         }
 

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

@@ -6,17 +6,19 @@
     android:paddingStart="@dimen/convert_7px"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <TextView
+    <com.develop.common.widget.MarqueeTextView
         android:id="@+id/tv_source_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textSize="@dimen/convert_30px"
         android:textColor="@color/source_name"
         android:layout_marginTop="@dimen/convert_21px"
-        tools:text="AAAAAAA"
+        tools:text="AAA"
         android:layout_marginEnd="@dimen/convert_16px"
-        android:maxLines="1"
-        android:ellipsize="end"
+        android:includeFontPadding="false"
+        android:ellipsize="marquee"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:singleLine="true"
         app:layout_constraintEnd_toStartOf="@+id/tv_source_amount"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>