sdk更新，

BusinessCommon/src/main/java/com/develop/common/data_repo/net/model/request/DeviceInfoBody.kt

@@ -18,7 +18,7 @@ object DeviceInfoBody {
         val times = MMkvUtils.getString("appTime") ?: "0"
         val appTime: Long = times.toLong()
 
-        val time = if (sn.startsWith("010")) {
+        var time = if (sn.startsWith("010")) {
             if (appTime > recipeUpdateTime) {
                 appTime.toString()
             } else {

BusinessCommon/src/main/java/com/develop/common/ui/CommonBindingActivity.kt

@@ -285,6 +285,11 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
             return
         }
 
+        //处理没放锅程序还继续运行
+        if (event.msg=="mei_fang_guo_yi_chan"&& CofarSDK.devInfo().runningStatus != DevStatus.STOP){
+            CofarSDK.stop()
+        }
+
         // 彩屏风扇不转，报错彩屏散热异常 无需弹窗
         if (CofarSDK.devInfo().errCode.toInt() == 15) {
             return

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

@@ -11,6 +11,7 @@ import androidx.core.content.ContextCompat.getSystemService
 import com.azhon.appupdate.listener.OnDownloadListener
 import com.azhon.appupdate.util.LogUtil
 import com.blankj.utilcode.util.FileUtils
+import com.blankj.utilcode.util.ToastUtils
 import com.blankj.utilcode.util.ZipUtils
 import com.develop.base.ext.fromJson
 import com.develop.base.ext.globalApp
@@ -295,6 +296,8 @@ object AppVersionUtil {
                         recipeUpdateTime
                     )
                 }
+            }.catch {
+                ToastUtils.showShort("下载失败 :"+it.toString())
             }
 
         }

BusinessCommon/src/main/java/com/develop/common/utils/StringUtils.java

@@ -1,5 +1,8 @@
 package com.develop.common.utils;
 
+import android.content.Context;
+import android.util.DisplayMetrics;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -18,5 +21,23 @@ public class StringUtils {
         }
     }
 
+    public static int getScreenSize(Context context) {
+        DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+        float width = displayMetrics.widthPixels / displayMetrics.density;
+        float height = displayMetrics.heightPixels / displayMetrics.density;
+        double screenSize = Math.sqrt(width * width + height * height);
+
+        if (screenSize > 10.1) {
+            // 超过10.1英寸，通常是大屏幕设备
+            return 10;
+        } else if (screenSize > 6.4) {
+            // 6.4-10英寸，通常是7寸或8寸
+            return 7;
+        } else {
+            // 6.4以下，通常是5寸或更小
+            return 5;
+        }
+    }
+
 
 }

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

