1、可选购物车功能

2、优化报警上传

BaseLibrary/src/main/java/com/hboxs/base_library/event/ErrorApiMessageEvent.java

@@ -12,10 +12,19 @@ public class ErrorApiMessageEvent {
     private Object data;
 
     private String level;
-    public ErrorApiMessageEvent(String name, Object data,String level){
+    private int id;
+
+    public ErrorApiMessageEvent(String name, Object data, String level){
+        this.name=name;
+        this.data=data;
+        this.level=level;
+    }
+
+    public ErrorApiMessageEvent(String name, Object data,String level,int id){
         this.name=name;
         this.data=data;
         this.level=level;
+        this.id=id;
     }
 
     public String getLevel() {
@@ -42,12 +51,21 @@ public class ErrorApiMessageEvent {
         this.data = data;
     }
 
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
     @Override
     public String toString() {
         return "ErrorApiMessageEvent{" +
                 "name='" + name + '\'' +
                 ", data=" + data +
                 ", level=" + level +
+                ", id=" + id +
                 '}';
     }
 }

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

@@ -256,7 +256,7 @@ public class App extends BaseApplication {
                                     ErrorViewHelper.getInstance().showErrorView(R.string.setting_plc_connect, lastErrorMessage);
                                     if (autoMode.add(prefix)){
                                         Log.d("上传报警", "onResult: 上传报警："+prefix);
-                                        EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, prefix,"1"));
+//                                        EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, prefix,"1"));
                                     }
                                 } else {
                                     ErrorViewHelper.getInstance().showErrorView(R.string.setting_plc_connect, new String[]{getString(R.string.error_wait), getString(R.string.make_fail_describe_refund)});

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

@@ -722,7 +722,7 @@ public class RemoteSupportService extends Service implements SendCallback {
         switch (messageEvent.getName()){
             case Name.WARNING_ALARM:
                 Log.d(TAG, "event: WARNING_ALARM"+messageEvent.getData());
-                setError1(1, (String) messageEvent.getData(),messageEvent.getLevel());
+                setError1(messageEvent.getId(), (String) messageEvent.getData(),messageEvent.getLevel());
                 break;
         }
 
@@ -1171,25 +1171,29 @@ public class RemoteSupportService extends Service implements SendCallback {
         Log.d(TAG, "RemoteSupportServiceonDestroy: ");
     }
     private static String reasonKey = "";
+    private static int preKey1 = -1;
 
     public void setError1(int key, String reason,String level) {
-        long date = System.currentTimeMillis();
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date curDate = new Date(date);
-        String time = formatter.format(curDate);
-        AddAlarmRecordBean addAlarmRecordBean = new AddAlarmRecordBean(reason, Heartbeat.deviceId, time, "",level);
+        if (preKey1 != key) {
+            preKey1 = key;
+            long date = System.currentTimeMillis();
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date curDate = new Date(date);
+            String time = formatter.format(curDate);
+            AddAlarmRecordBean addAlarmRecordBean = new AddAlarmRecordBean(reason, Heartbeat.deviceId, time, "", level);
 //        WarringBean warringBean = new WarringBean();
 //        warringBean.setTime(date);
 //        warringBean.setThingError(reason);
 //        getBeanDao().insert(warringBean);
-        Log.d(TAG, "setError1: "+addAlarmRecordBean.toString());
-        Gson gson = new Gson();
-        String json = gson.toJson(addAlarmRecordBean);
-        Log.d(TAG, "setError2报警: "+json);
-        RequestBody body = RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), json);
-        //上传到服务器
-        if (!reasonKey.equals(reason)) {
-            upError(body, 0);
+            Log.d(TAG, "setError1: " + addAlarmRecordBean.toString());
+            Gson gson = new Gson();
+            String json = gson.toJson(addAlarmRecordBean);
+            Log.d(TAG, "setError2报警: " + json);
+            RequestBody body = RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), json);
+            //上传到服务器
+            if (!reasonKey.equals(reason)) {
+                upError(body, 0);
+            }
         }
     }
 

app/src/main/java/com/bgy/autosale/helpers/CommunicationHelper.java

