更新进度、报警加序号、远程调节音量

.idea/misc.xml

@@ -17,10 +17,12 @@
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/layout/dialog_normal.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/layout/item_user_home.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/BaseLibrary/src/main/res/layout/layout_empty_data.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/drawable/bg_spec_tag.xml" value="0.17" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/drawable/bg_switch_off.xml" value="0.102" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/drawable/bg_switch_on.xml" value="0.102" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/drawable/circular_white.xml" value="0.102" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/drawable/vector_kernel_1.xml" value="0.165" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/drawable/vector_sauce_pineapple_1.xml" value="0.17" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/drawable/vector_sauce_pineapple_3.xml" value="0.165" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/activity_authnumer.xml" value="0.1" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/activity_device_manager.xml" value="0.24947916666666667" />
@@ -67,7 +69,7 @@
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_shop_cart_dishes.xml" value="0.264" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_switch.xml" value="0.176" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_technology.xml" value="0.4" />
-        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/view_batching.xml" value="0.46194690265486726" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/view_batching.xml" value="0.152" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/view_contact.xml" value="0.6" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/view_shop_cart.xml" value="0.264" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/xml/file_paths.xml" value="0.1" />

BaseLibrary/src/main/java/com/hboxs/base_library/base/BaseApplication.java

@@ -12,6 +12,8 @@ import com.example.spunsugar.db.DaoMaster;
 import com.example.spunsugar.db.DaoSession;
 import com.hboxs.base_library.beans.db.GreenDaoOpenHelper;
 import com.hboxs.base_library.constant.Global;
+import com.hboxs.base_library.constant.Heartbeat;
+import com.hboxs.base_library.util.FileUtil;
 import com.hboxs.base_library.util.GlideUtil;
 import com.hboxs.base_library.util.LogUtil;
 import com.hboxs.base_library.util.MMKVUtil;

BaseLibrary/src/main/java/com/hboxs/base_library/util/DrawableSelectorUtils.java

@@ -347,6 +347,14 @@ public class DrawableSelectorUtils {
             logoF = R.drawable.logo_umimatic;
             width = R.dimen.dp_65;
             height = R.dimen.dp_30;
+        }else if ("7775".equals(logo)){
+            logoF = R.drawable.logo_funcity;
+            width = R.dimen.dp_65;
+            height = R.dimen.dp_30;
+        }else if ("7754".equals(logo)){
+            logoF = R.drawable.logo_kiddie;//美国代理
+            width = R.dimen.dp_80;
+            height = R.dimen.dp_40;
         }
         ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
         layoutParams.width = UiUtil.getDimensionPixelRes(width);

BaseLibrary/src/main/java/com/hboxs/base_library/util/LanguageUtil.java