@@ -82,9 +82,6 @@ class HomeFilterSortSearchView : RelativeLayout {
     fun checkOnlineOrLocalRecipesView(showOnline:Boolean){
         if (showOnline){
             binding.recipesLayout.setGone()
-            binding.onlineLayout.setVisible()
-        } else {
-            binding.recipesLayout.setVisible()
             binding.onlineLayout.setGone()
         }
     }

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

@@ -153,7 +153,6 @@ class TimePickerView : ConstraintLayout {
     }
 
     private fun checkChangeTimeScale(firstPos: Int) {
-        Log.e("TAG PickerView", "firstPos : $firstPos")
         val firstUnit: String
         val secondUnit: String
         if (firstPos >= 60) {
@@ -215,7 +214,6 @@ class TimePickerView : ConstraintLayout {
         changeSetting: Boolean,
         setByUser: Boolean = false
     ) {
-        Log.d("TAG PickerView1111", "h:${hours}, m:${minute}, s:${second}, setByUser:${setByUser}")
         val firstTime: Int
         val secondTime: Int
         if (hours > 0 || minute >= 60) {
@@ -256,7 +254,6 @@ class TimePickerView : ConstraintLayout {
                 setByUser
             )
         }
-        Log.d("TAG PickerView", "h:${hours}, m:${minute}, s:${second}, setByUser:${setByUser}")
     }
 
     /**

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

@@ -176,7 +176,13 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
                             viewModel.recipesType = RecipesType.ONLINE
                             binding.functionTopBar.setHomeOrBack(HomeOrBack.Back)
                         } else {
-                            viewModel.recipesType =  RecipesType.LOCAL
+                            if (viewModel.isFromDownloadNewRecipesEntrance){
+                                viewModel.recipesType =  RecipesType.ONLINE
+
+                            }else{
+                                viewModel.recipesType =  RecipesType.LOCAL
+
+                            }
                             binding.functionTopBar.setHomeOrBack(HomeOrBack.Home)
                         }
                         EventBus.getDefault().post(HomeBackClickEvent(true))

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

@@ -540,7 +540,6 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
 
         if (!AppVersionUtil.dialogRecipeUpdate.isShow){
             AppVersionUtil.checkRecipeUpdate(false)
-
         }
 //        UpdateUtil.checkApkVersion(false)
         val userInfo = FoodDataProvider

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

@@ -29,6 +29,7 @@ import com.develop.base.ext.setGone
 import com.develop.base.ext.setVisible
 import com.develop.base.ext.text_color
 import com.develop.base.ext.updateText
+import com.develop.base.util.AppActivityManager
 import com.develop.base.util.GlobalToast
 import com.develop.base.widgets.CommonPopupWindow
 import com.develop.common.data_repo.db.*
@@ -219,6 +220,10 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
                                     if (!viewModel.isSearch) {
                                         resetView()
                                     }
+                                    //处理首页点击在线食谱，隐藏按钮
+                                    if (viewModel.isFromDownloadNewRecipesEntrance){
+                                        filterSortSearchView?.checkOnlineOrLocalRecipesView(true)
+                                    }
 //                                    hideOnlineLayout(filterSortModel.isOnLineState)
                                     onFunctionCallback = functionCallback
                                 }
@@ -360,7 +365,6 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
 
         }
 
-
         binding.page.apply {
             setDisableContentWhenRefresh(true)
             setDisableContentWhenLoading(true)
@@ -434,6 +438,9 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
         }
 
 
+
+
+
     }
 
 
@@ -650,6 +657,12 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
                     fromRefreshEvent = true
                 }
                 if (currCategoryName.isNotEmpty()) {
+                    /**
+                     * 一个奇怪的bug，在食谱页面去打开设置页面，然后切换语言成功此时还没返回HomeAvtivity 页面，
+                     * 会导致重新onPostCreateView重新绘制，绘制到localCategoryLiveData方法，但是没有post通知，但里面会走到updateCategoryName
+                     * 估做了判断是不是当前RecipesFragment 的主activity HomeActivity
+                     * **/
+
                     categoryDataList.forEach { devRecipe ->
                         if (devRecipe.name == currCategoryName) {
                             updateCategoryName(devRecipe)
@@ -823,6 +836,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
     /**更新分类名称并获取对应数据*/
     private fun updateCategoryName(devRecipeCategory: DevRecipeCategory) {
         loadingDialog.showDialog(childFragmentManager, "loadingDialog")
+
         viewModel.currCategoryName =
             devRecipeCategory.name ?: globalApp().getString(com.develop.common.R.string.all)
         var size = viewModel.categorySizeList[devRecipeCategory.number]
@@ -853,6 +867,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
             if (viewModel.categoryCode == "all") {
                 viewModel.queryLocalRecipes("")
             } else {
+                //选择语言以后，按关闭页面会走这里
                 viewModel.queryLocalRecipes(viewModel.categoryCode)
             }
 
@@ -980,6 +995,12 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
     fun onHomeBackClickEvent(event: HomeActivity.HomeBackClickEvent) {
         //搜索页面禁止上拉加载
         binding.page.setEnableLoadMore(true)
-        filterSortSearchView?.onLineState(  viewModel.recipesType == RecipesType.ONLINE)
+        if (viewModel.isFromDownloadNewRecipesEntrance){
+            filterSortSearchView?.checkOnlineOrLocalRecipesView(  viewModel.recipesType == RecipesType.ONLINE)
+
+        }else{
+            filterSortSearchView?.onLineState(  viewModel.recipesType == RecipesType.ONLINE)
+
+        }
     }
 }

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

@@ -157,7 +157,10 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                             val pm = getSystemService(Context.POWER_SERVICE) as PowerManager
                             pm.reboot("")
                         } else if (isFromSetting) {
-                            finish()
+                            //由于食谱问题，这边优化了重启 010D的
+                            val pm = getSystemService(Context.POWER_SERVICE) as PowerManager
+                            pm.reboot("")
+//                            finish()
                         }
                     }
                 }
@@ -169,7 +172,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
             }
 
         binding.tvNext.setOnClickListener {
-            if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
+            if (CofarSDK.devInfo().status != DevStatus.STOP.toInt()) {
                 isLanguageTip = false
                 cancelConfirmDialog.title = getString(com.develop.common.R.string.change_lang_tips)
                 cancelConfirmDialog.apply {
@@ -232,10 +235,10 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
         binding.languageRecycle.models?.get(index)?.apply {
             var l = this as ConfigUtils.Lang;
             MMkvUtils.save(CURRENT_LANGUAGE, l.value)
-            if (isFromSetting){
-                //系统变化语言
-                  updateLanguage(Locale(l.value.lowercase(),l.value.uppercase()))
-            }
+//            if (isFromSetting){
+//                //系统变化语言
+//                  updateLanguage(Locale(l.value.lowercase(),l.value.uppercase()))
+//            }
             LanguageUtils.applyLanguage(Locale(l.value.lowercase(),l.value.uppercase()))
         }
     }

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

@@ -52,6 +52,7 @@ import com.develop.common.tag.TURN_UP_KEY_CODE
 import com.develop.common.ui.CommonBVMActivity
 import com.develop.common.utils.CofarUtils
 import com.develop.common.utils.ConfigUtils
+import com.develop.common.utils.StringUtils
 import com.develop.common.utils.getTimeStr
 import com.develop.common.widget.DirectionView
 import com.develop.common.widget.EggsSelectorLayout
@@ -720,7 +721,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             return
         }
 
-//        Log.d("TAG DevStateEvent", "event:" + event.devInfo.toString())
+        Log.d("TAG DevStateEvent", "event:" + event.devInfo.toString())
         //由于sdk没有判断E7到E16 需要判断运行和暂停过程中，设备发生故障弹出窗口告知故障
         if ((isClickType == DevStatus.RUNNING.toInt() || isClickType == DevStatus.PAUSE.toInt()
                     || isClickType == DevStatus.STOP.toInt()) && viewModel.modeType != ModesType.WIGHT.name
@@ -961,6 +962,25 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         Log.d("TAG initModeData", "viewModel.modeType:" + viewModel.modeType)
         viewModel.modeType.apply {
             val baseMode = CofarSDK.devMode(this)
+            //处理5/7/10寸屏，默认转速不同
+            if (baseMode is Knead){
+                var  defMotorGear = when(StringUtils.getScreenSize(this@ModesDetailActivity)){
+                    5->{
+                        1
+                    }
+                    7->{
+                        3
+                    }
+                    10->{
+                        3
+                    }
+                    else->{
+                        1
+                    }
+                }
+                baseMode.defaultMotorGear = defMotorGear
+
+            }
             //显示对应模式UI
             if (this == ModesType.WIGHT.name || this == ModesType.SM_WIGHT.name) {
                 CofarSDK.recordConfig()

app/build.gradle

@@ -18,8 +18,8 @@ ext {
 
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-//    brandCode="010D"
-    brandCode = "000A"
+    brandCode="010D"
+//    brandCode = "000A"
     model = "1039"
 
 }
@@ -245,6 +245,7 @@ android {
             buildConfigField("String", "brandCode", "\"010F\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
         brand010DUpdate {
@@ -259,7 +260,17 @@ android {
             buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
-
+        brand010FUpdate {
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            buildConfigField("String", "UpdatePlatform", "\"night\"")
+            resValue("string", "app_theme", "@style/Splash010DTheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"010F\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+        }
 
         brand030A {
             dimension "platform"
@@ -411,12 +422,12 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 //
-             resValue("string", "app_theme", "@style/SplashTheme")
-            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"000A\"")
-            //appCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
+//             resValue("string", "app_theme", "@style/SplashTheme")
+//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"000A\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
 
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
 //            resValue("string", "app_theme", "@style/SplashTheme")
@@ -496,13 +507,13 @@ android {
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
-//            buildConfigField("String", "UpdatePlatform", "\"night\"")
-//            resValue("string", "app_theme", "@style/Splash010DTheme")
-//            buildConfigField("String", "model", "\"1039\"")
-//            buildConfigField("String", "brandCode", "\"010D\"")
-//            //appCode 1.01 指向bug修复，2.01指向功能变更
-//            buildConfigField("String", "appCode", "\"1.01\"")
-//            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "UpdatePlatform", "\"night\"")
+            resValue("string", "app_theme", "@style/Splash010DTheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"010D\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 
 
 

app/src/main/java/com/develop/foodcooking/FoodCookingApp.kt

@@ -98,8 +98,8 @@ class FoodCookingApp : BaseApp() {
         setIsBrand054A(BuildConfig.UpdatePlatform.equals("054A"))
         setIsBrand011A(is011)
         setIsBrand062(is062)
-        if (BuildConfig.brandCode.contains("010")){
-//            MMkvUtils.save("appTime", BuildConfig.time)
+        if (BuildConfig.brandCode.startsWith("010")){
+            MMkvUtils.save("appTime", BuildConfig.time)
         }
 
 

libBase/src/main/java/com/develop/base/ext/GlobaExt.kt

@@ -208,10 +208,10 @@ fun getSN(): String {
 //        return "045A21030020123010190001"
 //        return "000A30150020123010190001"
 //     return "002A30150020123010190001"
-     return "000A10390020123010190001"
+//     return "000A10390020123010190001"
 //        return "000A50670020123010190005"
 //    return "010D10390020123010190001"
-//        return "010F10390020123010190001"
+        return "010F10390020123010190001"
 
 //        return "011A10390020123010190001"
 //        return "000A50370020123010190004"

libBase/src/main/java/com/develop/base/manager/WifiHelp.kt

@@ -573,10 +573,14 @@ class WifiHelp {
                 //在每次连接成功or连接失败后更新一次数据
                 refreshWifiData()
                 if (networkInfo.detailedState == NetworkInfo.DetailedState.CONNECTED) {
+                    println("connected successfully connected successfully")
                     mBuild?.mErrorAuthenticating?.invoke("connected successfully")
                 }
                 if (networkInfo.detailedState == NetworkInfo.DetailedState.DISCONNECTED) {
+
                     mBuild?.mErrorAuthenticating?.invoke("failed to connect")
+
+//                    println("failed to connect :"+)
                     if (currWifiSSID==""){
                         return
                     }