处理涂鸦bug

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

@@ -46,7 +46,7 @@ public class TuyaUtilsSo {
     public Context context;
     private boolean isWeight = false;
     private int heatType = 0;
-    private int autoMaticType = -1;
+    public int autoMaticType = -1;
     private static Map<Integer, Integer> map;
     public boolean isUser = false;  //避免重复上报问题
 
@@ -469,12 +469,13 @@ public class TuyaUtilsSo {
                 DevInfo info = CofarSDK.devInfo();
                 BaseDevMode mode = info.getMode();
                 int time = (int) System.currentTimeMillis();
-                if (getAutoMaticModes(info.getRunningInstId()) != autoMaticType) {
-                    //称重的时候不忽略   由于称重的runningId 是 diy 对应不上，估在下面再处理多一个判断
-                    if (!info.isWeightStatus()){
-                        return;
-                    }
-                }
+
+//                if (getAutoMaticModes(info.getRunningInstId()) != autoMaticType) {
+//                    //称重的时候不忽略   由于称重的runningId 是 diy 对应不上，估在下面再处理多一个判断
+//                    if (!info.isWeightStatus()){
+//                        return;
+//                    }
+//                }
 
 //                Log.e("tuya_iot",info.toString());
                 int status = info.getStatus();
@@ -491,6 +492,10 @@ public class TuyaUtilsSo {
                 } else {
                     pot_status = 0;
                 }
+
+
+                //getStatus    0 stop  1 start  2 pause
+
                 int work_state = 0;
                 if (status == 0) {
                     work_state = 0;
@@ -595,9 +600,9 @@ public class TuyaUtilsSo {
     private int getModes(String enumValue) {
 
 
-        if (autoMaticType != -1) {
-            return autoMaticType;
-        }
+//        if (autoMaticType != -1) {
+//            return autoMaticType;
+//        }
 
         /**
          * 0 DIY,1 和面(Knead) ，2 蒸汽(Steam)， 3 低温慢煮(Sous_vide) ，4 煮米饭(Rice) ，
@@ -669,7 +674,7 @@ public class TuyaUtilsSo {
     }
 
 
-    private int getAutoMaticModes(String enumValue) {
+    public int getAutoMaticModes(String enumValue) {
         /**
          * 0 DIY,1 和面(Knead) ，2 蒸汽(Steam)， 3 低温慢煮(Sous_vide) ，4 煮米饭(Rice) ，
          * 5 搅碎(Chop) ， 6 奶昔(Smoothie)，7 称重(Weight) ,8 切丁(Dive)， 9 去皮(Peeling) ，10 烧水(Boil_water)，11 切丝切片 (Food_processor)

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

@@ -399,7 +399,6 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
 
         binding.ivLogo.setOnClickListener {
-            getSendDpValue()
 //            pageSize++
 //            getCook("2159212")
 
@@ -485,7 +484,6 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
         binding.tvAppVersion.setOnClickListener {
 //            getSendDpBool()
-            getSendDpMaxValue()
 //            getCook("1894212")
 
 
@@ -503,7 +501,6 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         binding.tvFirmware.setOnClickListener {
 //            getappLog()
 
-            getSendDpStr()
 
             tpCount++
             if (tpCount >= 7) {
@@ -523,7 +520,6 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
         binding.devSn.setOnClickListener {
 
-            getSendDpEmun()
 
 //            getCook("1891512")
 

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

@@ -384,6 +384,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
         //用于涂鸦指令上报
         Handler().postDelayed({
+            TuyaUtilsSo.getInstance().autoMaticType = TuyaUtilsSo.getInstance().getAutoMaticModes(modeType)
             TuyaUtilsSo.getInstance().mapClean()
             TuyaUtilsSo.getInstance().isUser = true
 //            TuyaUtilsSo.getInstance().uploadDataBuffer(baseMode)
@@ -1339,7 +1340,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     private fun initListener() {
         binding.ivBack.setOnClickListener {
             backClick()
-            TuyaUtilsSo.getInstance().setDpCurrentActivity()
         }
         binding.clCookTemp.setOnClickListener {
             viewModel.changeStep(CookSettingType.TEMP_SETTING)
@@ -1454,6 +1454,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                         )
 
                         FloatWindowManager.showStepFlowWindow(cookStepEvent)
+                        TuyaUtilsSo.getInstance().setDpCurrentActivity()
                         finish()
                     }
 
@@ -1463,6 +1464,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                     runOnMainThread {
                         FloatWindowManager.hideStepFlowWindow()
                         CofarSDK.stop()
+                        TuyaUtilsSo.getInstance().setDpCurrentActivity()
                         finish()
                     }
                 }
@@ -2752,7 +2754,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 supportFragmentManager, "backRequestDialog"
             )
             else {
-
+                TuyaUtilsSo.getInstance().setDpCurrentActivity()
                 CofarSDK.stoptWeight()
                 finish()
             }
@@ -2767,6 +2769,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             } catch (e: Exception) {
                 print(e)
             }
+            TuyaUtilsSo.getInstance().setDpCurrentActivity()
             CofarSDK.stoptWeight()
             finish()
         }

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

@@ -227,6 +227,7 @@ fun getSN(): String {
 //        return "011A10390020123010190002"
 //        return  "011D10390020123010190021"
 //        return  "011D10390020123010190088"
+//        return  "011D10390020123010190019"
         return  "011D10390020123010190003"
 //        return  "011A10390020123010190188"
 //        return "011A10390020123010190099"