@@ -236,7 +236,7 @@ public class CommunicationHelper {
                                     String number = subparts[1]; // 分隔后的第二部分
                                     Log.d(TAG, "onResultsubparts: Item: " + item + ", Number: " + number);
                                     if (itemSet.add(item)){
-                                       EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, item, number));//这里上传报警
+//                                       EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, item, number));//这里上传报警
                                         Log.d("上传报警", "onResult: 上传报警111："+item);
                                         shouldClearItemSet = false;
                                     }else {

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

@@ -613,6 +613,46 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         if (id == R.id.dishes_shop_cart_clear) {
             showClearDialog();
         } else if (id == R.id.dishes_shop_cart_pay) {
+            showChoosePay();
+        } else if (id == R.id.dishes_ice_cream) {
+            notifyAddShopCart();
+        } else if (id == R.id.dishes_add_shop_cart) {
+//            if (App.app.payChannel == Constant.PAY_POS_DEVICE && !Global.MDBCreditCardSuccess && Global.MDBCreditCardSuccessNumber != 1) {
+//                showToast(getString(R.string.credit_failed));
+//                return;
+//            }
+            if (!CommunicationHelper.getInstance().canGenerateOrder()) {
+                ToastUtil.getInstance().showText(CommunicationHelper.getInstance().getWhyCanOrderText());
+                return;//是否开机
+            }
+            if (Hawk.get(Name.SHOPPING_TROLLEY,true)){
+                addShopCart();
+                Log.d(TAG, "无购物车测试orderHelperonClick:2 "+currentDish);
+            }else {
+                orderHelper = OrderHelper.getInstance();
+                orderHelper.init(currentDish);
+                addItem(currentDish.selectSpecBeans);
+                initIceCream();
+                showChoosePay();
+                Log.d(TAG, "无购物车测试orderHelperonClick:1 "+orderHelper.getOrderList());
+                Log.d(TAG, "无购物车测试orderHelperonClick:2 "+currentDish);
+            }
+
+        } else if (id == R.id.dishes_sauce_1) {
+            selectSauce(0);
+        } else if (id == R.id.dishes_sauce_2) {
+            selectSauce(1);
+        } else if (id == R.id.dishes_sauce_3) {
+            selectSauce(2);
+        } else if (id == R.id.dishes_kernel_1) {
+            selectKernel(0);
+        } else if (id == R.id.dishes_kernel_2) {
+            selectKernel(1);
+        }
+    }
+
+    private void showChoosePay() {
+        if (Hawk.get(Name.SHOPPING_TROLLEY,true)) {
             if (Global.isVersions == 2) {
                 priceList = new ArrayList<>();
                 priceList1 = new ArrayList<>();
@@ -634,68 +674,50 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                         priceList.add(totalSum); // 将单个商品的总价格添加 buyCount 次
                     }
                     Log.d(TAG, "onClick:orderHelper 商品名字：" + orderHelper.getOrderList().get(i).selectTag + " 单个商品价格：" + totalSum + "  数量：" + orderHelper.getOrderList().get(i).buyCount);
+                    Log.d(TAG, "onClick:priceList " + priceList);
                 }
-                Log.d(TAG, "onClick:priceList " + priceList);
             }
