远程解冻模式适配

app/src/main/java/com/bgy/autosale/IceCreamDeviceConstants.java

@@ -9,14 +9,14 @@ public class IceCreamDeviceConstants {
     // 控制机台指令
     public static final int ORDER_RESET = 1; // 复位                              //复位开机
     public static final int ORDER_THAW = 2; // 解冻                               //解冻模式
-    public static final int ORDER_CLEAN = 3; // 本体搅拌开                         //本体搅拌开
+    public static final int ORDER_CLEAN = 3; // 本体搅拌开                         //搅拌模式
     public static final int ORDER_MANUAL_OPEN = 4; // 手动出料开
     public static final int ORDER_MANUAL_CLOSE = 5; // 手动出料关
     public static final int ORDER_REFRIGERATION = 6; // 制冷                      //制冷模式
     public static final int ORDER_KEEP_FRESH = 7; // 保鲜                         //保鲜模式
     public static final int ORDER_STAND_BY = 8; // 待机
     public static final int ORDER_MODE_AUTO = 9; // 自动/手动模式                  //自动/手动模式（自动的话消费者可以购买冰淇淋）
-    public static final int ORDER_STOP = 10; // 本体搅拌关
+    public static final int ORDER_STOP = 10; // 本体搅拌关                         //待机模式
     public static final int ORDER_MAKE_ORDER = 12; // 模拟下单
     public static final int ORDER_SAUCE_1 = 15; // 果酱1控制
     public static final int ORDER_SAUCE_2 = 16; // 果酱2控制

app/src/main/java/com/bgy/autosale/payutil/MQService.java

@@ -352,7 +352,13 @@ public class MQService extends Service implements SendCallback {
                     CommunicationHelper.getInstance().sendControl(IceCreamDeviceConstants.ORDER_KEEP_FRESH, this);
                 } else if (mode.equals("3")) {
                     LogUtils.logWrite("远程解冻");
-                    CommunicationHelper.getInstance().sendControl(IceCreamDeviceConstants.ORDER_THAW, this);
+                    CommunicationHelper.getInstance().sendControl(IceCreamDeviceConstants.ORDER_STOP, this);
+                    new Handler().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            CommunicationHelper.getInstance().sendControl(IceCreamDeviceConstants.ORDER_THAW, MQService.this);
+                        }
+                    },500);
                 }
                 break;
             default:

app/src/main/java/com/bgy/autosale/ui/consumer/IceCreamFragment.java

@@ -666,7 +666,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
 //            }
             if (!CommunicationHelper.getInstance().canGenerateOrder()) {
                 ToastUtil.getInstance().showText(CommunicationHelper.getInstance().getWhyCanOrderText());
-//                return;//是否开机
+                return;//是否开机
             }
             addShopCart();
 

config.gradle

@@ -5,7 +5,7 @@ ext {
             "minSdkVersion"                : 19,
             "targetSdkVersion"             : 28,
             "versionCode"                  : 110,
-            "versionName"                  : "1.0.49",//版本号修改
+            "versionName"                  : "1.0.50",//版本号修改
 
             "androidSupport"               : "28.0.0",
             "constraint-layout"            : "1.1.3",