更换美国代理logo

制作失败文本修复

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

@@ -259,7 +259,7 @@ public class App extends BaseApplication {
 //                                        EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, prefix,"1"));
                                     }
                                 } else {
-                                    ErrorViewHelper.getInstance().showErrorView(R.string.setting_plc_connect, new String[]{getString(R.string.error_wait), getString(R.string.make_fail_describe_refund)});
+                                    ErrorViewHelper.getInstance().showErrorView(R.string.setting_plc_connect, new String[]{getString(R.string.error_wait), getString(R.string.make_fail_describe)});
                                     EventBus.getDefault().post(new ErrorApiMessageEvent(Name.WARNING_ALARM, App.app.getString(R.string.error_wait),"1",20));
                                 }
                             }

app/src/main/java/com/bgy/autosale/ui/base/BaseAutoExitFragment.java

@@ -6,9 +6,12 @@ import android.os.Handler;
 import android.os.Looper;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentManager;
 import android.util.Log;
 import android.view.View;
 
+import com.bgy.autosale.R;
+import com.bgy.autosale.ui.consumer.MainFragment;
 import com.bgy.autosale.utils.PlcLog;
 import com.hboxs.base_library.constant.Global;
 import com.hboxs.base_library.util.LogUtils;
@@ -81,7 +84,11 @@ public abstract class BaseAutoExitFragment extends BaseFragment {
     // 当前页面超时，自动退出
     protected void onTimeOutFinish() {
         LogUtils.logWrite("超时返回广告页面");
-        finish("main");
+//        finish("main");
+        FragmentManager fragmentManager = getActivity().getSupportFragmentManager();
+        fragmentManager.beginTransaction()
+                .replace(R.id.main_fragment, new MainFragment()) // 替换为一个新的 Fragment
+                .commit();
         PlcLog.getInstance().e_s("BaseFragment", "是我发生了超时退出回到了主界面 ---" + this);
         Global.hasmoney = new BigDecimal("0").setScale(2, RoundingMode.HALF_UP);
         Global.hascoin = new BigDecimal("0").setScale(2, RoundingMode.HALF_UP);

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

@@ -300,7 +300,10 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                 setlanguege(languageNumber);
                 LanguageUtil.setLanguage();
                 showToast(getString(R.string.modified_success));
-                exit();
+                FragmentManager fragmentManager = getActivity().getSupportFragmentManager();
+                fragmentManager.beginTransaction()
+                        .replace(R.id.main_fragment, new MainFragment()) // 替换为一个新的 Fragment
+                        .commit();
             }
         });
         TextView tvEnglish = view.findViewById(R.id.tv_english);
@@ -318,7 +321,10 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
 //                getActivity().finish(); // 结束当前 Activity
 //                startActivity(intent); // 重新启动当前 Activity
                 showToast(getString(R.string.modified_success));
-                exit();
+                FragmentManager fragmentManager = getActivity().getSupportFragmentManager();
+                fragmentManager.beginTransaction()
+                        .replace(R.id.main_fragment, new MainFragment()) // 替换为一个新的 Fragment
+                        .commit();
             }
         });
 
