替换jar,合并清单文件失败修改，第一次打开应跳转到选择语言，电磁阀隐藏，鸡蛋程序隐藏

BusinessAirFryer/src/main/assets/config_000.json

@@ -15,7 +15,7 @@
       "bg": "cm_icon_cook_eggs",
       "icon": "cm_icon_cook_eggs",
       "devMode": "SOUP",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "WIGHT",

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -195,6 +195,41 @@
       "uid": "uuid3b0f5831c50a60f2",
       "ak": "8DolWLYhmoED0jaGp1H69pZ1NS2ksxrx"
     },
+    "000A21050020123010190003": {
+      "pid": "wy8ogbhchnzkmrup",
+      "uid": "uuidb583008af4f7e0e5",
+      "ak": "P0hXQYLU2X6t1pgi9jY6zCaGegU9p2Vt"
+    },
+    "000A21050020123010190004": {
+      "pid": "wy8ogbhchnzkmrup",
+      "uid": "uuidf7284796c227c7bb",
+      "ak": "GpCAOD6joYeMveSezS5j3DPNPQyETXtN"
+    },
+    "000A21050020123010190005": {
+      "pid": "wy8ogbhchnzkmrup",
+      "uid": "uuidd3455ac91ee502a5",
+      "ak": "lAQ118rLMMLbxAQIs02uRrPrEAbgB22t"
+    },
+    "000A21050020123010190006": {
+      "pid": "wy8ogbhchnzkmrup",
+      "uid": "uuid60253ba778a3f7e7",
+      "ak": "HptybR46DRlbaUEuhn8qyM5Aeg1HuwQU"
+    },
+    "000A10390020123010190014": {
+      "pid": "wy8ogbhchnzkmrup",
+      "uid": "uuid22c3a59b7f0651eb",
+      "ak": "NLwLjSoz1wwuX08O82I8kMzBRPJfjkfD"
+    },
+    "000A10390020123010190015": {
+      "pid": "wy8ogbhchnzkmrup",
+      "uid": "uuid0609ba97eab9326c",
+      "ak": "QSC00oGGSiXuJSBUVAieEgRqVVSYvcn1"
+    },
+    "000A10390020123010190016": {
+      "pid": "wy8ogbhchnzkmrup",
+      "uid": "uuidc326da3f310fff6f",
+      "ak": "btaFeNF4KP9UxWajlOitBUiqM2xrL3P4"
+    },
     "011A50370020123010190002": {
       "pid": "o0qxz32qigce6kpk",
       "uid": "uuid1ed716f65a8fc8c6",
@@ -290,6 +325,5 @@
       "uid": "uuid9fe5261dbd0ad0fe",
       "ak": "wjbbvACRUws6oVdtu2qqgdbq6d3rpq1M"
     }
-
   }
 }

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

@@ -206,10 +206,14 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             }
         }
 
-        if (!getSN().startsWith("000")) {
-            binding.tvCount.setGone()
-            binding.ivPotCover.setGone()
-        }
+        //2023.12.11 000A客户需要隐藏电磁阀
+        binding.tvCount.setGone()
+        binding.ivPotCover.setGone()
+
+//        if (!getSN().startsWith("000")) {
+//            binding.tvCount.setGone()
+//            binding.ivPotCover.setGone()
+//        }
 
         turnDevModeUI();
         viewModel.modeType = intent.extras?.getString(MODE_TYPE, ModesType.CHOP.name) ?: ""
@@ -633,13 +637,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         if (!initModeData) {
             return
         }
