Browse Source

011F 换肤新增图片

zhangshenjie 3 months ago
parent
commit
4d08e628bc
66 changed files with 264 additions and 3 deletions
  1. 2 2
      BusinessAirFryer/src/main/assets/config_011.json
  2. 259 0
      BusinessAirFryer/src/main/assets/config_011F.json
  3. 3 1
      BusinessCommon/src/main/java/com/develop/common/utils/ConfigUtils.kt
  4. BIN
      skin-DarkBlue/src/main/res/drawable/aab.png
  5. BIN
      skin-DarkBlue/src/main/res/drawable/air_fryer.png
  6. BIN
      skin-DarkBlue/src/main/res/drawable/air_steam.png
  7. BIN
      skin-DarkBlue/src/main/res/drawable/bakc.png
  8. BIN
      skin-DarkBlue/src/main/res/drawable/bake.png
  9. BIN
      skin-DarkBlue/src/main/res/drawable/bg_cook_session.webp
  10. BIN
      skin-DarkBlue/src/main/res/drawable/chicken.png
  11. BIN
      skin-DarkBlue/src/main/res/drawable/chicken_wing.png
  12. BIN
      skin-DarkBlue/src/main/res/drawable/cm_icon_cook_eggs.png
  13. BIN
      skin-DarkBlue/src/main/res/drawable/cm_icon_cook_rice.png
  14. BIN
      skin-DarkBlue/src/main/res/drawable/cm_icon_puree.png
  15. BIN
      skin-DarkBlue/src/main/res/drawable/cm_icon_roast.png
  16. BIN
      skin-DarkBlue/src/main/res/drawable/cm_icon_smoothie.png
  17. BIN
      skin-DarkBlue/src/main/res/drawable/cm_icon_sovs_vide.png
  18. BIN
      skin-DarkBlue/src/main/res/drawable/dehydrate.png
  19. BIN
      skin-DarkBlue/src/main/res/drawable/drumsticks.png
  20. BIN
      skin-DarkBlue/src/main/res/drawable/egg_tart.png
  21. BIN
      skin-DarkBlue/src/main/res/drawable/fish_steak.png
  22. BIN
      skin-DarkBlue/src/main/res/drawable/french_fries.png
  23. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_auto_clean_011.png
  24. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_auto_clean_bg_011.png
  25. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_boil_water_011.png
  26. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_boil_water_bg_011.png
  27. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_chop_011.png
  28. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_chop_bg_011.png
  29. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_cook_rice_011.png
  30. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_cook_rice_bg_011.png
  31. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_food_processor_011.png
  32. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_food_processor_bg_011.png
  33. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_knead_dough_011.png
  34. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_knead_dough_bg_011.png
  35. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_smoothie_011.png
  36. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_smoothie_bg_011.png
  37. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_sovs_vide_011.png
  38. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_sovs_vide_bg_011.png
  39. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_steam_011.png
  40. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_steam_bg_011.png
  41. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_turbo_011.png
  42. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_turbo_bg_011.png
  43. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_weight_011.png
  44. BIN
      skin-DarkBlue/src/main/res/drawable/ic_a_weight_bg_011.png
  45. BIN
      skin-DarkBlue/src/main/res/drawable/ic_language_banner.webp
  46. BIN
      skin-DarkBlue/src/main/res/drawable/ic_mode_banner1.webp
  47. BIN
      skin-DarkBlue/src/main/res/drawable/ic_mode_banner2.webp
  48. BIN
      skin-DarkBlue/src/main/res/drawable/ic_mode_boil_water.webp
  49. BIN
      skin-DarkBlue/src/main/res/drawable/ic_mode_chop.webp
  50. BIN
      skin-DarkBlue/src/main/res/drawable/ic_mode_food_processor.webp
  51. BIN
      skin-DarkBlue/src/main/res/drawable/ic_mode_knead_dough.webp
  52. BIN
      skin-DarkBlue/src/main/res/drawable/ic_mode_slow_cook.webp
  53. BIN
      skin-DarkBlue/src/main/res/drawable/ic_mode_weight.webp
  54. BIN
      skin-DarkBlue/src/main/res/drawable/ic_screen1.webp
  55. BIN
      skin-DarkBlue/src/main/res/drawable/ic_screensaver.png
  56. BIN
      skin-DarkBlue/src/main/res/drawable/ic_setting_about.webp
  57. BIN
      skin-DarkBlue/src/main/res/drawable/ic_setting_brightness.webp
  58. BIN
      skin-DarkBlue/src/main/res/drawable/ic_setting_language.webp
  59. BIN
      skin-DarkBlue/src/main/res/drawable/ic_setting_reset.webp
  60. BIN
      skin-DarkBlue/src/main/res/drawable/ic_setting_wifi.webp
  61. BIN
      skin-DarkBlue/src/main/res/drawable/meat.png
  62. BIN
      skin-DarkBlue/src/main/res/drawable/pizza.png
  63. BIN
      skin-DarkBlue/src/main/res/drawable/reheat.png
  64. BIN
      skin-DarkBlue/src/main/res/drawable/shrimp.png
  65. BIN
      skin-DarkBlue/src/main/res/drawable/steam.png
  66. BIN
      skin-DarkBlue/src/main/res/drawable/vegetable.png

