wbspool 1 year ago
parent
commit
8815acabd8

+ 2 - 2
BusinessCommon/src/main/java/com/develop/common/widget/DirectionView.kt

@@ -44,12 +44,12 @@ class DirectionView : FrameLayout {
 
     fun updateDirectionView(direction: Direction) {
         if (direction == Direction.RIGHT) {
-            binding.ivDirection.rotation = 180f
+            binding.ivDirection.rotationY = 180f
             binding.tvTurnRight.setTextColor(0xffffffff.toInt())
             binding.tvTurnLeft.setTextColor(0xffE60012.toInt())
 
         } else {
-            binding.ivDirection.rotation = 0f
+            binding.ivDirection.rotationY = 0f
             binding.tvTurnRight.setTextColor(0xffE60012.toInt())
             binding.tvTurnLeft.setTextColor(0xffffffff.toInt())
         }

+ 3 - 4
BusinessCommon/src/main/res/values-fr/strings.xml

@@ -38,12 +38,11 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="settings">Paramètres</string>
     <string name="grid_view">Grid view</string>
     <string name="list_view">Aperçu de la liste</string>
-    <string name="adapted_cooking">Programmes automatiques</string>
+    <string name="adapted_cooking">Mode  Manuel</string>
     <string name="scales">Balance</string>
     <string name="boil_water">BOIL WATER</string>
     <string name="chop">Hacher</string>
-    <string name="ferment">Emulsionner</string>
-
+    <string name="mulsify">Emulsionner</string>
     <string name="slow_cook">Mijoter</string>
     <string name="knead_dough">Pétrir</string>
     <string name="steam">Vapeur</string>
@@ -247,7 +246,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="error_pot_clover_tips">The current cooking mode is not consistent with the type of pot cover. Do you want to switch to the corresponding cooking mode?</string>
     <string name="cook_eggs">COOK EGGS</string>
     <string name="cook_rice">COOK RICE</string>
-    <string name="mulsify">Emulsionner</string>
+    <string name="ferment">Yaourt</string>
     <string name="puree">PUREE</string>
     <string name="roast">ROAST</string>
     <string name="smoothie">SMOOTHIE</string>

+ 5 - 1
BusinessSetting/src/main/java/com/develop/setting/ui/BrightnessActivity.kt

@@ -52,7 +52,11 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
 
             override fun onStopTrackingTouch(p0: SeekBar?) {
                 if (p0 != null) {
-                    CofarSDK.configBrightness((128 - p0.progress))
+                    val v = (128 - p0.progress)
+                    if(v >= 0){
+                        CofarSDK.configBrightness(v)
+                    }
+
                 }
 
             }

+ 1 - 1
BusinessSetting/src/main/java/com/develop/setting/ui/HelpDocsActivity.kt

@@ -8,7 +8,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.common.router.Screens
 import com.develop.setting.R
 
-@Route(path = Screens.Setting.POLICY)
+@Route(path = Screens.Setting.HELP)
 class HelpDocsActivity : AppCompatActivity() {
 
 

+ 1 - 1
BusinessSetting/src/main/java/com/develop/setting/ui/SettingMainActivity.kt

@@ -98,7 +98,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                             navigateTo(Screens.Setting.RESTORE)
                         }
                         SettingType.STORAGE -> {
-                            navigateTo(Screens.Setting.HELP)
+                           openFileManager()
                         }
                     }
                 }

+ 6 - 2
BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -528,7 +528,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
                 //称重模式
                 viewModel.changeStep(CookSettingType.WEIGHT)
-                CofarSDK.changeMode(baseMode)
+                //CofarSDK.changeMode(baseMode)
             } else if (this == ModesType.TURBO.name) {
                 CofarSDK.recordConfig()
 
@@ -1394,6 +1394,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         binding.ivTurbo.visibility = View.GONE
         binding.ivWeight.visibility = View.GONE
         binding.tvModeName.text = viewModel.getModeTitle(resources)
+
         if (!isNightTheme()){
             binding.ivBanner.setBackgroundResource(viewModel.getBanner())
         }
@@ -1446,7 +1447,10 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             var cm = viewModel.modeType;
             modeType = viewModel.lastModeType
             viewModel.modeType = viewModel.lastModeType
-            binding.tvModeName.text = viewModel.getModeTitle(resources)
+            //binding.tvModeName.text = viewModel.getModeTitle(resources)
+            var workMode = ConfigUtils.getMode(modeType)
+            binding.tvModeName.text = getString(resources.getIdentifier(workMode?.name,"string",this.packageName))
+
             if (!isNightTheme()){
                 binding.ivBanner.setBackgroundResource(viewModel.getBanner())
             }

+ 1 - 1
app/build.gradle

@@ -8,7 +8,7 @@ plugins {
 
 ext{
 
-    versionCode=230606190
+    versionCode=230606210
     brandCode="010D"
     brandVersionCode=versionCode
     model="1039"

BIN
app/src/main/assets/skins/night.skin


BIN
libThirdPart/libs/cofar-cooking-device-sdk-0.0.1-SNAPSHOT.jar


BIN
skin-support/src/main/res/drawable/cm_icon_mulsify.webp


BIN
skin-support/src/main/res/drawable/ic_grid_ferment.webp