062换肤文件

BusinessCommon/src/main/java/com/develop/common/dialog/RecipeUpdateDialog.kt

@@ -10,6 +10,7 @@ import android.view.animation.LinearInterpolator
 import android.view.animation.RotateAnimation
 import android.widget.RelativeLayout
 import androidx.fragment.app.FragmentManager
+import com.develop.base.ext.isBrand062
 import com.develop.base.mvvm.FullScreenTransparentDialog
 import com.develop.base.util.ThreadUtils
 import com.develop.base.util.TopResumedAtyHolder
@@ -25,6 +26,7 @@ class RecipeUpdateDialog() : FullScreenTransparentDialog() {
     var type = "UPDATE_TIPS";
 
     var msg = ""
+    var is062 = isBrand062()
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
@@ -74,7 +76,11 @@ class RecipeUpdateDialog() : FullScreenTransparentDialog() {
             val layoutParams = binding.tvYes.layoutParams as RelativeLayout.LayoutParams;
             layoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL)
             binding.tvCancel.layoutParams = layoutParams
+            if (is062){
+                binding.tvYes.setBackgroundResource(R.drawable.dialog_recipes_cancel)
+            }
             binding.tvYes.text = getString(R.string.stop)
+
         }
 
         if (type == "SUCCESS") {
@@ -87,6 +93,9 @@ class RecipeUpdateDialog() : FullScreenTransparentDialog() {
             layoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL)
             binding.tvCancel.layoutParams = layoutParams
             binding.tvYes.text = getString(R.string.ok)
+            if (is062){
+                binding.tvYes.setBackgroundResource(R.drawable.dialog_recipes_download)
+            }
         }
        val animation = RotateAnimation(
             0f,

BusinessCommon/src/main/java/com/develop/common/router/Screens.kt

@@ -29,6 +29,7 @@ object Screens {
     object Main {
         private const val SCHEMA = "/main"
         const val ENTRANCE_CHOSEN = "$SCHEMA/entrance_chosen"
+        const val ENTRANCE_CHOSEN_TWO = "$SCHEMA/entrance_chosen_two"
         const val HOME = "$SCHEMA/home"
     }
 

BusinessCommon/src/main/java/com/develop/common/utils/AppVersionUtil.kt

@@ -154,6 +154,7 @@ object AppVersionUtil {
                                     }
 
                                     override fun onCancel() {
+
                                     }
 
                                 }

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

@@ -5,6 +5,7 @@ import android.graphics.ColorFilter
 import android.graphics.Paint
 import android.graphics.PixelFormat
 import android.graphics.drawable.Drawable
+import com.develop.base.ext.isBrand062
 
 class CookProgressDrawable: Drawable() {
 
@@ -13,8 +14,9 @@ class CookProgressDrawable: Drawable() {
     private val bgColor = 0xffE5E5E5.toInt()
     private val pgColor = 0xffE60012.toInt()
     private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+    private val is062 = isBrand062()
     init {
-        paint.color = pgColor
+        paint.color = if (is062) 0xffDAE343.toInt() else pgColor
         paint.style = Paint.Style.FILL
     }
 

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="@dimen/convert_100px"/>
+    <stroke android:color="@color/color_EE8F08"
+        android:width="@dimen/convert_2px"/>
+
+</shape>

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

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

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

@@ -43,7 +43,7 @@
         <TextView
             android:id="@+id/tv_ok"
             android:layout_width="@dimen/convert_300px"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_height="@dimen/convert_100px"
             android:layout_below="@+id/tv_msg"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/convert_30px"

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

@@ -77,7 +77,7 @@
             android:layout_height="@dimen/convert_60px"
             android:layout_below="@id/tv_msg"
             android:layout_marginTop="@dimen/convert_80px"
-            android:background="@drawable/bg_orange_button"
+            android:background="@drawable/dialog_recipes_download"
             android:gravity="center"
             android:text="@string/update"
             android:textColor="#fff"
@@ -90,11 +90,11 @@
             android:layout_below="@id/tv_msg"
             android:layout_alignParentEnd="true"
             android:layout_marginTop="@dimen/convert_80px"
-            android:background="@drawable/bg_ee8f08_stoke"
+            android:background="@drawable/dialog_recipes_cancel"
             android:elevation="@dimen/convert_4px"
             android:gravity="center"
             android:text="@string/no"
-            android:textColor="@color/no_color"
+            android:textColor="@color/dialog_recipes_no"
             android:textSize="@dimen/convert_30px" />
 
 

BusinessCommon/src/main/res/values/colors.xml

@@ -153,6 +153,7 @@
     <color name="more_bg">#E83F97</color>
     <color name="hide_bg">#1EABDB</color>
     <color name="no_color">#FB900C</color>
+    <color name="dialog_recipes_no">#FB900C</color>
     <color name="view_change">#EE8F08</color>
     <color name="text_hit">#B1B2B2</color>
     <color name="direction_color">#ffffff</color>

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

@@ -3,6 +3,7 @@ package com.develop.main.ui
 import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.lifecycle.MutableLiveData
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.base.ext.getModelNum
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.src
@@ -41,6 +42,7 @@ import com.tuya.smartai.iot_sdk.Log
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
+@Route(path = Screens.Main.ENTRANCE_CHOSEN_TWO)
 class ModeEntrance2Activity : CommonBindingActivity<ActivityModeEntrance2Binding>() {
     private var title = ""
     private var isShowLoading = false

BusinessSetting/src/main/java/com/develop/setting/ui/LanguageActivity.kt

@@ -213,6 +213,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
             var l = this as ConfigUtils.Lang;
             MMkvUtils.save(CURRENT_LANGUAGE, l.value)
             if (isFromSetting){
+                //系统变化语言
                   updateLanguage(Locale(l.value.lowercase(),l.value.uppercase()))
             }
             LanguageUtils.applyLanguage(Locale(l.value.lowercase(),l.value.uppercase()))

skin-blue/src/main/res/drawable/dialog_recipes_cancel.xml

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

skin-blue/src/main/res/drawable/dialog_recipes_download.xml

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

skin-blue/src/main/res/values/colors.xml

@@ -158,10 +158,11 @@
     <color name="tool_name">#5887DA</color>
     <color name="more_circle">#E03E52</color>
     <color name="cook_tab_unselected">#000</color>
-    <color name="step_status_bar">#1A1A1A</color>
+    <color name="step_status_bar">#5887DA</color>
     <color name="more_bg">#E03E52</color>
     <color name="hide_bg">#fff</color>
     <color name="no_color">#5887DA</color>
+    <color name="dialog_recipes_no">#ffffff</color>
     <color name="view_change">#5887DA</color>
     <color name="text_hit">#eeeeee</color>
 </resources>