-            showLoading();
-            if (App.app.payChannel == Constant.PAY_FREE || manualReason != null) {
-                payType = 0;
-                manualMake();
-                LogUtils.logWrite("免费制作了");
-            } else if (App.app.payChannel == Constant.PAY_ONLINE || manualReason != null) {
-                if (Hawk.get("PRICEBEAN") != null) {
-                    priceBeans = Hawk.get("PRICEBEAN");
-                } else {
-                    dismissLoading();
-                    showToast("请重新设置价格");
-                    return;
-                }
-                carsPay(str());//国内二码合一支付
-                Log.d(TAG, "onClick: 二码合一");
-            } else if (App.app.payChannel == Constant.PAY_ONLINE_AND_PRICE_MODEL || manualReason != null) {
-                dismissLoading();
-                showDialogChoosePay();
-                Log.d(TAG, "onClick: 二码合一");
-            } else if (App.app.payChannel == Constant.PAY_POS_DEVICE || manualReason != null) {
-                Log.d(TAG, "onClick: MDB板信用卡支付");
-                payType = 4;
-                pay();//MDB板信用卡支付
-            } else if (App.app.payChannel == Constant.PAY_PRICE_MODEL || manualReason != null) {
-                showPayMixDialog();
-//                manualMake();
-            } else if (App.app.payChannel == Constant.PAY_NAYAX_PAY || manualReason != null) {
-                payType = 4;
-                showNayaxCreditCard();
-            } else if (App.app.payChannel == Constant.PAY_NAYAX_PAY_MIX || manualReason != null) {
-                dismissLoading();
-                showDialogChoosePay();
-            } else if (App.app.payChannel == Constant.PAY_POS_DEVICE_PAY_MIX || manualReason != null) {
+        }else{
+            priceList = new ArrayList<>();
+            priceList1 = new ArrayList<>();
+            
+            pri = PriceUtil.getDishPriceOne(currentDish);
+        }
+        showLoading();
+        if (App.app.payChannel == Constant.PAY_FREE || manualReason != null) {
+            payType = 0;
+            manualMake();
+            LogUtils.logWrite("免费制作了");
+        } else if (App.app.payChannel == Constant.PAY_ONLINE || manualReason != null) {
+            if (Hawk.get("PRICEBEAN") != null) {
+                priceBeans = Hawk.get("PRICEBEAN");
+            } else {
                 dismissLoading();
-                showDialogChoosePay();
-            }
-        } else if (id == R.id.dishes_ice_cream) {
-            notifyAddShopCart();
-        } else if (id == R.id.dishes_add_shop_cart) {
-//            if (App.app.payChannel == Constant.PAY_POS_DEVICE && !Global.MDBCreditCardSuccess && Global.MDBCreditCardSuccessNumber != 1) {
-//                showToast(getString(R.string.credit_failed));
-//                return;
-//            }
-            if (!CommunicationHelper.getInstance().canGenerateOrder()) {
-                ToastUtil.getInstance().showText(CommunicationHelper.getInstance().getWhyCanOrderText());
-                return;//是否开机
+                showToast("请重新设置价格");
+                return;
             }
-            addShopCart();
-
-        } else if (id == R.id.dishes_sauce_1) {
-            selectSauce(0);
-        } else if (id == R.id.dishes_sauce_2) {
-            selectSauce(1);
-        } else if (id == R.id.dishes_sauce_3) {
-            selectSauce(2);
-        } else if (id == R.id.dishes_kernel_1) {
-            selectKernel(0);
-        } else if (id == R.id.dishes_kernel_2) {
-            selectKernel(1);
+            carsPay(str());//国内二码合一支付
+            Log.d(TAG, "onClick: 二码合一");
+        } else if (App.app.payChannel == Constant.PAY_ONLINE_AND_PRICE_MODEL || manualReason != null) {
+            dismissLoading();
+            showDialogChoosePay();
+            Log.d(TAG, "onClick: 二码合一");
+        } else if (App.app.payChannel == Constant.PAY_POS_DEVICE || manualReason != null) {
+            Log.d(TAG, "onClick: MDB板信用卡支付");
+            payType = 4;
+            pay();//MDB板信用卡支付
+        } else if (App.app.payChannel == Constant.PAY_PRICE_MODEL || manualReason != null) {
+            showPayMixDialog();
+//                manualMake();
+        } else if (App.app.payChannel == Constant.PAY_NAYAX_PAY || manualReason != null) {
+            payType = 4;
+            showNayaxCreditCard();
+        } else if (App.app.payChannel == Constant.PAY_NAYAX_PAY_MIX || manualReason != null) {
+            dismissLoading();
+            showDialogChoosePay();
+        } else if (App.app.payChannel == Constant.PAY_POS_DEVICE_PAY_MIX || manualReason != null) {
+            dismissLoading();
+            showDialogChoosePay();
         }
     }
 
@@ -755,7 +777,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                 arrayCode = inputText.split("#");
                 combinationCount = arrayCode.length;
                 Log.d(TAG, "handlePaymentSelection: " + arrayCode);
