提交人：jtm

提交内容:bug fixed

BusinessAirFryer/src/main/assets/config_010.json

@@ -36,7 +36,7 @@
     {
       "type": "FERMENT",
       "name": "ferment",
-      "bg": "ic_mode_chop",
+      "bg": "ic_mode_ferment",
       "icon": "ic_grid_ferment",
       "devMode": "SOUP",
       "listShow": true

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -113,7 +113,7 @@ object DataFactory {
             R.drawable.ic_grid_adapted_cooking,
             R.drawable.ic_grid_weight,
             R.drawable.ic_grid_boil_water,
-            R.drawable.ic_grid_chop,
+            R.drawable.ic_grid_ferment,
             R.drawable.ic_grid_slow_cook,
             R.drawable.ic_grid_knead_dough,
             R.drawable.ic_grid_steam,

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

@@ -132,8 +132,8 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="pmpt_cancel">Annuler</string>
     <string name="pmpt_msg">Conseil</string>
     <string name="dev_end_of_run_tips">Bon appetit ! </string>
-    <string name="hight_temp_warning_tips">Attention, la température excède 60 degrès et la vitesse 3, êtes-vous sûre de vouloir continuer? </string>
-    <string name="hight_temp_turbo_tips">Attention, la température excède 60 degrès, vous ne pouvez pas utiliser la fonction Pulse. Merci d\'attendre que le bol refroidisse</string>
+    <string name="hight_temp_warning_tips">La température actuelle est trop élevée, voulez-vous continuer à utiliser la vitesse maximale ?</string>
+    <string name="hight_temp_turbo_tips">Si la température est supérieure à 60⁰, la fonction Pulse ne peut pas être utilisée.</string>
     <string name="update_msg">Le système se met à jour, merci de patienter</string>
     <string name="update_title">Dernière version téléchargée</string>
     <string name="finish_download">Fin de téléchargement</string>
@@ -202,11 +202,11 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="weight_two_kg_tips">Calibrez la balance sur 2kg</string>
     <string name="weight_align_success">La balance est calibrée avec succès !</string>
     <string name="change_lang_tips2">Après le paramètrage de la langue, les recettes se mettrons automatiquement à jour et redémarreront. Etes-vous sûre de vouloir changer de langue?</string>
-    <string name="pot_clover_not_clost_tips">Le couvercle n\'est pas fermé. Veuillez le fermer pour continuer</string>
+    <string name="pot_clover_not_clost_tips">Veuillez bien fermer le couvercle.</string>
     <string name="screen_saver_title">Voulez-vous mettre l\'écran en veille?</string>
     <string name="sex">Sexe</string>
     <string name="wight">Balance</string>
-    <string name="running_block_tips">Veuillez arrêter ce programme pour en démarrer un autre</string>
+    <string name="running_block_tips">Le robot est en cours de fonctionnement. Veuillez l\'arrêter ou appuyer sur pause avant de continuer.</string>
     <string name="unset_target_time">Le temps n\'a pas été paramétré</string>
     <string name="empty_notice">Notes vides</string>
     <string name="app_name">Mises à jour système Android</string>

BusinessSetting/src/main/AndroidManifest.xml

@@ -9,9 +9,6 @@
         tools:ignore="ProtectedPermissions" />
 
     <application>
-        <activity
-            android:name=".HelpDocsActivity"
-            android:exported="false" />
         <activity
             android:name=".ui.PowerAnimationActivity"
             android:screenOrientation="landscape" />

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

@@ -1,17 +1,22 @@
 package com.develop.setting.ui
 
 import android.graphics.Rect
+import android.net.wifi.WifiManager
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.EditText
 import android.widget.RelativeLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.azhon.appupdate.util.DensityUtil
+import com.blankj.utilcode.util.DeviceUtils
+import com.blankj.utilcode.util.KeyboardUtils
 import com.blankj.utilcode.util.NetworkUtils
+import com.blankj.utilcode.util.ViewUtils
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
-import com.develop.base.ext.toJson
 import com.develop.base.manager.WifiData
 import com.develop.base.manager.WifiHelp
 import com.develop.base.util.GlobalToast
@@ -19,6 +24,7 @@ import com.develop.common.event.FinishAtyEvent
 import com.develop.common.router.Screens
 import com.develop.common.tag.WIFI_FROM_MAIN_SETTING
 import com.develop.common.ui.CommonBindingActivity
+import com.develop.common.widget.HomeFunctionTopBar.Companion.dp60
 import com.develop.common.widget.WifiContentView
 import com.develop.setting.R
 import com.develop.setting.databinding.ActivityWifiListBinding
@@ -30,24 +36,41 @@ import com.yanzhenjie.permission.AndPermission
 import com.yanzhenjie.permission.runtime.Permission
 import org.greenrobot.eventbus.EventBus
 
+
 @Route(path = Screens.Setting.WIFI)
-class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
+class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
+    KeyboardUtils.OnSoftInputChangedListener {
     private var isFromMainSetting = false
     private lateinit var wifiHelp: WifiHelp
     private var wifiDataList = mutableListOf<WifiData>()
 
     private var selectedPosition = -1
-
     override fun createViewBinding(inflater: LayoutInflater): ActivityWifiListBinding {
         return ActivityWifiListBinding.inflate(inflater)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (!getWlanStatus()) {
+            setWlanStatus(true)
+        }
+        KeyboardUtils.registerSoftInputChangedListener(this, this)
         initView()
         initListener()
     }
 
+    private fun getWlanStatus(): Boolean {
+        //从系统服务中获取无线网络管理器
+        val wm = applicationContext.getSystemService(WIFI_SERVICE) as WifiManager
+        return wm.isWifiEnabled
+    }
+
+    private fun setWlanStatus(enabled: Boolean) {
+        //从系统服务中获取无线网络管理器
+        val wm = applicationContext.getSystemService(WIFI_SERVICE) as WifiManager
+        wm.isWifiEnabled = enabled
+    }
+
     private fun initView() {
         isFromMainSetting = intent.extras?.getBoolean(WIFI_FROM_MAIN_SETTING) ?: false
 
@@ -79,8 +102,11 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
             setup {
 
                 addType<WifiData>(R.layout.item_wifi_info)
-                onClick{
-                    Log.i("linzm","22wifi-debug,selectedPosition：${selectedPosition}，absoluteAdapterPosition：${absoluteAdapterPosition}")
+                onClick {
+                    Log.i(
+                        "linzm",
+                        "22wifi-debug,selectedPosition：${selectedPosition}，absoluteAdapterPosition：${absoluteAdapterPosition}"
+                    )
 
                 }
                 onBind {
@@ -108,7 +134,10 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
                         }
                     }
 
-                    Log.i("linzm","wifi-debug,selectedPosition：${selectedPosition}，absoluteAdapterPosition：${absoluteAdapterPosition},${model.toString()}")
+                    Log.i(
+                        "linzm",
+                        "wifi-debug,selectedPosition：${selectedPosition}，absoluteAdapterPosition：${absoluteAdapterPosition},${model.toString()}"
+                    )
                     wifiContent.showInputView(selectedPosition == absoluteAdapterPosition, model)
 
                     R.id.wifi_content.onLongClick {
@@ -188,5 +217,21 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
         var dp30 = (com.develop.common.R.dimen.convert_30px).resId2Dimension().toInt()
         var dp45 = (com.develop.common.R.dimen.convert_45px).resId2Dimension().toInt()
         var dp50 = (com.develop.common.R.dimen.convert_50px).resId2Dimension().toInt()
+        var dp90 = (com.develop.common.R.dimen.convert_160px).resId2Dimension().toInt()
+    }
+
+    override fun onSoftInputChanged(height: Int) {
+        val location = IntArray(2)
+        binding.wifiRecycler.layoutManager?.findViewByPosition(selectedPosition)
+            ?.findViewById<EditText>(
+                com.develop.common.R.id.et_pwd
+            )?.getLocationOnScreen(location)
+        val viewBottom = resources.displayMetrics.heightPixels - location[1]
+        val requireDistance = dp90
+        if (viewBottom - height >= requireDistance) {
+            return
+        }
+        val deltaHeight = height - viewBottom + requireDistance
+        binding.wifiRecycler.scrollY = deltaHeight
     }
 }

BusinessStep/src/main/java/com/develop/step/ui/FoodListActivity.kt

@@ -17,6 +17,7 @@ import com.develop.common.widget.FoodContentView
 import com.develop.common.R
 import com.develop.common.data_repo.FoodDataProvider
 import com.develop.common.dialog.LoadingDialog
+import com.develop.common.event.RefreshLikeDataEvent
 import com.develop.common.tag.*
 import com.develop.step.databinding.ActivityFoodListBinding
 import com.develop.step.viewmodel.FoodListViewModel
@@ -96,6 +97,13 @@ class FoodListActivity : CommonBVMActivity<ActivityFoodListBinding, FoodListView
         viewModel.refreshData()
     }
 
+
+    @Subscribe
+    fun onLikeStateEvent(event: RefreshLikeDataEvent) {
+        viewModel.refreshData()
+    }
+
+
     override fun onResume() {
         super.onResume()
         viewModel.refreshData()

BusinessStep/src/main/java/com/develop/step/viewmodel/ModesViewMode.kt

@@ -7,7 +7,6 @@ import android.view.View
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
 import androidx.lifecycle.MutableLiveData
-import com.develop.base.ext.globalApp
 import com.develop.base.mvvm.BaseViewModel
 import com.develop.common.data_repo.db.ModesType
 import com.develop.step.CookSettingType
@@ -55,7 +54,7 @@ class ModesViewMode : BaseViewModel() {
     fun getBanner(): Int {
         return when (modeType) {
             ModesType.CHOP.name -> {
-                R.drawable.ic_mode_chop
+                R.drawable.ic_grid_ferment
             }
             ModesType.STEAM.name -> {
                 R.drawable.ic_mode_steam
@@ -82,7 +81,7 @@ class ModesViewMode : BaseViewModel() {
                 R.drawable.ic_mode_turbo
             }
             else -> {
-                R.drawable.ic_mode_chop
+                R.drawable.ic_grid_ferment
             }
         }
     }

app/build.gradle

@@ -12,7 +12,7 @@ ext{
 
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-    brandCode="010D"
+    brandCode="030A"
     model="1039"
 }
 

app/src/main/AndroidManifest.xml

@@ -42,14 +42,14 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/SplashNightTheme"
+        android:theme="@style/SplashTheme"
         android:largeHeap="true"
         tools:targetApi="31">
         <activity
             android:screenOrientation="landscape"
             android:name=".MainActivity"
             android:exported="true"
-            android:theme="@style/SplashNightTheme">
+            android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.HOME" />