+ 2 - 2
BusinessAirFryer/src/main/assets/config_011.json

@@ -76,7 +76,7 @@
     {
       "type": "SMOOTHIE",
       "name": "smoothie_011",
-      "bg": "ic_a_smoothie_011",
+      "bg": "ic_a_smoothie_bg_011",
       "icon": "ic_a_smoothie_011",
       "devMode": "SOUP",
       "listShow": true
@@ -92,7 +92,7 @@
     {
       "type": "WIGHT",
       "name": "wight_011",
-      "bg": "ic_a_weight_011",
+      "bg": "ic_a_weight_bg_011",
       "icon": "ic_a_weight_011",
       "devMode": "SOUP",
       "listShow": true

+ 259 - 0
BusinessAirFryer/src/main/assets/config_011F.json

@@ -0,0 +1,259 @@
+{
+  "baseQrUrl": "https://icook.cofarcn.com/h5/index.html",
+  "workModes": [
+    {
+      "type": "ADAPTED_COOKING",
+      "name": "adapted_cooking_011",
+      "bg": "ic_mode_diy",
+      "icon": "ic_grid_adapted_cooking",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+    {
+      "type": "KNEAD_TOUGH",
+      "name": "knead_011",
+      "bg": "ic_a_knead_dough_bg_011",
+      "icon": "ic_a_knead_dough_011",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "STEAM",
+      "name": "steam_011",
+      "bg": "ic_a_steam_bg_011",
+      "icon": "ic_a_steam_011",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "BOIL_WATER",
+      "name": "boil_water_011",
+      "bg": "ic_a_boil_water_bg_011",
+      "icon": "ic_a_boil_water_011",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "SOVS_VIDE",
+      "name": "sovs_vide_011",
+      "bg": "ic_a_sovs_vide_bg_011",
+      "icon": "ic_a_sovs_vide_011",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "COOK_RICE",
+      "name": "cook_rice_011",
+      "bg": "ic_a_cook_rice_bg_011",
+      "icon": "ic_a_cook_rice_011",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "FOOD_PROCESSOR",
+      "name": "food_processor_011",
+      "bg": "ic_a_food_processor_bg_011",
+      "icon": "ic_a_food_processor_011",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "CHOP",
+      "name": "chop_011",
+      "bg": "ic_a_chop_bg_011",
+      "icon": "ic_a_chop_011",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "TURBO",
+      "name": "turbo_011",
+      "bg": "ic_a_turbo_bg_011",
+      "icon": "ic_a_turbo_011",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "SMOOTHIE",
+      "name": "smoothie_011",
+      "bg": "ic_a_smoothie_bg_011",
+      "icon": "ic_a_smoothie_011",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "AUTO_CLEAN",
+      "name": "auto_clean_011",
+      "bg": "ic_a_auto_clean_bg_011",
+      "icon": "ic_a_auto_clean_011",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "WIGHT",
+      "name": "wight_011",
+      "bg": "ic_a_weight_bg_011",
+      "icon": "ic_a_weight_011",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+
+    {
+      "type": "DICING",
+      "name": "dicing_011",
+      "bg": "ic_a_dicing_bg_011",
+      "icon": "ic_a_dicing_011",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+    {
+      "type": "CITRUS_JUICER",
+      "name": "citrus_juicer_011",
+      "bg": "ic_a_citrus_juicer_bg_011",
+      "icon": "ic_a_citrus_juicer_011",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+
+    {
+      "type": "POTATO_PEELER",
+      "name": "potato_peeler_011",
+      "bg": "ic_a_potato_peeler_bg_011",
+      "icon": "ic_a_potato_peeler_011",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+
+    {
+      "type": "SLOW_COOK",
+      "name": "slow_cook",
+      "bg": "ic_a_slow_cook_bg",
+      "icon": "ic_a_slow_cook",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+    {
+      "type": "COOK_EGGS",
+      "name": "cook_eggs",
+      "bg": "cm_icon_cook_eggs",
+      "icon": "cm_icon_cook_eggs",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+
+
+
+    {
+      "type": "AF_DIY",
+      "name": "af_diy",
+      "bg": "af_diy_bg",
+      "icon": "af_diy",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_AIR_FRYER",
+      "name": "af_air_fryer",
+      "bg": "af_air_fryer_bg_011",
+      "icon": "af_air_fryer_011",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_BAKE",
+      "name": "af_bake",
+      "bg": "af_bake_bg_011",
+      "icon": "af_bake_011",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_DRUMSTICKS",
+      "name": "af_drumsticks",
+      "bg": "af_drumsticks_bg_011",
+      "icon": "af_drumsticks_011",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_EGG_TART",
+      "name": "af_egg_tart",
+      "bg": "af_egg_tart_bg",
+      "icon": "af_egg_tart",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_PIZZA",
+      "name": "af_pizza",
+      "bg": "af_pizza_bg_011",
+      "icon": "af_pizza_011",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_DEHYDRATE",
+      "name": "af_dehydrate",
+      "bg": "af_dehydrate_bg_011",
+      "icon": "af_dehydrate_011",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_REHEAT",
+      "name": "af_reheat",
+      "bg": "af_reheat_bg_011",
+      "icon": "af_reheat_011",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_CHICKEN_WING",
+      "name": "af_chicken_wing",
+      "bg": "af_a_chicken_wing_bg_011",
+      "icon": "af_a_chicken_wing_011",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_STEAK",
+      "name": "af_steak",
+      "bg": "af_steak_bg_011",
+      "icon": "af_steak_011",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_SEA_FOOD",
+      "name": "af_sea_food",
+      "bg": "af_sea_food_bg_011",
+      "icon": "af_sea_food_011",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_VEGETABLE",
+      "name": "af_vegetable",
+      "bg": "af_vegetable_bg_011",
+      "icon": "af_vegetable_011",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_MUTTON_CHOP",
+      "name": "af_mutton_chop",
+      "bg": "af_mutton_chop_bg",
+      "icon": "af_mutton_chop",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "WIGHT",
+      "name": "wight_011",
+      "bg": "ic_a_weight_011",
+      "icon": "ic_a_weight_011",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    }
+  ]
+}

+ 3 - 1
BusinessCommon/src/main/java/com/develop/common/utils/ConfigUtils.kt

@@ -41,7 +41,9 @@ object ConfigUtils {
                 inputStream = GlobalApp().assets.open("config_000B.json")
             }else if (sn.startsWith("010I")||sn.startsWith("010H")){
                 inputStream = GlobalApp().assets.open("config_010IH.json")
-            } else {
+            } else if (sn.startsWith("011F")){
+                inputStream = GlobalApp().assets.open("config_011F.json")
+            }else {
                 if (fileList.contains("config_${brandNum}.json")) {
                     inputStream = GlobalApp().assets.open("config_${brandNum}.json")
                 } else {

BIN
skin-DarkBlue/src/main/res/drawable/aab.png


BIN
skin-DarkBlue/src/main/res/drawable/air_fryer.png


BIN
skin-DarkBlue/src/main/res/drawable/air_steam.png


BIN
skin-DarkBlue/src/main/res/drawable/bakc.png


BIN
skin-DarkBlue/src/main/res/drawable/bake.png


BIN
skin-DarkBlue/src/main/res/drawable/bg_cook_session.webp


BIN
skin-DarkBlue/src/main/res/drawable/chicken.png


BIN
skin-DarkBlue/src/main/res/drawable/chicken_wing.png


BIN
skin-DarkBlue/src/main/res/drawable/cm_icon_cook_eggs.png


BIN
skin-DarkBlue/src/main/res/drawable/cm_icon_cook_rice.png


BIN
skin-DarkBlue/src/main/res/drawable/cm_icon_puree.png


BIN
skin-DarkBlue/src/main/res/drawable/cm_icon_roast.png


BIN
skin-DarkBlue/src/main/res/drawable/cm_icon_smoothie.png


BIN
skin-DarkBlue/src/main/res/drawable/cm_icon_sovs_vide.png


BIN
skin-DarkBlue/src/main/res/drawable/dehydrate.png


BIN
skin-DarkBlue/src/main/res/drawable/drumsticks.png


BIN
skin-DarkBlue/src/main/res/drawable/egg_tart.png


BIN
skin-DarkBlue/src/main/res/drawable/fish_steak.png


BIN
skin-DarkBlue/src/main/res/drawable/french_fries.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_auto_clean_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_auto_clean_bg_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_boil_water_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_boil_water_bg_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_chop_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_chop_bg_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_cook_rice_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_cook_rice_bg_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_food_processor_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_food_processor_bg_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_knead_dough_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_knead_dough_bg_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_smoothie_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_smoothie_bg_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_sovs_vide_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_sovs_vide_bg_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_steam_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_steam_bg_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_turbo_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_turbo_bg_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_weight_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_a_weight_bg_011.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_language_banner.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_mode_banner1.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_mode_banner2.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_mode_boil_water.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_mode_chop.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_mode_food_processor.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_mode_knead_dough.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_mode_slow_cook.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_mode_weight.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_screen1.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_screensaver.png


BIN
skin-DarkBlue/src/main/res/drawable/ic_setting_about.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_setting_brightness.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_setting_language.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_setting_reset.webp


BIN
skin-DarkBlue/src/main/res/drawable/ic_setting_wifi.webp


BIN
skin-DarkBlue/src/main/res/drawable/meat.png


BIN
skin-DarkBlue/src/main/res/drawable/pizza.png


BIN
skin-DarkBlue/src/main/res/drawable/reheat.png


BIN
skin-DarkBlue/src/main/res/drawable/shrimp.png


BIN
skin-DarkBlue/src/main/res/drawable/steam.png


BIN
skin-DarkBlue/src/main/res/drawable/vegetable.png