-                if (combinationCount > orderHelper.generateMakingIceCream().size()) {
+                if (combinationCount > orderHelper.generateMakingIceCream().size()&&Hawk.get(Name.SHOPPING_TROLLEY,true)) {
                     ToastUtil.getInstance().showText(UiUtil.getStringRes(R.string.only_one_code));
                     return; // 直接返回，不继续执行
                 } else {
@@ -1027,12 +1049,14 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
             if (v.isSelected()) {
                 SpecBean sb = v.getSpecBean();
                 currentDish.selectSpecBeans.add(sb);
+                Log.d(TAG, "无购物车测试initIceCream1: "+currentDish.selectSpecBeans);
             }
         }
         for (BatchingView v : kernelViews) {
             if (v.isSelected()) {
                 SpecBean sb = v.getSpecBean();
                 currentDish.selectSpecBeans.add(sb);
+                Log.d(TAG, "无购物车测试initIceCream2: "+currentDish.selectSpecBeans);
             }
         }
         initPrice();
@@ -1883,7 +1907,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                 for (int j = 0; j < getPriceList.size(); j++) {
                     DecimalFormat df = new DecimalFormat("#.##");
                     df.setRoundingMode(RoundingMode.HALF_UP);
-                    if (priceList1.size() > 0) {
+                    if (!priceList1.isEmpty()) {
                         double newPri = getPriceList.get(j) - priceList1.get(0);
                         String roundedResult = df.format(newPri);
                         getPriceList.set(j, Double.valueOf(roundedResult));
@@ -1936,7 +1960,6 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
 
     // 添加购物车
     private void addShopCart() {
-        Log.d(TAG, "addShopCart: " + currentDish.selectSpecBeans);
         ResponseBean<Integer> result = addItem(currentDish.selectSpecBeans);
         if (!result.success) {
             return;
@@ -2125,7 +2148,9 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
 //        HashMap<String, String> strings1 = new HashMap<>();
 
         ArrayList<String> strings = new ArrayList<>();
-        for (int i = 0; i < shoppingCartBeanList.size(); i++) {
+        Log.d(TAG, "无购物车测试: "+currentDish);
+        if (Hawk.get(Name.SHOPPING_TROLLEY,true)){
+            for (int i = 0; i < shoppingCartBeanList.size(); i++) {
             strings.clear();
             //优惠码集合
             for (int i1 = 0; i1 < shoppingCartBeanList.get(i).getCount(); i1++) {
@@ -2161,6 +2186,29 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
             }
 
         }
+        }else {
+            if (arrayCode!=null){
+                strings.add(arrayCode[0]);
+            }else {
+                strings.add("0");
+            }
+            String s1 = new Gson().toJson(strings);
+            StringBuilder sb = new StringBuilder();
+            if (currentDish.selectSpecBeans.size()>0){
+                Log.d(TAG, "无购物车测试1: "+currentDish.selectSpecBeans);
+                for (int i = 0; i < currentDish.selectSpecBeans.size(); i++) {
+                    sb.append(currentDish.selectSpecBeans.get(i).name);
+                    if (i < currentDish.selectSpecBeans.size() - 1) {
+                        sb.append(",");
+                    }
+                }
+                a.put(currentDish.name+"-"+sb+"-1",s1);
+            }else {
+                Log.d(TAG, "无购物车测试2: "+currentDish.selectSpecBeans);
+                a.put(currentDish.name+"-"+"1",s1);
+            }
+        }
+
         String str = gson.toJson(a);
         Log.d(TAG, shoppingCartBeanList.size() + "showShoppingTrolleyDialog: " + str);
         return str;

app/src/main/java/com/bgy/autosale/ui/operator/SwitchSettingActivity.java

@@ -28,6 +28,8 @@ public class SwitchSettingActivity extends BaseScanGunActivity implements View.O
     RadioButton rbCoinCashResetYes, rbCoinCashResetNo;
     RadioButton rbPromotionCodeYes, rbPromotionCodeNo;
     RadioButton rbVoiceYes, rbVoiceNo;
+    RadioButton rbShopCartYes, rbShopCartNo;
+
     Spinner spLanguage2;
     private ArrayAdapter<String> language2ArrayAdapter;
 
@@ -58,6 +60,19 @@ public class SwitchSettingActivity extends BaseScanGunActivity implements View.O
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
+        RadioGroup rgShopCart = findViewById(R.id.rg_shop_cart);
+        rgShopCart.setOnCheckedChangeListener(this);
+
+        rbShopCartYes = findViewById(R.id.rb_shop_cart_yes);
+        rbShopCartNo = findViewById(R.id.rb_shop_cart_no);
+
+        Boolean shopCartY = Hawk.get(Name.SHOPPING_TROLLEY, true);
+        if (shopCartY) {
+            rbShopCartYes.setChecked(true);
+        } else {
+            rbShopCartNo.setChecked(true);
+        }
+
         RadioGroup rgAutoUpload = findViewById(R.id.rg_auto_upload);
         rgAutoUpload.setOnCheckedChangeListener(this);
 
@@ -148,6 +163,10 @@ public class SwitchSettingActivity extends BaseScanGunActivity implements View.O
             Hawk.put(Name.VOICE_MEAL_PICKUP_PROMPTS, true);
         } else if (checkedId == R.id.rb_voice_no) {
             Hawk.put(Name.VOICE_MEAL_PICKUP_PROMPTS, false);
+        } else if (checkedId == R.id.rb_shop_cart_yes) {
+            Hawk.put(Name.SHOPPING_TROLLEY, true);
+        } else if (checkedId == R.id.rb_shop_cart_no) {
+            Hawk.put(Name.SHOPPING_TROLLEY, false);
         }
 
     }

app/src/main/java/com/bgy/autosale/utils/IceCreamErrorUtils.java

@@ -134,22 +134,28 @@ public class IceCreamErrorUtils {
         if (!errorCode1.equals("0")) {
             if (checkStatusError(errorCode1, 0)) {
                 stringBuilder.append(App.app.getString(R.string.error_toke_order_time_out)).append("-1,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_toke_order_time_out),"1",1));
             }
             if (checkStatusError(errorCode1, 1)) {
                 stringBuilder.append(App.app.getString(R.string.error_milk_slurry_lack)).append("-2,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_milk_slurry_lack),"2",2));
             }
             if (checkStatusError(errorCode1, 2)) {
                 if (isRR141) {
                     stringBuilder.append(App.app.getString(R.string.error_cup_lack)).append("-3,");
+                    EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_cup_lack),"3",3));
                 } else {
                     stringBuilder.append(App.app.getString(R.string.error_cup_1_lack)).append("-3,");
+                    EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_cup_1_lack),"3",4));
                 }
             }
             if (!isRR141 && checkStatusError(errorCode1, 3)) {
                 stringBuilder.append(App.app.getString(R.string.error_cup_2_lack)).append("-3,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_cup_2_lack),"3",5));
             }
             if (checkStatusError(errorCode1, 4)) {
                 stringBuilder.append(App.app.getString(R.string.error_high_pressure)).append("-3,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_high_pressure),"3",6));
             }
             if (isRR141) {
                 if (checkStatusError(errorCode1, 5)) {
@@ -175,9 +181,11 @@ public class IceCreamErrorUtils {
                 }
                 if (checkStatusError(errorCode1, 13)) {
                     stringBuilder.append(App.app.getString(R.string.error_reset)).append("-3,");
+                    EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_reset),"3",7));
                 }
                 if (checkStatusError(errorCode1, 14)) {
                     stringBuilder.append(App.app.getString(R.string.error_power_saving)).append("-1,");
+                    EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_power_saving),"1",7));
                 }
             }
         }
