Browse Source

011涂鸦 食谱处理

zhangshenjie 4 months ago
parent
commit
d9d8fe3887

+ 11 - 3
BusinessSetting/src/main/java/com/develop/setting/ui/AboutActivity.kt

@@ -9,6 +9,7 @@ import android.content.pm.PackageInstaller
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
+import android.util.Log
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -69,7 +70,6 @@ import com.google.gson.Gson
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevStatus
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevStatusEvent
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
-import com.tuya.smartai.iot_sdk.Log
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -101,6 +101,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
     private var tpCount = 0
     private var name = "A"
     private var sn = getSN()
+    private var pageSize = 80
     private val cancelConfirmDialog by lazy {
         CancelConfirmDialog()
     }
@@ -387,6 +388,11 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
 
         binding.ivLogo.setOnClickListener {
+
+//            pageSize++
+
+
+
             weightAlignCount++
             if (weightAlignCount >= 7) {
                 weightAlignCount = 0
@@ -500,6 +506,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 //            searchRecipes()
 //            getRecipes()
 //            getappLog()
+
+
             testCount++
             if (testCount >= 7) {
                 testCount = 0
@@ -586,10 +594,10 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         map["lang"] = "PL"
         map["categoryIds"] = ""
         map["pageNo"] = 0
-        map["pageSize"] = 300
+        map["pageSize"] = pageSize
         titleMap["queryJson"] = map
         var json = GsonUtils.GsonString(titleMap)
-
+        Log.e("TAG recipes", "json:$json")
         appGlobalScope.launch(Dispatchers.IO) {
             var httpResponse = TuyaUtils.ioTSDKManager.httpRequest("tuya.device.menu.lang.list", "1.0", json)
             var str = httpResponse.result

+ 2 - 1
BusinessStep/src/main/java/com/develop/step/ui/cook_step/model/CookStepStatus.kt

@@ -13,6 +13,7 @@ class CookStepStatus(
 
     fun isWeightMode(): Boolean {
         return workMode == "WIGHT" || workMode == "WEIGH" || workMode == "WEIGHT"
+                || workMode =="AF_WEIGHT" || workMode == "SM_WEIGHT" || workMode == "SM_WIGHT"
     }
 
     fun isTurboMode(): Boolean {
@@ -27,7 +28,7 @@ class CookStepStatus(
     }
     fun  isWarning():Boolean{
 //        return  workMode == "WARNING" || workMode == "AF_WARNING" || workMode =="AF_DESCRIPTION"
-        return  workMode == "WARNING" || workMode == "AF_WARNING"
+        return  workMode == "WARNING" || workMode == "AF_WARNING" || workMode == "SM_WARNING"
     }
 
     fun  isFinalStep() :Boolean{