@@ -609,6 +615,9 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
     public void onDestroyView() {
         super.onDestroyView();
         LogUtils.logWrite("退出了选购页面");
+        if (loadingDialog != null && loadingDialog.isShowing()) {
+            loadingDialog.dismiss();
+        }
         removeFinish();
         mHandler.removeCallbacks(mRunnable);
         UISoundHelper.getInstance().playSelectFlavor(false);

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

@@ -122,7 +122,7 @@
     <string name="take_describe_finish">Bestellung abgeschlossen. Ich hoffe, wir sehen uns wieder!</string>
     <string name="take_finish">Bestellung abgeholt</string>
     <string name="make_fail_tip">Ups, im Prozess ist ein Fehler aufgetreten.</string>
-    <string name="make_fail_describe">Keine Sorge, der nicht gelieferte Betrag wurde Ihnen erstattet.</string>
+    <string name="make_fail_describe">Bei Fragen wenden Sie sich bitte an den Kundenservice~</string>
     <string name="make_fail_describe_refund">Ungemachtes Eis ist die ursprüngliche Rückerstattung für den Straßenverkehr. Wenn Sie Fragen haben, wenden Sie sich bitte an den Kundendienst.</string>
 
     <!-- 后台登录 -->

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

@@ -122,7 +122,7 @@
     <string name="take_describe_finish">Order Completed. Hope to see you again!</string>
     <string name="take_finish">Order Picked Up</string>
     <string name="make_fail_tip">Oops,Error occurs in process.</string>
-    <string name="make_fail_describe">No worries,Undelivered amount has been refunded to you.</string>
+    <string name="make_fail_describe">If you have any questions, please contact customer service~</string>
     <string name="make_fail_describe_refund">Unmade ice cream will be the original road refund, if you have any questions, please contact customer service.</string>
 
     <!-- 后台登录 -->

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

@@ -122,7 +122,7 @@
     <string name="take_describe_finish">Pedido completado. ¡Espero verte de nuevo!</string>
     <string name="take_finish">Pedido recogido</string>
     <string name="make_fail_tip">Ups, se produce un error en el proceso.</string>
-    <string name="make_fail_describe">No te preocupes, se te ha reembolsado el importe no entregado.</string>
+    <string name="make_fail_describe">Si tiene alguna pregunta, comuníquese con el servicio de atención al cliente.</string>
     <string name="make_fail_describe_refund">El helado sin hacer será el reembolso original en carretera. Si tiene alguna pregunta, comuníquese con el servicio de atención al cliente.</string>
 
     <!-- 后台登录 -->

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

@@ -121,7 +121,7 @@
     <string name="take_describe_finish">Tellimus on lõpetatud. Loodetavasti näeme teid veel!</string>
     <string name="take_finish">Tellimuse järgi</string>
     <string name="make_fail_tip">Vabandust, protsessis ilmnes viga.</string>
-    <string name="make_fail_describe">Ärge muretsege, kohaletoimetamata summa on teile tagastatud.</string>
+    <string name="make_fail_describe">Küsimuste korral võtke ühendust klienditeenindusega~</string>
     <string name="make_fail_describe_refund">Valmistamata jäätise eest makstakse algne raha tagasi. Kui teil on küsimusi, võtke ühendust klienditeenindusega.</string>
 
     <!-- 后台登录 -->

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

@@ -94,50 +94,50 @@
     <string name="paying_close">L\'ordine verrà annullato tra %d secondi.</string>
     <string name="paying_describe">Pagamento in corso, attendere prego</string>
 
-<string name="paying_success_tip">Pagamento effettuato con successo, l\'ordine è in fase di elaborazione.</string>
-<string name="paying_fail_tip">Pagamento non riuscito, riprova.</string>
-<string name="paying_back">Torna alla pagina precedente</string>
-<string name="paying_again">Riprova pagamento</string>
-<string name="pay_way_only">Solo pagamento WeChat e Alipay</string>
-<string name="pay_time_out">Tempo scaduto per il pagamento</string>
-<string name="pay_cancel">Annulla pagamento</string>
-
-        <!-- 出餐页 -->
-        <string name="error_plc_order_err">Errore di produzione</string>
-<string name="take_tip">Promemoria ritiro</string>
-<string name="take_back">Torna alla home page</string>
-<string name="pay_success">Pagamento completato</string>
-<string name="order_complete">Ordine completato</string>
-<string name="make_describe_ing">Il tuo gelato è in produzione, attendi prego</string>
-
-
-<string name="make_ing">In preparazione</string>
-<string name="take_describe_complete">Il tuo gelato è pronto, ritira il tuo ordine.</string>
-<string name="take_complete">Ritiro possibile.</string>
-<string name="take_describe_close">ATTENZIONE - Chiusura della zona di ritiro.</string>
-<string name="take_close">Reimpostazione in corso</string>
-<string name="take_describe_finish">Ordine completato. Spero di rivederti!</string>
-<string name="take_finish">Ordine ritirato</string>
-<string name="make_fail_tip">Oops, si è verificato un errore durante la consegna.</string>
-<string name="make_fail_describe">Nessun problema, l\'importo non consegnato ti è stato rimborsato.</string>
-<string name="make_fail_describe_refund">Il gelato non preparato sarà rimborsato come l\'importo originale. Per qualsiasi domanda, contatta il servizio clienti.</string>
+    <string name="paying_success_tip">Pagamento effettuato con successo, l\'ordine è in fase di elaborazione.</string>
+    <string name="paying_fail_tip">Pagamento non riuscito, riprova.</string>
+    <string name="paying_back">Torna alla pagina precedente</string>
+    <string name="paying_again">Riprova pagamento</string>
+    <string name="pay_way_only">Solo pagamento WeChat e Alipay</string>
+    <string name="pay_time_out">Tempo scaduto per il pagamento</string>
+    <string name="pay_cancel">Annulla pagamento</string>
+
+    <!-- 出餐页 -->
+    <string name="error_plc_order_err">Errore di produzione</string>
+    <string name="take_tip">Promemoria ritiro</string>
+    <string name="take_back">Torna alla home page</string>
+    <string name="pay_success">Pagamento completato</string>
+    <string name="order_complete">Ordine completato</string>
+    <string name="make_describe_ing">Il tuo gelato è in produzione, attendi prego</string>
+
+
+    <string name="make_ing">In preparazione</string>
+    <string name="take_describe_complete">Il tuo gelato è pronto, ritira il tuo ordine.</string>
+    <string name="take_complete">Ritiro possibile.</string>
+    <string name="take_describe_close">ATTENZIONE - Chiusura della zona di ritiro.</string>
+    <string name="take_close">Reimpostazione in corso</string>
+    <string name="take_describe_finish">Ordine completato. Spero di rivederti!</string>
+    <string name="take_finish">Ordine ritirato</string>
+    <string name="make_fail_tip">Oops, si è verificato un errore durante la consegna.</string>
+    <string name="make_fail_describe">Per qualsiasi domanda, contattare il servizio clienti~</string>
+    <string name="make_fail_describe_refund">Il gelato non preparato sarà rimborsato come l\'importo originale. Per qualsiasi domanda, contatta il servizio clienti.</string>
 
     <!-- Ordine ritirato -->
     <string name="auth_login_type_scan">Ordine ritirato</string>
-<string name="auth_login_type_phone">Ordine ritirato</string>
-<string name="auth_login_type_phone_hint">请输手机号码</string>
- <string name="auth_login_type_pwd_hint">nome utente</string>
- <string name="auth_login_type_pwd_get_way">查看动态密码获取方式 >></string>
- <string name="auth_login_return">返回点餐屏</string>
- <string name="auth_login_confirm">登录</string>
- <string name="auth_login_scan_hint">请出示登录二维码,置于扫码口</string>
- <string name="auth_login_scan_code_get_way">查看登录二维码获取方式 >></string>
- <string name="auth_login_fail">登录认证失败!</string>
- <string name="auth_login_understand">看懂了</string>
- <string name="operate_reason_title">请选择操作原因</string>
-
-        <!-- 后台管理 -->
-        <string name="auth_old_pwd">Inserisci la vecchia password</string>
+    <string name="auth_login_type_phone">Ordine ritirato</string>
+    <string name="auth_login_type_phone_hint">请输手机号码</string>
+    <string name="auth_login_type_pwd_hint">nome utente</string>
+    <string name="auth_login_type_pwd_get_way">查看动态密码获取方式 >></string>
+    <string name="auth_login_return">返回点餐屏</string>
+    <string name="auth_login_confirm">登录</string>
+    <string name="auth_login_scan_hint">请出示登录二维码,置于扫码口</string>
+    <string name="auth_login_scan_code_get_way">查看登录二维码获取方式 >></string>
+    <string name="auth_login_fail">登录认证失败!</string>
+    <string name="auth_login_understand">看懂了</string>
+    <string name="operate_reason_title">请选择操作原因</string>
+
+    <!-- 后台管理 -->
+    <string name="auth_old_pwd">Inserisci la vecchia password</string>
     <string name="auth_old_pwd_fail">Verifica della vecchia password non riuscita</string>
     <string name="auth_new_pwd">Inserisci la nuova password</string>
     <string name="auth_new_pwd_again">Inserisci di nuovo la nuova password</string>
@@ -169,85 +169,85 @@
     <string name="setting_common_config">Configurazione parametri</string>
     <string name="setting_version_un_support">La funzionalità specificataLa funzione non è supportata da questa versione.</string>
 
-<string name="setting_reset_ing">Reset in corso</string>
-<string name="setting_reset_success">Reset completato</string>
-<string name="setting_reset_fail">Reset non riuscito</string>
-<string name="setting_check_prepare">Rimuovere prima le anomalie dal dispositivo!</string>
-<string name="setting_plc_send_ing">Invio in corso</string>
-
-<string name="setting_plc_send_success">Inviato!</string>
-<string name="setting_plc_send_fail">Invio non riuscito!</string>
-<string name="setting_plc_send_busy">Elaborazione di altri comandi~</string>
-
-<string name="setting_control_device">Gestione macchina</string>
-<string name="setting_control_cut_down">Risparmio energetico Conservazione</string>
-<string name="setting_control_power_on">Accensione</string>
-<string name="setting_control_refrigeration">Refrigerazione</string>
-<string name="setting_control_keep_fresh">Conservazione</string>
-<string name="setting_control_clean_mode">Lavaggio dell\'erogatore</string>
-<string name="setting_control_keep_device">Stand by</string>
-<string name="setting_control_sauce_1">Gestione sciroppo 1</string>
-<string name="setting_control_sauce_2">Gestione sciroppo 2</string>
-<string name="setting_control_sauce_3">Gestione sciroppo 3</string>
-<string name="setting_control_kernel_1">Gestione guarnizioni 1</string>
-<string name="setting_control_kernel_2">Gestione guarnizioni 2</string>
-<string name="setting_control_kernel_3">Gestione topping 3</string>
-<string name="setting_control_positive">Pompaggio</string>
-<string name="setting_control_negative">Pompaggio inverso</string>
-<string name="setting_control_stop">Arresta</string>
-<string name="setting_control_open">Accendi</string>
-<string name="setting_control_close">Spegni</string>
-<string name="setting_control_cut_down_tip">Scollegare tutti gli alimentatori tranne quello per la conservazione?</string>
-<string name="setting_control_cut_down_success">Entrare in modalità risparmio energetico</string>
-
-<string name="setting_switch_on">ACCESO</string>
-<string name="setting_switch_off">SPENTO</string>
-<string name="setting_technology_version">Versione corrente: %s</string>
-<string name="setting_technology_version_not_new">Aggiornato all\'ultima versione</string>
-<string name="setting_technology_version_new">Ultima versione:%s</string>
-<string name="setting_technology_version_update">Aggiorna</string>
-<string name="setting_technology_num">Numero di fabbrica</string>
-<string name="setting_technology_num_reset">Reimposta</string>
-<string name="setting_technology_system_reset">Ripristino del sistema</string>
-<string name="setting_technology_update_pwd">Reimposta password</string>
-<string name="setting_technology_upload_log">Registro del programma</string>
-<string name="setting_technology_clean_config">Pulisci configurazione</string>
-<string name="setting_technology">Supporto tecnico</string>
-<string name="setting_technology_upload_success">Caricamento completato</string>
-<string name="setting_technology_mcu_debug">Debug MCU</string>
-<string name="setting_technology_mcu_debug_fail">Avvio non riuscito. Installa e riprova.</string>
-
-<string name="setting_technology_language">Lingua dell\'APP</string>
-<string name="setting_technology_sn_input">Inserisci il numero effettivo del dispositivo</string>
-<string name="setting_technology_sn_update">L\'applicazione si riavvierà automaticamente dopo 5 secondi per rendere effettive le modifiche!</string>
-<string name="setting_technology_debug">Modalità di debug</string>
-
-<string name="setting_run_mode">Modalità di esecuzione</string>
-<string name="setting_run_online">Online</string>
-<string name="setting_run_offline">Offline</string>
-<string name="setting_pay_mode">Modalità di pagamento</string>
-<string name="setting_pay_free">Gratuita</string>
-<string name="setting_pay_pos">POS</string>
-<string name="setting_pay_online">Online</string>
-
-<string name="setting_clean_title">Configurazione pulizia</string>
-<string name="setting_clean_switch">Interruttore pulizia</string>
-<string name="setting_lock_switch">Interruttore blocco</string>
-<string name="setting_clean_schedule_day">Programmazione pulizia (Giorni)</string>
-<string name="setting_clean_warn_first_time">Primo avviso (Ore)</string>
-<string name="setting_clean_warn_second_time">Secondo avviso (Ore)</string>
-<string name="setting_clean_warn_last_time">Ultimo avviso (Ore)</string>
-
-<string name="setting_icecream_title">Gelato</string>
-<string name="setting_icecream_name">Nome del gelato</string>
-<string name="setting_icecream_price">Prezzo del gelato</string>
-<string name="setting_kernel_title_1">Kernel(1)</string>
-<string name="setting_kernel_title_2">Kernel(2)</string>
-<string name="setting_kernel_name_1">Nome del kernel(1)</string>
-<string name="setting_kernel_name_2">Nome del kernel(2)</string>
-<string name="setting_kernel_price_1">Prezzo del kernel(1)</string>
-<string name="setting_kernel_price_2">Prezzo del kernel(2)</string>
-<string name="setting_sauce_title_1">Salsa(1)</string>
+    <string name="setting_reset_ing">Reset in corso</string>
+    <string name="setting_reset_success">Reset completato</string>
+    <string name="setting_reset_fail">Reset non riuscito</string>
+    <string name="setting_check_prepare">Rimuovere prima le anomalie dal dispositivo!</string>
+    <string name="setting_plc_send_ing">Invio in corso</string>
+
+    <string name="setting_plc_send_success">Inviato!</string>
+    <string name="setting_plc_send_fail">Invio non riuscito!</string>
+    <string name="setting_plc_send_busy">Elaborazione di altri comandi~</string>
+
+    <string name="setting_control_device">Gestione macchina</string>
+    <string name="setting_control_cut_down">Risparmio energetico Conservazione</string>
+    <string name="setting_control_power_on">Accensione</string>
+    <string name="setting_control_refrigeration">Refrigerazione</string>
+    <string name="setting_control_keep_fresh">Conservazione</string>
+    <string name="setting_control_clean_mode">Lavaggio dell\'erogatore</string>
+    <string name="setting_control_keep_device">Stand by</string>
+    <string name="setting_control_sauce_1">Gestione sciroppo 1</string>
+    <string name="setting_control_sauce_2">Gestione sciroppo 2</string>
+    <string name="setting_control_sauce_3">Gestione sciroppo 3</string>
+    <string name="setting_control_kernel_1">Gestione guarnizioni 1</string>
+    <string name="setting_control_kernel_2">Gestione guarnizioni 2</string>
+    <string name="setting_control_kernel_3">Gestione topping 3</string>
+    <string name="setting_control_positive">Pompaggio</string>
+    <string name="setting_control_negative">Pompaggio inverso</string>
+    <string name="setting_control_stop">Arresta</string>
+    <string name="setting_control_open">Accendi</string>
+    <string name="setting_control_close">Spegni</string>
+    <string name="setting_control_cut_down_tip">Scollegare tutti gli alimentatori tranne quello per la conservazione?</string>
+    <string name="setting_control_cut_down_success">Entrare in modalità risparmio energetico</string>
+
+    <string name="setting_switch_on">ACCESO</string>
+    <string name="setting_switch_off">SPENTO</string>
+    <string name="setting_technology_version">Versione corrente: %s</string>
+    <string name="setting_technology_version_not_new">Aggiornato all\'ultima versione</string>
+    <string name="setting_technology_version_new">Ultima versione:%s</string>
+    <string name="setting_technology_version_update">Aggiorna</string>
+    <string name="setting_technology_num">Numero di fabbrica</string>
+    <string name="setting_technology_num_reset">Reimposta</string>
+    <string name="setting_technology_system_reset">Ripristino del sistema</string>
+    <string name="setting_technology_update_pwd">Reimposta password</string>
+    <string name="setting_technology_upload_log">Registro del programma</string>
+    <string name="setting_technology_clean_config">Pulisci configurazione</string>
+    <string name="setting_technology">Supporto tecnico</string>
+    <string name="setting_technology_upload_success">Caricamento completato</string>
+    <string name="setting_technology_mcu_debug">Debug MCU</string>
+    <string name="setting_technology_mcu_debug_fail">Avvio non riuscito. Installa e riprova.</string>
+
+    <string name="setting_technology_language">Lingua dell\'APP</string>
+    <string name="setting_technology_sn_input">Inserisci il numero effettivo del dispositivo</string>
+    <string name="setting_technology_sn_update">L\'applicazione si riavvierà automaticamente dopo 5 secondi per rendere effettive le modifiche!</string>
+    <string name="setting_technology_debug">Modalità di debug</string>
+
+    <string name="setting_run_mode">Modalità di esecuzione</string>
+    <string name="setting_run_online">Online</string>
+    <string name="setting_run_offline">Offline</string>
+    <string name="setting_pay_mode">Modalità di pagamento</string>
+    <string name="setting_pay_free">Gratuita</string>
+    <string name="setting_pay_pos">POS</string>
+    <string name="setting_pay_online">Online</string>
+
+    <string name="setting_clean_title">Configurazione pulizia</string>
+    <string name="setting_clean_switch">Interruttore pulizia</string>
+    <string name="setting_lock_switch">Interruttore blocco</string>
+    <string name="setting_clean_schedule_day">Programmazione pulizia (Giorni)</string>
+    <string name="setting_clean_warn_first_time">Primo avviso (Ore)</string>
+    <string name="setting_clean_warn_second_time">Secondo avviso (Ore)</string>
+    <string name="setting_clean_warn_last_time">Ultimo avviso (Ore)</string>
+
+    <string name="setting_icecream_title">Gelato</string>
+    <string name="setting_icecream_name">Nome del gelato</string>
+    <string name="setting_icecream_price">Prezzo del gelato</string>
+    <string name="setting_kernel_title_1">Kernel(1)</string>
+    <string name="setting_kernel_title_2">Kernel(2)</string>
+    <string name="setting_kernel_name_1">Nome del kernel(1)</string>
+    <string name="setting_kernel_name_2">Nome del kernel(2)</string>
+    <string name="setting_kernel_price_1">Prezzo del kernel(1)</string>
+    <string name="setting_kernel_price_2">Prezzo del kernel(2)</string>
+    <string name="setting_sauce_title_1">Salsa(1)</string>
     <string name="setting_sauce_title_2">Salsa(2)</string>
     <string name="setting_sauce_title_3">Salsa(3)</string>
     <string name="setting_sauce_name_1">Nome della salsa(1)</string>
@@ -317,40 +317,40 @@
     <string name="error_power_saving">N. 1 Risparmio energetico</string>
     <string name="error_wait">N. 2 Il dispositivo non è in stato di vendita automatica</string>
     <string name="error_door_un_close">N. 3 Sportello del dispositivo nonchiuso</string>
-<string name="error_toke_order_time_out">N. 4 Timeout ritiro</string>
-<string name="error_milk_slurry_lack">N. 5 Scorta scarsa di miscela di latte</string>
-<string name="error_cup_lack">N. 6 Scorta scarsa del bicchiere</string>
-<string name="error_cup_1_lack">N. 7 Scorta scarsa nel portabicchieri 1</string>
-<string name="error_cup_2_lack">N. 8 Scorta scarsa nel portabicchieri 2</string>
-<string name="error_high_pressure">N. 9 Allarme alta pressione della pressa</string>
-<string name="error_nuts_1_lack">N. 10 Scorta scarsa di guarnizioni 1</string>
-<string name="error_nuts_2_lack">N. 11 Scorta scarsa di guarnizioni 2</string>
-<string name="error_nuts_3_lack">N. 12 Scorta di topping 3 insufficiente</string>
-<string name="error_jam_1_lack">N. 13 Scorta di sciroppo 1 insufficiente</string>
-<string name="error_jam_2_lack">N. 14 Scorta di sciroppo 2 insufficiente</string>
-<string name="error_jam_3_lack">N. 15 Scorta di sciroppo 3 insufficiente</string>
-<string name="error_reset">N. 16 Reset non riuscito</string>
-<string name="error_cup_empty">N. 17 Bicchiere vuoto</string>
-<string name="error_cup_1_empty">N. 18 Portabicchiere 1 vuoto</string>
-<string name="error_cup_2_empty">N. 19 Portabicchiere 2 vuoto</string>
-<string name="error_no_in_refrigeration">N. 20 Non in refrigerazione</string>
-<string name="error_milk_slurry_empty">N. 21 Miscela di latte esaurita</string>
-<string name="error_machine_fault">N. 22 Malfunzionamento macchina</string>
-<string name="error_machine_offline">N. 23 Macchina fuori linea</string>
-<string name="error_order_time_out">N. 24 Timeout di produzione</string>
-<string name="error_door_obstacle">N. 25 Ostacoli allo slot di prelievo</string>
-<string name="error_claw_no_cup">N. 26 Pinza automatica vuota</string>
-<string name="error_rotate_machine">N. 27 Allarme motore di rotazione</string>
-<string name="error_elevator_machine">N. 28 Allarme motore di sollevamento</string>
-<string name="error_door_machine">N.29 Allarme motore porta</string>
- <string name="error_door_slip_fail">N.30 Mancata caduta della tazza</string>
- <string name="error_rotate_time_out">N.31 Timeout della tavola rotante</string>
- <string name="error_contact_phone">Telefono:</string>
+    <string name="error_toke_order_time_out">N. 4 Timeout ritiro</string>
+    <string name="error_milk_slurry_lack">N. 5 Scorta scarsa di miscela di latte</string>
+    <string name="error_cup_lack">N. 6 Scorta scarsa del bicchiere</string>
+    <string name="error_cup_1_lack">N. 7 Scorta scarsa nel portabicchieri 1</string>
+    <string name="error_cup_2_lack">N. 8 Scorta scarsa nel portabicchieri 2</string>
+    <string name="error_high_pressure">N. 9 Allarme alta pressione della pressa</string>
+    <string name="error_nuts_1_lack">N. 10 Scorta scarsa di guarnizioni 1</string>
+    <string name="error_nuts_2_lack">N. 11 Scorta scarsa di guarnizioni 2</string>
+    <string name="error_nuts_3_lack">N. 12 Scorta di topping 3 insufficiente</string>
+    <string name="error_jam_1_lack">N. 13 Scorta di sciroppo 1 insufficiente</string>
+    <string name="error_jam_2_lack">N. 14 Scorta di sciroppo 2 insufficiente</string>
+    <string name="error_jam_3_lack">N. 15 Scorta di sciroppo 3 insufficiente</string>
+    <string name="error_reset">N. 16 Reset non riuscito</string>
+    <string name="error_cup_empty">N. 17 Bicchiere vuoto</string>
+    <string name="error_cup_1_empty">N. 18 Portabicchiere 1 vuoto</string>
+    <string name="error_cup_2_empty">N. 19 Portabicchiere 2 vuoto</string>
+    <string name="error_no_in_refrigeration">N. 20 Non in refrigerazione</string>
+    <string name="error_milk_slurry_empty">N. 21 Miscela di latte esaurita</string>
+    <string name="error_machine_fault">N. 22 Malfunzionamento macchina</string>
+    <string name="error_machine_offline">N. 23 Macchina fuori linea</string>
+    <string name="error_order_time_out">N. 24 Timeout di produzione</string>
+    <string name="error_door_obstacle">N. 25 Ostacoli allo slot di prelievo</string>
+    <string name="error_claw_no_cup">N. 26 Pinza automatica vuota</string>
+    <string name="error_rotate_machine">N. 27 Allarme motore di rotazione</string>
+    <string name="error_elevator_machine">N. 28 Allarme motore di sollevamento</string>
+    <string name="error_door_machine">N.29 Allarme motore porta</string>
+    <string name="error_door_slip_fail">N.30 Mancata caduta della tazza</string>
+    <string name="error_rotate_time_out">N.31 Timeout della tavola rotante</string>
+    <string name="error_contact_phone">Telefono:</string>
 
     <!-- 初始化 -->
     <string name="init_sn_input">输入设备编号</string>
- <string name="init_sn_check">请确保输入的设备编号准确无误</string>
- <string name="init_sn_save">保存重启生效</string>
+    <string name="init_sn_check">请确保输入的设备编号准确无误</string>
+    <string name="init_sn_save">保存重启生效</string>
     <string name="init_check_activation">Controlla attivazione</string>
     <string name="init_activation">Attiva dispositivo</string>
     <string name="init_activation_error">Attivazione non riuscita: %s</string>
@@ -383,41 +383,41 @@
     <string name="describe_shop_cart_clear_tip">Vuoi svuotare il carrello?</string>
     <string name="describe_update_password">"La password predefinita è un rischio per la sicurezza. Vuoi cambiarla immediatamente?</string>
     <string name="describe_paying_give_up_tip">La produzione NON inizierà dopo l\'annullamento dell\'ordine. Se hai pagato, contatta il personale. Vuoi annullare l\'ordine?</string>
-<string name="describe_open_spec_multiple">Per una migliore qualità, questa funzione regolerà le porzioni di ogni gusto all\'80%.\n Vuoi attivare la funzione?</string>
-<string name="describe_open_free_mode">Vuoi aprire la modalità gratuita per questo dispositivo?</string>
-<string name="button_back">Indietro</string>
-<string name="button_update">Modifica</string>
-<string name="button_open">Apri</string>
-<string name="button_start">Avvia</string>
-<string name="button_clear">Cancella</string>
-<string name="button_delete">Elimina</string>
-<string name="button_confirm">Conferma</string>
-<string name="button_cancel">Annulla</string>
-<string name="button_un_set_pwd">Più tardi</string>
-<string name="button_set_pwd">Imposta su</string>
-<string name="button_paying_give_up">Annulla ordine</string>
-<string name="button_paying_keep_on">Continua con il pagamento</string>
-<string name="button_setting">Impostazione</string>
-
-<string name="plc_errTip1">Modalità manuale del dispositivo</string>
-<string name="plc_errTip2">Stato anomalo</string>
-<string name="plc_errTip3">Apparecchiatura occupata</string>
-<string name="plc_errTip4">Presa con induzione</string>
-
-<string name="setting_jam_set">Impostazione</string>
-<string name="setting_ker_map">Modifica guarnizioni</string>
-<string name="setting_jam_map">Modifica sciroppo</string>
-<string name="setting_ker_def">Guarnizioni predefinite</string>
-<string name="setting_jam_def">Sciroppo predefinito</string>
-
- <string name="time_ready">Tempo pronto</string>
- <string name="maxcount_tips_start">为了保障口感,请取完6杯后再次扫码制作哦~</string>
- <string name="maxcount_tips_end">您还有余雪糕需要继续扫码喔~</string>
-
- <string name="setting_warn_real_time">Avvisa:</string>
- <string name="setting_error_log">Registro errori:</string>
- <string name="setting_make_fail_title">Fallisci!</string>
- <string name="setting_make_fail">Avviso:</string>
+    <string name="describe_open_spec_multiple">Per una migliore qualità, questa funzione regolerà le porzioni di ogni gusto all\'80%.\n Vuoi attivare la funzione?</string>
+    <string name="describe_open_free_mode">Vuoi aprire la modalità gratuita per questo dispositivo?</string>
+    <string name="button_back">Indietro</string>
+    <string name="button_update">Modifica</string>
+    <string name="button_open">Apri</string>
+    <string name="button_start">Avvia</string>
+    <string name="button_clear">Cancella</string>
+    <string name="button_delete">Elimina</string>
+    <string name="button_confirm">Conferma</string>
+    <string name="button_cancel">Annulla</string>
+    <string name="button_un_set_pwd">Più tardi</string>
+    <string name="button_set_pwd">Imposta su</string>
+    <string name="button_paying_give_up">Annulla ordine</string>
+    <string name="button_paying_keep_on">Continua con il pagamento</string>
+    <string name="button_setting">Impostazione</string>
+
+    <string name="plc_errTip1">Modalità manuale del dispositivo</string>
+    <string name="plc_errTip2">Stato anomalo</string>
+    <string name="plc_errTip3">Apparecchiatura occupata</string>
+    <string name="plc_errTip4">Presa con induzione</string>
+
+    <string name="setting_jam_set">Impostazione</string>
+    <string name="setting_ker_map">Modifica guarnizioni</string>
+    <string name="setting_jam_map">Modifica sciroppo</string>
+    <string name="setting_ker_def">Guarnizioni predefinite</string>
+    <string name="setting_jam_def">Sciroppo predefinito</string>
+
+    <string name="time_ready">Tempo pronto</string>
+    <string name="maxcount_tips_start">为了保障口感,请取完6杯后再次扫码制作哦~</string>
+    <string name="maxcount_tips_end">您还有余雪糕需要继续扫码喔~</string>
+
+    <string name="setting_warn_real_time">Avvisa:</string>
+    <string name="setting_error_log">Registro errori:</string>
+    <string name="setting_make_fail_title">Fallisci!</string>
+    <string name="setting_make_fail">Avviso:</string>
     <string name="setting_make_fail_insert">Avviso Inserisci:</string>
     <string name="setting_make_fail_warn">Avviso</string>
 
@@ -504,5 +504,4 @@
     <string name="shop_cart_price">%1$d gelato, totale %2$s %3$s</string>
     <string name="other_param_setting">Altre impostazioni dei parametri</string>
 
-</resources>
-<!--意大利-->
+</resources><!--意大利-->

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

@@ -122,7 +122,7 @@
     <string name="take_describe_finish">Užsakymas baigtas. Tikimės, kad dar susitiksime!</string>
     <string name="take_finish">Užsakymas paimtas</string>
     <string name="make_fail_tip">Oi, proceso metu įvyko klaida.</string>
-    <string name="make_fail_describe">Nesijaudinkite, neįteikta suma jums buvo grąžinta.</string>
+    <string name="make_fail_describe">Jei turite klausimų, susisiekite su klientų aptarnavimo tarnyba~</string>
     <string name="make_fail_describe_refund">Už nepagamintus ledus bus grąžinama suma. Jei turite klausimų, susisiekite su klientų aptarnavimo tarnyba.</string>
 
     <!-- 后台登录 -->

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

@@ -122,7 +122,7 @@
     <string name="take_describe_finish">Pasūtījums ir pabeigts. Ceru, ka tiksimies vēlreiz!</string>
     <string name="take_finish">Pasūtījums saņemts</string>
     <string name="make_fail_tip">Hmm, procesā radās kļūda.</string>
-    <string name="make_fail_describe">Neuztraucieties, jums ir atmaksāta nepiegādātā summa.</string>
+    <string name="make_fail_describe">Ja jums ir kādi jautājumi, lūdzu, sazinieties ar klientu apkalpošanas dienestu~</string>
     <string name="make_fail_describe_refund">Negatavotais saldējums būs sākotnējā ceļa atmaksa. Ja jums ir kādi jautājumi, lūdzu, sazinieties ar klientu apkalpošanas dienestu.</string>
 
     <!-- 后台登录 -->

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

@@ -122,7 +122,7 @@
     <string name="take_describe_finish">Поруџбина је завршена. Надам се да ћемо вас поново видети!</string>
     <string name="take_finish">Поруџбина преузета</string>
     <string name="make_fail_tip">Упс, дошло је до грешке у процесу.</string>
-    <string name="make_fail_describe">Не брините, неиспоручена количина вам је враћена.</string>
+    <string name="make_fail_describe">Ако имате било каквих питања, обратите се корисничкој служби~</string>
     <string name="make_fail_describe_refund">Ненаправљени сладолед ће бити оригинални повраћај новца, ако имате било каквих питања, обратите се корисничкој служби.</string>
 
     <!-- Сладолед за сладолед -->

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

@@ -122,7 +122,7 @@
     <string name="take_describe_finish">Замовлення виконано. Сподіваюся побачити вас знову!</string>
     <string name="take_finish">Замовлення отримано</string>
     <string name="make_fail_tip">На жаль, у процесі сталася помилка.</string>
-    <string name="make_fail_describe">Не хвилюйтеся, недоставлену суму вам повернено.</string>
+    <string name="make_fail_describe">Якщо у вас виникли запитання, зверніться до служби підтримки клієнтів~</string>
     <string name="make_fail_describe_refund">Неприготоване морозиво буде початковим відшкодуванням дороги. Якщо у вас виникнуть запитання, зверніться до служби підтримки клієнтів.</string>
 
     <!-- 后台登录 -->

config.gradle

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

module_offpay/src/main/java/com/example/offpay/wmdb/WeaverUtil.java

@@ -40,6 +40,41 @@ public class WeaverUtil {
     }
 
     /**
+     * 出货失败
+     *
+     * @param itemNumber 不合格产品的货号。此编号由制造商定义，未定义或未实施时设置为 FFFFh。
+     * @param vendAmount 售卖失败产品的售卖金额（按比例计算）（以“售卖已批准”或“售卖金额”表示）。对于购物车售卖模式，
+     *                   在 VMC 发生不可预知的重置的情况下，
+     *                   非现金设备应在 VMC 确认最后一件产品之前，为所有出现“售卖失败”请求的产品累计此金额。如果发生不可预知的重置，
+     *                   非现金设备应认为所有未确认的产品均已成功售卖，因此应仅退还所有“售卖失败”请求累计的金额。
+     * @param itemCount 如果售货机是自动售货篮，则表示此售货机中等待售出的产品数量。
+     *                  对于正常售货和自动售货篮中的最后一件产品，此字段应为 0。
+     *                  对于自动售货篮模式，此字段应在每次售货成功/失败后递减。
+     *                  如果自动售货篮模式中不是最后一件产品，此字段也可以为 0。
+     *                  这意味着自动售货篮在中途中断，不会再发出售货成功/失败消息（无现金设备应认为所有剩余产品均未售出）。
+     * @param optionsAmount 售卖失败产品金额（以“售卖已批准”的“选项金额”表示）——售卖金额的一部分，涵盖选项金额。
+     *                      对于价格保持模式下的购物车售卖模式，在 VMC 发生不可预知的重置的情况下，非现金设备应在 VMC 确认最后一件产品之前，
+     *                      为所有出现“售卖失败”请求的产品累积此金额，以防 VMC 发生不可预知的重置。
+     *                      如果发生不可预知的重置，非现金设备应认为所有未确认的产品均已成功售卖，因此应仅退还所有“售卖失败”请求累积的金额。
+     * @param reason 00h：未知错误/故障。
+     *               01h：选项不存在/未配置。
+     *               02h：选项为空/产品未分配。
+     *               03h：选项有缺陷。
+     *               04h：配料已用完
+     *               05h：选项被锁定。
+     *               06h：选项被禁止（针对此时间、此价目表或此用户）。
+     *               07h：产品已过期。
+     *               08h：温度条件超出范围
+     *               09h：机器繁忙或处于错误模式（例如菜单）。
+     *               0Ah：信用额度不足
+     */
+    public static void creditCardVendFailed(String itemNumber,String vendAmount,String itemCount,String optionsAmount,String reason) {
+        Log.d(TAG, "creditCardrequestVend: " + "1302" + itemNumber+vendAmount+itemCount+optionsAmount+reason);
+        SerialPortUtil.getSerialPortUtil().sendSerialPort("1303" + "00"+vendAmount+itemCount+optionsAmount+"00");
+
+    }
+
+    /**
      * 信用卡禁能
      */
     public static void creditCardDisableReader() {