@@ -186,12 +194,15 @@ public class IceCreamErrorUtils {
             if (checkStatusError(errorCode2, 0)) {
                 if (isRR141) {
                     stringBuilder.append(App.app.getString(R.string.error_cup_empty)).append("-3,");
+                    EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_cup_empty),"3",8));
                 } else {
                     stringBuilder.append(App.app.getString(R.string.error_cup_1_empty)).append("-2,");
+                    EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_cup_1_empty),"2",9));
                 }
             }
             if (!isRR141 && checkStatusError(errorCode2, 1)) {
                 stringBuilder.append(App.app.getString(R.string.error_cup_2_empty)).append("-3,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_cup_2_empty),"3",10));
             }
 //            if (checkStatusError(errorCode2, 2)) {
 //                stringBuilder.append("雪糕机无杯,");
@@ -201,36 +212,45 @@ public class IceCreamErrorUtils {
             }
             if (checkStatusError(errorCode2, 4)) {
                 stringBuilder.append(App.app.getString(R.string.error_milk_slurry_empty)).append("-3,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_milk_slurry_empty),"3",11));
             }
             if (checkStatusError(errorCode2, 5)) {
                 stringBuilder.append(App.app.getString(R.string.error_machine_fault)).append("-4,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_machine_fault),"4",12));
             }
             if (checkStatusError(errorCode2, 6)) {
                 stringBuilder.append(App.app.getString(R.string.error_machine_offline)).append("-3,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_machine_offline),"3",13));
             }
             if (checkStatusError(errorCode2, 7)) {
                 stringBuilder.append(App.app.getString(R.string.error_order_time_out)).append("-2,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_order_time_out),"2",14));
             }
             if (checkStatusError(errorCode2, 8)) {
 //                stringBuilder.append(App.app.getString(R.string.error_door_obstacle)).append(",");
             }
             if (checkStatusError(errorCode2, 10)) {
                 stringBuilder.append(App.app.getString(R.string.error_claw_no_cup)).append("-2,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_claw_no_cup),"2",15));
             }
             if (checkStatusError(errorCode2, 11)) {
                 stringBuilder.append(App.app.getString(R.string.error_rotate_machine)).append("-3,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_rotate_machine),"3",16));
             }
             if (checkStatusError(errorCode2, 12)) {
                 stringBuilder.append(App.app.getString(R.string.error_elevator_machine)).append("-3,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_elevator_machine),"3",17));
             }
             if (checkStatusError(errorCode2, 13)) {
                 stringBuilder.append(App.app.getString(R.string.error_door_machine)).append("-3,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_door_machine),"3",18));
             }
             if (checkStatusError(errorCode2, 14)) {
 //                stringBuilder.append(App.app.getString(R.string.error_door_slip_fail)).append(",");
             }
             if (checkStatusError(errorCode2, 15)) {
                 stringBuilder.append(App.app.getString(R.string.error_rotate_time_out)).append("-3,");
+                EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_rotate_time_out),"3",19));
             }
         }
 

app/src/main/res/layout/activity_system_switch_setting.xml

@@ -21,9 +21,14 @@
             app:layout_constraintStart_toStartOf="parent"
             app:srcCompat="@drawable/vector_btn_back" />
     </RelativeLayout>
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:ignore="MissingConstraints">
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
+        android:layout_weight="1"
         android:layout_height="match_parent"
         android:layout_marginTop="@dimen/dp_20"
         android:orientation="vertical"
@@ -269,4 +274,58 @@
 
     </LinearLayout>
 
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/dp_20"
+        android:orientation="vertical"
+        tools:ignore="MissingConstraints">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            tools:ignore="MissingConstraints">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_8"
+                android:text="@string/shop_cart"
+                android:textColor="#333"
+                android:textSize="@dimen/sp_14"
+                android:textStyle="bold" />
+
+            <RadioGroup
+                android:id="@+id/rg_shop_cart"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/rb_shop_cart_yes"
+                    android:layout_width="@dimen/dp_60"
+                    android:layout_height="@dimen/dp_26"
+                    android:gravity="center"
+                    android:text="@string/setting_switch_on"
+                    android:textColor="#576478"
+                    android:textSize="@dimen/sp_8" />
+
+                <RadioButton
+                    android:id="@+id/rb_shop_cart_no"
+                    android:layout_width="@dimen/dp_60"
+                    android:layout_height="@dimen/dp_26"
+                    android:layout_marginLeft="@dimen/dp_20"
+                    android:gravity="center"
+                    android:text="@string/setting_switch_off"
+                    android:textColor="#576478"
+                    android:textSize="@dimen/sp_8" />
+            </RadioGroup>
+        </LinearLayout>
+
+    </LinearLayout>
+    </LinearLayout>
+
 </android.support.constraint.ConstraintLayout>

config.gradle

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