@@ -49,7 +49,7 @@ public class LanguageUtil {
     public static final String JieKe = language[11];//捷克
     public static final String RouMaNiYa = language[12];//罗马尼亚
 //    public static final String NuoWei = language[13];//挪威
-//    public static final String PuTaoYa = language[14];//葡萄牙
+    public static final String PuTaoYa = language[14];//葡萄牙
 //    public static final String RuiShi = language[15];//瑞士
 //    public static final String SiFaLuoKe = language[16];//斯伐洛克
 //    public static final String XiongYaLi = language[17];//匈牙利
@@ -152,7 +152,7 @@ public class LanguageUtil {
         } else if (languageType == 14) {
 //            changeAppLanguage(LanguageUtil.NuoWei);
         } else if (languageType == 15) {
-//            changeAppLanguage(LanguageUtil.PuTaoYa);
+            changeAppLanguage(LanguageUtil.PuTaoYa);
         } else if (languageType == 16) {
 //            changeAppLanguage(LanguageUtil.RuiShi);
         } else if (languageType == 17) {

app/build.gradle

@@ -85,9 +85,15 @@ android {
     packagingOptions {
         exclude 'META-INF/io.netty.versions.properties'
     }
+    repositories {
+        flatDir {
+            dir'libs'
+        }
+    }
 }
 
 dependencies {
+    implementation files('libs/bugly-core-4.1.9.aar')
 //    implementation 'com.github.bumptech.glide:glide:4.9.0'
 //    implementation 'com.android.support:appcompat-v7:28.0.0'
 //    implementation 'com.android.support:recyclerview-v7:28.0.0'

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

@@ -11,6 +11,7 @@ import android.content.res.Configuration;
 import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 
@@ -41,9 +42,13 @@ import com.hboxs.base_library.util.HotWifitUtil;
 import com.hboxs.base_library.util.LogUtil;
 import com.hboxs.base_library.util.SharedPreferencesUtils;
 import com.orhanobut.hawk.Hawk;
+import com.tencent.bugly.crashreport.CrashReport;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -115,6 +120,7 @@ public class App extends BaseApplication {
         new Thread(new Runnable() {
             @Override
             public void run() {
+                initBugly();
                 initGoodsBean();
                 // 启动服务
                 ZtlManager.GetInstance().setContext(getApplicationContext());//屏幕厂家数据初始化
@@ -323,4 +329,59 @@ public class App extends BaseApplication {
 
         return packInfo.versionName;
     }
+
+    /**
+     * 初始化bugly
+     */
+    private void initBugly() {
+        Context context = getApplicationContext();
+// 获取当前包名
+        String packageName = context.getPackageName();
+// 获取当前进程名
+        String processName = getProcessName(android.os.Process.myPid());
+// 设置是否为上报进程
+        CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(context);
+        LogUtil.d(TAG, "processName.equals(packageName): " + processName.equals(packageName));
+        LogUtil.d(TAG, "processName: " + processName);
+        strategy.setUploadProcess(processName == null || processName.equals(packageName));
+// 初始化Bugly
+
+        CrashReport.initCrashReport(context, "1f084d947d", true, strategy);
+        Heartbeat.deviceId = FileUtil.getDeviceId();
+        if (Heartbeat.deviceId != null && Heartbeat.deviceId.length() > 6) {
+            CrashReport.setUserId(Heartbeat.deviceId.substring(Heartbeat.deviceId.length() - 6) + "si320");
+        }
+// 如果通过“AndroidManifest.xml”来配置APP信息，初始化方法如下
+// CrashReport.initCrashReport(context, strategy);
+
+    }
+
+    /**
+     * 获取进程号对应的进程名
+     *
+     * @param pid 进程号
+     * @return 进程名
+     */
+    private static String getProcessName(int pid) {
+        BufferedReader reader = null;
+        try {
+            reader = new BufferedReader(new FileReader("/proc/" + pid + "/cmdline"));
+            String processName = reader.readLine();
+            if (!TextUtils.isEmpty(processName)) {
+                processName = processName.trim();
+            }
+            return processName;
+        } catch (Throwable throwable) {
+            throwable.printStackTrace();
+        } finally {
+            try {
+                if (reader != null) {
+                    reader.close();
+                }
+            } catch (IOException exception) {
+                exception.printStackTrace();
+            }
+        }
+        return null;
+    }
 }

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

@@ -8,7 +8,7 @@ public class IceCreamDeviceConstants {
 
     // 控制机台指令
     public static final int ORDER_RESET = 1; // 复位                              //复位开机
-    public static final int ORDER_THAW = 2; // 解冻
+    public static final int ORDER_THAW = 2; // 解冻                               //解冻模式
     public static final int ORDER_CLEAN = 3; // 本体搅拌开                         //本体搅拌开
     public static final int ORDER_MANUAL_OPEN = 4; // 手动出料开
     public static final int ORDER_MANUAL_CLOSE = 5; // 手动出料关

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

@@ -208,6 +208,7 @@ public class DownPresenter {
                 Log.d(TAG, "handleMessage msg.arg1:  " + msg.arg1);
                 Log.d(TAG, "handleMessage msg.arg2: " + msg.arg2);
                 if (progressUpdate != null) {
+                    Log.d(TAG, "handleMessage: ");
                     progressUpdate.onProgressUpdate(msg.arg1, msg.arg2);
                 }
             }
@@ -251,7 +252,6 @@ public class DownPresenter {
                     break;
                 //下载失败
                 case DownloadManager.STATUS_FAILED:
-                    stopQuery();
                     Log.d(TAG, "queryState: 下载失败");
                     break;
             }

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

@@ -8,6 +8,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.media.AudioManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
@@ -248,16 +249,16 @@ public class MQService extends Service implements SendCallback {
                 //EventBus.getDefault().post(new ApiMessageEvent("alarmClock", baseBean.getKind_data()));
                 break;
             case "volume":
-//                String kind_data = baseBean.getKind_data();
-//                try {
-//                    int i = Integer.parseInt(kind_data);
-//                    if (i >= 0 && i <= 15) {
-//                        AudioManager am = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-//                        am.setStreamVolume(AudioManager.STREAM_MUSIC, i, 0);
-//                        LogUtils.logWrite("MQ的音量：" + i);
-//                    }
-//                } catch (Exception e) {
-//                }
+                String kind_data = baseBean.getKind_data();
+                try {
+                    int i = Integer.parseInt(kind_data);
+                    if (i >= 0 && i <= 15) {
+                        AudioManager am = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+                        am.setStreamVolume(AudioManager.STREAM_MUSIC, i, 0);
+                        LogUtils.logWrite("MQ的音量：" + i);
+                    }
+                } catch (Exception e) {
+                }
                 break;
             case "selfName"://客户自填地址
 //                PushToinform(Name.SELFNAME, baseBean.getKind_data());
@@ -338,7 +339,7 @@ public class MQService extends Service implements SendCallback {
                     ex.printStackTrace();
                 }
                 break;
-            case "workingMode"://雪糕机的工作模式（0：制冷，1：搅拌，2：保鲜）
+            case "workingMode"://雪糕机的工作模式（0：制冷，1：搅拌，2：保鲜，3：解冻）
                 String mode = baseBean.getKind_data();
                 if (mode.equals("0")) {
                     LogUtils.logWrite("远程制冷");
@@ -349,6 +350,9 @@ public class MQService extends Service implements SendCallback {
                 } else if (mode.equals("2")) {
                     LogUtils.logWrite("远程保鲜");
                     CommunicationHelper.getInstance().sendControl(IceCreamDeviceConstants.ORDER_KEEP_FRESH, this);
+                } else if (mode.equals("3")) {
+                    LogUtils.logWrite("远程解冻");
+                    CommunicationHelper.getInstance().sendControl(IceCreamDeviceConstants.ORDER_THAW, this);
                 }
                 break;
             default:
@@ -1232,7 +1236,7 @@ public class MQService extends Service implements SendCallback {
                 || "2019".equals(s) || "7391".equals(s) || "0924".equals(s) || "9427".equals(s) || "0735".equals(s)
                 || "5769".equals(s) || "6894".equals(s) || "8123".equals(s) || "5217".equals(s) || "6431".equals(s)
                 || "7777".equals(s) || "8080".equals(s) || "6702".equals(s) || "7772".equals(s) || "7761".equals(s)
-                || "7773".equals(s) || "7774".equals(s) || "7786".equals(s)) {
+                || "7773".equals(s) || "7774".equals(s) || "7786".equals(s) || "7775".equals(s)|| "7754".equals(s)) {
             Hawk.put("logo", s);
             Hawk.get("logo", "7777");
         }

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

@@ -595,28 +595,28 @@ 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) {
-            if (Global.isVersions==2){
-                 priceList = new ArrayList<>();
-                 priceList1 = new ArrayList<>();
-                 for (int i = 0; i < orderHelper.getOrderList().size(); i++) {
-                     ShoppingCartBean shoppingCart = new ShoppingCartBean();
-                     shoppingCart.setShoppingName(orderHelper.getOrderList().get(i).selectTag);//商品名字
-                     shoppingCart.setCount(orderHelper.getOrderList().get(i).buyCount);
-                     shoppingCart.setPrice(Double.parseDouble(orderHelper.getOrderList().get(i).price));
-                     double totalSum = 0.0; // 用于存储总和
-                     if (orderHelper.getOrderList().get(i).selectSpecBeans.size() > 0) {
-                         for (int j = 0; j < orderHelper.getOrderList().get(i).selectSpecBeans.size(); j++) {
-                             totalSum += Double.parseDouble(orderHelper.getOrderList().get(i).selectSpecBeans.get(j).price);
-                         }
-                         totalSum += shoppingCart.getPrice();
-                     } else {
-                         totalSum = shoppingCart.getPrice();
-                     }
-                     for (int k = 0; k < orderHelper.getOrderList().get(i).buyCount; k++) {
-                         priceList.add(totalSum); // 将单个商品的总价格添加 buyCount 次
-                     }
-                     Log.d(TAG, "onClick:orderHelper 商品名字：" + orderHelper.getOrderList().get(i).selectTag + " 单个商品价格：" + totalSum + "  数量：" + orderHelper.getOrderList().get(i).buyCount);
-                 }
+            if (Global.isVersions == 2) {
+                priceList = new ArrayList<>();
+                priceList1 = new ArrayList<>();
+                for (int i = 0; i < orderHelper.getOrderList().size(); i++) {
+                    ShoppingCartBean shoppingCart = new ShoppingCartBean();
+                    shoppingCart.setShoppingName(orderHelper.getOrderList().get(i).selectTag);//商品名字
+                    shoppingCart.setCount(orderHelper.getOrderList().get(i).buyCount);
+                    shoppingCart.setPrice(Double.parseDouble(orderHelper.getOrderList().get(i).price));
+                    double totalSum = 0.0; // 用于存储总和
+                    if (orderHelper.getOrderList().get(i).selectSpecBeans.size() > 0) {
+                        for (int j = 0; j < orderHelper.getOrderList().get(i).selectSpecBeans.size(); j++) {
+                            totalSum += Double.parseDouble(orderHelper.getOrderList().get(i).selectSpecBeans.get(j).price);
+                        }
+                        totalSum += shoppingCart.getPrice();
+                    } else {
+                        totalSum = shoppingCart.getPrice();
+                    }
+                    for (int k = 0; k < orderHelper.getOrderList().get(i).buyCount; k++) {
+                        priceList.add(totalSum); // 将单个商品的总价格添加 buyCount 次
+                    }
+                    Log.d(TAG, "onClick:orderHelper 商品名字：" + orderHelper.getOrderList().get(i).selectTag + " 单个商品价格：" + totalSum + "  数量：" + orderHelper.getOrderList().get(i).buyCount);
+                }
             }
             showLoading();
             if (App.app.payChannel == Constant.PAY_FREE || manualReason != null) {
@@ -643,6 +643,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                 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();
@@ -717,7 +718,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                             return;
                         }
                         Log.d(TAG, "onClickListener: 1");
-                        handlePaymentSelection(5, R.id.iv_qr_code, () ->  carsPay(str()));//国内二码合一支付
+                        handlePaymentSelection(5, R.id.iv_qr_code, () -> carsPay(str()));//国内二码合一支付
                         break;
                 }
             }
@@ -876,7 +877,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
 
     private void selectSauce(int position) {
         BatchingView batchingView = sauceViews[position];
-
+        Log.d(TAG, "selectSauce: " + position);
         if (App.app.specMultipleChoices) {
             batchingView.setSelected(!batchingView.isSelected());
         } else {
@@ -899,16 +900,14 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         }
         // 添加果酱的动效和视觉图
         if (batchingView.isSelected()) {
-            sauceDownViews.clear();
-            // 反序判断， 是否要从上一层流酱料下来
-            AppCompatImageView effectView = sauceEffectViews[2];
-
-            Glide.with(effectView).load(batchingView.getEffectIcons()[0]).into(effectView);
+            AppCompatImageView effectView = sauceEffectViews[selectCount - 1];
+            effectView.setImageResource(batchingView.getEffectIcons()[selectCount - 1]);
             effectView.startAnimation(pullFlavorAnim);
         } else {
             AppCompatImageView effectView = sauceEffectViews[selectCount];
             effectView.setImageBitmap(null);
         }
+        Log.d(TAG, "selectSauce:1 "+selectCount);
         initIceCream();
     }
 
@@ -1826,7 +1825,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
     // 进入手动制作的界面
     private void manualMake() {
         Log.d(TAG, "manualMake orderHelper: " + orderHelper.getOrderList().toString());
-        if (arrayCode!=null){
+        if (arrayCode != null) {
             for (String s : arrayCode) {
                 updateCode(s);
             }
@@ -1875,7 +1874,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                     sum += price; // 单个商品价格的总和
                 }
                 Log.d(TAG, "manualMake: sum" + sum + ":" + orderHelper.getOrderList().get(i).buyCount);
-                saveCoinOrder(shoppingCart.getShoppingName(), sum, payType,localOrderSn, orderHelper.getOrderList().get(i).buyCount);
+                saveCoinOrder(shoppingCart.getShoppingName(), sum, payType, localOrderSn, orderHelper.getOrderList().get(i).buyCount);
             }
         }
         LogUtils.logWrite("制作了" + orderHelper.generateMakingIceCream().size() + "杯冰淇淋");
@@ -1895,6 +1894,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
 
             removeFinish();
             LinkedList<MakeIceCreamBean> iceCreamOrders = OrderHelper.getInstance().generateMakingIceCream();
+            Log.d(TAG, "manualMake: MakeIceCreamBean" + iceCreamOrders);
             CommunicationHelper.getInstance().setMakingIceCreams(iceCreamOrders);
             Fragment fragment = PaySuccessFragment.getFragment(CommunicationHelper.getInstance().getMakingIceCreams().size(), isManualMode());
             FragmentTransaction transaction = getFragmentManager().beginTransaction();
@@ -2062,10 +2062,12 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         //scanDialog.startGetTime(sn);
 //        extracted();
     }
+
     private ArrayList<String> promotionCodes;
+
     private String str() {
         promotionCodes = new ArrayList<>();
-        if (arrayCode!=null&&arrayCode.length>0){
+        if (arrayCode != null && arrayCode.length > 0) {
             promotionCodes.addAll(Arrays.asList(arrayCode));
         }
         shoppingCartBeanList.clear();
@@ -2097,21 +2099,21 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
             strings.clear();
             //优惠码集合
             for (int i1 = 0; i1 < shoppingCartBeanList.get(i).getCount(); i1++) {
-                if (i1<promotionCodes.size()){
+                if (i1 < promotionCodes.size()) {
                     strings.add(promotionCodes.get(i1));
-                }else {
+                } else {
                     strings.add("0");
                 }
-                Log.d(TAG, ":shoppingCartBeanList onClick: "+strings+" "+promotionCodes);
+                Log.d(TAG, ":shoppingCartBeanList onClick: " + strings + " " + promotionCodes);
             }
             String s1 = new Gson().toJson(strings);
-            Log.d(TAG, ":shoppingCartBeanList onClick:0 "+s1+" "+promotionCodes);
-                for (int j = 0; j < promotionCodes.size(); j++) {
-                    String s = promotionCodes.get(j);
-                    if (s != null &&"".equals(s)) {
-                        Log.d(TAG, ":shoppingCartBeanList onClick:2 "+s1+" "+promotionCodes);
-                        s1 = s;
-                    }
+            Log.d(TAG, ":shoppingCartBeanList onClick:0 " + s1 + " " + promotionCodes);
+            for (int j = 0; j < promotionCodes.size(); j++) {
+                String s = promotionCodes.get(j);
+                if (s != null && "".equals(s)) {
+                    Log.d(TAG, ":shoppingCartBeanList onClick:2 " + s1 + " " + promotionCodes);
+                    s1 = s;
+                }
             }
 
             Log.d(TAG, shoppingCartBeanList.size() + ":shoppingCartBeanList onClick: " + s1 + ":" + shoppingCartBeanList.get(i).getShoppingName() + "-" + shoppingCartBeanList.get(i).getCount());
@@ -2488,9 +2490,9 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                                 LogUtil.d("优惠码过期了哦!", type + "");
                                 break;
                             case "success":
-                                if (Global.isVersions==2){
-                                getConfirmCodeOverseas(code, id);
-                                }else {
+                                if (Global.isVersions == 2) {
+                                    getConfirmCodeOverseas(code, id);
+                                } else {
                                     getConfirmCodeSuccess(1, id);
                                 }
                                 break;
@@ -2583,7 +2585,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
             showNayaxCreditCard();
         } else if (id == R.id.iv_w_mdb_xinyongka) {
             showDialogWMDBCreditCard();
-        }else if (id == R.id.iv_qr_code) {
+        } else if (id == R.id.iv_qr_code) {
             carsPay(str());
         }
     }

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

@@ -242,11 +242,11 @@ public class LanguageActivity extends StaticActivity implements View.OnClickList
 //            languageType = 14;
 //            languageValue = LanguageUtil.NuoWei;
         } else if (checkedId == R.id.rb_putaoya) {
-            showToast("未有此翻译,请联系添加。");
-            finish();
-            return;
-//            languageType = 15;
-//            languageValue = LanguageUtil.PuTaoYa;
+//            showToast("未有此翻译,请联系添加。");
+//            finish();
+//            return;
+            languageType = 15;
+            languageValue = LanguageUtil.PuTaoYa;
         } else if (checkedId == R.id.rb_ruishi) {
             showToast("未有此翻译,请联系添加。");
             finish();

app/src/main/java/com/bgy/autosale/ui/operator/fragments/SwitchFragment.java

@@ -444,7 +444,7 @@ public class SwitchFragment extends BaseFragment implements RadioGroup.OnChecked
         if (id == R.id.btn_changlogoupdate) {
             String s = etChanglog.getText().toString();
             if ("7772".equals(s)||"7770".equals(s)||"7777".equals(s)||"7761".equals(s)
-                    ||"7773".equals(s)||"7774".equals(s)||"7786".equals(s)) {
+                    ||"7773".equals(s)||"7774".equals(s)||"7786".equals(s)||"7775".equals(s)||"7754".equals(s)) {
                 Hawk.put("logo", s);
                 Hawk.get("logo", "7777");
                 ToastUtil.showToast(UiUtil.getStringRes(R.string.xgwc));

app/src/main/java/com/bgy/autosale/ui/operator/fragments/TechnologySupportFragment.java

@@ -34,6 +34,7 @@ import com.bgy.autosale.R;
 import com.bgy.autosale.entitys.LanguageBean;
 import com.bgy.autosale.helpers.SmallApkHelper;
 import com.bgy.autosale.payutil.ApkInfoBean;
+import com.bgy.autosale.payutil.DownPresenter;
 import com.bgy.autosale.payutil.DownServer;
 import com.bgy.autosale.payutil.EtlDialog;
 import com.bgy.autosale.payutil.GetApkInfoListBean;
@@ -100,7 +101,7 @@ import okhttp3.RequestBody;
  * Created by cjx on 2020-12-31
  * 说明：
  */
-public class TechnologySupportFragment extends BaseFragment implements View.OnClickListener {
+public class TechnologySupportFragment extends BaseFragment implements View.OnClickListener, DownPresenter.ProgressUpdate {
 
     private final int ACTION_SN = 2;
     private final int ACTION_DEBUG = 5;
@@ -161,6 +162,9 @@ private final ArrayList<LanguageBean> languages = new ArrayList<>(Arrays.asList(
         btnSystemDisconnect = findViewById(R.id.btn_system_disconnect);
         btnSystemDisconnect.setOnClickListener(this);
         verTv.setText(App.app.getString(R.string.version_information) + ":" + getVersionName());
+        downPresenter = DownPresenter.getInstance();
+        downPresenter.setProgressUpdate(this);
+
         tvTsDeviceId1=findViewById(R.id.tv_ts_device_id1);
         if (Heartbeat.deviceId != null && Heartbeat.deviceId.length() > 6) {
             tvTsDeviceId1.setText(Heartbeat.deviceId.substring(Heartbeat.deviceId.length() - 6));
@@ -669,6 +673,10 @@ private final ArrayList<LanguageBean> languages = new ArrayList<>(Arrays.asList(
                 switch (type) {
                     case R.id.btn_confirm:
                         if (isUpdate) {
+                            if (downPresenter == null) {
+                                downPresenter = DownPresenter.getInstance();
+                                downPresenter.setProgressUpdate(TechnologySupportFragment.this);
+                            }
                             //更新 下载
                             if (downloadApkIntent != null) {
                                 BaseApplication.getContext().stopService(downloadApkIntent);
@@ -758,6 +766,14 @@ private final ArrayList<LanguageBean> languages = new ArrayList<>(Arrays.asList(
         BaseApplication.getContext().startService(downloadApkIntent);
     }
 
+    @Override
+    public void onProgressUpdate(double mDownload_so_far, double mDownload_all) {
+        if (updateDialog != null) {
+            LogUtil.d(TAG, "onProgressUpdate: value--》" + mDownload_so_far + ";max -->" + mDownload_all + ";百分比--》" + (int) ((mDownload_so_far / mDownload_all) * 100D));
+            updateDialog.setContent((int) ((mDownload_so_far / mDownload_all) * 100D));
+        }
+    }
+
     private String getVersionName() {
         String versionName = "";
         PackageManager pm = BaseApplication.getContext().getPackageManager();
@@ -1128,10 +1144,14 @@ private final ArrayList<LanguageBean> languages = new ArrayList<>(Arrays.asList(
         super.onStart();
         EventBus.getDefault().register(this);
     }
+    private DownPresenter downPresenter;
 
     @Override
     public void onStop() {
         EventBus.getDefault().unregister(this);
+        if (downPresenter != null) {
+            downPresenter.setProgressUpdate(null);
+        }
         super.onStop();
     }
     private Map<String, Integer> flowerTypeIds;//存储花型对应的id

app/src/main/java/com/bgy/autosale/ui/widget/BatchingView.java

@@ -85,7 +85,7 @@ public class BatchingView extends FrameLayout {
 
         setClickable(true);
         setOnClickListener(listener);
-
+//        initDefaultIcon();
         checkStock();
     }
 
@@ -122,6 +122,17 @@ public class BatchingView extends FrameLayout {
         }
         return getSpecBean().effectImage;
     }
+//public int[] getEffectIcons() {
+//    // 调用 initDefaultIcon 来根据 specBean.name 设置效果图
+//    initDefaultIcon();
+//    // 返回根据名字设置的效果图
+//    if (specBean.effectImage != null) {
+//        return specBean.effectImage;
+//    } else {
+//        // 如果没有设置特定效果图，返回一个默认空的图标数组
+//        return new int[]{};
+//    }
+//}
 
     public SpecBean getSpecBean() {
         return specBean;
@@ -151,60 +162,66 @@ public class BatchingView extends FrameLayout {
             icon = R.drawable.vector_peanut;
             specBean.name = App.app.getString(R.string.peanut);
             specBean.effectImage = new int[]{
-                    R.drawable.vector_kernel_1
+                    R.drawable.vector_kernel_1,
+                    R.drawable.vector_kernel_2,
+                    R.drawable.vector_kernel_3
             };
         } else if (specBean.name.contains("榛子")) {
             icon = R.drawable.vector_filbert;
             specBean.name = App.app.getString(R.string.filbert);
             specBean.effectImage = new int[]{
-                    R.drawable.vector_kernel_2
+                    R.drawable.vector_kernel_1,
+                    R.drawable.vector_kernel_2,
+                    R.drawable.vector_kernel_3
             };
         } else if (specBean.name.contains("腰果")) {
             icon = R.drawable.vector_cashew;
             specBean.name = App.app.getString(R.string.cashew);
             specBean.effectImage = new int[]{
+                    R.drawable.vector_kernel_1,
+                    R.drawable.vector_kernel_2,
                     R.drawable.vector_kernel_3
             };
         } else if (specBean.name.contains("菠萝")) {
             specBean.effectImage = new int[]{
-//                    R.drawable.vector_sauce_pineapple_1,
-//                    R.drawable.vector_sauce_pineapple_2,
+                    R.drawable.vector_sauce_pineapple_1,
+                    R.drawable.vector_sauce_pineapple_2,
                     R.drawable.vector_sauce_pineapple_3,
             };
             icon = R.drawable.vector_pineapple;
             specBean.name = App.app.getString(R.string.pineapple);
         } else if (specBean.name.contains("草莓") || specBean.name.contains("Strawberry")) {
             specBean.effectImage = new int[]{
-//                    R.drawable.vector_sauce_strawberry_1,
-//                    R.drawable.vector_sauce_strawberry_2,
+                    R.drawable.vector_sauce_strawberry_1,
+                    R.drawable.vector_sauce_strawberry_2,
                     R.drawable.vector_sauce_strawberry_3,
             };
             specBean.name = App.app.getString(R.string.strawberry);
-            if (Constant.LANGUAGE_ZH.equals(App.app.language)) {
+//            if (Constant.LANGUAGE_ZH.equals(App.app.language)) {
                 icon = R.drawable.vector_strawberry;
-            } else {
-                icon = R.drawable.strawberry_ic;
-            }
+//            } else {
+//                icon = R.drawable.strawberry_ic;
+//            }
         } else if (specBean.name.contains("蓝莓")) {
             specBean.effectImage = new int[]{
-//                    R.drawable.vector_sauce_blueberry_1,
-//                    R.drawable.vector_sauce_blueberry_2,
+                    R.drawable.vector_sauce_blueberry_1,
+                    R.drawable.vector_sauce_blueberry_2,
                     R.drawable.vector_sauce_blueberry_3,
             };
             icon = R.drawable.vector_blueberry;
             specBean.name = App.app.getString(R.string.blueberry);
         } else if (specBean.name.contains("芒果")) {
             specBean.effectImage = new int[]{
-//                    R.drawable.vector_sauce_mango_1,
-//                    R.drawable.vector_sauce_mango_2,
+                    R.drawable.vector_sauce_mango_1,
+                    R.drawable.vector_sauce_mango_2,
                     R.drawable.vector_sauce_mango_3,
             };
             icon = R.drawable.vector_mango;
             specBean.name = App.app.getString(R.string.mango);
         } else if (specBean.name.contains("巧克力") || specBean.name.contains("Chocolate")) {
             specBean.effectImage = new int[]{
-//                    R.drawable.vector_sauce_chocolate_1,
-//                    R.drawable.vector_sauce_chocolate_2,
+                    R.drawable.vector_sauce_chocolate_1,
+                    R.drawable.vector_sauce_chocolate_2,
                     R.drawable.vector_sauce_chocolate_3,
             };
             icon = R.drawable.vector_chocolate;

app/src/main/res/values-ar/strings.xml

@@ -311,40 +311,40 @@
     <string name="remote_shutdown_in_sale">فشلت العملية أثناء قيام المستخدم بطلب الطعام</string>
 
     <!-- خلل في المعدات -->
-    <string name="error_power_saving">وضعية توفير الطاقة</string>
-    <string name="error_wait">لم يدخل الجهاز في حالة البيع التلقائي</string>
     <string name="error_contact_format">%s-إذا كانت لديك أية أسئلة، فيرجى الاتصال بموظفي تشغيل المتجر (%s)</string>
     <string name="error_milk_slurry_empty_tip">انتظار النادل لتجديد الحليب</string>
     <string name="error_cup_empty_tip">انتظار النادل لإعادة ملء كوب الآيس كريم</string>
-    <string name="error_door_un_close">باب الجهاز غير مغلق</string>
-    <string name="error_toke_order_time_out">مهلة استلام الوجبة</string>
-    <string name="error_milk_slurry_lack">مكونات ماكينة الآيس كريم نفدت</string>
-    <string name="error_cup_lack">قطارة الكوب تفتقد كوبًا</string>
-    <string name="error_cup_1_lack">لا يوجد أنبوب واحد مفقود</string>
-    <string name="error_cup_2_lack">لا يوجد أنبوب ذو كوبين</string>
-    <string name="error_high_pressure">اضغط على إنذار الضغط العالي</string>
-    <string name="error_nuts_1_lack">الجوز 1 مفقود</string>
-    <string name="error_nuts_2_lack">المكسرات 2 تفتقر إلى المادة</string>
-    <string name="error_nuts_3_lack">المكسرات 3 تفتقر إلى المكونات</string>
-    <string name="error_jam_1_lack">لقد نفدت مكونات Jam 1</string>
-    <string name="error_jam_2_lack">يفتقر محتوى Jam 2 إلى المكونات</string>
-    <string name="error_jam_3_lack">يفتقر محتوى Jam 3 إلى المكونات</string>
-    <string name="error_reset">فشلت إعادة التعيين</string>
-    <string name="error_cup_empty">قطارة الكوب لا تحتوي على كوب</string>
-    <string name="error_cup_1_empty">لا يوجد كوب في أنبوب الكوب 1</string>
-    <string name="error_cup_2_empty">لا يوجد كوب في أنبوب الكوب رقم 2</string>
-    <string name="error_no_in_refrigeration">لا يدخل في التبريد التلقائي</string>
-    <string name="error_milk_slurry_empty">آلة الآيس كريم خالية من المكونات</string>
-    <string name="error_machine_fault">خطأ في الجسم الرئيسي لآلة الآيس كريم</string>
-    <string name="error_machine_offline">لقد فقد الاتصال بالجسم الرئيسي لآلة الآيس كريم</string>
-    <string name="error_order_time_out">آلة الآيس كريم لا تنتج الآيس كريم</string>
-    <string name="error_door_obstacle">يوجد عائق عند الشبكة</string>
-    <string name="error_claw_no_cup">يسقط المخلب الكهربائي كوبًا أثناء التشغيل</string>
-    <string name="error_rotate_machine">خطأ في محرك السائر لدوران المرحلة الدوارة</string>
-    <string name="error_elevator_machine">خطأ في محرك السائر لرفع المرحلة الدوارة</string>
-    <string name="error_door_machine">خطأ في محرك السائر لرفع الباب</string>
-    <string name="error_door_slip_fail">فشل في الانزلاق إلى أسفل كوب الطعام</string>
-    <string name="error_rotate_time_out">مهلة دوران جدول التدوير</string>
+    <string name="error_power_saving">No.1 وضعية توفير الطاقة</string>
+    <string name="error_wait">No.2 لم يدخل الجهاز في حالة البيع التلقائي</string>
+    <string name="error_door_un_close">No.3 باب الجهاز غير مغلق</string>
+    <string name="error_toke_order_time_out">No.4 مهلة استلام الوجبة</string>
+    <string name="error_milk_slurry_lack">No.5 مكونات ماكينة الآيس كريم نفدت</string>
+    <string name="error_cup_lack">No.6 قطارة الكوب تفتقد كوبًا</string>
+    <string name="error_cup_1_lack">No.7 لا يوجد أنبوب واحد مفقود</string>
+    <string name="error_cup_2_lack">No.8 لا يوجد أنبوب ذو كوبين</string>
+    <string name="error_high_pressure">No.9 اضغط على إنذار الضغط العالي</string>
+    <string name="error_nuts_1_lack">No.10 الجوز 1 مفقود</string>
+    <string name="error_nuts_2_lack">No.11 المكسرات 2 تفتقر إلى المادة</string>
+    <string name="error_nuts_3_lack">No.12 المكسرات 3 تفتقر إلى المكونات</string>
+    <string name="error_jam_1_lack">No.13 لقد نفدت مكونات Jam 1</string>
+    <string name="error_jam_2_lack">No.14 يفتقر محتوى Jam 2 إلى المكونات</string>
+    <string name="error_jam_3_lack">No.15 يفتقر محتوى Jam 3 إلى المكونات</string>
+    <string name="error_reset">No.16 فشلت إعادة التعيين</string>
+    <string name="error_cup_empty">No.17 قطارة الكوب لا تحتوي على كوب</string>
+    <string name="error_cup_1_empty">No.18 لا يوجد كوب في أنبوب الكوب 1</string>
+    <string name="error_cup_2_empty">No.19 لا يوجد كوب في أنبوب الكوب رقم 2</string>
+    <string name="error_no_in_refrigeration">No.20 لا يدخل في التبريد التلقائي</string>
+    <string name="error_milk_slurry_empty">No.21 آلة الآيس كريم خالية من المكونات</string>
+    <string name="error_machine_fault">No.22 خطأ في الجسم الرئيسي لآلة الآيس كريم</string>
+    <string name="error_machine_offline">No.23 لقد فقد الاتصال بالجسم الرئيسي لآلة الآيس كريم</string>
+    <string name="error_order_time_out">No.24 آلة الآيس كريم لا تنتج الآيس كريم</string>
+    <string name="error_door_obstacle">No.25 يوجد عائق عند الشبكة</string>
+    <string name="error_claw_no_cup">No.26 يسقط المخلب الكهربائي كوبًا أثناء التشغيل</string>
+    <string name="error_rotate_machine">No.27 خطأ في محرك السائر لدوران المرحلة الدوارة</string>
+    <string name="error_elevator_machine">No.28 خطأ في محرك السائر لرفع المرحلة الدوارة</string>
+    <string name="error_door_machine">No.29 خطأ في محرك السائر لرفع الباب</string>
+    <string name="error_door_slip_fail">No.30 فشل في الانزلاق إلى أسفل كوب الطعام</string>
+    <string name="error_rotate_time_out">No.31 مهلة دوران جدول التدوير</string>
     <string name="error_contact_phone">الهاتف:</string>
 
     <!-- التهيئة -->

app/src/main/res/values-cs/strings.xml

@@ -310,40 +310,40 @@
     <string name="remote_shutdown_in_sale">V prodeji, operace se nezdařila!</string>
 
     <!-- 设备异常 -->
-    <string name="error_power_saving">Úspora energie</string>
-    <string name="error_wait">Zařízení není ve stavu automatického prodeje</string>
     <string name="error_contact_format">%s-V případě jakýchkoli dotazů kontaktujte personál obchodu. (%s)</string>
     <string name="error_milk_slurry_empty_tip">Čekání na doplnění mléčné směsi</string>
     <string name="error_cup_empty_tip">Čekání na doplnění zmrzlinového poháru</string>
-    <string name="error_door_un_close">Dvířka zařízení nejsou zavřená</string>
-    <string name="error_toke_order_time_out">Časový limit vyzvednutí</string>
-    <string name="error_milk_slurry_lack">Nízká zásoba mléčné směsi</string>
-    <string name="error_cup_lack">Nízká zásoba šálku</string>
-    <string name="error_cup_1_lack">Nízké zásoby v držáku na pohárky 1</string>
-    <string name="error_cup_2_lack">Nízké zásoby v držáku na pohárky 2</string>
-    <string name="error_high_pressure">Alarm vysokého tlaku lisovacího stroje</string>
-    <string name="error_nuts_1_lack">Nízké zásoby polevy 1</string>
-    <string name="error_nuts_2_lack">Nízké zásoby polevy 2</string>
-    <string name="error_nuts_3_lack">Nízké zásoby polevy 3</string>
-    <string name="error_jam_1_lack">Nízká zásoba sirupu 1</string>
-    <string name="error_jam_2_lack">Nízká zásoba sirupu 2</string>
-    <string name="error_jam_3_lack">Nízká zásoba sirupu 3</string>
-    <string name="error_reset">Resetování se nezdařilo</string>
-    <string name="error_cup_empty">Žádný šálek</string>
-    <string name="error_cup_1_empty">Držák na pohár 1 prázdný</string>
-    <string name="error_cup_2_empty">Držák na pohár 2 prázdný</string>
-    <string name="error_no_in_refrigeration">Není v chladničce</string>
-    <string name="error_milk_slurry_empty">Mléčná směs prázdná</string>
-    <string name="error_machine_fault">Porucha stroje</string>
-    <string name="error_machine_offline">Stroj je mimo provoz</string>
-    <string name="error_order_time_out">Časový limit produkce</string>
-    <string name="error_door_obstacle">Překážky ve slotu pro vyzvednutí</string>
-    <string name="error_claw_no_cup">Automatické uchopení prázdné</string>
-    <string name="error_rotate_machine">Alarm rotujícího motoru</string>
-    <string name="error_elevator_machine">Alarm motoru zvedání</string>
-    <string name="error_door_machine">Alarm motoru dveří</string>
-    <string name="error_door_slip_fail">Nepodařilo se upustit šálek</string>
-    <string name="error_rotate_time_out">Časový limit otočného stolu</string>
+    <string name="error_power_saving">No.1 Úspora energie</string>
+    <string name="error_wait">No.2 Zařízení není ve stavu automatického prodeje</string>
+    <string name="error_door_un_close">No.3 Dvířka zařízení nejsou zavřená</string>
+    <string name="error_toke_order_time_out">No.4 Časový limit vyzvednutí</string>
+    <string name="error_milk_slurry_lack">No.5 Nízká zásoba mléčné směsi</string>
+    <string name="error_cup_lack">No.6 Nízká zásoba šálku</string>
+    <string name="error_cup_1_lack">No.7 Nízké zásoby v držáku na pohárky 1</string>
+    <string name="error_cup_2_lack">No.8 Nízké zásoby v držáku na pohárky 2</string>
+    <string name="error_high_pressure">No.9 Alarm vysokého tlaku lisovacího stroje</string>
+    <string name="error_nuts_1_lack">No.10 Nízké zásoby polevy 1</string>
+    <string name="error_nuts_2_lack">No.11 Nízké zásoby polevy 2</string>
+    <string name="error_nuts_3_lack">No.12 Nízké zásoby polevy 3</string>
+    <string name="error_jam_1_lack">No.13 Nízká zásoba sirupu 1</string>
+    <string name="error_jam_2_lack">No.14 Nízká zásoba sirupu 2</string>
+    <string name="error_jam_3_lack">No.15 Nízká zásoba sirupu 3</string>
+    <string name="error_reset">No.16 Resetování se nezdařilo</string>
+    <string name="error_cup_empty">No.17 Žádný šálek</string>
+    <string name="error_cup_1_empty">No.18 Držák na pohár 1 prázdný</string>
+    <string name="error_cup_2_empty">No.19 Držák na pohár 2 prázdný</string>
+    <string name="error_no_in_refrigeration">No.20 Není v chladničce</string>
+    <string name="error_milk_slurry_empty">No.21 Mléčná směs prázdná</string>
+    <string name="error_machine_fault">No.22 Porucha stroje</string>
+    <string name="error_machine_offline">No.23 Stroj je mimo provoz</string>
+    <string name="error_order_time_out">No.24 Časový limit produkce</string>
+    <string name="error_door_obstacle">No.25 Překážky ve slotu pro vyzvednutí</string>
+    <string name="error_claw_no_cup">No.26 Automatické uchopení prázdné</string>
+    <string name="error_rotate_machine">No.27 Alarm rotujícího motoru</string>
+    <string name="error_elevator_machine">No.28 Alarm motoru zvedání</string>
+    <string name="error_door_machine">No.29 Alarm motoru dveří</string>
+    <string name="error_door_slip_fail">No.30 Nepodařilo se upustit šálek</string>
+    <string name="error_rotate_time_out">No.31 Časový limit otočného stolu</string>
     <string name="error_contact_phone">Telefon:</string>
 
     <!-- 初始化 -->

app/src/main/res/values-de/strings.xml

@@ -309,40 +309,41 @@
     <string name="remote_shutdown_flavor_stock">Geringer Vorrat an Milchmischung, Vorgang fehlgeschlagen!</string>
     <string name="remote_shutdown_in_sale">Im Angebot, Vorgang fehlgeschlagen!</string>
     <!-- 设备异常 -->
-    <string name="error_power_saving">Energiesparen</string>
-    <string name="error_wait">Das Gerät befindet sich nicht im Status „Automatischer Verkauf“</string>
+
     <string name="error_contact_format">%s-Bei Fragen wenden Sie sich bitte an das Filialpersonal.(%s)</string>
     <string name="error_milk_slurry_empty_tip">Warten auf Nachfüllen der Milchmischung</string>
     <string name="error_cup_empty_tip">Warten auf das Nachfüllen des Eisbechers</string>
-    <string name="error_door_un_close">Gerätetür nicht geschlossen</string>
-    <string name="error_toke_order_time_out">Abholzeitüberschreitung</string>
-    <string name="error_milk_slurry_lack">Geringer Bestand an Milchmischung</string>
-    <string name="error_cup_lack">Geringer Bechervorrat</string>
-    <string name="error_cup_1_lack">Geringer Vorrat im Getränkehalter 1</string>
-    <string name="error_cup_2_lack">Geringer Vorrat im Getränkehalter 2</string>
-    <string name="error_high_pressure">Hochdruckalarm der Pressmaschine</string>
-    <string name="error_nuts_1_lack">Geringer Bestand an Toppings 1</string>
-    <string name="error_nuts_2_lack">Geringer Bestand an Toppings 2</string>
-    <string name="error_nuts_3_lack">Geringer Bestand an Toppings 3</string>
-    <string name="error_jam_1_lack">Geringer Sirupvorrat 1</string>
-    <string name="error_jam_2_lack">Geringer Sirupvorrat 2</string>
-    <string name="error_jam_3_lack">Geringer Sirupvorrat 3</string>
-    <string name="error_reset">Zurücksetzen fehlgeschlagen</string>
-    <string name="error_cup_empty">Keine Tasse</string>
-    <string name="error_cup_1_empty">Getränkehalter 1 leer</string>
-    <string name="error_cup_2_empty">Getränkehalter 2 leer</string>
-    <string name="error_no_in_refrigeration">Nicht im Kühlschrank</string>
-    <string name="error_milk_slurry_empty">Milchmischung leer</string>
-    <string name="error_machine_fault">Maschinenstörung</string>
-    <string name="error_machine_offline">Maschine offline</string>
-    <string name="error_order_time_out">Produktionszeitüberschreitung</string>
-    <string name="error_door_obstacle">Hindernisse am Abholplatz</string>
-    <string name="error_claw_no_cup">Auto-Grabber leer</string>
-    <string name="error_rotate_machine">Rotierender Motoralarm</string>
-    <string name="error_elevator_machine">Hebemotoralarm</string>
-    <string name="error_door_machine">Türmotoralarm</string>
-    <string name="error_door_slip_fail">Becher konnte nicht fallen gelassen werden</string>
-    <string name="error_rotate_time_out">Zeitüberschreitung des Rotationstisches</string>
+    <string name="error_power_saving">No.1 Energiesparen</string>
+    <string name="error_wait">No.2 Das Gerät befindet sich nicht im Status „Automatischer Verkauf“</string>
+    <string name="error_door_un_close">No.3 Gerätetür nicht geschlossen</string>
+    <string name="error_toke_order_time_out">No.4 Abholzeitüberschreitung</string>
+    <string name="error_milk_slurry_lack">No.5 Geringer Bestand an Milchmischung</string>
+    <string name="error_cup_lack">No.6 Geringer Bechervorrat</string>
+    <string name="error_cup_1_lack">No.7 Geringer Vorrat im Getränkehalter 1</string>
+    <string name="error_cup_2_lack">No.8 Geringer Vorrat im Getränkehalter 2</string>
+    <string name="error_high_pressure">No.9 Hochdruckalarm der Pressmaschine</string>
+    <string name="error_nuts_1_lack">No.10 Geringer Bestand an Toppings 1</string>
+    <string name="error_nuts_2_lack">No.11 Geringer Bestand an Toppings 2</string>
+    <string name="error_nuts_3_lack">No.12 Geringer Bestand an Toppings 3</string>
+    <string name="error_jam_1_lack">No.13 Geringer Sirupvorrat 1</string>
+    <string name="error_jam_2_lack">No.14 Geringer Sirupvorrat 2</string>
+    <string name="error_jam_3_lack">No.15 Geringer Sirupvorrat 3</string>
+    <string name="error_reset">No.16 Zurücksetzen fehlgeschlagen</string>
+    <string name="error_cup_empty">No.17 Keine Tasse</string>
+    <string name="error_cup_1_empty">No.18 Getränkehalter 1 leer</string>
+    <string name="error_cup_2_empty">No.19 Getränkehalter 2 leer</string>
+    <string name="error_no_in_refrigeration">No.20 Nicht im Kühlschrank</string>
+    <string name="error_milk_slurry_empty">No.21 Milchmischung leer</string>
+    <string name="error_machine_fault">No.22 Maschinenstörung</string>
+    <string name="error_machine_offline">No.23 Maschine offline</string>
+    <string name="error_order_time_out">No.24 Produktionszeitüberschreitung</string>
+    <string name="error_door_obstacle">No.25 Hindernisse am Abholplatz</string>
+    <string name="error_claw_no_cup">No.26 Auto-Grabber leer</string>
+    <string name="error_rotate_machine">No.27 Rotierender Motoralarm</string>
+    <string name="error_elevator_machine">No.28 Hebemotoralarm</string>
+    <string name="error_door_machine">No.29 Türmotoralarm</string>
+    <string name="error_door_slip_fail">No.30 Becher konnte nicht fallen gelassen werden</string>
+    <string name="error_rotate_time_out">No.31 Zeitüberschreitung des Rotationstisches</string>
     <string name="error_contact_phone">Telefon:</string>
 
     <!-- 初始化 -->

app/src/main/res/values-en/strings.xml

@@ -311,40 +311,40 @@
     <string name="remote_shutdown_in_sale">On sale, operation failed!</string>
 
     <!-- 设备异常 -->
-    <string name="error_power_saving">Power saving</string>
-    <string name="error_wait">The device is not in the automatic sale state</string>
     <string name="error_contact_format">%s-For any question, please contact store staff.(%s)</string>
     <string name="error_milk_slurry_empty_tip">Waiting for milk mix refill</string>
     <string name="error_cup_empty_tip">Waiting for ice cream cup refill</string>
-    <string name="error_door_un_close">Device door not closed</string>
-    <string name="error_toke_order_time_out">Pickup timeout</string>
-    <string name="error_milk_slurry_lack">Low stock of milk mix</string>
-    <string name="error_cup_lack">Low stock of cup</string>
-    <string name="error_cup_1_lack">Low stock in cup holder 1</string>
-    <string name="error_cup_2_lack">Low stock in cup holder 2</string>
-    <string name="error_high_pressure">High pressure alarm of the pressing machine</string>
-    <string name="error_nuts_1_lack">Low stock of toppings 1</string>
-    <string name="error_nuts_2_lack">Low stock of toppings 2</string>
-    <string name="error_nuts_3_lack">Low stock of toppings 3</string>
-    <string name="error_jam_1_lack">Low stock of syrup 1</string>
-    <string name="error_jam_2_lack">Low stock of syrup 2</string>
-    <string name="error_jam_3_lack">Low stock of syrup 3</string>
-    <string name="error_reset">Reset failed</string>
-    <string name="error_cup_empty">No cup</string>
-    <string name="error_cup_1_empty">Cup holder 1 empty</string>
-    <string name="error_cup_2_empty">Cup holder 2 empty</string>
-    <string name="error_no_in_refrigeration">Not in refrigeration</string>
-    <string name="error_milk_slurry_empty">Milk mix empty</string>
-    <string name="error_machine_fault">Machine malfunction</string>
-    <string name="error_machine_offline">Machine off line</string>
-    <string name="error_order_time_out">Production timeout</string>
-    <string name="error_door_obstacle">Obstacles at the pickup slot</string>
-    <string name="error_claw_no_cup">Auto-grabber empty</string>
-    <string name="error_rotate_machine">Rotating motor alarm</string>
-    <string name="error_elevator_machine">Lifting motor alarm</string>
-    <string name="error_door_machine">Door motor alarm</string>
-    <string name="error_door_slip_fail">Failure to drop the cup</string>
-    <string name="error_rotate_time_out">Rotary table timeout</string>
+    <string name="error_power_saving">No.1 Power saving</string>
+    <string name="error_wait">No.2 The device is not in the automatic sale state</string>
+    <string name="error_door_un_close">No.3 Device door not closed</string>
+    <string name="error_toke_order_time_out">No.4 Pickup timeout</string>
+    <string name="error_milk_slurry_lack">No.5 Low stock of milk mix</string>
+    <string name="error_cup_lack">No.6 Low stock of cup</string>
+    <string name="error_cup_1_lack">No.7 Low stock in cup holder 1</string>
+    <string name="error_cup_2_lack">No.8 Low stock in cup holder 2</string>
+    <string name="error_high_pressure">No.9 High pressure alarm of the pressing machine</string>
+    <string name="error_nuts_1_lack">No.10 Low stock of toppings 1</string>
+    <string name="error_nuts_2_lack">No.11 Low stock of toppings 2</string>
+    <string name="error_nuts_3_lack">No.12 Low stock of toppings 3</string>
+    <string name="error_jam_1_lack">No.13 Low stock of syrup 1</string>
+    <string name="error_jam_2_lack">No.14 Low stock of syrup 2</string>
+    <string name="error_jam_3_lack">No.15 Low stock of syrup 3</string>
+    <string name="error_reset">No.16 Reset failed</string>
+    <string name="error_cup_empty">No.17 No cup</string>
+    <string name="error_cup_1_empty">No.18 Cup holder 1 empty</string>
+    <string name="error_cup_2_empty">No.19 Cup holder 2 empty</string>
+    <string name="error_no_in_refrigeration">No.20 Not in refrigeration</string>
+    <string name="error_milk_slurry_empty">No.21 Milk mix empty</string>
+    <string name="error_machine_fault">No.22 Machine malfunction</string>
+    <string name="error_machine_offline">No.23 Machine off line</string>
+    <string name="error_order_time_out">No.24 Production timeout</string>
+    <string name="error_door_obstacle">No.25 Obstacles at the pickup slot</string>
+    <string name="error_claw_no_cup">No.26 Auto-grabber empty</string>
+    <string name="error_rotate_machine">No.27 Rotating motor alarm</string>
+    <string name="error_elevator_machine">No.28 Lifting motor alarm</string>
+    <string name="error_door_machine">No.29 Door motor alarm</string>
+    <string name="error_door_slip_fail">No.30 Failure to drop the cup</string>
+    <string name="error_rotate_time_out">No.31 Rotary table timeout</string>
     <string name="error_contact_phone">Telephone:</string>
 
     <!-- 初始化 -->

app/src/main/res/values-es/strings.xml

@@ -311,40 +311,40 @@
     <string name="remote_shutdown_in_sale">On sale, operation failed!</string>
 
     <!-- 设备异常 -->
-    <string name="error_power_saving">Power saving</string>
-    <string name="error_wait">The device is not in the automatic sale state</string>
     <string name="error_contact_format">%s-For any question, please contact store staff.(%s)</string>
     <string name="error_milk_slurry_empty_tip">Waiting for milk mix refill</string>
     <string name="error_cup_empty_tip">Waiting for ice cream cup refill</string>
-    <string name="error_door_un_close">Device door not closed</string>
-    <string name="error_toke_order_time_out">Pickup timeout</string>
-    <string name="error_milk_slurry_lack">Low stock of milk mix</string>
-    <string name="error_cup_lack">Low stock of cup</string>
-    <string name="error_cup_1_lack">Low stock in cup holder 1</string>
-    <string name="error_cup_2_lack">Low stock in cup holder 2</string>
-    <string name="error_high_pressure">High pressure alarm of the pressing machine</string>
-    <string name="error_nuts_1_lack">Low stock of toppings 1</string>
-    <string name="error_nuts_2_lack">Low stock of toppings 2</string>
-    <string name="error_nuts_3_lack">Low stock of toppings 3</string>
-    <string name="error_jam_1_lack">Low stock of syrup 1</string>
-    <string name="error_jam_2_lack">Low stock of syrup 2</string>
-    <string name="error_jam_3_lack">Low stock of syrup 3</string>
-    <string name="error_reset">Reset failed</string>
-    <string name="error_cup_empty">No cup</string>
-    <string name="error_cup_1_empty">Cup holder 1 empty</string>
-    <string name="error_cup_2_empty">Cup holder 2 empty</string>
-    <string name="error_no_in_refrigeration">Not in refrigeration</string>
-    <string name="error_milk_slurry_empty">Milk mix empty</string>e
-    <string name="error_machine_fault">Machine malfunction</string>
-    <string name="error_machine_offline">Machine off line</string>
-    <string name="error_order_time_out">Production timeout</string>
-    <string name="error_door_obstacle">Obstacles at the pickup slot</string>
-    <string name="error_claw_no_cup">Auto-grabber empty</string>
-    <string name="error_rotate_machine">Rotating motor alarm</string>
-    <string name="error_elevator_machine">Lifting motor alarm</string>
-    <string name="error_door_machine">Door motor alarm</string>
-    <string name="error_door_slip_fail">Failure to drop the cup</string>
-    <string name="error_rotate_time_out">Rotary table timeout</string>
+    <string name="error_power_saving">No.1 Power saving</string>
+    <string name="error_wait">No.2 The device is not in the automatic sale state</string>
+    <string name="error_door_un_close">No.3 Device door not closed</string>
+    <string name="error_toke_order_time_out">No.4 Pickup timeout</string>
+    <string name="error_milk_slurry_lack">No.5 Low stock of milk mix</string>
+    <string name="error_cup_lack">No.6 Low stock of cup</string>
+    <string name="error_cup_1_lack">No.7 Low stock in cup holder 1</string>
+    <string name="error_cup_2_lack">No.8 Low stock in cup holder 2</string>
+    <string name="error_high_pressure">No.9 High pressure alarm of the pressing machine</string>
+    <string name="error_nuts_1_lack">No.10 Low stock of toppings 1</string>
+    <string name="error_nuts_2_lack">No.11 Low stock of toppings 2</string>
+    <string name="error_nuts_3_lack">No.12 Low stock of toppings 3</string>
+    <string name="error_jam_1_lack">No.13 Low stock of syrup 1</string>
+    <string name="error_jam_2_lack">No.14 Low stock of syrup 2</string>
+    <string name="error_jam_3_lack">No.15 Low stock of syrup 3</string>
+    <string name="error_reset">No.16 Reset failed</string>
+    <string name="error_cup_empty">No.17 No cup</string>
+    <string name="error_cup_1_empty">No.18 Cup holder 1 empty</string>
+    <string name="error_cup_2_empty">No.19 Cup holder 2 empty</string>
+    <string name="error_no_in_refrigeration">No.20 Not in refrigeration</string>
+    <string name="error_milk_slurry_empty">No.21 Milk mix empty</string>e
+    <string name="error_machine_fault">No.22 Machine malfunction</string>
+    <string name="error_machine_offline">No.23 Machine off line</string>
+    <string name="error_order_time_out">No.24 Production timeout</string>
+    <string name="error_door_obstacle">No.25 Obstacles at the pickup slot</string>
+    <string name="error_claw_no_cup">No.26 Auto-grabber empty</string>
+    <string name="error_rotate_machine">No.27 Rotating motor alarm</string>
+    <string name="error_elevator_machine">No.28 Lifting motor alarm</string>
+    <string name="error_door_machine">No.29 Door motor alarm</string>
+    <string name="error_door_slip_fail">No.30 Failure to drop the cup</string>
+    <string name="error_rotate_time_out">No.31 Rotary table timeout</string>
     <string name="error_contact_phone">Telephone:</string>
 
     <!-- 初始化 -->

app/src/main/res/values-et/strings.xml

@@ -309,40 +309,40 @@
     <string name="remote_shutdown_in_sale">Müügil, toiming ebaõnnestus!</string>
 
     <!-- 设备异常 -->
-    <string name="error_power_saving">Toitesääst</string>
-    <string name="error_wait">Seade ei ole automaatmüügi olekus</string>
     <string name="error_contact_format">%s-Küsimuste korral võtke ühendust poe töötajatega.(%s)</string>
     <string name="error_milk_slurry_empty_tip">Piimasegu täitmise ootel</string>
     <string name="error_cup_empty_tip">Jäätisetopsi täitmist oodates</string>
-    <string name="error_door_un_close">Seadme uks pole suletud</string>
-    <string name="error_toke_order_time_out">Vastuvõtu ajalõpp</string>
-    <string name="error_milk_slurry_lack">Vähe piimasegu varu</string>
-    <string name="error_cup_lack">Vähe tassivaru</string>
-    <string name="error_cup_1_lack">Topsihoidja 1 laos on vähe</string>
-    <string name="error_cup_2_lack">Topsihoidja 2 laos on vähe</string>
-    <string name="error_high_pressure">Pressimismasina kõrgrõhuhäire</string>
-    <string name="error_nuts_1_lack">Vähe kattevaru 1</string>
-    <string name="error_nuts_2_lack">Vähe lisandivaru 2</string>
-    <string name="error_nuts_3_lack">Vähe lisandivaru 3</string>
-    <string name="error_jam_1_lack">Vähe siirupivaru 1</string>
-    <string name="error_jam_2_lack">Vähe siirupivaru 2</string>
-    <string name="error_jam_3_lack">Vähe siirupivaru 3</string>
-    <string name="error_reset">Lähtestamine ebaõnnestus</string>
-    <string name="error_cup_empty">Tassi pole</string>
-    <string name="error_cup_1_empty">Tassihoidja 1 tühi</string>
-    <string name="error_cup_2_empty">Tassihoidja 2 tühi</string>
-    <string name="error_no_in_refrigeration">Pole külmkapis</string>
-    <string name="error_milk_slurry_empty">Piimasegu tühi</string>
-    <string name="error_machine_fault">Masina rike</string>
-    <string name="error_machine_offline">Masin võrgust väljas</string>
-    <string name="error_order_time_out">Tootmise ajalõpp</string>
-    <string name="error_door_obstacle">Takistused pealevõtmispesas</string>
-    <string name="error_claw_no_cup">Automaatne haaraja tühi</string>
-    <string name="error_rotate_machine">Pöörleva mootori alarm</string>
-    <string name="error_elevator_machine">Tõstemootori alarm</string>
-    <string name="error_door_machine">Ukse mootori alarm</string>
-    <string name="error_door_slip_fail">Tassi kukutamine ebaõnnestus</string>
-    <string name="error_rotate_time_out">Pöördtabeli ajalõpp</string>
+    <string name="error_power_saving">No.1 Toitesääst</string>
+    <string name="error_wait">No.2 Seade ei ole automaatmüügi olekus</string>
+    <string name="error_door_un_close">No.3 Seadme uks pole suletud</string>
+    <string name="error_toke_order_time_out">No.4 Vastuvõtu ajalõpp</string>
+    <string name="error_milk_slurry_lack">No.5 Vähe piimasegu varu</string>
+    <string name="error_cup_lack">No.6 Vähe tassivaru</string>
+    <string name="error_cup_1_lack">No.7 Topsihoidja 1 laos on vähe</string>
+    <string name="error_cup_2_lack">No.8 Topsihoidja 2 laos on vähe</string>
+    <string name="error_high_pressure">No.9 Pressimismasina kõrgrõhuhäire</string>
+    <string name="error_nuts_1_lack">No.10 Vähe kattevaru 1</string>
+    <string name="error_nuts_2_lack">No.11 Vähe lisandivaru 2</string>
+    <string name="error_nuts_3_lack">No.12 Vähe lisandivaru 3</string>
+    <string name="error_jam_1_lack">No.13 Vähe siirupivaru 1</string>
+    <string name="error_jam_2_lack">No.14 Vähe siirupivaru 2</string>
+    <string name="error_jam_3_lack">No.15 Vähe siirupivaru 3</string>
+    <string name="error_reset">No.16 Lähtestamine ebaõnnestus</string>
+    <string name="error_cup_empty">No.17 Tassi pole</string>
+    <string name="error_cup_1_empty">No.18 Tassihoidja 1 tühi</string>
+    <string name="error_cup_2_empty">No.19 Tassihoidja 2 tühi</string>
+    <string name="error_no_in_refrigeration">No.20 Pole külmkapis</string>
+    <string name="error_milk_slurry_empty">No.21 Piimasegu tühi</string>
+    <string name="error_machine_fault">No.22 Masina rike</string>
+    <string name="error_machine_offline">No.23 Masin võrgust väljas</string>
+    <string name="error_order_time_out">No.24 Tootmise ajalõpp</string>
+    <string name="error_door_obstacle">No.25 Takistused pealevõtmispesas</string>
+    <string name="error_claw_no_cup">No.26 Automaatne haaraja tühi</string>
+    <string name="error_rotate_machine">No.27 Pöörleva mootori alarm</string>
+    <string name="error_elevator_machine">No.28 Tõstemootori alarm</string>
+    <string name="error_door_machine">No.29 Ukse mootori alarm</string>
+    <string name="error_door_slip_fail">No.30 Tassi kukutamine ebaõnnestus</string>
+    <string name="error_rotate_time_out">No.31 Pöördtabeli ajalõpp</string>
     <string name="error_contact_phone">Telefon:</string>
 
     <!-- 初始化 -->

app/src/main/res/values-fr/strings.xml

@@ -313,40 +313,40 @@
     <string name="remote_shutdown_in_sale">L\'opération a échoué alors que l\'utilisateur commandait de la nourriture</string>
 
     <!-- Anomalie de l\'équipement -->
-    <string name="error_power_saving">Veille d\'économie d\'énergie</string>
-    <string name="error_wait">L\'appareil n\'est pas entré dans l\'état de vente automatique</string>
     <string name="error_contact_format" formatted="false">%s-Si vous avez des questions, veuillez contacter le personnel d\'exploitation du magasin (%s)</string>
     <string name="error_milk_slurry_empty_tip">En attente que le serveur fasse le plein de lait</string>
     <string name="error_cup_empty_tip">En attente que le serveur remplisse le verre de glace</string>
-    <string name="error_door_un_close">La porte de l\'appareil n\'est pas fermée</string>
-    <string name="error_toke_order_time_out">Délai d\'expiration de la prise en charge des repas</string>
-    <string name="error_milk_slurry_lack">La machine à glace n\'a plus d\'ingrédients</string>
-    <string name="error_cup_lack">Il manque une tasse au compte-gouttes</string>
-    <string name="error_cup_1_lack">Il manque 1 tube de tasse</string>
-    <string name="error_cup_2_lack">Le tube n° 2 tasses est manquant</string>
-    <string name="error_high_pressure">Appuyez sur l\'alarme haute pression</string>
-    <string name="error_nuts_1_lack">Les écrous 1 sont manquants</string>
-    <string name="error_nuts_2_lack">Les écrous 2 manquent de matière</string>
-    <string name="error_nuts_3_lack">Nuts 3 manque d\'ingrédients</string>
-    <string name="error_jam_1_lack">La confiture 1 n\'a plus d\'ingrédients</string>
-    <string name="error_jam_2_lack">La confiture 2 manque d\'ingrédients</string>
-    <string name="error_jam_3_lack">La confiture 3 manque d\'ingrédients</string>
-    <string name="error_reset">Échec de la réinitialisation</string>
-    <string name="error_cup_empty">Le compte-gouttes n\'a pas de tasse</string>
-    <string name="error_cup_1_empty">Aucune tasse dans le tube de tasse 1</string>
-    <string name="error_cup_2_empty">Pas de gobelet dans le tube de gobelet n°2</string>
-    <string name="error_no_in_refrigeration">Réfrigération automatique non renseignée</string>
-    <string name="error_milk_slurry_empty">Machine à glace à court d\'ingrédients</string>
-    <string name="error_machine_fault">Panne du corps principal de la machine à glace</string>
-    <string name="error_machine_offline">Le corps principal de la machine à glace a perdu la communication</string>
-    <string name="error_order_time_out">La sorbetière ne produit pas de glace</string>
-    <string name="error_door_obstacle">Il y a un obstacle au niveau de la grille</string>
-    <string name="error_claw_no_cup">La griffe électrique laisse tomber une tasse pendant le fonctionnement</string>
-    <string name="error_rotate_machine">Erreur du moteur pas à pas de rotation de l\'étage rotatif</string>
-    <string name="error_elevator_machine">Erreur du moteur pas à pas de levage de l\'étage rotatif</string>
-    <string name="error_door_machine">Erreur du moteur pas à pas de l\'ascenseur de porte</string>
-    <string name="error_door_slip_fail">Échec du glissement de la tasse à manger</string>
-    <string name="error_rotate_time_out">Délai d\'expiration de la rotation de la table de rotation</string>
+    <string name="error_power_saving">No.1 Veille d\'économie d\'énergie</string>
+    <string name="error_wait">No.2 L\'appareil n\'est pas entré dans l\'état de vente automatique</string>
+    <string name="error_door_un_close">No.3 La porte de l\'appareil n\'est pas fermée</string>
+    <string name="error_toke_order_time_out">No.4 Délai d\'expiration de la prise en charge des repas</string>
+    <string name="error_milk_slurry_lack">No.5 La machine à glace n\'a plus d\'ingrédients</string>
+    <string name="error_cup_lack">No.6 Il manque une tasse au compte-gouttes</string>
+    <string name="error_cup_1_lack">No.7 Il manque 1 tube de tasse</string>
+    <string name="error_cup_2_lack">No.8 Le tube n° 2 tasses est manquant</string>
+    <string name="error_high_pressure">No.9 Appuyez sur l\'alarme haute pression</string>
+    <string name="error_nuts_1_lack">No.10 Les écrous 1 sont manquants</string>
+    <string name="error_nuts_2_lack">No.11 Les écrous 2 manquent de matière</string>
+    <string name="error_nuts_3_lack">No.12 Nuts 3 manque d\'ingrédients</string>
+    <string name="error_jam_1_lack">No.13 La confiture 1 n\'a plus d\'ingrédients</string>
+    <string name="error_jam_2_lack">No.14 La confiture 2 manque d\'ingrédients</string>
+    <string name="error_jam_3_lack">No.15 La confiture 3 manque d\'ingrédients</string>
+    <string name="error_reset">No.16 Échec de la réinitialisation</string>
+    <string name="error_cup_empty">No.17 Le compte-gouttes n\'a pas de tasse</string>
+    <string name="error_cup_1_empty">No.18 Aucune tasse dans le tube de tasse 1</string>
+    <string name="error_cup_2_empty">No.19 Pas de gobelet dans le tube de gobelet n°2</string>
+    <string name="error_no_in_refrigeration">No.20 Réfrigération automatique non renseignée</string>
+    <string name="error_milk_slurry_empty">No.21 Machine à glace à court d\'ingrédients</string>
+    <string name="error_machine_fault">No.22 Panne du corps principal de la machine à glace</string>
+    <string name="error_machine_offline">No.23 Le corps principal de la machine à glace a perdu la communication</string>
+    <string name="error_order_time_out">No.24 La sorbetière ne produit pas de glace</string>
+    <string name="error_door_obstacle">No.25 Il y a un obstacle au niveau de la grille</string>
+    <string name="error_claw_no_cup">No.26 La griffe électrique laisse tomber une tasse pendant le fonctionnement</string>
+    <string name="error_rotate_machine">No.27 Erreur du moteur pas à pas de rotation de l\'étage rotatif</string>
+    <string name="error_elevator_machine">No.28 Erreur du moteur pas à pas de levage de l\'étage rotatif</string>
+    <string name="error_door_machine">No.29 Erreur du moteur pas à pas de l\'ascenseur de porte</string>
+    <string name="error_door_slip_fail">No.30 Échec du glissement de la tasse à manger</string>
+    <string name="error_rotate_time_out">No.31 Délai d\'expiration de la rotation de la table de rotation</string>
     <string name="error_contact_phone">Téléphone :</string>
 
     <!-- Initialisation -->

app/src/main/res/values-hy/strings.xml

@@ -313,40 +313,40 @@
     <string name="remote_shutdown_in_sale">Գործողությունը ձախողվեց, երբ օգտատերը սնունդ էր պատվիրում</string>
 
     <!-- Սարքավորման աննորմալություն -->
-    <string name="error_power_saving">Էներգախնայողության սպասման ռեժիմ</string>
-    <string name="error_wait">Սարքը չի մտել ավտոմատ վաճառքի վիճակ</string>
     <string name="error_contact_format">%s-Եթե հարցեր ունեք, դիմեք խանութի սպասարկման անձնակազմին (%s)</string>
     <string name="error_milk_slurry_empty_tip">Սպասում է մատուցողի կաթը լցնելու</string>
     <string name="error_cup_empty_tip">Սպասում եմ, որ մատուցողը նորից լցնի պաղպաղակի բաժակը</string>
-    <string name="error_door_un_close">Սարքի դուռը փակ չէ</string>
-    <string name="error_toke_order_time_out">Սննդի ընդունման ժամկետը</string>
-    <string name="error_milk_slurry_lack">Պաղպաղակի մեքենան բացակայում է բաղադրիչներից</string>
-    <string name="error_cup_lack">Գավաթաթելին բացակայում է բաժակը</string>
-    <string name="error_cup_1_lack">Բացակայում է 1 բաժակ խողովակ</string>
-    <string name="error_cup_2_lack">2 բաժակ խողովակը բացակայում է</string>
-    <string name="error_high_pressure">Սեղմեք բարձր ճնշման ազդանշան</string>
-    <string name="error_nuts_1_lack">Nuts 1-ը բացակայում է</string>
-    <string name="error_nuts_2_lack">Nuts 2-ում չկա նյութ</string>
-    <string name="error_nuts_3_lack">Nuts 3-ում բացակայում են բաղադրիչները</string>
-    <string name="error_jam_1_lack">Ջեմ 1-ը բացակայում է բաղադրիչներից</string>
-    <string name="error_jam_2_lack">Jam 2-ում չկան բաղադրիչներ</string>
-    <string name="error_jam_3_lack">Jam 3-ում բացակայում են բաղադրիչները</string>
-    <string name="error_reset">Վերականգնումը ձախողվեց</string>
-    <string name="error_cup_empty">Գավաթի կաթիլիչը բաժակ չունի</string>
-    <string name="error_cup_1_empty">Բաժակ չկա բաժակի խողովակում 1</string>
-    <string name="error_cup_2_empty">Թիվ 2 բաժակ խողովակում բաժակ չկա</string>
-    <string name="error_no_in_refrigeration">Չի մտնում ավտոմատ սառեցում</string>
-    <string name="error_milk_slurry_empty">Պաղպաղակի մեքենա առանց բաղադրիչների</string>
-    <string name="error_machine_fault">Պաղպաղակի մեքենայի հիմնական մարմնի անսարքություն</string>
-    <string name="error_machine_offline">Պաղպաղակի մեքենայի հիմնական մասը կորցրել է հաղորդակցությունը</string>
-    <string name="error_order_time_out">Պաղպաղակի մեքենան պաղպաղակ չի արտադրում</string>
-    <string name="error_door_obstacle">Վանդակի մոտ խոչընդոտ կա</string>
-    <string name="error_claw_no_cup">Էլեկտրական ճանկը շահագործման ընթացքում գցում է բաժակը</string>
-    <string name="error_rotate_machine">Պտտվող փուլի պտտման աստիճանական շարժիչի սխալ</string>
-    <string name="error_elevator_machine">Պտտվող աստիճանի բարձրացման աստիճանային շարժիչի սխալ</string>
-    <string name="error_door_machine">Դռան վերելակի քայլային շարժիչի սխալ</string>
-    <string name="error_door_slip_fail">Չհաջողվեց սահել ճաշի գավաթը ներքև</string>
-    <string name = "error_rotate_time_out">Պտտման աղյուսակի պտտման ժամկետը</string>
+    <string name="error_power_saving">No.1 Էներգախնայողության սպասման ռեժիմ</string>
+    <string name="error_wait">No.2 Սարքը չի մտել ավտոմատ վաճառքի վիճակ</string>
+    <string name="error_door_un_close">No.3 Սարքի դուռը փակ չէ</string>
+    <string name="error_toke_order_time_out">No.4 Սննդի ընդունման ժամկետը</string>
+    <string name="error_milk_slurry_lack">No.5 Պաղպաղակի մեքենան բացակայում է բաղադրիչներից</string>
+    <string name="error_cup_lack">No.6 Գավաթաթելին բացակայում է բաժակը</string>
+    <string name="error_cup_1_lack">No.7 Բացակայում է 1 բաժակ խողովակ</string>
+    <string name="error_cup_2_lack">No.8 2 բաժակ խողովակը բացակայում է</string>
+    <string name="error_high_pressure">No.9 Սեղմեք բարձր ճնշման ազդանշան</string>
+    <string name="error_nuts_1_lack">No.10 Nuts 1-ը բացակայում է</string>
+    <string name="error_nuts_2_lack">No.11 Nuts 2-ում չկա նյութ</string>
+    <string name="error_nuts_3_lack">No.12 Nuts 3-ում բացակայում են բաղադրիչները</string>
+    <string name="error_jam_1_lack">No.13 Ջեմ 1-ը բացակայում է բաղադրիչներից</string>
+    <string name="error_jam_2_lack">No.14 Jam 2-ում չկան բաղադրիչներ</string>
+    <string name="error_jam_3_lack">No.15 Jam 3-ում բացակայում են բաղադրիչները</string>
+    <string name="error_reset">No.16 Վերականգնումը ձախողվեց</string>
+    <string name="error_cup_empty">No.17 Գավաթի կաթիլիչը բաժակ չունի</string>
+    <string name="error_cup_1_empty">No.18 Բաժակ չկա բաժակի խողովակում 1</string>
+    <string name="error_cup_2_empty">No.19 Թիվ 2 բաժակ խողովակում բաժակ չկա</string>
+    <string name="error_no_in_refrigeration">No.20 Չի մտնում ավտոմատ սառեցում</string>
+    <string name="error_milk_slurry_empty">No.21 Պաղպաղակի մեքենա առանց բաղադրիչների</string>
+    <string name="error_machine_fault">No.22 Պաղպաղակի մեքենայի հիմնական մարմնի անսարքություն</string>
+    <string name="error_machine_offline">No.23 Պաղպաղակի մեքենայի հիմնական մասը կորցրել է հաղորդակցությունը</string>
+    <string name="error_order_time_out">No.24 Պաղպաղակի մեքենան պաղպաղակ չի արտադրում</string>
+    <string name="error_door_obstacle">No.25 Վանդակի մոտ խոչընդոտ կա</string>
+    <string name="error_claw_no_cup">No.26 Էլեկտրական ճանկը շահագործման ընթացքում գցում է բաժակը</string>
+    <string name="error_rotate_machine">No.27 Պտտվող փուլի պտտման աստիճանական շարժիչի սխալ</string>
+    <string name="error_elevator_machine">No.28 Պտտվող աստիճանի բարձրացման աստիճանային շարժիչի սխալ</string>
+    <string name="error_door_machine">No.29 Դռան վերելակի քայլային շարժիչի սխալ</string>
+    <string name="error_door_slip_fail">No.30 Չհաջողվեց սահել ճաշի գավաթը ներքև</string>
+    <string name = "error_rotate_time_out">No.31 Պտտման աղյուսակի պտտման ժամկետը</string>
     <string name = "error_contact_phone">Հեռախոս.</string>
 
     <!-- Նախնականացում -->

app/src/main/res/values-ko/strings.xml

@@ -315,40 +315,40 @@
     <string name="remote_shutdown_in_sale">사용자가 음식을 주문하는 동안 작업이 실패했습니다</string>
 
     <!-- 장비 ​​이상 -->
-    <string name="error_power_saving">절전 대기</string>
-    <string name="error_wait">기기가 자동 판매 상태로 들어가지 않았습니다</string>
     <string name="error_contact_format">%s - 문의사항이 있으시면 매장 운영담당자(%s)에게 연락주세요</string>
     <string name="error_milk_slurry_empty_tip">웨이터가 우유를 채워주기를 기다리는 중</string>
     <string name="error_cup_empty_tip">웨이터가 아이스크림 컵을 다시 채울 때까지 기다리는 중</string>
-    <string name="error_door_un_close">기기 문이 닫히지 않았습니다</string>
-    <string name="error_toke_order_time_out">식사 픽업 시간 초과</string>
-    <string name="error_milk_slurry_lack">아이스크림 기계에 재료가 부족합니다</string>
-    <string name="error_cup_lack">컵 드로퍼에 컵이 없습니다</string>
-    <string name="error_cup_1_lack">1번 컵 튜브가 없습니다</string>
-    <string name="error_cup_2_lack">2번 컵 튜브가 없습니다</string>
-    <string name="error_high_pressure">고압 경보를 누르세요</string>
-    <string name="error_nuts_1_lack">너트 1이 없습니다</string>
-    <string name="error_nuts_2_lack">Nuts 2 자료가 부족합니다</string>
-    <string name="error_nuts_3_lack">견과류 3에는 재료가 부족합니다</string>
-    <string name="error_jam_1_lack">잼 1 재료가 부족합니다</string>
-    <string name="error_jam_2_lack">Jam 2에 재료가 부족합니다</string>
-    <string name="error_jam_3_lack">잼 3에 재료가 부족합니다</string>
-    <string name="error_reset">재설정 실패</string>
-    <string name="error_cup_empty">컵 투입구에 컵이 없습니다</string>
-    <string name="error_cup_1_empty">컵 튜브 1에 컵이 없습니다</string>
-    <string name="error_cup_2_empty">2번 컵 튜브에 컵이 없습니다</string>
-    <string name="error_no_in_refrigeration">자동 냉장에 들어가지 않습니다</string>
-    <string name="error_milk_slurry_empty">아이스크림 기계 재료 부족</string>
-    <string name="error_machine_fault">아이스크림 기계 본체 고장</string>
-    <string name="error_machine_offline">아이스크림 기계 본체의 통신이 두절되었습니다</string>
-    <string name="error_order_time_out">아이스크림 기계에서 아이스크림이 나오지 않습니다</string>
-    <string name="error_door_obstacle">격자에 장애물이 있습니다</string>
-    <string name="error_claw_no_cup">작동 중에 전기 발톱이 컵을 떨어뜨립니다</string>
-    <string name="error_rotate_machine">회전 스테이지 회전 스테퍼 모터 오류</string>
-    <string name="error_elevator_machine">로터리 스테이지 리프팅 스테퍼 모터 오류</string>
-    <string name="error_door_machine">도어 리프트 스테퍼 모터 오류</string>
-    <string name="error_door_slip_fail">식탁 컵을 아래로 내리지 못했습니다</string>
-    <string name="error_rotate_time_out">회전 테이블 회전 시간 초과</string>
+    <string name="error_power_saving">No.1 절전 대기</string>
+    <string name="error_wait">No.2 기기가 자동 판매 상태로 들어가지 않았습니다</string>
+    <string name="error_door_un_close">No.3 기기 문이 닫히지 않았습니다</string>
+    <string name="error_toke_order_time_out">No.4 식사 픽업 시간 초과</string>
+    <string name="error_milk_slurry_lack">No.5 아이스크림 기계에 재료가 부족합니다</string>
+    <string name="error_cup_lack">No.6 컵 드로퍼에 컵이 없습니다</string>
+    <string name="error_cup_1_lack">No.7 1번 컵 튜브가 없습니다</string>
+    <string name="error_cup_2_lack">No.8 2번 컵 튜브가 없습니다</string>
+    <string name="error_high_pressure">No.9 고압 경보를 누르세요</string>
+    <string name="error_nuts_1_lack">No.10 너트 1이 없습니다</string>
+    <string name="error_nuts_2_lack">No.11 Nuts 2 자료가 부족합니다</string>
+    <string name="error_nuts_3_lack">No.12 견과류 3에는 재료가 부족합니다</string>
+    <string name="error_jam_1_lack">No.13 잼 1 재료가 부족합니다</string>
+    <string name="error_jam_2_lack">No.14 Jam 2에 재료가 부족합니다</string>
+    <string name="error_jam_3_lack">No.15 잼 3에 재료가 부족합니다</string>
+    <string name="error_reset">No.16 재설정 실패</string>
+    <string name="error_cup_empty">No.17 컵 투입구에 컵이 없습니다</string>
+    <string name="error_cup_1_empty">No.18 컵 튜브 1에 컵이 없습니다</string>
+    <string name="error_cup_2_empty">No.19 2번 컵 튜브에 컵이 없습니다</string>
+    <string name="error_no_in_refrigeration">No.20 자동 냉장에 들어가지 않습니다</string>
+    <string name="error_milk_slurry_empty">No.21 아이스크림 기계 재료 부족</string>
+    <string name="error_machine_fault">No.22 아이스크림 기계 본체 고장</string>
+    <string name="error_machine_offline">No.23 아이스크림 기계 본체의 통신이 두절되었습니다</string>
+    <string name="error_order_time_out">No.24 아이스크림 기계에서 아이스크림이 나오지 않습니다</string>
+    <string name="error_door_obstacle">No.25 격자에 장애물이 있습니다</string>
+    <string name="error_claw_no_cup">No.26 작동 중에 전기 발톱이 컵을 떨어뜨립니다</string>
+    <string name="error_rotate_machine">No.27 회전 스테이지 회전 스테퍼 모터 오류</string>
+    <string name="error_elevator_machine">No.28 로터리 스테이지 리프팅 스테퍼 모터 오류</string>
+    <string name="error_door_machine">No.29 도어 리프트 스테퍼 모터 오류</string>
+    <string name="error_door_slip_fail">No.30 식탁 컵을 아래로 내리지 못했습니다</string>
+    <string name="error_rotate_time_out">No.31 회전 테이블 회전 시간 초과</string>
     <string name="error_contact_phone">전화번호:</string>
 
     <!-- 초기화 -->

app/src/main/res/values-lt/strings.xml

@@ -309,40 +309,40 @@
     <string name="remote_shutdown_in_sale">Parduodama, operacija nepavyko!</string>
 
     <!-- 设备异常 -->
-    <string name="error_power_saving">Energijos taupymas</string>
-    <string name="error_wait">Įrenginys nėra automatinio pardavimo būsenoje</string>
     <string name="error_contact_format">%s - Jei turite klausimų, susisiekite su parduotuvės personalu.(%s)</string>
     <string name="error_milk_slurry_empty_tip">Laukiama pieno mišinio papildymo</string>
     <string name="error_cup_empty_tip">Laukiama ledų puodelio papildymo</string>
-    <string name="error_door_un_close">Įrenginio durelės neuždarytos</string>
-    <string name="error_toke_order_time_out">Baigėsi atsiėmimo skirtasis laikas</string>
-    <string name="error_milk_slurry_lack">Mažai pieno mišinio atsargų</string>
-    <string name="error_cup_lack">Mažai puodelio atsargų</string>
-    <string name="error_cup_1_lack">Mažai atsargų 1 puodelio laikiklyje</string>
-    <string name="error_cup_2_lack">Mažai atsargų 2 puodelių laikiklyje</string>
-    <string name="error_high_pressure">Presavimo mašinos aukšto slėgio aliarmas</string>
-    <string name="error_nuts_1_lack">Mažai 1 priedų atsargų</string>
-    <string name="error_nuts_2_lack">Mažai 2 priedų atsargų</string>
-    <string name="error_nuts_3_lack">Mažai priedų 3</string>
-    <string name="error_jam_1_lack">Mažai 1 sirupo atsargų</string>
-    <string name="error_jam_2_lack">Mažai 2 sirupo atsargų</string>
-    <string name="error_jam_3_lack">Mažai sirupo atsargų 3</string>
-    <string name="error_reset">Iš naujo nustatyti nepavyko</string>
-    <string name="error_cup_empty">Be puodelio</string>
-    <string name="error_cup_1_empty">1 puodelio laikiklis tuščias</string>
-    <string name="error_cup_2_empty">2 puodelio laikiklis tuščias</string>
-    <string name="error_no_in_refrigeration">Ne šaldytuve</string>
-    <string name="error_milk_slurry_empty">Tuščias pieno mišinys</string>
-    <string name="error_machine_fault">Mašinos gedimas</string>
-    <string name="error_machine_offline">Mašina neprisijungusi</string>
-    <string name="error_order_time_out">Baigėsi gamybos laikas</string>
-    <string name="error_door_obstacle">Kliūtys paėmimo vietoje</string>
-    <string name="error_claw_no_cup">Automatinis paėmimas tuščias</string>
-    <string name="error_rotate_machine">Besisukantis variklio signalas</string>
-    <string name="error_elevator_machine">Kėlimo variklio signalas</string>
-    <string name="error_door_machine">Durų variklio signalizacija</string>
-    <string name="error_door_slip_fail">Nepavyko numesti puodelio</string>
-    <string name="error_rotate_time_out">Rotacinės lentelės skirtasis laikas</string>
+    <string name="error_power_saving">No.1 Energijos taupymas</string>
+    <string name="error_wait">No.2 Įrenginys nėra automatinio pardavimo būsenoje</string>
+    <string name="error_door_un_close">No.3 Įrenginio durelės neuždarytos</string>
+    <string name="error_toke_order_time_out">No.4 Baigėsi atsiėmimo skirtasis laikas</string>
+    <string name="error_milk_slurry_lack">No.5 Mažai pieno mišinio atsargų</string>
+    <string name="error_cup_lack">No.6 Mažai puodelio atsargų</string>
+    <string name="error_cup_1_lack">No.7 Mažai atsargų 1 puodelio laikiklyje</string>
+    <string name="error_cup_2_lack">No.8 Mažai atsargų 2 puodelių laikiklyje</string>
+    <string name="error_high_pressure">No.9 Presavimo mašinos aukšto slėgio aliarmas</string>
+    <string name="error_nuts_1_lack">No.10 Mažai 1 priedų atsargų</string>
+    <string name="error_nuts_2_lack">No.11 Mažai 2 priedų atsargų</string>
+    <string name="error_nuts_3_lack">No.12 Mažai priedų 3</string>
+    <string name="error_jam_1_lack">No.13 Mažai 1 sirupo atsargų</string>
+    <string name="error_jam_2_lack">No.14 Mažai 2 sirupo atsargų</string>
+    <string name="error_jam_3_lack">No.15 Mažai sirupo atsargų 3</string>
+    <string name="error_reset">No.16 Iš naujo nustatyti nepavyko</string>
+    <string name="error_cup_empty">No.17 Be puodelio</string>
+    <string name="error_cup_1_empty">No.18 1 puodelio laikiklis tuščias</string>
+    <string name="error_cup_2_empty">No.19 2 puodelio laikiklis tuščias</string>
+    <string name="error_no_in_refrigeration">No.20 Ne šaldytuve</string>
+    <string name="error_milk_slurry_empty">No.21 Tuščias pieno mišinys</string>
+    <string name="error_machine_fault">No.22 Mašinos gedimas</string>
+    <string name="error_machine_offline">No.23 Mašina neprisijungusi</string>
+    <string name="error_order_time_out">No.24 Baigėsi gamybos laikas</string>
+    <string name="error_door_obstacle">No.25 Kliūtys paėmimo vietoje</string>
+    <string name="error_claw_no_cup">No.26 Automatinis paėmimas tuščias</string>
+    <string name="error_rotate_machine">No.27 Besisukantis variklio signalas</string>
+    <string name="error_elevator_machine">No.28 Kėlimo variklio signalas</string>
+    <string name="error_door_machine">No.29 Durų variklio signalizacija</string>
+    <string name="error_door_slip_fail">No.30 Nepavyko numesti puodelio</string>
+    <string name="error_rotate_time_out">No.31 Rotacinės lentelės skirtasis laikas</string>
     <string name="error_contact_phone">Telefonas:</string>
 
     <!-- 初始化 -->

app/src/main/res/values-lv/strings.xml

@@ -308,40 +308,40 @@
     <string name="remote_shutdown_in_sale">Pārdošanā darbība neizdevās!</string>
 
     <!-- 设备异常 -->
-    <string name="error_power_saving">Enerģijas taupīšana</string>
-    <string name="error_wait">Ierīce nav automātiskās pārdošanas stāvoklī</string>
     <string name="error_contact_format">%s-Ja jums ir kādi jautājumi, lūdzu, sazinieties ar veikala darbiniekiem.(%s)</string>
     <string name="error_milk_slurry_empty_tip">Gaida piena maisījuma uzpildīšanu</string>
     <string name="error_cup_empty_tip">Gaida saldējuma krūzes uzpildi</string>
-    <string name="error_door_un_close">Ierīces durvis nav aizvērtas</string>
-    <string name="error_toke_order_time_out">Saņemšanas noildze</string>
-    <string name="error_milk_slurry_lack">Trūks piena maisījuma krājums</string>
-    <string name="error_cup_lack">Trūks krūzes krājums</string>
-    <string name="error_cup_1_lack">Trūks krājums 1. glāzes turētājā</string>
-    <string name="error_cup_2_lack">Trūks krājums 2. glāzes turētājā</string>
-    <string name="error_high_pressure">Presēšanas iekārtas augsta spiediena trauksme</string>
-    <string name="error_nuts_1_lack">Mazs piedevu krājums 1</string>
-    <string name="error_nuts_2_lack">Mazs piedevu krājums 2</string>
-    <string name="error_nuts_3_lack">Trūks piedevu krājums 3</string>
-    <string name="error_jam_1_lack">Trūks sīrupa krājums 1</string>
-    <string name="error_jam_2_lack">Trūks 2. sīrupa krājums</string>
-    <string name="error_jam_3_lack">Trūks sīrupa krājums 3</string>
-    <string name="error_reset">Atiestatīšana neizdevās</string>
-    <string name="error_cup_empty">Nav krūzes</string>
-    <string name="error_cup_1_empty">1. glāzes turētājs, tukšs</string>
-    <string name="error_cup_2_empty">Tukšs glāzes turētājs 2</string>
-    <string name="error_no_in_refrigeration">Nav ledusskapī</string>
-    <string name="error_milk_slurry_empty">Tukšs piena maisījums</string>
-    <string name="error_machine_fault">Iekārtas darbības traucējumi</string>
-    <string name="error_machine_offline">Iekārta bezsaistē</string>
-    <string name="error_order_time_out">Ražošanas noildze</string>
-    <string name="error_door_obstacle">Šķēršļi paņemšanas vietā</string>
-    <string name="error_claw_no_cup">Automātiskā satvērēja tukša</string>
-    <string name="error_rotate_machine">Rotējoša motora trauksme</string>
-    <string name="error_elevator_machine">Pacelšanas motora trauksme</string>
-    <string name="error_door_machine">Durvju motora signalizācija</string>
-    <string name="error_door_slip_fail">Neizdevās nomest krūzīti</string>
-    <string name="error_rotate_time_out">Rotācijas tabulas taimauts</string>
+    <string name="error_power_saving">No.1 Enerģijas taupīšana</string>
+    <string name="error_wait">No.2 Ierīce nav automātiskās pārdošanas stāvoklī</string>
+    <string name="error_door_un_close">No.3 Ierīces durvis nav aizvērtas</string>
+    <string name="error_toke_order_time_out">No.4 Saņemšanas noildze</string>
+    <string name="error_milk_slurry_lack">No.5 Trūks piena maisījuma krājums</string>
+    <string name="error_cup_lack">No.6 Trūks krūzes krājums</string>
+    <string name="error_cup_1_lack">No.7 Trūks krājums 1. glāzes turētājā</string>
+    <string name="error_cup_2_lack">No.8 Trūks krājums 2. glāzes turētājā</string>
+    <string name="error_high_pressure">No.9 Presēšanas iekārtas augsta spiediena trauksme</string>
+    <string name="error_nuts_1_lack">No.10 Mazs piedevu krājums 1</string>
+    <string name="error_nuts_2_lack">No.11 Mazs piedevu krājums 2</string>
+    <string name="error_nuts_3_lack">No.12 Trūks piedevu krājums 3</string>
+    <string name="error_jam_1_lack">No.13 Trūks sīrupa krājums 1</string>
+    <string name="error_jam_2_lack">No.14 Trūks 2. sīrupa krājums</string>
+    <string name="error_jam_3_lack">No.15 Trūks sīrupa krājums 3</string>
+    <string name="error_reset">No.16 Atiestatīšana neizdevās</string>
+    <string name="error_cup_empty">No.17 Nav krūzes</string>
+    <string name="error_cup_1_empty">No.18 1. glāzes turētājs, tukšs</string>
+    <string name="error_cup_2_empty">No.19 Tukšs glāzes turētājs 2</string>
+    <string name="error_no_in_refrigeration">No.20 Nav ledusskapī</string>
+    <string name="error_milk_slurry_empty">No.21 Tukšs piena maisījums</string>
+    <string name="error_machine_fault">No.22 Iekārtas darbības traucējumi</string>
+    <string name="error_machine_offline">No.23 Iekārta bezsaistē</string>
+    <string name="error_order_time_out">No.24 Ražošanas noildze</string>
+    <string name="error_door_obstacle">No.25 Šķēršļi paņemšanas vietā</string>
+    <string name="error_claw_no_cup">No.26 Automātiskā satvērēja tukša</string>
+    <string name="error_rotate_machine">No.27 Rotējoša motora trauksme</string>
+    <string name="error_elevator_machine">No.28 Pacelšanas motora trauksme</string>
+    <string name="error_door_machine">No.29 Durvju motora signalizācija</string>
+    <string name="error_door_slip_fail">No.30 Neizdevās nomest krūzīti</string>
+    <string name="error_rotate_time_out">No.31 Rotācijas tabulas taimauts</string>
     <string name="error_contact_phone">Tālrunis:</string>
     <!-- 初始化 -->
     <string name="init_sn_input">输入设备编号</string>

app/src/main/res/values-ms/strings.xml

@@ -311,40 +311,40 @@
     <string name="remote_shutdown_in_sale">Operasi gagal semasa pengguna memesan makanan</string>
 
     <!-- Keabnormalan peralatan -->
-    <string name="error_power_saving">Siaga penjimatan kuasa</string>
-    <string name="error_wait">Peranti belum memasuki keadaan jual automatik</string>
     <string name="error_contact_format">%s-Jika anda mempunyai sebarang soalan, sila hubungi kakitangan operasi kedai (%s)</string>
     <string name="error_milk_slurry_empty_tip">Menunggu pelayan mengisi susu</string>
     <string name="error_cup_empty_tip">Menunggu pelayan mengisi semula cawan aiskrim</string>
-    <string name="error_door_un_close">Pintu peranti tidak ditutup</string>
-    <string name="error_toke_order_time_out">Tamat masa pengambilan makanan</string>
-    <string name="error_milk_slurry_lack">Mesin aiskrim kehabisan bahan</string>
-    <string name="error_cup_lack">Penitis cawan tiada cawan</string>
-    <string name="error_cup_1_lack">Tiub 1 cawan tiada</string>
-    <string name="error_cup_2_lack">Tiub 2 cawan tiada</string>
-    <string name="error_high_pressure">Tekan penggera tekanan tinggi</string>
-    <string name="error_nuts_1_lack">Nuts 1 tiada</string>
-    <string name="error_nuts_2_lack">Nuts 2 kekurangan bahan</string>
-    <string name="error_nuts_3_lack">Nuts 3 kekurangan bahan</string>
-    <string name="error_jam_1_lack">Jam 1 kehabisan bahan</string>
-    <string name="error_jam_2_lack">Jam 2 kekurangan bahan</string>
-    <string name="error_jam_3_lack">Jam 3 kekurangan bahan</string>
-    <string name="error_reset">Reset gagal</string>
-    <string name="error_cup_empty">Penitis cawan tiada cawan</string>
-    <string name="error_cup_1_empty">Tiada cawan dalam tiub cawan 1</string>
-    <string name="error_cup_2_empty">Tiada cawan dalam tiub No. 2 cawan</string>
-    <string name="error_no_in_refrigeration">Tidak memasuki penyejukan automatik</string>
-    <string name="error_milk_slurry_empty">Mesin aiskrim kehabisan bahan</string>
-    <string name="error_machine_fault">Kesalahan badan utama mesin aiskrim</string>
-    <string name="error_machine_offline">Badan utama mesin aiskrim telah kehilangan komunikasi</string>
-    <string name="error_order_time_out">Mesin aiskrim tidak menghasilkan aiskrim</string>
-    <string name="error_door_obstacle">Terdapat halangan di jeriji</string>
-    <string name="error_claw_no_cup">Kuku elektrik menjatuhkan cawan semasa operasi</string>
-    <string name="error_rotate_machine">Ralat motor pelangkah putaran peringkat putaran</string>
-    <string name="error_elevator_machine">Ralat motor stepper mengangkat peringkat berputar</string>
-    <string name="error_door_machine">Ralat motor stepper angkat pintu</string>
-    <string name="error_door_slip_fail">Gagal meluncur ke bawah cawan makan</string>
-    <string name="error_rotate_time_out">Tamat masa putaran jadual putaran</string>
+    <string name="error_power_saving">No.1 Siaga penjimatan kuasa</string>
+    <string name="error_wait">No.2 Peranti belum memasuki keadaan jual automatik</string>
+    <string name="error_door_un_close">No.3 Pintu peranti tidak ditutup</string>
+    <string name="error_toke_order_time_out">No.4 Tamat masa pengambilan makanan</string>
+    <string name="error_milk_slurry_lack">No.5 Mesin aiskrim kehabisan bahan</string>
+    <string name="error_cup_lack">No.6 Penitis cawan tiada cawan</string>
+    <string name="error_cup_1_lack">No.7 Tiub 1 cawan tiada</string>
+    <string name="error_cup_2_lack">No.8 Tiub 2 cawan tiada</string>
+    <string name="error_high_pressure">No.9 Tekan penggera tekanan tinggi</string>
+    <string name="error_nuts_1_lack">No.10 Nuts 1 tiada</string>
+    <string name="error_nuts_2_lack">No.11 Nuts 2 kekurangan bahan</string>
+    <string name="error_nuts_3_lack">No.12 Nuts 3 kekurangan bahan</string>
+    <string name="error_jam_1_lack">No.13 Jam 1 kehabisan bahan</string>
+    <string name="error_jam_2_lack">No.14 Jam 2 kekurangan bahan</string>
+    <string name="error_jam_3_lack">No.15 Jam 3 kekurangan bahan</string>
+    <string name="error_reset">No.16 Reset gagal</string>
+    <string name="error_cup_empty">No.17 Penitis cawan tiada cawan</string>
+    <string name="error_cup_1_empty">No.18 Tiada cawan dalam tiub cawan 1</string>
+    <string name="error_cup_2_empty">No.19 Tiada cawan dalam tiub No. 2 cawan</string>
+    <string name="error_no_in_refrigeration">No.20 Tidak memasuki penyejukan automatik</string>
+    <string name="error_milk_slurry_empty">No.21 Mesin aiskrim kehabisan bahan</string>
+    <string name="error_machine_fault">No.22 Kesalahan badan utama mesin aiskrim</string>
+    <string name="error_machine_offline">No.23 Badan utama mesin aiskrim telah kehilangan komunikasi</string>
+    <string name="error_order_time_out">No.24 Mesin aiskrim tidak menghasilkan aiskrim</string>
+    <string name="error_door_obstacle">No.25 Terdapat halangan di jeriji</string>
+    <string name="error_claw_no_cup">No.26 Kuku elektrik menjatuhkan cawan semasa operasi</string>
+    <string name="error_rotate_machine">No.27 Ralat motor pelangkah putaran peringkat putaran</string>
+    <string name="error_elevator_machine">No.28 Ralat motor stepper mengangkat peringkat berputar</string>
+    <string name="error_door_machine">No.29 Ralat motor stepper angkat pintu</string>
+    <string name="error_door_slip_fail">No.30 Gagal meluncur ke bawah cawan makan</string>
+    <string name="error_rotate_time_out">No.31 Tamat masa putaran jadual putaran</string>
     <string name="error_contact_phone">Telefon:</string>
 
     <!-- Permulaan -->

app/src/main/res/values-pt/strings.xml

@@ -0,0 +1,506 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="setting_technology_language_describe">Chinês</string>
+
+    <!-- Configurar o nome da aplicação principal da diferença-->
+    <string name="app_name">Máquina de gelado</string>
+    <string name="bd" traduzable="false">19900521</string>
+    <string name="un" traduzable="false">ChenJinXu</string>
+    <string name="pos_no_ready" translatable="false">O dispositivo POS não está pronto!</string>
+    <string name="pay_way_tip_marshall" translatable="false">Finalize o seu pagamento no POS.</string>
+    <string name="pay_error_pos" translatable="false">Autorização recusada</string>
+    <string name="cache_file_name" translatable="false">Gelado</string>
+    <string name="error_device_clean">Dispositivo a limpar</string>
+    <string name="initiate_device" translatable="false">inicializar o dispositivo POS</string>
+
+    <!-- Módulo de comunicação -->
+    <string name="plc_send_action_again">Reenviar comando >>> </string>
+    <string name="plc_connect_status">Ligação: %s Descrição: %s</string>
+    <string name="plc_header_length_error">Erro de comprimento do cabeçalho: %d</string>
+    <string name="plc_header_error">Erro na informação do cabeçalho: %d != %d;</string>
+    <string name="plc_message_length_error">Erro de comprimento de mensagem predefinido: %d</string>
+    <string name="plc_body_empty">Nenhuma informação de conteúdo do corpo</string>
+    <string name="plc_body_length_error">Erro de comprimento do conteúdo: %d != %d</string>
+
+    <string name="plc_disconnect_initiative">Desligar ativamente o cliente</string>
+    <string name="plc_disconnect">Desconexão do dispositivo</string>
+    <string name="plc_has_other_order">O dispositivo não processou o último pedido >> </string>
+    <string name="plc_send_order_again">Tente enviar novamente o pedido >> </string>
+    <string name="plc_make_error_not_status">O equipamento não reportou o estado da produção, resultando numa entrega anormal da refeição >> </string>
+    <string name="plc_message_body_empty">O conteúdo da mensagem está vazio! </string>
+    <string name="plc_order_empty">O conteúdo da encomenda foi apagado!</string>
+    <string name="plc_order_result_empty">O comprimento do conteúdo do resultado da encomenda está errado!</string>
+    <string name="plc_order_start">Pronto para começar a fazer gelado: %s</string>
+    <string name="plc_order_making">Subpedido a ser atendido: %s</string>
+    <string name="plc_order_prepare">Pedido a retirar: %s</string>
+    <string name="plc_order_taked">O pedido foi realizado: %s</string>
+    <string name="plc_order_busy">Estado ocupado: %s</string>
+    <string name="plc_order_error">Falha ao entregar o subencomenda!</string>
+    <string name="plc_order_error2">Exceção de entrega de refeições!</string>
+    <string name="plc_prepare">O dispositivo está pronto para receber encomendas!</string>
+    <string name="plc_not_order">Sem informação de encomenda!</string>
+    <string name="plc_order_receive">Encomenda recebida >> %s</string>
+    <string name="plc_order_no_response">Nenhuma resposta ao encomendar!</string>
+
+    <!-- Página de anúncios -->
+    <string name="guide_touch">Ordenação do ecrã táctil</string>
+    <string name="no_ready">Estado das vendas anormal</string>
+    <string name="is_in_sale_view">Saia da página de encomendas e tente novamente. </string>
+    <string name="is_in_get_dishes_info">Obtenção de informação do produto~</string>
+    <string name="is_click_too_fast">Clicado muito rápido~</string>
+    <string name="is_used_code">Não há gelado a ser feito para este pedido</string>
+    <string name="is_invalid_code">Opa, o seu código QR é inválido, contacte o empregado de mesa~</string>
+    <string name="check_fail">Falha ao consultar o pedido</string>
+    <string name="guide_text_1">Parece que está a sentir falta de um copo de gelado, venha experimentar~</string>
+    <string name="guide_text_2">Olá, acho que queres comer gelado~</string>
+
+    <!-- Página de encomendas -->
+    <string name="price_unit">￥</string>
+    <string name="ice_cream">Gelado</string>
+    <string name="buy_too_much">Limitado a 6 chávenas de cada vez! </string>
+    <string name="no_dishes_info">Falha ao obter informações sobre o produto! </string>
+    <string name="flavor_original">Gelado original</string>
+    <string name="flavor_original_hw">Gelado original</string>
+    <string name="flavor_multi">Gelado multisabor</string>
+    <string name="flavor_sauce">Adicionar geleia +</string>
+    <string name="flavor_kernel">+ escolher kernel</string>
+    <string name="shop_cart_add">Adicionar ao carrinho</string>
+    <string name="make_now">Faça agora</string>
+    <string name="shop_cart">Carrinho de compras</string>
+    <string name="shop_cart_pay">Ir para pagamento</string>
+    <string name="shop_cart_price">Total de %d chávenas, total de %1s%2s</string>
+    <string name="shop_cart_half_price_tip">Gelado com as mesmas especificações, o segundo pode ter um desconto a metade do preço! </string>
+    <string name="peanut">amendoim</string>
+    <string name="filbert">Avelã</string>
+    <string name="cashew">Caju</string>
+    <string name="pineapple">Ananás</string>
+    <string name="strawberry">Morango</string>
+    <string name="blueberry">Mirtilo</string>
+    <string name="mango">Manga</string>
+    <string name="chocolates">Chocolate</string>
+    <string name="oreo">Oreo</string>
+    <string name="flavor_invalid">Nenhum</string>
+    <string name="flavor_stock_empty">Esgotado</string>
+    <string name="spec_stock_empty">%s está esgotado</string>
+    <string name="spec_invalid">%s foi removido das prateleiras</string>
+    <string name="flavor_stock">%d chávenas restantes</string>
+    <string name="material_milk">Leite</string>
+    <string name="material_cup">copo</string>
+
+    <!-- Página de pagamento -->
+    <string name="pay_init_error">O carrinho de compras foi limpo, volte a encomendar</string>
+    <string name="pay_close">Fechar automaticamente após %ds</string>
+    <string name="pay_go">Por favor, pague</string>
+    <string name="pay_price">Pagamento total real:</string>
+    <string name="pay_way_tip">Abra o WeChat/Alipay e digitalize o código QR para pagar</string>
+    <string name="pay_way_tip2">Coloque o código de pagamento no scanner de código para concluir o pagamento</string>
+    <string name="pay_way">Forma de pagamento:</string>
+    <string name="pay_way_wechat">WeChat</string>
+    <string name="pay_way_alipay">Alipay</string>
+    <string name="paying_tip">Dica de pagamento</string>
+    <string name="paying_close">Cancelar automaticamente o pedido após %ds</string>
+    <string name="paying_describe">Pagamento em curso, aguarde...</string>
+    <string name="paying_success_tip">Pagamento com sucesso, encomenda em processamento...</string>
+    <string name="paying_fail_tip">Falha no pagamento,Por favor, tente novamente</string>
+    <string name="paying_back">Voltar à página anterior,</string>
+    <string name="paying_again">Pague novamente</string>
+    <string name="pay_way_only">Suporta apenas pagamentos WeChat e Alipay</string>
+    <string name="pay_time_out">Nenhum pagamento devido após o tempo limite, feche a interface</string>
+    <string name="pay_cancel">Cancelar o pagamento e fechar a interface</string>
+
+    <!-- Página do jantar -->
+    <string name="error_plc_order_err">Falha ao encomendar</string>
+    <string name="take_tip">Dicas para fazer refeições</string>
+    <string name="take_back">Regressar à página inicial</string>
+    <string name="pay_success">Pagamento efectuado com sucesso</string>
+    <string name="order_complete">Encomenda concluída</string>
+    <string name="make_describe_ing">O seu gelado está a ser feito, aguarde...</string>
+    <string name="make_ing">Preparação de refeições</string>
+    <string name="take_describe_complete">O seu gelado está concluído, pegue nele o mais rápido possível! </string>
+    <string name="take_complete">Por favor, leve a refeição</string>
+    <string name="take_describe_close">A porta de entrada de alimentos está a fechar, tenha atenção. </string>
+    <string name="take_close">Redefinição</string>
+    <string name="take_describe_finish">Encomenda concluída, bem-vindo a visitar na próxima vez~</string>
+    <string name="take_finish">Obtido</string>
+    <string name="make_fail_tip">Oh, desculpem~falha na criação</string>
+    <string name="make_fail_describe">Se tiver alguma dúvida, contacte o serviço de apoio ao cliente~</string>
+    <string name="make_fail_describe_refund">O gelado não feito será reembolsado da mesma forma.</string>
+
+    <!-- Login de back-end -->
+    <string name="auth_login_type_scan">Verifique o código para iniciar sessão</string>
+    <string name="auth_login_type_phone">Login com número de telemóvel</string>
+    <string name="auth_login_type_phone_hint">Introduza o número do seu telemóvel</string>
+    <string name="auth_login_type_pwd_hint">Password dinâmica</string>
+    <string name="auth_login_type_pwd_get_way">Ver método dinâmico de aquisição de palavras-passe >></string>
+    <string name="auth_login_return">Regressar ao ecrã do pedido</string>
+    <string name="auth_login_confirm">Login</string>
+    <string name="auth_login_scan_hint">Apresente o código QR de login e coloque-o na porta de digitalização</string>
+    <string name="auth_login_scan_code_get_way">Ver o método de aquisição do código QR de login >></string>
+    <string name="auth_login_fail">Falha na autenticação de login! </string>
+    <string name="auth_login_understand">Entendido</string>
+    <string name="operate_reason_title">Selecione o motivo da operação</string>
+
+    <!-- Gestão de back-end -->
+    <string name="auth_old_pwd">Introduza a palavra-passe original</string>
+    <string name="auth_old_pwd_fail">Erro de verificação da palavra-passe original</string>
+    <string name="auth_new_pwd">Introduza uma nova palavra-passe</string>
+    <string name="auth_new_pwd_again">Introduza novamente a nova palavra-passe</string>
+    <string name="auth_new_pwd_different">As duas novas palavras-passe são inconsistentes, introduza novamente a nova palavra-passe</string>
+    <string name="auth_new_pwd_success">Modificação com sucesso</string>
+    <string name="auth_fail">Falha na autenticação!</string>
+    <string name="ice_cream_setting">Definições da máquina de gelado</string>
+    <string name="return_start">Retornar ao pedido</string>
+    <string name="exit_app">Sair da aplicação</string>
+    <string name="guide_video">Guia de utilização\nVídeo de operação</string>
+
+    <string name="setting_temperature_anomaly">Anormalidade da temperatura</string>
+    <string name="realtime_warnings">Informações em tempo real:</string>
+    <string name="setting_common">Definições de funcionamento</string>
+    <string name="setting_warnings">Registo de aviso</string>
+    <string name="setting_machine">Gestão de máquinas</string>
+    <string name="setting_switch">Configuração do modo</string>
+    <string name="setting_price">Plano de vendas</string>
+    <string name="error_plc_disconnect">Dispositivo não ligado</string>
+    <string name="setting_select_manual">Por favor, mude primeiro o dispositivo para o estado manual! </string>
+    <string name="setting_plc_connect">Ligado</string>
+    <string name="setting_plc_un_connect">Não está ligado</string>
+    <string name="setting_common_reset">Redefinir</string>
+    <string name="setting_common_manual">Manual</string>
+    <string name="setting_common_auto">Automático</string>
+    <string name="setting_common_clean">Limpeza da máquina</string>
+    <string name="setting_common_check">Verificação do funcionamento</string>
+    <string name="setting_common_order">Encomenda manual</string>
+    <string name="setting_common_config">Configuração dos parâmetros</string>
+    <string name="setting_version_un_support">A versão atual do MCU não suporta esta função</string>
+    <string name="setting_reset_ing">Redefinição</string>
+    <string name="setting_reset_success">Reposição bem-sucedida</string>
+    <string name="setting_reset_fail">Falha no reinício</string>
+    <string name="setting_check_prepare">Primeiro limpe a exceção do dispositivo! </string>
+    <string name="setting_plc_send_ing">A enviar...</string>
+    <string name="setting_plc_send_success">Enviado com sucesso! </string>
+    <string name="setting_plc_send_fail">Falha no envio! </string>
+    <string name="setting_plc_send_busy">Processando outras instruções~</string>
+
+    <string name="setting_control_device">Gestão de máquinas</string>
+    <string name="setting_control_cut_down">Economia de energia e atualização</string>
+    <string name="setting_control_power_on">Ligar</string>
+    <string name="setting_control_refrigeration">Automático (arrefecimento)</string>
+    <string name="setting_control_keep_fresh">Modo noturno (fresco)</string>
+    <string name="setting_control_clean_mode">Limpeza da saída</string>
+    <string name="setting_control_keep_device">Em espera</string>
+    <string name="setting_control_sauce_1">Gestão do Jam 1</string>
+    <string name="setting_control_sauce_2">Gestão do Jam 2</string>
+    <string name="setting_control_sauce_3">Gestão do Jam 3</string>
+    <string name="setting_control_kernel_1">Gestão de Guoshan 1</string>
+    <string name="setting_control_kernel_2">Gestão de Guoshan 2</string>
+    <string name="setting_control_kernel_3">Gestão do Guoshan 3</string>
+    <string name="setting_control_positive">positivo</string>
+    <string name="setting_control_negative">Desempate inverso</string>
+    <string name="setting_control_stop">Parar</string>
+    <string name="setting_control_open">Abrir</string>
+    <string name="setting_control_close">Fechar</string>
+    <string name="setting_control_cut_down_tip">Se desligar oTodas as fontes de alimentação? </string>
+    <string name="setting_control_cut_down_success">Entre no modo de poupança de energia após 5 segundos</string>
+
+
+    <string name="setting_switch_on">Ativado</string>
+    <string name="setting_switch_off">Desligado</string>
+    <string name="setting_technology_version">Versão actual: %s</string>
+    <string name="setting_technology_version_not_new">Sem versão mais recente</string>
+    <string name="setting_technology_version_new">Versão mais recente: %s</string>
+    <string name="setting_technology_version_update">Atualizar</string>
+    <string name="setting_technology_num">Número de fábrica</string>
+    <string name="setting_technology_num_reset">Repor</string>
+    <string name="setting_technology_system_reset">Repor definições de fábrica</string>
+    <string name="setting_technology_update_pwd">Alterar palavra-passe</string>
+    <string name="setting_technology_upload_log">Registo do programa</string>
+    <string name="setting_technology_clean_config">Configuração de limpeza</string>
+    <string name="setting_technology">Apoio técnico</string>
+    <string name="setting_technology_upload_success">Upload com sucesso</string>
+    <string name="setting_technology_mcu_debug">Depuração de MCU</string>
+    <string name="setting_technology_mcu_debug_fail">Falha no arranque, instale a aplicação de depuração</string>
+    <string name="setting_technology_language">Linguagem de programação</string>
+    <string name="setting_technology_sn_input">Introduza o número real do dispositivo</string>
+    <string name="setting_technology_sn_update">Reinicie automaticamente a aplicação após 5 segundos para entrar em vigor! </string>
+    <string name="setting_technology_debug">Modo de depuração</string>
+
+
+    <string name="setting_run_mode">Modo de execução</string>
+    <string name="setting_run_online">Modo Online</string>
+    <string name="setting_run_offline">Modo offline</string>
+    <string name="setting_pay_mode">Método de pagamento</string>
+    <string name="setting_pay_free">Modo gratuito</string>
+    <string name="setting_pay_pos">Passador de cartão MDB</string>
+    <string name="setting_pay_online">Modo de pagamento online</string>
+
+    <string name="setting_clean_title">Configuração de limpeza</string>
+    <string name="setting_clean_switch">Ativar restrições de limpeza</string>
+    <string name="setting_lock_switch">Bloqueio não limpo</string>
+    <string name="setting_clean_schedule_day">Ciclo de limpeza (dias)</string>
+    <string name="setting_clean_warn_first_time">Tempo de antecedência do primeiro aviso (horas)</string>
+    <string name="setting_clean_warn_second_time">Tempo de antecedência do novo aviso (horas)</string>
+    <string name="setting_clean_warn_last_time">Tempo de antecedência do último aviso (horas)</string>
+
+    <string name="setting_icecream_title">Gelado</string>
+    <string name="setting_icecream_name">Gelado original</string>
+    <string name="setting_icecream_price">Preço do gelado</string>
+    <string name="setting_kernel_title_1">Fruta esmagada (1)</string>
+    <string name="setting_kernel_title_2">Frutas esmagadas (2)</string>
+    <string name="setting_kernel_name_1">Nome da fruta (1)</string>
+    <string name="setting_kernel_name_2">Nome da fruta (2)</string>
+    <string name="setting_kernel_price_1">Preço de esmagamento de fruta (1)</string>
+    <string name="setting_kernel_price_2">Preço de esmagamento de fruta (2)</string>
+    <string name="setting_sauce_title_1">Geleia(1)</string>
+    <string name="setting_sauce_title_2">Geleia(2)</string>
+    <string name="setting_sauce_title_3">Geleia (3)</string>
+    <string name="setting_sauce_name_1">Nome da geleia (1)</string>
+    <string name="setting_sauce_name_2">Nome da geleia (2)</string>
+    <string name="setting_sauce_name_3">Nome da geleia (3)</string>
+    <string name="setting_sauce_price_1">Preço da geleia (1)</string>
+    <string name="setting_sauce_price_2">Preço da geleia (2)</string>
+    <string name="setting_sauce_price_3">Preço da geleia (3)</string>
+
+    <string name="setting_clean_countdown_time">Contagem decrescente de limpeza:</string>
+    <string name="setting_clean_countdown_time_hour">Hora</string>
+    <string name="setting_clean_countdown_time_minute">Minuto</string>
+    <string name="setting_clean_countdown_time_out">O tempo de limpeza foi excedido</string>
+    <string name="setting_clean_countdown_error_tip">O dispositivo está inativo</string>
+    <string name="setting_clean_countdown_error_describe">Aguarda ativação~</string>
+
+    <string name="setting_clean_recent_time">Hora da última limpeza: %s</string>
+    <string name="setting_clean_stir_time">Tempo de agitação:</string>
+    <string name="setting_clean_clean_time">Tempos atuais de limpeza do tanque de material: %d</string>
+    <string name="setting_clean_button_pull_stop">Parar aninhamento</string>
+    <string name="setting_clean_button_pull_start">Iniciar aninhamento</string>
+    <string name="setting_clean_button_stir_stop">Pare de mexer</string>
+    <string name="setting_clean_button_stir_start">Começar a mexer</string>
+    <string name="setting_clean_tip">Demora 3 minutos para a primeira agitação</string>
+    <string name="setting_clean_describe">Notas:\n1. O material só pode ser descarregado no modo de agitação\n2. " será apresentado no tempo</string>
+    <string name="setting_clean_complete">Limpeza completa do depósito</string>
+    <string name="setting_clean_finish">Concluir</string>
+    <string name="setting_clean_finish_tip">Clique no botão Finish após a conclusão da limpeza</string>
+
+    <string name="setting_operate_check_start">Iniciar verificação</string>
+    <string name="setting_operate_check_tip">O dispositivo está a ser verificado...</string>
+    <string name="setting_operate_check_progress_ing">A verificar</string>
+    <string name="setting_operate_check_complete">Verificação concluída</string>
+    <string name="setting_operate_check_complete_return">A verificação foi concluída e será devolvida automaticamente após 5 segundos</string>
+    <string name="setting_operate_check_exception">Verificar exceção</string>
+    <string name="setting_operate_check_fail">Falha</string>
+
+    <string name="setting_config_sauce_1">Tempo de descarga do Jam 1</string>
+    <string name="setting_config_sauce_2">Tempo de descarga do Jam 2</string>
+    <string name="setting_config_sauce_3">Compota 3Tempo de alta</string>
+    <string name="setting_config_kernel_1">Esmagamento de fruta 1 tempo de descarga</string>
+    <string name="setting_config_kernel_2">Tempo de descarga do esmagamento de fruta 2</string>
+    <string name="setting_config_kernel_3">Tempo de descarga do esmagamento de fruta 3</string>
+    <string name="setting_config_milk">Tempo de descarga da mistura</string>
+    <string name="setting_config_cup">Tempo da primeira chávena</string>
+    <string name="setting_config_free">Tempo livre</string>
+    <string name="setting_config_recommend">Definições recomendadas</string>
+    <string name="setting_config_sauce_1_recommend">Recomende a configuração para 4000 ms</string>
+    <string name="setting_config_sauce_2_recommend">A definição recomendada é 3.000 ms</string>
+    <string name="setting_config_sauce_3_recommend">A definição recomendada é 5.000 ms</string>
+    <string name="setting_config_kernel_1_recommend">A definição recomendada é 1600 ms</string>
+    <string name="setting_config_kernel_2_recommend">A definição recomendada é 1600 ms</string>
+    <string name="setting_config_kernel_3_recommend">A definição recomendada é 1600 ms</string>
+    <string name="setting_config_milk_recommend">A definição recomendada é 2.800 ms</string>
+    <string name="setting_config_cup_recommend">A definição recomendada é 2.400 ms</string>
+    <string name="setting_config_free_recommend">Recomende a configuração para 6 min</string>
+
+    <string name="remote_operate_success">Operação bem-sucedida</string>
+    <string name="remote_operate_failed">Falha na operação</string>
+    <string name="remote_shutdown_flavor_stock">Mistura insuficiente, falha na operação</string>
+    <string name="remote_shutdown_in_sale">A operação falhou enquanto o utilizador estava a encomendar comida</string>
+
+    <!-- Anormalidade no equipamento -->
+    <string name="error_contact_format">%s-Se tiver alguma dúvida, contacte a equipa de operação da loja (%s)</string>
+    <string name="error_milk_slurry_empty_tip">Aguarda que o empregado reabasteça o leite</string>
+    <string name="error_cup_empty_tip">À espera que o empregado encha o copo de gelado</string>
+    <string name="error_power_saving">No.1 Espera de poupança de energia</string>
+    <string name="error_wait">No.2 O dispositivo não entrou no estado de venda automática</string>
+    <string name="error_door_un_close">No.3 A porta do dispositivo não está fechada</string>
+    <string name="error_toke_order_time_out">No.4 Tempo limite para o levantamento da refeição</string>
+    <string name="error_milk_slurry_lack">No.5 A máquina de gelado está sem ingredientes</string>
+    <string name="error_cup_lack">No.6 Falta um copo no conta-gotas</string>
+    <string name="error_cup_1_lack">No.7 Não falta tubo de 1 chávena</string>
+    <string name="error_cup_2_lack">No.8 Não falta tubo de 2 chávenas</string>
+    <string name="error_high_pressure">No.9 Pressione o alarme de pressão arterial elevada</string>
+    <string name="error_nuts_1_lack">No.10 Falta a noz 1</string>
+    <string name="error_nuts_2_lack">No.11 Nuts 2 não tem material</string>
+    <string name="error_nuts_3_lack">No.12 Nozes 3 não tem ingredientes</string>
+    <string name="error_jam_1_lack">No.13 A geleia 1 está sem ingredientes</string>
+    <string name="error_jam_2_lack">No.14 A geleia 2 não tem ingredientes</string>
+    <string name="error_jam_3_lack">No.15 A geleia 3 não tem ingredientes</string>
+    <string name="error_reset">No.16 Falha no reinício</string>
+    <string name="error_cup_empty">No.17 O conta-gotas não tem copo</string>
+    <string name="error_cup_1_empty">No.18 Não existe copo no tubo do copo 1</string>
+    <string name="error_cup_2_empty">No.19 Não existe copo no tubo nº 2</string>
+    <string name="error_no_in_refrigeration">No.20 Não entra na refrigeração automática</string>
+    <string name="error_milk_slurry_empty">No.21 Máquina de gelado sem ingredientes</string>
+    <string name="error_machine_fault">No.22 Falha no corpo principal da máquina de gelado</string>
+    <string name="error_machine_offline">No.23 O corpo principal da máquina de gelado perdeu comunicação</string>
+    <string name="error_order_time_out">No.24 A máquina de gelado não produz gelado</string>
+    <string name="error_door_obstacle">No.25 Existe um obstáculo na grelha</string>
+    <string name="error_claw_no_cup">No.26 A garra elétrica deixa cair um copo durante o funcionamento</string>
+    <string name="error_rotate_machine">No.27 Erro no motor de passo de rotação do estágio rotativo</string>
+    <string name="error_elevator_machine">No.28 Erro no motor de passo de elevação do estágio rotativo</string>
+    <string name="error_door_machine">No.29 Erro no motor de passo de elevação da porta</string>
+    <string name="error_door_slip_fail">No.30 Falha ao deslizar a chávena de jantar</string>
+    <string name="error_rotate_time_out">No.31 Tempo limite de rotação da tabela de rotação</string>
+    <string name="error_contact_phone">Telefone:</string>
+
+    <!-- Inicialização -->
+    <string name="init_sn_input">Introduza o número do dispositivo</string>
+    <string name="init_sn_check">Certifique-se de que o número do dispositivo introduzido está correto</string>
+    <string name="init_sn_save">Guarde e reinicie para entrar em vigor</string>
+    <string name="init_check_activation">Verificar o estado de ativação···</string>
+    <string name="init_activation">Ativar dispositivo···</string>
+    <string name="init_activation_error">Falha na ativação: %s</string>
+    <string name="init_power">Obter permissões do dispositivo···</string>
+    <string name="init_power_error">Falha ao obter as permissões do dispositivo: %s</string>
+    <string name="init_synchronization">Dados de sincronização···</string>
+    <string name="init_synchronization_error">Erro de dados de sincronização: %s</string>
+    <string name="init_synchronization_error_dishes">Não existe informação sobre o prato</string>
+    <string name="init_synchronization_error_stock">Informações de localização do inventário de dispositivos em falta</string>
+    <string name="init_synchronization_error_material">Informações de material em falta</string>
+    <string name="init_synchronization_error_spec">Informações de prática em falta</string>
+    <string name="init_startup">Programa de arranque...</string>
+    <string name="init_complete">Inicialização concluída...</string>
+    <string name="init_store_config">Detectar configuração da loja···</string>
+    <string name="init_store_config_error">Exceção de configuração de armazenamento: %s</string>
+    <string name="init_store_connect">Ligar ao sistema de encomendas···</string>
+    <string name="init_store_connect_error">Exceção do sistema de pedido de ligação: %s</string>
+    <string name="init_resource_download">Descarregar ficheiro de recursos: %s, progresso do download: %s</string>
+    <string name="init_update_tip">A atualização automática está em manutenção, não opere</string>
+    <string name="init_update_install">Instalação do programa mais recente</string>
+    <string name="init_update_install_success">A atualização foi concluída, o programa será iniciado automaticamente, não opere</string>
+    <string name="init_update_install_fail">Falha na instalação, por favor tente novamente</string>
+
+    <!-- Prompt pop-up -->
+    <string name="tip">Dicas</string>
+    <string name="tip_empty_order">Não foram encontradas informações de encomenda</string>
+    <string name="tip_used_order">Código da refeição consumida</string>
+    <string name="tip_search_order_failed">Consultar dados do pedidofalhou</string>
+    <string name="tip_use_technology">"Por favor, utilize este módulo sob a orientação do suporte técnico!</string>
+    <string name="describe_shop_cart_clear_tip">Limpar os artigos atuais do carrinho de compras? </string>
+    <string name="describe_update_password">A palavra-passe atual é a predefinida e existem riscos de segurança. </string>
+    <string name="describe_paying_give_up_tip">O pedido não será efetuado após a desistência. Quer abandonar o pedido? </string>
+    <string name="describe_open_spec_multiple">Para garantir uma produção normal, esta função irá ajustar o tamanho da porção de cada sabor para cerca de 80% da porção de seleção única\nTem a certeza de que pretende ativá-la? </string>
+    <string name="describe_open_free_mode">Tem a certeza que pretende ativar o modo de gelado gratuito para este dispositivo? </string>
+    <string name="button_back">Retornar</string>
+    <string name="button_update">Modificar</string>
+    <string name="button_open">Ver</string>
+    <string name="button_start">Iniciar</string>
+    <string name="button_clear">Limpar</string>
+    <string name="button_delete">Backspace</string>
+    <string name="button_confirm">Confirmar</string>
+    <string name="button_cancel">Cancelar</string>
+    <string name="button_un_set_pwd">Ainda não está definido</string>
+    <string name="button_set_pwd">Definir nova palavra-passe</string>
+    <string name="button_paying_give_up">Desistir do pedido</string>
+    <string name="button_paying_keep_on">Continuar a pagar</string>
+    <string name="button_setting">Definições</string>
+
+    <string name="plc_errTip1">Modo manual do equipamento</string>
+    <string name="plc_errTip2">Anormalidade no equipamento</string>
+    <string name="plc_errTip3">O dispositivo está ocupado</string>
+    <string name="plc_errTip4">Existe um sensor na saída de alimentos</string>
+
+    <string name="setting_jam_set">Alterar</string>
+    <string name="setting_ker_map">Mapear quebra de fruta</string>
+    <string name="setting_jam_map">Mapeamento de pipeline</string>
+    <string name="setting_ker_def">Esmagamento de fruta padrão</string>
+    <string name="setting_jam_def">Canal predefinido</string>
+
+    <string name="time_ready">A hora actual está a ser preparada</string>
+    <string name="maxcount_tips_start">Para garantir o sabor, leia novamente o código após tomar 6 chávenas~</string>
+    <string name="maxcount_tips_end">Ainda tem gelado e precisa de continuar a digitalizar o código~</string>
+
+    <string name="setting_warn_real_time">Aviso em tempo real:</string>
+    <string name="setting_error_log">Registo de falhas:</string>
+    <string name="setting_make_fail_title">Falha!</string>
+    <string name="setting_make_fail">Alarme:</string>
+    <string name="setting_make_fail_insert">Inserção de alarme de aviso:</string>
+    <string name="setting_make_fail_warn">Aviso</string>
+
+    <!-- Registo -->
+    <string name="making_error">Exceção quando se faz gelado</string>
+    <string name="making_ing">Fabrico de gelado</string>
+    <string name="making_out_cup">making_out_cup</string>
+    <string name="making_out_flavor">Gelado</string>
+    <string name="making_taking">À espera para tirar o gelado</string>
+    <string name="making_taked">O gelado foi tirado</string>
+    <string name="making_finish">Concluir encomenda</string>
+    <string name="making_next">Faça o próximo gelado e ainda há %d gelados por fazer</string>
+    <string name="mcu_connect">Ligação do dispositivo bem-sucedida</string>
+    <string name="mcu_disconnect">Dispositivo desligado</string>
+    <string name="mcu_waring_message">Aviso: %s, Mensagem: %s</string>
+
+    <string name="setting_select_icon">Selecionar ícone</string>
+    <string name="setting_select_kernel_icon">Selecionar ícone de esmagamento de fruta</string>
+    <string name="setting_select_sauce_icon">Selecionar ícone de geleia</string>
+
+    <string name="clean_recycle">Ciclo de limpeza: %d</string>
+    <string name="clean_lock_warning_last">Aviso de última limpeza</string>
+    <string name="clean_lock_warning_first">Aviso de primeira limpeza</string>
+    <string name="clean_lock_warning_second">Aviso de segunda limpeza</string>
+    <string name="clean_lock_notify_last">Limpeza da última notificação</string>
+    <string name="clean_lock_notify_first">Limpeza da primeira notificação</string>
+    <string name="clean_lock_notify_second">Segunda limpeza de notificações</string>
+    <string name="scan_code">Código QR reconhecido: %s</string>
+
+    <string name="update_channel">Atualizar canal de pagamento para: %d</string>
+    <string name="update_mode">O modo de execução da actualização é: %d</string>
+    <string name="pay_demo">demonstração de pagamento</string>
+    <string name="pay_select">Selecione o método de pagamento</string>
+    <string name="no_pay">Não é necessário pagamento</string>
+    <string name="cash_pay">Pagamento em dinheiro</string>
+    <string name="credit_failed">Falha na comunicação do leitor de cartões.</string>
+    <string name="system_link">Ligar sistema</string>
+    <string name="system_divorce">Sair do sistema</string>
+    <string name="update_app">Verificar atualizações</string>
+    <string name="price_model">Pagamento misto de notas e moedas</string>
+    <string name="nayax_model1">Nayax não ocioso</string>
+    <string name="nayax_model2">Nayax idle</string>
+    <string name="have_money">Valor investido:</string>
+    <string name="nayax_model">Modelo NaYax:</string>
+    <string name="nayax_pay">Pagamento NaYax</string>
+    <string name="nayax_pay_mix">NaYax+pagamento misto</string>
+    <string name="setting_pay_pos_pay_mix">Leitor de cartões MDB + pagamento misto</string>
+    <string name="online_and_price_model">Dois códigos num pagamento + pagamento em papel-moeda</string>
+    <string name="ict_currency_selection">Seleção de moeda TIC</string>
+    <string name="banknote_exchange_protocol">Protocolo de troca de notas</string>
+    <string name="mdb_level">nível MDB</string>
+    <string name="coin_x">pulso da moeda vezes X</string>
+    <string name="coin_divide_x">Pulso da moeda dividido por X</string>
+    <string name="setting_text_message">Modificar parte do texto</string>
+    <string name="sleep_msg">Encerrado</string>
+    <string name="setting_flavor_config">Configuração do sabor</string>
+    <string name="setting_flavor_multiple_choice">Múltipla escolha de sabor</string>
+    <string name="setting_sale_service">Serviço de Venda</string>
+    <string name="setting_service_visibility">Mostrar serviço</string>
+    <string name="setting_service_title">Título do serviço</string>
+    <string name="setting_service_content">Conteúdo do serviço</string>
+    <string name="coin_rate">Taxa da moeda</string>
+    <string name="confirm_name">Modificar nome</string>
+    <string name="setting_technology_other">Outro</string>
+    <string name="alarm_clock_setting">Despertador programado</string>
+    <string name="change_cooling">Interruptor de refrigeração</string>
+    <string name="change_freshness">Alterar atualização</string>
+    <string name="credit_describe">Modificar aviso de passagem do cartão</string>
+    <string name="time_set">Definições relacionadas com o tempo</string>
+    <string name="card_time">Tempo da sessão de passagem do cartão MDB</string>
+    <string name="cash_time">Tempo da sessão de dinheiro</string>
+    <string name="automatic_back_time">Modo automático: regressa automaticamente ao tempo de interface de espera</string>
+    <string name="manual_back_time">Modo manual: retorno automático ao tempo de interface de espera</string>
+    <string name="unit">Unidade monetária</string>
+    <string name="nayax_time">Tempo da sessão Nayax</string>
+    <string name="nayax_card_pay">Pagar com cartão</string>
+    <string name="nayax_scan_pay">Leia o código QR para pagar</string>
+    <string name="nayax_pay_icon_choice">Alteração do ícone de pagamento Nayax</string>
+    <string name="ic_icon_text">Alteração do texto do ícone do gelado</string>
+    <string name="credit_card_text_description">Descrição do texto do cartão de crédito</string>
+    <string name="function_switch_setting">Interruptor de configuração da função</string>
+</resources>
+<!--葡萄牙-->

app/src/main/res/values-ro/strings.xml

@@ -314,40 +314,40 @@
     <string name="remote_shutdown_in_sale">Operațiunea a eșuat în timp ce utilizatorul comanda mâncare</string>
 
     <!-- Anormalitate echipament -->
-    <string name="error_power_saving">Mod de așteptare pentru economisirea energiei</string>
-    <string name="error_wait">Dispozitivul nu a intrat în starea de vânzare automată</string>
     <string name="error_contact_format">%s-Dacă aveți întrebări, vă rugăm să contactați personalul de operare a magazinului (%s)</string>
     <string name="error_milk_slurry_empty_tip">Se așteaptă ca chelnerul să completeze lapte</string>
     <string name="error_cup_empty_tip">Așteptăm ca chelnerul să umple paharul cu înghețată</string>
-    <string name="error_door_un_close">Ușa dispozitivului nu este închisă</string>
-    <string name="error_toke_order_time_out">Timp de preluare a mesei</string>
-    <string name="error_milk_slurry_lack">Mașina de înghețată nu mai are ingrediente</string>
-    <string name="error_cup_lack">Picuratorul de ceașcă îi lipsește o ceașcă</string>
-    <string name="error_cup_1_lack">Lipsește un tub de cană</string>
-    <string name="error_cup_2_lack">Lipsește tubul cu 2 pahare</string>
-    <string name="error_high_pressure">Apăsați alarma de înaltă presiune</string>
-    <string name="error_nuts_1_lack">Nuts 1 lipsește</string>
-    <string name="error_nuts_2_lack">Nuts 2 nu are material</string>
-    <string name="error_nuts_3_lack">Nuts 3 nu are ingrediente</string>
-    <string name="error_jam_1_lack">Dulceata 1 nu mai are ingrediente</string>
-    <string name="error_jam_2_lack">Dulceata 2 lipsește ingrediente</string>
-    <string name="error_jam_3_lack">Dulceata 3 îi lipsesc ingredientele</string>
-    <string name="error_reset">Resetarea eșuată</string>
-    <string name="error_cup_empty">Picuratorul de ceașcă nu are cană</string>
-    <string name="error_cup_1_empty">Nici o cană în tubul de ceașcă 1</string>
-    <string name="error_cup_2_empty">Nici o cană în tubul de cană nr. 2</string>
-    <string name="error_no_in_refrigeration">Nu intră în refrigerare automată</string>
-    <string name="error_milk_slurry_empty">Mașină de înghețată fără ingrediente</string>
-    <string name="error_machine_fault">Eșecul corpului principal al mașinii de înghețată</string>
-    <string name="error_machine_offline">Corpul principal al mașinii de înghețată și-a pierdut comunicarea</string>
-    <string name="error_order_time_out">Mașina de înghețată nu produce înghețată</string>
-    <string name="error_door_obstacle">Există un obstacol la grătar</string>
-    <string name="error_claw_no_cup">Gheara electrică cade o cană în timpul funcționării</string>
-    <string name="error_rotate_machine">Eroare motor pas cu pas de rotație a treptei rotative</string>
-    <string name="error_elevator_machine">Eroare motor pas cu pas de ridicare a treptei rotative</string>
-    <string name="error_door_machine">Eroare motor pas cu pas ridicare uși</string>
-    <string name="error_door_slip_fail">Nu s-a putut aluneca în jos cana de luat masa</string>
-    <string name="error_rotate_time_out">Timpul de rotație al tabelului de rotație</string>
+    <string name="error_power_saving">No.1 Mod de așteptare pentru economisirea energiei</string>
+    <string name="error_wait">No.2 Dispozitivul nu a intrat în starea de vânzare automată</string>
+    <string name="error_door_un_close">No.3 Ușa dispozitivului nu este închisă</string>
+    <string name="error_toke_order_time_out">No.4 Timp de preluare a mesei</string>
+    <string name="error_milk_slurry_lack">No.5 Mașina de înghețată nu mai are ingrediente</string>
+    <string name="error_cup_lack">No.6 Picuratorul de ceașcă îi lipsește o ceașcă</string>
+    <string name="error_cup_1_lack">No.7 Lipsește un tub de cană</string>
+    <string name="error_cup_2_lack">No.8 Lipsește tubul cu 2 pahare</string>
+    <string name="error_high_pressure">No.9 Apăsați alarma de înaltă presiune</string>
+    <string name="error_nuts_1_lack">No.10 Nuts 1 lipsește</string>
+    <string name="error_nuts_2_lack">No.11 Nuts 2 nu are material</string>
+    <string name="error_nuts_3_lack">No.12 Nuts 3 nu are ingrediente</string>
+    <string name="error_jam_1_lack">No.13 Dulceata 1 nu mai are ingrediente</string>
+    <string name="error_jam_2_lack">No.14 Dulceata 2 lipsește ingrediente</string>
+    <string name="error_jam_3_lack">No.15 Dulceata 3 îi lipsesc ingredientele</string>
+    <string name="error_reset">No.16 Resetarea eșuată</string>
+    <string name="error_cup_empty">No.17 Picuratorul de ceașcă nu are cană</string>
+    <string name="error_cup_1_empty">No.18 Nici o cană în tubul de ceașcă 1</string>
+    <string name="error_cup_2_empty">No.19 Nici o cană în tubul de cană nr. 2</string>
+    <string name="error_no_in_refrigeration">No.20 Nu intră în refrigerare automată</string>
+    <string name="error_milk_slurry_empty">No.21 Mașină de înghețată fără ingrediente</string>
+    <string name="error_machine_fault">No.22 Eșecul corpului principal al mașinii de înghețată</string>
+    <string name="error_machine_offline">No.23 Corpul principal al mașinii de înghețată și-a pierdut comunicarea</string>
+    <string name="error_order_time_out">No.24 Mașina de înghețată nu produce înghețată</string>
+    <string name="error_door_obstacle">No.25 Există un obstacol la grătar</string>
+    <string name="error_claw_no_cup">No.26 Gheara electrică cade o cană în timpul funcționării</string>
+    <string name="error_rotate_machine">No.27 Eroare motor pas cu pas de rotație a treptei rotative</string>
+    <string name="error_elevator_machine">No.28 Eroare motor pas cu pas de ridicare a treptei rotative</string>
+    <string name="error_door_machine">No.29 Eroare motor pas cu pas ridicare uși</string>
+    <string name="error_door_slip_fail">No.30 Nu s-a putut aluneca în jos cana de luat masa</string>
+    <string name="error_rotate_time_out">No.31 Timpul de rotație al tabelului de rotație</string>
     <string name="error_contact_phone">Telefon:</string>
 
     <!-- Inițializare -->

app/src/main/res/values-ru/strings.xml

@@ -306,40 +306,40 @@
     <string name="remote_shutdown_in_sale">Операция не удалась, пока пользователь заказывал еду</string>
 
     <!-- 设备异常 -->
-    <string name="error_power_saving">Режим энергосбережения</string>
-    <string name="error_wait">Устройство не перешло в состояние автоматической продажи</string>
     <string name="error_contact_format">%s - Если у вас есть вопросы, обратитесь к персоналу магазина (%s)</string>
     <string name="error_milk_slurry_empty_tip">Ждем, пока официант наполнит молоко</string>
     <string name="error_cup_empty_tip">Ожидание, пока официант снова наполнит чашку мороженого</string>
-    <string name="error_door_un_close">Дверца устройства не закрыта</string>
-    <string name="error_toke_order_time_out">Тайм-аут получения еды</string>
-    <string name="error_milk_slurry_lack">В машине для мороженого закончились ингредиенты</string>
-    <string name="error_cup_lack">В капельнице отсутствует чашка</string>
-    <string name="error_cup_1_lack">Отсутствует трубка для чашки № 1</string>
-    <string name="error_cup_2_lack">Отсутствует трубка для чашки № 2</string>
-    <string name="error_high_pressure">Нажмите сигнал тревоги высокого давления</string>
-    <string name="error_nuts_1_lack">Отсутствует гайка 1</string>
-    <string name="error_nuts_2_lack">Гайкам 2 не хватает материала</string>
-    <string name="error_nuts_3_lack">В Nuts 3 не хватает ингредиентов</string>
-    <string name="error_jam_1_lack">В джеме 1 закончились ингредиенты</string>
-    <string name="error_jam_2_lack">В варенье 2 не хватает ингредиентов</string>
-    <string name="error_jam_3_lack">В варенье 3 не хватает ингредиентов</string>
-    <string name="error_reset">Не удалось выполнить сброс</string>
-    <string name="error_cup_empty">В капельнице нет чашки</string>
-    <string name="error_cup_1_empty">Нет чашки в трубке для чашки 1</string>
-    <string name="error_cup_2_empty">В трубке для чашек № 2 нет чашки</string>
-    <string name="error_no_in_refrigeration">Не включает автоматическое охлаждение</string>
-    <string name="error_milk_slurry_empty">В машине для мороженого закончились ингредиенты</string>
-    <string name="error_machine_fault">Отказ основного корпуса машины для мороженого</string>
-    <string name="error_machine_offline">Основной корпус мороженицы потерял связь</string>
-    <string name="error_order_time_out">Машина для мороженого не производит мороженое</string>
-    <string name="error_door_obstacle">У решетки есть препятствие</string>
-    <string name="error_claw_no_cup">Электрический захват роняет чашку во время работы</string>
-    <string name="error_rotate_machine">Ошибка шагового двигателя поворотной ступени</string>
-    <string name="error_elevator_machine">Ошибка шагового двигателя подъема поворотной ступени</string>
-    <string name="error_door_machine">Ошибка шагового двигателя дверного подъемника</string>
-    <string name="error_door_slip_fail">Не удалось опустить обеденную чашку</string>
-    <string name="error_rotate_time_out">Тайм-аут вращения стола</string>
+    <string name="error_power_saving">No.1 Режим энергосбережения</string>
+    <string name="error_wait">No.2 Устройство не перешло в состояние автоматической продажи</string>
+    <string name="error_door_un_close">No.3 Дверца устройства не закрыта</string>
+    <string name="error_toke_order_time_out">No.4 Тайм-аут получения еды</string>
+    <string name="error_milk_slurry_lack">No.5 В машине для мороженого закончились ингредиенты</string>
+    <string name="error_cup_lack">No.6 В капельнице отсутствует чашка</string>
+    <string name="error_cup_1_lack">No.7 Отсутствует трубка для чашки № 1</string>
+    <string name="error_cup_2_lack">No.8 Отсутствует трубка для чашки № 2</string>
+    <string name="error_high_pressure">No.9 Нажмите сигнал тревоги высокого давления</string>
+    <string name="error_nuts_1_lack">No.10 Отсутствует гайка 1</string>
+    <string name="error_nuts_2_lack">No.11 Гайкам 2 не хватает материала</string>
+    <string name="error_nuts_3_lack">No.12 В Nuts 3 не хватает ингредиентов</string>
+    <string name="error_jam_1_lack">No.13 В джеме 1 закончились ингредиенты</string>
+    <string name="error_jam_2_lack">No.14 В варенье 2 не хватает ингредиентов</string>
+    <string name="error_jam_3_lack">No.15 В варенье 3 не хватает ингредиентов</string>
+    <string name="error_reset">No.16 Не удалось выполнить сброс</string>
+    <string name="error_cup_empty">No.17 В капельнице нет чашки</string>
+    <string name="error_cup_1_empty">No.18 Нет чашки в трубке для чашки 1</string>
+    <string name="error_cup_2_empty">No.19 В трубке для чашек № 2 нет чашки</string>
+    <string name="error_no_in_refrigeration">No.20 Не включает автоматическое охлаждение</string>
+    <string name="error_milk_slurry_empty">No.21 В машине для мороженого закончились ингредиенты</string>
+    <string name="error_machine_fault">No.22 Отказ основного корпуса машины для мороженого</string>
+    <string name="error_machine_offline">No.23 Основной корпус мороженицы потерял связь</string>
+    <string name="error_order_time_out">No.24 Машина для мороженого не производит мороженое</string>
+    <string name="error_door_obstacle">No.25 У решетки есть препятствие</string>
+    <string name="error_claw_no_cup">No.26 Электрический захват роняет чашку во время работы</string>
+    <string name="error_rotate_machine">No.27 Ошибка шагового двигателя поворотной ступени</string>
+    <string name="error_elevator_machine">No.28 Ошибка шагового двигателя подъема поворотной ступени</string>
+    <string name="error_door_machine">No.29 Ошибка шагового двигателя дверного подъемника</string>
+    <string name="error_door_slip_fail">No.30 Не удалось опустить обеденную чашку</string>
+    <string name="error_rotate_time_out">No.31 Тайм-аут вращения стола</string>
     <string name="error_contact_phone">Телефон:</string>
 
     <!-- 初始化 -->

app/src/main/res/values-th/strings.xml

@@ -309,40 +309,40 @@
     <string name="remote_shutdown_in_sale">การดำเนินการล้มเหลวในขณะที่ผู้ใช้สั่งอาหาร</string>
 
     <!-- ความผิดปกติของอุปกรณ์ -->
-    <string name="error_power_saving">โหมดสแตนด์บายประหยัดพลังงาน</string>
-    <string name="error_wait">อุปกรณ์ไม่ได้เข้าสู่สถานะการจำหน่ายอัตโนมัติ</string>
     <string name="error_contact_format">%s-หากคุณมีคำถามใด ๆ โปรดติดต่อเจ้าหน้าที่ฝ่ายปฏิบัติการของร้านค้า (%s)</string>
     <string name="error_milk_slurry_empty_tip">กำลังรอพนักงานเติมนม</string>
     <string name="error_cup_empty_tip">กำลังรอให้พนักงานเติมถ้วยไอศกรีม</string>
-    <string name="error_door_un_close">ประตูอุปกรณ์ไม่ได้ปิด</string>
-    <string name="error_toke_order_time_out">หมดเวลารับอาหาร</string>
-    <string name="error_milk_slurry_lack">เครื่องทำไอศกรีมไม่มีส่วนผสม</string>
-    <string name="error_cup_lack">หลอดหยดแก้วไม่มีถ้วย</string>
-    <string name="error_cup_1_lack">หลอดแก้วหมายเลข 1 หายไป</string>
-    <string name="error_cup_2_lack">หลอดแก้วหมายเลข 2 หายไป</string>
-    <string name="error_high_pressure">กดสัญญาณเตือนแรงดันสูง</string>
-    <string name="error_nuts_1_lack">Nuts 1 หายไป</string>
-    <string name="error_nuts_2_lack">Nuts 2 ขาดวัสดุ</string>
-    <string name="error_nuts_3_lack">ถั่ว 3 ขาดส่วนผสม</string>
-    <string name="error_jam_1_lack">Jam 1 ส่วนผสมหมด</string>
-    <string name="error_jam_2_lack">Jam 2 ขาดส่วนผสม</string>
-    <string name="error_jam_3_lack">Jam 3 ขาดส่วนผสม</string>
-    <string name="error_reset">การรีเซ็ตล้มเหลว</string>
-    <string name="error_cup_empty">ถ้วยหยดไม่มีถ้วย</string>
-    <string name="error_cup_1_empty">ไม่มีถ้วยในท่อแก้ว 1</string>
-    <string name="error_cup_2_empty">ไม่มีถ้วยในท่อถ้วยหมายเลข 2</string>
-    <string name="error_no_in_refrigeration">ไม่เข้าสู่การทำความเย็นอัตโนมัติ</string>
-    <string name="error_milk_slurry_empty">เครื่องทำไอศกรีมไม่มีส่วนผสม</string>
-    <string name="error_machine_fault">ตัวเครื่องเครื่องทำไอศกรีมขัดข้อง</string>
-    <string name="error_machine_offline">ตัวเครื่องหลักของเครื่องทำไอศกรีมสูญเสียการสื่อสาร</string>
-    <string name="error_order_time_out">เครื่องทำไอศกรีมไม่ผลิตไอศกรีม</string>
-    <string name="error_door_obstacle">มีสิ่งกีดขวางอยู่ที่ตะแกรง</string>
-    <string name="error_claw_no_cup">กรงเล็บไฟฟ้าทำถ้วยหล่นระหว่างการทำงาน</string>
-    <string name="error_rotate_machine">สเต็ปเปอร์มอเตอร์หมุนแท่นหมุนเกิดข้อผิดพลาด</string>
-    <string name="error_elevator_machine">ข้อผิดพลาดของสเต็ปเปอร์มอเตอร์การยกแท่นหมุน</string>
-    <string name="error_door_machine">สเต็ปเปอร์มอเตอร์ลิฟต์ประตูเกิดข้อผิดพลาด</string>
-    <string name="error_door_slip_fail">ไม่สามารถเลื่อนถ้วยทานอาหารลงได้</string>
-    <string name="error_rotate_time_out">หมดเวลาการหมุนตารางการหมุน</string>
+    <string name="error_power_saving">No.1 โหมดสแตนด์บายประหยัดพลังงาน</string>
+    <string name="error_wait">No.2 อุปกรณ์ไม่ได้เข้าสู่สถานะการจำหน่ายอัตโนมัติ</string>
+    <string name="error_door_un_close">No.3 ประตูอุปกรณ์ไม่ได้ปิด</string>
+    <string name="error_toke_order_time_out">No.4 หมดเวลารับอาหาร</string>
+    <string name="error_milk_slurry_lack">No.5 เครื่องทำไอศกรีมไม่มีส่วนผสม</string>
+    <string name="error_cup_lack">No.6 หลอดหยดแก้วไม่มีถ้วย</string>
+    <string name="error_cup_1_lack">No.7 หลอดแก้วหมายเลข 1 หายไป</string>
+    <string name="error_cup_2_lack">No.8 หลอดแก้วหมายเลข 2 หายไป</string>
+    <string name="error_high_pressure">No.9 กดสัญญาณเตือนแรงดันสูง</string>
+    <string name="error_nuts_1_lack">No.10 Nuts 1 หายไป</string>
+    <string name="error_nuts_2_lack">No.11 Nuts 2 ขาดวัสดุ</string>
+    <string name="error_nuts_3_lack">No.12 ถั่ว 3 ขาดส่วนผสม</string>
+    <string name="error_jam_1_lack">No.13 Jam 1 ส่วนผสมหมด</string>
+    <string name="error_jam_2_lack">No.14 Jam 2 ขาดส่วนผสม</string>
+    <string name="error_jam_3_lack">No.15 Jam 3 ขาดส่วนผสม</string>
+    <string name="error_reset">No.16 การรีเซ็ตล้มเหลว</string>
+    <string name="error_cup_empty">No.17 ถ้วยหยดไม่มีถ้วย</string>
+    <string name="error_cup_1_empty">No.18 ไม่มีถ้วยในท่อแก้ว 1</string>
+    <string name="error_cup_2_empty">No.19 ไม่มีถ้วยในท่อถ้วยหมายเลข 2</string>
+    <string name="error_no_in_refrigeration">No.20 ไม่เข้าสู่การทำความเย็นอัตโนมัติ</string>
+    <string name="error_milk_slurry_empty">No.21 เครื่องทำไอศกรีมไม่มีส่วนผสม</string>
+    <string name="error_machine_fault">No.22 ตัวเครื่องเครื่องทำไอศกรีมขัดข้อง</string>
+    <string name="error_machine_offline">No.23 ตัวเครื่องหลักของเครื่องทำไอศกรีมสูญเสียการสื่อสาร</string>
+    <string name="error_order_time_out">No.24 เครื่องทำไอศกรีมไม่ผลิตไอศกรีม</string>
+    <string name="error_door_obstacle">No.25 มีสิ่งกีดขวางอยู่ที่ตะแกรง</string>
+    <string name="error_claw_no_cup">No.26 กรงเล็บไฟฟ้าทำถ้วยหล่นระหว่างการทำงาน</string>
+    <string name="error_rotate_machine">No.27 สเต็ปเปอร์มอเตอร์หมุนแท่นหมุนเกิดข้อผิดพลาด</string>
+    <string name="error_elevator_machine">No.28 ข้อผิดพลาดของสเต็ปเปอร์มอเตอร์การยกแท่นหมุน</string>
+    <string name="error_door_machine">No.29 สเต็ปเปอร์มอเตอร์ลิฟต์ประตูเกิดข้อผิดพลาด</string>
+    <string name="error_door_slip_fail">No.30 ไม่สามารถเลื่อนถ้วยทานอาหารลงได้</string>
+    <string name="error_rotate_time_out">No.31 หมดเวลาการหมุนตารางการหมุน</string>
     <string name="error_contact_phone">โทรศัพท์:</string>
     <!-- การเริ่มต้น -->
     <string name="init_sn_input">กรอกหมายเลขอุปกรณ์</string>

app/src/main/res/values-zh/strings.xml

@@ -313,40 +313,40 @@
     <string name="remote_shutdown_in_sale">用户点餐中，操作失败</string>
 
     <!-- 设备异常 -->
-    <string name="error_power_saving">省电待机中</string>
-    <string name="error_wait">设备未进入自动售卖状态</string>
     <string name="error_contact_format">%s-有任何问题，请联系门店运营人员(%s)</string>
     <string name="error_milk_slurry_empty_tip">正在等待服务员补充奶浆</string>
     <string name="error_cup_empty_tip">正在等待服务员补充雪糕杯</string>
-    <string name="error_door_un_close">设备门未关闭</string>
-    <string name="error_toke_order_time_out">取餐超时</string>
-    <string name="error_milk_slurry_lack">雪糕机缺料</string>
-    <string name="error_cup_lack">落杯器缺杯</string>
-    <string name="error_cup_1_lack">1号杯筒缺杯</string>
-    <string name="error_cup_2_lack">2号杯筒缺杯</string>
-    <string name="error_high_pressure">压机高压报警</string>
-    <string name="error_nuts_1_lack">果碎1缺料</string>
-    <string name="error_nuts_2_lack">果碎2缺料</string>
-    <string name="error_nuts_3_lack">果碎3缺料</string>
-    <string name="error_jam_1_lack">果酱1缺料</string>
-    <string name="error_jam_2_lack">果酱2缺料</string>
-    <string name="error_jam_3_lack">果酱3缺料</string>
-    <string name="error_reset">回原失败</string>
-    <string name="error_cup_empty">落杯器无杯</string>
-    <string name="error_cup_1_empty">1号杯筒无杯</string>
-    <string name="error_cup_2_empty">2号杯筒无杯</string>
-    <string name="error_no_in_refrigeration">未进入自动制冷</string>
-    <string name="error_milk_slurry_empty">雪糕机无料</string>
-    <string name="error_machine_fault">雪糕机主体故障</string>
-    <string name="error_machine_offline">雪糕机主体通讯失联</string>
-    <string name="error_order_time_out">雪糕机不出雪糕</string>
-    <string name="error_door_obstacle">光栅处有障碍物</string>
-    <string name="error_claw_no_cup">电爪运行中掉杯</string>
-    <string name="error_rotate_machine">旋转台旋转步进电机报错</string>
-    <string name="error_elevator_machine">旋转台升降步进电机报错</string>
-    <string name="error_door_machine">门升降步进电机报错</string>
-    <string name="error_door_slip_fail">餐口杯子下滑失败</string>
-    <string name="error_rotate_time_out">旋转台旋转超时</string>
+    <string name="error_power_saving">No.1 省电待机中</string>
+    <string name="error_wait">No.2 设备未进入自动售卖状态</string>
+    <string name="error_door_un_close">No.3 设备门未关闭</string>
+    <string name="error_toke_order_time_out">No.4 取餐超时</string>
+    <string name="error_milk_slurry_lack">No.5 雪糕机缺料</string>
+    <string name="error_cup_lack">No.6 落杯器缺杯</string>
+    <string name="error_cup_1_lack">No.7 1号杯筒缺杯</string>
+    <string name="error_cup_2_lack">No.8 2号杯筒缺杯</string>
+    <string name="error_high_pressure">No.9 压机高压报警</string>
+    <string name="error_nuts_1_lack">No.10 果碎1缺料</string>
+    <string name="error_nuts_2_lack">No.11 果碎2缺料</string>
+    <string name="error_nuts_3_lack">No.12 果碎3缺料</string>
+    <string name="error_jam_1_lack">No.13 果酱1缺料</string>
+    <string name="error_jam_2_lack">No.14 果酱2缺料</string>
+    <string name="error_jam_3_lack">No.15 果酱3缺料</string>
+    <string name="error_reset">No.16 回原失败</string>
+    <string name="error_cup_empty">No.17 落杯器无杯</string>
+    <string name="error_cup_1_empty">No.18 1号杯筒无杯</string>
+    <string name="error_cup_2_empty">No.19 2号杯筒无杯</string>
+    <string name="error_no_in_refrigeration">No.20 未进入自动制冷</string>
+    <string name="error_milk_slurry_empty">No.21 雪糕机无料</string>
+    <string name="error_machine_fault">No.22 雪糕机主体故障</string>
+    <string name="error_machine_offline">No.23 雪糕机主体通讯失联</string>
+    <string name="error_order_time_out">No.24 雪糕机不出雪糕</string>
+    <string name="error_door_obstacle">No.25 光栅处有障碍物</string>
+    <string name="error_claw_no_cup">No.26 电爪运行中掉杯</string>
+    <string name="error_rotate_machine">No.27 旋转台旋转步进电机报错</string>
+    <string name="error_elevator_machine">No.28 旋转台升降步进电机报错</string>
+    <string name="error_door_machine">No.29 门升降步进电机报错</string>
+    <string name="error_door_slip_fail">No.30 餐口杯子下滑失败</string>
+    <string name="error_rotate_time_out">No.31 旋转台旋转超时</string>
     <string name="error_contact_phone">电话：</string>
 
     <!-- 初始化 -->

app/src/main/res/values/strings.xml

@@ -313,40 +313,40 @@
     <string name="remote_shutdown_in_sale">用户点餐中，操作失败</string>
 
     <!-- 设备异常 -->
-    <string name="error_power_saving">省电待机中</string>
-    <string name="error_wait">设备未进入自动售卖状态</string>
     <string name="error_contact_format">%s-有任何问题，请联系门店运营人员(%s)</string>
     <string name="error_milk_slurry_empty_tip">正在等待服务员补充奶浆</string>
     <string name="error_cup_empty_tip">正在等待服务员补充雪糕杯</string>
-    <string name="error_door_un_close">设备门未关闭</string>
-    <string name="error_toke_order_time_out">取餐超时</string>
-    <string name="error_milk_slurry_lack">雪糕机缺料</string>
-    <string name="error_cup_lack">落杯器缺杯</string>
-    <string name="error_cup_1_lack">1号杯筒缺杯</string>
-    <string name="error_cup_2_lack">2号杯筒缺杯</string>
-    <string name="error_high_pressure">压机高压报警</string>
-    <string name="error_nuts_1_lack">果碎1缺料</string>
-    <string name="error_nuts_2_lack">果碎2缺料</string>
-    <string name="error_nuts_3_lack">果碎3缺料</string>
-    <string name="error_jam_1_lack">果酱1缺料</string>
-    <string name="error_jam_2_lack">果酱2缺料</string>
-    <string name="error_jam_3_lack">果酱3缺料</string>
-    <string name="error_reset">回原失败</string>
-    <string name="error_cup_empty">落杯器无杯</string>
-    <string name="error_cup_1_empty">1号杯筒无杯</string>
-    <string name="error_cup_2_empty">2号杯筒无杯</string>
-    <string name="error_no_in_refrigeration">未进入自动制冷</string>
-    <string name="error_milk_slurry_empty">雪糕机无料</string>
-    <string name="error_machine_fault">雪糕机主体故障</string>
-    <string name="error_machine_offline">雪糕机主体通讯失联</string>
-    <string name="error_order_time_out">雪糕机不出雪糕</string>
-    <string name="error_door_obstacle">光栅处有障碍物</string>
-    <string name="error_claw_no_cup">电爪运行中掉杯</string>
-    <string name="error_rotate_machine">旋转台旋转步进电机报错</string>
-    <string name="error_elevator_machine">旋转台升降步进电机报错</string>
-    <string name="error_door_machine">门升降步进电机报错</string>
-    <string name="error_door_slip_fail">餐口杯子下滑失败</string>
-    <string name="error_rotate_time_out">旋转台旋转超时</string>
+    <string name="error_power_saving">No.1 省电待机中</string>
+    <string name="error_wait">No.2 设备未进入自动售卖状态</string>
+    <string name="error_door_un_close">No.3 设备门未关闭</string>
+    <string name="error_toke_order_time_out">No.4 取餐超时</string>
+    <string name="error_milk_slurry_lack">No.5 雪糕机缺料</string>
+    <string name="error_cup_lack">No.6 落杯器缺杯</string>
+    <string name="error_cup_1_lack">No.7 1号杯筒缺杯</string>
+    <string name="error_cup_2_lack">No.8 2号杯筒缺杯</string>
+    <string name="error_high_pressure">No.9 压机高压报警</string>
+    <string name="error_nuts_1_lack">No.10 果碎1缺料</string>
+    <string name="error_nuts_2_lack">No.11 果碎2缺料</string>
+    <string name="error_nuts_3_lack">No.12 果碎3缺料</string>
+    <string name="error_jam_1_lack">No.13 果酱1缺料</string>
+    <string name="error_jam_2_lack">No.14 果酱2缺料</string>
+    <string name="error_jam_3_lack">No.15 果酱3缺料</string>
+    <string name="error_reset">No.16 回原失败</string>
+    <string name="error_cup_empty">No.17 落杯器无杯</string>
+    <string name="error_cup_1_empty">No.18 1号杯筒无杯</string>
+    <string name="error_cup_2_empty">No.19 2号杯筒无杯</string>
+    <string name="error_no_in_refrigeration">No.20 未进入自动制冷</string>
+    <string name="error_milk_slurry_empty">No.21 雪糕机无料</string>
+    <string name="error_machine_fault">No.22 雪糕机主体故障</string>
+    <string name="error_machine_offline">No.23 雪糕机主体通讯失联</string>
+    <string name="error_order_time_out">No.24 雪糕机不出雪糕</string>
+    <string name="error_door_obstacle">No.25 光栅处有障碍物</string>
+    <string name="error_claw_no_cup">No.26 电爪运行中掉杯</string>
+    <string name="error_rotate_machine">No.27 旋转台旋转步进电机报错</string>
+    <string name="error_elevator_machine">No.28 旋转台升降步进电机报错</string>
+    <string name="error_door_machine">No.29 门升降步进电机报错</string>
+    <string name="error_door_slip_fail">No.30 餐口杯子下滑失败</string>
+    <string name="error_rotate_time_out">No.31 旋转台旋转超时</string>
     <string name="error_contact_phone">电话：</string>
 
     <!-- 初始化 -->

config.gradle

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