Browse Source

公版,054代码上传

zhangshenjie 3 months ago
parent
commit
a68a88ea14

BIN
BusinessCommon/src/main/res/drawable-xxxhdpi/ic_more_star_011.webp


+ 7 - 0
BusinessCommon/src/main/res/drawable/more_bg_conner_011.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="@color/more_bg_011"/>
+    <corners android:radius="@dimen/convert_30px"/>
+
+</shape>

+ 1 - 0
BusinessCommon/src/main/res/values/colors.xml

@@ -157,6 +157,7 @@
     <color name="cook_tab_unselected">#ffa627</color>
     <color name="step_status_bar">#FFA627</color>
     <color name="more_bg">#E83F97</color>
+    <color name="more_bg_011">#D51317</color>
     <color name="hide_bg">#1EABDB</color>
     <color name="no_color">#FB900C</color>
     <color name="dialog_recipes_no">#FB900C</color>

+ 21 - 5
BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailActivity.kt

@@ -252,7 +252,14 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         } else {
             binding.viewLike.src = com.develop.common.R.drawable.ic_unlike
         }
-        binding.viewMore.background_drawable = com.develop.common.R.drawable.more_bg_conner
+        if (baseSn.startsWith("011")||baseSn.startsWith("054")){
+            binding.viewMore.background_drawable = com.develop.common.R.drawable.more_bg_conner_011
+            binding.viewMoreClose.setBgColor(com.develop.common.R.color.more_bg_011)
+
+        }else{
+            binding.viewMore.background_drawable = com.develop.common.R.drawable.more_bg_conner
+
+        }
         binding.viewHide.background_drawable = com.develop.common.R.drawable.hide_bg_conner
         if (cookSource == "local") {
             binding.tvDownload.setText(com.develop.common.R.string.start_cooking)
@@ -393,10 +400,19 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             }
         }
 
-        binding.tvMoreScore.setLeftDrawable(
-            com.develop.common.R.drawable.ic_more_star,
-            com.develop.common.R.dimen.convert_60px
-        )
+        if (baseSn.startsWith("011")||baseSn.startsWith("054")){
+            binding.tvMoreScore.setLeftDrawable(
+                com.develop.common.R.drawable.ic_more_star_011,
+                com.develop.common.R.dimen.convert_60px
+            )
+
+        }else{
+            binding.tvMoreScore.setLeftDrawable(
+                com.develop.common.R.drawable.ic_more_star,
+                com.develop.common.R.dimen.convert_60px
+            )
+
+        }
 
         binding.tvMoreDelete.setLeftDrawable(
             com.develop.common.R.drawable.ic_more_delete,

+ 1 - 0
skin-zeroOneOne/src/main/res/values/colors.xml

@@ -164,4 +164,5 @@
     <color name="dialog_recipes_no">#1A1A1A</color>
     <color name="view_change">#fff</color>
     <color name="text_hit">#eeeeee</color>
+
 </resources>