-        Log.d(
-            "dddddddd", "targetTime==${event.devInfo.targetTime}" +
-                    "==remainTime==${event.devInfo.remainTime}==targetTimeBuffer==${event.devInfo.targetTimeBuffer}" +
-                    "==minTime==${event.devInfo.mode.minTime}==maxTime==${event.devInfo.mode.maxTime}" +
-                    "===potCloverEleStatus==${currDevInfo.potCloverEleStatus}==minTemp==${event.devInfo.mode.minTemp}" +
-                    "==maxTemp==${event.devInfo.mode.maxTemp}==minMotorGear==${event.devInfo.mode.minMotorGear}==maxWaterGear==${event.devInfo.mode.maxWaterGear}"
-        )
+        Log.d("TAG dddddd","event:"+event.devInfo.toString())
         ThreadUtils.runOnMainThread {
             currDevInfo = event.devInfo
             mRunningState = currDevInfo.runningStatus.toInt()
@@ -1155,9 +1153,11 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         binding.clSetTime.stopAlphaAnim()
         binding.functionLayout.visibility = View.VISIBLE
         binding.llWeightView.visibility = View.GONE
-        if (getSN().startsWith("000")){
-            binding.ivPotCover.setVisible()
-        }
+            // 2023.12.11客户需要隐藏
+//        if (getSN().startsWith("000")){
+//            binding.ivPotCover.setVisible()
+//        }
+
         if (viewModel.modeType == ModesType.WIGHT.name || viewModel.modeType == ModesType.TURBO.name) {
             binding.ivWeight.visibility = View.GONE
             binding.ivTurbo.visibility = View.GONE
@@ -1186,7 +1186,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         visibilityEgg(View.GONE)
         binding.functionLayout.visibility = View.GONE
         binding.llWeightView.visibility = View.VISIBLE
-        Log.d("dddddd", "llTurboView===GONE")
         binding.llTurboView.visibility = View.GONE
         //开始称重
         CofarSDK.startWeight()
@@ -1201,7 +1200,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         binding.ivTurbo.visibility = View.GONE
         visibilityEgg(View.GONE)
         binding.functionLayout.visibility = View.GONE
-        Log.d("dddddd", "llTurboView===VISIBLE")
         binding.llTurboView.visibility = View.VISIBLE
         binding.llWeightView.visibility = View.GONE
     }
@@ -1546,7 +1544,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     ) {
 
 
-//        Log.d("TAG updateTimeUI","minTime：$minTime   maxTime:$maxTime  remainTime:$remainTime  targetTime:$targetTime    type :$type")
+        Log.d("TAG updateTimeUI","minTime：$minTime   maxTime:$maxTime  remainTime:$remainTime  targetTime:$targetTime  isTimeChange:$isTimeChange   focusUpdate$focusUpdate  type :$type")
 
         this.isTimeChange = isTimeChange
         this.maxTime = maxTime.toLong()
@@ -1772,6 +1770,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 binding.apply {
                     ivWeight.visibility = View.VISIBLE
                     ivTurbo.visibility = View.VISIBLE
+                    visibilityEgg(View.VISIBLE)
                     btnStop.visibility = View.INVISIBLE
                     btnStart.visibility = View.VISIBLE
                     btnPause.visibility = View.INVISIBLE
@@ -2193,8 +2192,11 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         CofarSDK.confirm()
     }
     private fun  visibilityEgg(visibility :Int){
+        //2023.12.11 000A客户，鸡蛋程序还未完整，需隐藏
         if ("COOK_EGGS" == viewModel.modeType) {
-            binding.ivEggs.visibility = visibility
+            binding.ivEggs.visibility = View.GONE
+            //由于SDK默认时间只有20秒，需要自己另行设置
+            CofarSDK.devInfo().mode.maxTime = 20*60
         }else{
             binding.ivEggs.visibility = View.GONE
         }

app/build.gradle

@@ -13,7 +13,7 @@ ext{
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="036I"
-    brandCode="011A"
+    brandCode="000A"
     model="1039"
 
 }
@@ -33,7 +33,7 @@ android {
     defaultConfig {
         applicationId "com.develop.foodcooking"
         minSdk 21
-        targetSdk 30
+        targetSdk 31
         versionCode project.ext.versionCode
         versionName "${project.ext.model}.${project.ext.brandCode}.${project.ext.versionCode}"
         archivesBaseName = "cofar-cooking_${versionName}"

app/src/main/AndroidManifest.xml

@@ -57,6 +57,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name="com.github.moduth.blockcanary.ui.DisplayActivity" android:exported="true" />
+
 
         <meta-data
             android:name="design_width_in_dp"

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

@@ -3,6 +3,7 @@ package com.develop.foodcooking
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.net.Uri
 import android.os.Build
 import android.os.PowerManager
@@ -14,7 +15,6 @@ import com.blankj.utilcode.util.ResourceUtils
 import com.blankj.utilcode.util.Utils
 import com.develop.base.app.BaseApp
 import com.develop.base.ext.getBrandNum
-import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.setIsBrand011A
 import com.develop.base.ext.setIsBrand036I
 import com.develop.base.ext.setNightTheme
@@ -49,6 +49,7 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import java.io.File
 import java.lang.reflect.Method
+import java.util.Locale
 import java.util.concurrent.TimeUnit
 
 

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

@@ -33,7 +33,8 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
             navigateTo(Screens.Main.ENTRANCE_CHOSEN)
         } else {
             //机器首次开机时会出现两段开机动画，这样给用户的感觉开机时长太长了，因此决定去掉后面apk显示的那一段开机动画
-            navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+            navigateTo(Screens.Setting.LANGUAGE)
+//            navigateTo(Screens.Main.ENTRANCE_CHOSEN)
         }
 //        this.initSDK()
         //初始化涂鸦

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

@@ -187,9 +187,8 @@ fun getSN(): String {
     var serial: String
 
 //    return "045A10220020123010120023"
-    return "000A30150020123010190001"
+//    return "000A30150020123010190001"
 //    return "010D30150020123010190001"
-
 //    return "011A30150020123010190001"
 //    return "007D20020020123010190001"
 //    return "036I21060020123010180001"