优化使用优惠码逻辑

新增远程屏蔽果酱果碎
新增远程控制果酱正反抽

BaseLibrary/src/main/java/com/hboxs/base_library/constant/Global.java

@@ -40,7 +40,7 @@ public abstract class Global {
      * 信用卡支付方式user
      */
     public static int payCCType = 0;
-
+    
     /**
      * 控制支付方式
      */

BaseLibrary/src/main/res/values-aa/strings.xml

@@ -1120,6 +1120,6 @@
     <string name="promo_code_duplication">შეიყვანეთ ფასდაკლების კოდი არაერთხელ და მხოლოდ ერთი ფასდაკლების კოდის გამოყენება შეიძლება ერთი პროდუქტისთვის</string>
     <string name="only_one_code">ფასდაკლების კოდის გამოყენება შესაძლებელია მხოლოდ ერთხელ თითო ჭიქაზე</string>
     <string name="more_code">თუ რამდენიმე ფასდაკლების კოდია, გამოიყენეთ სიმბოლო "#" მათ გამოსაყოფად</string>
-
+    <string name="promotioncode5">სარეკლამო კოდი სწორია</string>
 </resources>
 <!--格鲁吉亚-->

BaseLibrary/src/main/res/values-ab/strings.xml

@@ -1101,6 +1101,6 @@
     <string name="promo_code_duplication">優惠碼輸入重複，單一商品只能使用一個優惠碼</string>
     <string name="only_one_code">每杯只能使用一次優惠碼</string>
     <string name="more_code">如果有多個優惠碼,使用符號"#"分隔</string>
-
+    <string name="promotioncode5">優惠碼正確</string>
 </resources>
 <!--繁体-->

BaseLibrary/src/main/res/values-ak/strings.xml

@@ -1074,5 +1074,6 @@
     <string name="promo_code_duplication">Insira o código de desconto repetidamente e apenas um código de desconto poderá ser usado para um único produto</string>
     <string name="only_one_code">O código de desconto só pode ser usado uma vez por xícara</string>
     <string name="more_code">Se houver vários códigos de desconto, use o símbolo "#" para separá-los</string>
+    <string name="promotioncode5">O código promocional está correto</string>
 </resources>
     <!--葡萄牙语-->

BaseLibrary/src/main/res/values-am/strings.xml

@@ -1531,6 +1531,6 @@
     <string name="promo_code_duplication">کد تخفیف را به طور مکرر وارد کنید، و تنها یک کد تخفیف می تواند برای یک محصول استفاده شود</string>
     <string name="only_one_code">کد تخفیف فقط یک بار در هر فنجان قابل استفاده است</string>
     <string name="more_code">اگر چندین کد تخفیف وجود دارد، از نماد "#" برای جدا کردن آنها استفاده کنید</string>
-
+    <string name="promotioncode5">کد تخفیف صحیح است</string>
 </resources>
 <!--    波斯语-->

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

@@ -1117,6 +1117,7 @@
     <string name="promo_code_duplication">أدخل رمز الخصم بشكل متكرر، ويمكن استخدام رمز خصم واحد فقط لمنتج واحد</string>
     <string name="only_one_code">لا يمكن استخدام رمز الخصم إلا مرة واحدة لكل كوب</string>
     <string name="more_code">إذا كانت هناك رموز خصم متعددة، فاستخدم الرمز "#" للفصل بينها</string>
+    <string name="promotioncode5">رمز العرض الترويجي صحيح</string>
 
 </resources>
     <!--阿拉伯语-->

BaseLibrary/src/main/res/values-ba/strings.xml

@@ -1099,6 +1099,7 @@
     <string name="promo_code_duplication">Insira o código de desconto repetidamente e apenas um código de desconto poderá ser usado para um único produto</string>
     <string name="only_one_code">O código de desconto só pode ser usado uma vez por xícara</string>
     <string name="more_code">Se houver vários códigos de desconto, use o símbolo "#" para separá-los</string>
+    <string name="promotioncode5">O código promocional está correto</string>
 
 </resources>
         <!--葡萄牙语-->

BaseLibrary/src/main/res/values-bg/strings.xml

@@ -1160,6 +1160,7 @@
     <string name="promo_code_duplication">Въведете кода за отстъпка многократно и само един код за отстъпка може да се използва за един продукт</string>
     <string name="only_one_code">Кодът за отстъпка може да се използва само веднъж на чаша</string>
     <string name="more_code">Ако има няколко кода за отстъпка, използвайте символа „#“, за да ги разделите</string>
+    <string name="promotioncode5">Промоционалният код е правилен</string>
 
 </resources>
     <!--保加利亚-->

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

@@ -1112,6 +1112,7 @@
     <string name="promo_code_duplication">Slevový kód zadávejte opakovaně a na jeden produkt lze použít pouze jeden slevový kód</string>
     <string name="only_one_code">Slevový kód lze použít pouze jednou na šálek</string>
     <string name="more_code">Pokud existuje více slevových kódů, oddělte je pomocí symbolu „#“</string>
+    <string name="promotioncode5">Propagační kód je správný</string>
 
 </resources>
         <!--捷克语-->

BaseLibrary/src/main/res/values-da/strings.xml

@@ -1113,6 +1113,7 @@
     <string name="promo_code_duplication">Kampagnekoden indtastes gentagne gange, kun én kampagnekode kan bruges til et enkelt produkt</string>
     <string name="only_one_code">Kampagnekoden kan kun bruges én gang pr. kop</string>
     <string name="more_code">Hvis der er flere kampagnekoder, skal du bruge symbolet "#" for at adskille dem</string>
+    <string name="promotioncode5">Kampagnekoden er korrekt</string>
 
 </resources>
 <!--丹麦语-->

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

@@ -1128,6 +1128,7 @@
     <string name="promo_code_duplication">Der Aktionscode wird mehrfach eingegeben, es kann nur ein Aktionscode für ein Produkt verwendet werden</string>
     <string name="only_one_code">Der Aktionscode kann nur einmal pro Tasse verwendet werden</string>
     <string name="more_code">Wenn mehrere Aktionscodes vorhanden sind, verwenden Sie das Symbol "#", um sie zu trennen</string>
+    <string name="promotioncode5">Aktionscode ist korrekt</string>
 
 </resources>
 <!--德语-->

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

@@ -1121,5 +1121,7 @@
     <string name="promo_code_duplication">The promo code is entered repeatedly, only one promo code can be used for a single product</string>
     <string name="only_one_code">The promo code can only be used once per cup</string>
     <string name="more_code">If there are multiple promo codes, use the symbol "#" to separate them</string>
+    <string name="promotioncode5">Promotion code is correct</string>
+
 </resources>
 <!--英语-->

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

@@ -1166,6 +1166,7 @@
     <string name="promo_code_duplication">El código promocional se ingresa repetidamente, solo se puede usar un código promocional para un solo producto</string>
     <string name="only_one_code">El código promocional solo se puede usar una vez por taza</string>
     <string name="more_code">Si hay varios códigos promocionales, use el símbolo "#" para separarlos</string>
+    <string name="promotioncode5">El código de promoción es correcto</string>
 
 </resources>
 <!--西班牙语-->

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

@@ -1115,5 +1115,6 @@
     <string name="promo_code_duplication">Sooduskoodi sisestatakse korduvalt, ühe toote puhul saab kasutada ainult ühte sooduskoodi</string>
     <string name="only_one_code">Sooduskoodi saab kasutada ainult üks kord tassi kohta</string>
     <string name="more_code">Kui sooduskoode on mitu, kasutage nende eraldamiseks sümbolit „#”</string>
+    <string name="promotioncode5">Sooduskood on õige</string>
 
 </resources><!--爱沙尼亚-->

BaseLibrary/src/main/res/values-fi/strings.xml

@@ -1113,6 +1113,7 @@
     <string name="promo_code_duplication">Tarjouskoodi syötetään toistuvasti, yhdelle tuotteelle voi käyttää vain yhtä tarjouskoodia</string>
     <string name="only_one_code">Tarjouskoodia voi käyttää vain kerran kuppia kohden</string>
     <string name="more_code">Jos tarjouskoodeja on useita, erota ne symbolilla #</string>
+    <string name="promotioncode5">Kampanjakoodi on oikein</string>
 
 </resources>
 <!--芬兰语-->

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

@@ -1129,6 +1129,7 @@
     <string name="promo_code_duplication">Le code promo est saisi à plusieurs reprises, un seul code promo peut être utilisé pour un seul produit</string>
     <string name="only_one_code">Le code promo ne peut être utilisé qu\'une seule fois par tasse</string>
     <string name="more_code">S\'il y a plusieurs codes promo, utilisez le symbole "#" pour les séparer</string>
+    <string name="promotioncode5">Le code promotionnel est correct</string>
 
 </resources>
 <!--法语-->

BaseLibrary/src/main/res/values-hu/strings.xml

@@ -1112,6 +1112,7 @@
     <string name="promo_code_duplication">A promóciós kódot többször kell megadni, egyetlen termékhez csak egy promóciós kód használható</string>
     <string name="only_one_code">A promóciós kód csészénként csak egyszer használható fel</string>
     <string name="more_code">Ha több promóciós kód is van, használja a "#" szimbólumot az elválasztásukhoz</string>
+    <string name="promotioncode5">A promóciós kód helyes</string>
 
 </resources>
 <!--匈牙利语-->

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

@@ -1103,6 +1103,7 @@
     <string name="promo_code_duplication">Պրոմո կոդը բազմիցս մուտքագրվում է, միայն մեկ պրոմո կոդը կարող է օգտագործվել մեկ ապրանքի համար</string>
     <string name="only_one_code">Պրոմո կոդը կարող է օգտագործվել միայն մեկ բաժակի համար</string>
     <string name="more_code">Եթե կան բազմաթիվ պրոմո կոդեր, օգտագործեք «#» նշանը՝ դրանք առանձնացնելու համար</string>
+    <string name="promotioncode5">Առաջխաղացման կոդը ճիշտ է</string>
 
 </resources>
     <!--亚美尼亚-->

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

@@ -1091,6 +1091,7 @@
     <string name="promo_code_duplication">Il codice promozionale viene inserito ripetutamente, è possibile utilizzare un solo codice promozionale per un singolo prodotto</string>
     <string name="only_one_code">Il codice promozionale può essere utilizzato solo una volta per tazza</string>
     <string name="more_code">Se sono presenti più codici promozionali, utilizzare il simbolo "#" per separarli</string>
+    <string name="promotioncode5">Il codice promozionale è corretto</string>
 
 </resources>
 <!--意大利-->

BaseLibrary/src/main/res/values-ja/strings.xml

@@ -1121,5 +1121,6 @@
     <string name="promo_code_duplication">プロモーション コードが繰り返し入力されています。1 つの製品に使用できるプロモーション コードは 1 つだけです</string>
     <string name="only_one_code">プロモーション コードは 1 杯につき 1 回のみ使用できます</string>
     <string name="more_code">プロモーション コードが複数ある場合は、記号「#」を使用して区切ります</string>
+    <string name="promotioncode5">プロモーションコードは正しいです</string>
 
 </resources><!--日语-->

BaseLibrary/src/main/res/values-ka/strings.xml

@@ -1109,5 +1109,7 @@
     <string name="password">Senha</string>
     <string name="hotwifi_name_pass">parâmetros de ponto de acesso Wi-Fi</string>
     <string name="choose_language_type">Selecione o tipo de moeda</string>
+    <string name="promotioncode5">O código promocional está correto</string>
+
 </resources>
     <!--巴西2-葡萄牙语-->

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

@@ -1109,5 +1109,6 @@
     <string name="promo_code_duplication">프로모 코드는 반복적으로 입력되므로, 단일 제품에는 하나의 프로모 코드만 사용할 수 있습니다.</string>
     <string name="only_one_code">프로모 코드는 컵당 한 번만 사용할 수 있습니다.</string>
     <string name="more_code">프로모 코드가 여러 개 있는 경우, "#" 기호를 사용하여 구분합니다.</string>
+    <string name="promotioncode5">프로모션 코드가 정확합니다.</string>
 
 </resources><!--韩语-->

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

@@ -1190,6 +1190,7 @@
     <string name="promo_code_duplication">Reklamos kredito kodas įvedamas pakartotinai, vienam produktui galima naudoti tik vieną reklamos kredito kodą</string>
     <string name="only_one_code">Reklamos kredito kodas vienam puodeliui gali būti naudojamas tik vieną kartą</string>
     <string name="more_code">Jei yra keli reklamos kredito kodai, naudokite simbolį „#“, kad juos atskirtumėte</string>
+    <string name="promotioncode5">Reklamos kodas teisingas</string>
 
 </resources>
 <!--立陶宛-->

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

@@ -753,17 +753,17 @@
     <string name="discountscode"> akcijas kods</string>
     <string name="inputdiscountscode"> ievadiet atlaides kodu</string>
     <string name="discountscodeTipe">Noklikšķiniet uz kredītkartes vai banknotes maksājuma ikonas</string>
-    <string name="mixed_promotion_code"> jaukts maksājums + atlaides kods </string>
-    <string name="special_discount"> Preferenciāla atlaide </string>
-    <string name="nayax_apple_pay">Nayax ābolu maksājums</string>
-    <string name="discount_message1"> Atlaides nav pieejamas cenām, kas ir zemākas par 1 juaņu. </string>
-    <string name="discount_message2"> nevar izmantot atlaižu kodus </string>
-    <string name="discount_message3"> Atlaides kods neeksistē!</string>
-    <string name="discount_message4"> Atlaides kods ir izmantots!</string>
-    <string name="discount_message5"> Šis atlaižu kods neattiecas uz šo uzņēmumu!</string>
-    <string name="discount_message6"> Atlaides kods ir beidzies!</string>
-    <string name="coin_pulse_multiply_message"> Sveiki, lūdzu, ievadiet 1,10,100</string>
-    <string name="mdb_credit_card_E_wallet">mdb kredītkarte + elektroniskais maks</string>
+<!--    <string name="mixed_promotion_code"> jaukts maksājums + atlaides kods </string>-->
+<!--    <string name="special_discount"> Preferenciāla atlaide </string>-->
+<!--    <string name="nayax_apple_pay">Nayax ābolu maksājums</string>-->
+<!--    <string name="discount_message1"> Atlaides nav pieejamas cenām, kas ir zemākas par 1 juaņu. </string>-->
+<!--    <string name="discount_message2"> nevar izmantot atlaižu kodus </string>-->
+<!--    <string name="discount_message3"> Atlaides kods neeksistē!</string>-->
+<!--    <string name="discount_message4"> Atlaides kods ir izmantots!</string>-->
+<!--    <string name="discount_message5"> Šis atlaižu kods neattiecas uz šo uzņēmumu!</string>-->
+<!--    <string name="discount_message6"> Atlaides kods ir beidzies!</string>-->
+<!--    <string name="coin_pulse_multiply_message"> Sveiki, lūdzu, ievadiet 1,10,100</string>-->
+<!--    <string name="mdb_credit_card_E_wallet">mdb kredītkarte + elektroniskais maks</string>-->
     <string name="w_mdb_credit_card_note_machine">W-MDB kredītkarte+piezīmju iekārta</string>
     <string name="mdb_cc_ep">mdb kredītkarte+mdb elektroniskais maksājums</string>
     <string name="electronicpayment_context1">1. Aperte F2 bez teclado.\n\n 2. Noklikšķiniet uz “OK”.</string>
@@ -1114,6 +1114,7 @@
     <string name="promo_code_duplication">Reklāmas kods tiek ievadīts atkārtoti, vienam produktam var izmantot tikai vienu akcijas kodu</string>
     <string name="only_one_code">Reklāmas kodu var izmantot tikai vienu reizi vienā krūzē</string>
     <string name="more_code">Ja ir vairāki reklāmas kodi, izmantojiet simbolu "#", lai tos atdalītu</string>
+    <string name="promotioncode5">Reklāmas kods ir pareizs</string>
 
 </resources>
 <!--拉脱维亚-->

BaseLibrary/src/main/res/values-mn/strings.xml

@@ -56,7 +56,7 @@
     <string name="fancy_42">Дөрөвдүгээр сарын сэвшээ салхи</string>
 
     <string name="pay_choose">Төлбөрийн аргыг сонгоно уу</string>
-    <string name="pay_choose_df">"Accept el cargo (antes) de hacer el Pago"\n\n"Төлбөрийг (төлбөр хийхээс өмнө) хүлээн авна уу"</string>
+<!--    <string name="pay_choose_df">"Accept el cargo (antes) de hacer el Pago"\n\n"Төлбөрийг (төлбөр хийхээс өмнө) хүлээн авна уу"</string>-->
     <string name="welcome">тавтай морил</string>
 
     <string name="user_login">Хэрэглэгчийн нэвтрэлт</string>
@@ -1113,5 +1113,6 @@
     <string name = "promo_code_duplication">Урамшууллын кодыг дахин дахин оруулах бөгөөд нэг бүтээгдэхүүнд зөвхөн нэг сурталчилгааны кодыг ашиглах боломжтой</string>
     <string name = "only_one_code" >Урамшууллын кодыг нэг аяга тутамд нэг л удаа ашиглах боломжтой</string>
     <string name = "more_code">Хэрэв олон сурталчилгааны код байгаа бол тэдгээрийг тусгаарлахын тулд "#" тэмдгийг ашиглаарай</string>
+    <string name="promotioncode5">Урамшууллын код зөв</string>
 
 </resources><!--蒙古语-->

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

@@ -52,5 +52,6 @@
     <string name="promo_code_duplication">Masukkan kod diskaun berulang kali dan hanya satu kod diskaun boleh digunakan untuk satu produk</string>
     <string name="only_one_code">Kod diskaun hanya boleh digunakan sekali setiap cawan</string>
     <string name="more_code">Jika terdapat berbilang kod diskaun, gunakan simbol "#" untuk memisahkannya</string>
+    <string name="promotioncode5">Kod promosi adalah betul</string>
 </resources>
 <!--马来语-->

BaseLibrary/src/main/res/values-nl/strings.xml

@@ -1114,6 +1114,7 @@
     <string name="promo_code_duplication">De promotiecode wordt herhaaldelijk ingevoerd, er kan slechts één promotiecode voor één product worden gebruikt</string>
     <string name="only_one_code">De promotiecode kan slechts één keer per kopje worden gebruikt</string>
     <string name="more_code">Als er meerdere promotiecodes zijn, gebruik dan het symbool "#" om ze te scheiden</string>
+    <string name="promotioncode5">Promotiecode is correct</string>
 
 </resources>
 <!--荷兰语-->

BaseLibrary/src/main/res/values-no/strings.xml

@@ -1114,6 +1114,7 @@
     <string name="promo_code_duplication">Kampanjekoden skrives inn gjentatte ganger, kun én kampanjekode kan brukes for ett enkelt produkt</string>
     <string name="only_one_code">Kampanjekoden kan bare brukes én gang per kopp</string>
     <string name="more_code">Hvis det er flere kampanjekoder, bruk symbolet "#" for å skille dem</string>
+    <string name="promotioncode5">Kampanjekoden er riktig</string>
 
 </resources>
 <!--挪威语-->

BaseLibrary/src/main/res/values-pl/strings.xml

@@ -1570,5 +1570,6 @@
     <string name="promo_code_duplication">Kod promocyjny jest wprowadzany wielokrotnie, tylko jeden kod promocyjny może być użyty dla jednego produktu</string>
     <string name="only_one_code">Kod promocyjny może być użyty tylko raz na kubek</string>
     <string name="more_code">Jeśli jest wiele kodów promocyjnych, użyj symbolu „#”, aby je rozdzielić</string>
+    <string name="promotioncode5">Kod promocyjny jest poprawny</string>
 
 </resources><!--波兰语-->

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

@@ -1125,5 +1125,6 @@
     <string name="password">Senha</string>
     <string name="hotwifi_name_pass">parâmetros de ponto de acesso Wi-Fi</string>
     <string name="choose_language_type">Selecione o tipo de moeda</string>
+    <string name="promotioncode5">O código promocional está correto</string>
 </resources>
 <!--葡萄牙语-->

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

@@ -1115,6 +1115,7 @@
     <string name="promo_code_duplication">Codul promoțional este introdus în mod repetat, un singur cod promoțional poate fi utilizat pentru un singur produs</string>
     <string name="only_one_code">Codul promoțional poate fi folosit o singură dată pe cană</string>
     <string name="more_code">Dacă există mai multe coduri promoționale, utilizați simbolul „#” pentru a le separa</string>
+    <string name="promotioncode5">Codul promoțional este corect</string>
 
 </resources>
 <!--罗马尼亚-->

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

@@ -702,18 +702,18 @@
     <string name="restart_machine"> Перезагрузите устройство</string>
     <string name="dlsbs"> Извините, у вас нет полномочий для входа в систему. Пожалуйста, свяжитесь с администратором устройства для получения полномочий.</string>
     <string name="online_paymentcode">Онлайн+Код оплаты+Код скидки </string>
-    <string name="nayax_money_coin">Кредитная карта+банкноты+монеты</string>
-    <string name="servicetelephone"> Служебный телефон:</string>
-    <string name="mdb_banknotes">Кредитная карта+устройство для банкнот</string>
-    <string name="japanese_pay"> Оплата Япония+оплата монетами </string>
-    <string name="discounts"> Код скидки</string>
-    <string name="input_discounts"> Введите код скидки</string>
-    <string name="confirm_discounts"> После нажатия кнопки “OK”, не забудьте выбрать способ оплаты выше </string>
-    <string name="confirm_discounts2"> Зеленая кнопка означает “доступно”, серая кнопка означает “недоступно” </string>
-    <string name="promo_code_tips1"> Данный код скидки не существует!</string>
-    <string name="promp_code_tips2"> Был использован код скидки!</string>
-    <string name="promp_code_tips3"> Данный код скидки не подходит для данного устройства!!</string>
-    <string name="promp_code_tips4"> Срок кода для скидки истек!</string>
+<!--    <string name="nayax_money_coin">Кредитная карта+банкноты+монеты</string>-->
+<!--    <string name="servicetelephone"> Служебный телефон:</string>-->
+<!--    <string name="mdb_banknotes">Кредитная карта+устройство для банкнот</string>-->
+<!--    <string name="japanese_pay"> Оплата Япония+оплата монетами </string>-->
+<!--    <string name="discounts"> Код скидки</string>-->
+<!--    <string name="input_discounts"> Введите код скидки</string>-->
+<!--    <string name="confirm_discounts"> После нажатия кнопки “OK”, не забудьте выбрать способ оплаты выше </string>-->
+<!--    <string name="confirm_discounts2"> Зеленая кнопка означает “доступно”, серая кнопка означает “недоступно” </string>-->
+<!--    <string name="promo_code_tips1"> Данный код скидки не существует!</string>-->
+<!--    <string name="promp_code_tips2"> Был использован код скидки!</string>-->
+<!--    <string name="promp_code_tips3"> Данный код скидки не подходит для данного устройства!!</string>-->
+<!--    <string name="promp_code_tips4"> Срок кода для скидки истек!</string>-->
 
 
     <string name="quibinary">Два кода в одном (WeChat Alipay)</string>

BaseLibrary/src/main/res/values-sk/strings.xml

@@ -754,17 +754,17 @@
     <string name="discountscode">Propagačný kód</string>
     <string name="inputdiscountscode">Zadajte zľavový kód</string>
     <string name="discountscodeTipe">Kliknite na ikonu platby kreditnou kartou alebo bankovkou</string>
-    <string name="mixed_promotion_code">Zmiešaná platba + zľavový kód</string>
-    <string name="special_discount">Prednostná zľava</string>
-    <string name="nayax_apple_pay">Nayax platba</string>
-    <string name="discount_message1">Zľavy nie sú dostupné pre ceny nižšie ako 1 minca.</string>
-    <string name="discount_message2">Nemožno použiť zľavové kódy!</string>
-    <string name="discount_message3">Zľavový kód neexistuje!</string>
-    <string name="discount_message4">Zľavový kód bol použitý!</string>
-    <string name="discount_message5">Tento zľavový kód nie je pre túto firmu!</string>
-    <string name="discount_message6">Platnosť zľavového kódu vypršala!</string>
-    <string name="coin_pulse_multiply_message">Dobrý deň, zadajte prosím 1,10,100</string>
-    <string name="mdb_credit_card_E_wallet">mdb kreditná karta + elektronická peňaženka</string>
+<!--    <string name="mixed_promotion_code">Zmiešaná platba + zľavový kód</string>-->
+<!--    <string name="special_discount">Prednostná zľava</string>-->
+<!--    <string name="nayax_apple_pay">Nayax platba</string>-->
+<!--    <string name="discount_message1">Zľavy nie sú dostupné pre ceny nižšie ako 1 minca.</string>-->
+<!--    <string name="discount_message2">Nemožno použiť zľavové kódy!</string>-->
+<!--    <string name="discount_message3">Zľavový kód neexistuje!</string>-->
+<!--    <string name="discount_message4">Zľavový kód bol použitý!</string>-->
+<!--    <string name="discount_message5">Tento zľavový kód nie je pre túto firmu!</string>-->
+<!--    <string name="discount_message6">Platnosť zľavového kódu vypršala!</string>-->
+<!--    <string name="coin_pulse_multiply_message">Dobrý deň, zadajte prosím 1,10,100</string>-->
+<!--    <string name="mdb_credit_card_E_wallet">mdb kreditná karta + elektronická peňaženka</string>-->
     <string name="w_mdb_credit_card_note_machine">W-MDB kreditná karta + bankomat</string>
     <string name="mdb_cc_ep">kreditná karta mdb + elektronická platba mdb</string>
     <string name="electronicpayment_context1">1. Aperte F2 no teclado.\n\n  2. Kliknite na žiadne „OK“.</string>
@@ -1115,6 +1115,7 @@
     <string name="promo_code_duplication">Propagačný kód sa zadáva opakovane, pre jeden produkt možno použiť iba jeden propagačný kód</string>
     <string name="only_one_code">Promo kód možno použiť iba raz na šálku</string>
     <string name="more_code">Ak existuje viacero propagačných kódov, oddeľte ich pomocou symbolu „#“</string>
+    <string name="promotioncode5">Propagačný kód je správny</string>
 
 </resources>
     <!--斯洛伐克-->

BaseLibrary/src/main/res/values-sq/strings.xml

@@ -704,25 +704,25 @@
     <string name="restart_machine"> התחל מחדש את המכונה</string>
     <string name="dlsbs"> מצטער, אין לך סמכות להיכנס. אנא התחבר למנהל המערכת כדי לקבל סמכות</string>
     <string name="online_paymentcode">אונליין + קוד תשלום + קוד הנחה </string>
-    <string name="nayax_money_coin">nayax+notes+coins</string>
-    <string name="servicetelephone"> טלפון קבוע של השירות</string>
-    <string name="mdb_banknotes">מכשיר כרטיס אשראי + מכשיר שטרות כסף</string>
-    <string name="japanese_pay"> Japan payment + coin payment </string>
-    <string name="discounts"> קוד הנחה</string>
-    <string name="input_discounts"> הכנס את קוד ההנחה</string>
-    <string name="confirm_discounts"> לאחר לחיצה על כפתור האישור, זכור לבחור אמצעי תשלום בחלון למעלה</string>
-    <string name="confirm_discounts2"> הכפתור הירוק מייצג זמינות. הכפתור האפור מייצג אי-זמינות </string>
-    <string name="promo_code_tips1"> קוד הנחה לא קיים</string>
-    <string name="promp_code_tips2"> קוד ההנחה כבר היה בשימוש</string>
-    <string name="promp_code_tips3"> קוד ההנחה הזה הוא לא לעסק הזה</string>
-    <string name="promp_code_tips4"> תוקף קוד ההנחה פקע</string>
-    <string name="uniform_pricing">Uniform pricing</string>
-    <string name="value_type">Please select a currency value type</string>
-    <string name="russia">Russia</string>
-    <string name="malaysia">Malaysia</string>
-    <string name="america">United States</string>
-    <string name="rmb">RMB</string>
-    <string name="singapore">Singapore</string>
+<!--    <string name="nayax_money_coin">nayax+notes+coins</string>-->
+<!--    <string name="servicetelephone"> טלפון קבוע של השירות</string>-->
+<!--    <string name="mdb_banknotes">מכשיר כרטיס אשראי + מכשיר שטרות כסף</string>-->
+<!--    <string name="japanese_pay"> Japan payment + coin payment </string>-->
+<!--    <string name="discounts"> קוד הנחה</string>-->
+<!--    <string name="input_discounts"> הכנס את קוד ההנחה</string>-->
+<!--    <string name="confirm_discounts"> לאחר לחיצה על כפתור האישור, זכור לבחור אמצעי תשלום בחלון למעלה</string>-->
+<!--    <string name="confirm_discounts2"> הכפתור הירוק מייצג זמינות. הכפתור האפור מייצג אי-זמינות </string>-->
+<!--    <string name="promo_code_tips1"> קוד הנחה לא קיים</string>-->
+<!--    <string name="promp_code_tips2"> קוד ההנחה כבר היה בשימוש</string>-->
+<!--    <string name="promp_code_tips3"> קוד ההנחה הזה הוא לא לעסק הזה</string>-->
+<!--    <string name="promp_code_tips4"> תוקף קוד ההנחה פקע</string>-->
+<!--    <string name="uniform_pricing">Uniform pricing</string>-->
+<!--    <string name="value_type">Please select a currency value type</string>-->
+<!--    <string name="russia">Russia</string>-->
+<!--    <string name="malaysia">Malaysia</string>-->
+<!--    <string name="america">United States</string>-->
+<!--    <string name="rmb">RMB</string>-->
+<!--    <string name="singapore">Singapore</string>-->
     <string name="pay_zhibi_epayment">Biller/תשלום אלקטרוני</string>
     <string name="pay_xinyongkazhibicode">כרטיס אשראי/תשלום מעורב/קוד קידום</string>
     <string name="w_mdb_03">כרטיס אשראי W-MDB + התקן שטר 03</string>
@@ -1068,6 +1068,6 @@
     <string name="promo_code_duplication">קוד ההטבה מוזן שוב ושוב, ניתן להשתמש רק בקוד הטבה אחד עבור מוצר בודד</string>
     <string name="only_one_code">ניתן להשתמש בקוד ההטבה רק פעם אחת לכל כוס</string>
     <string name="more_code">אם ישנם קודי קידום מכירות מרובים, השתמש בסמל "#" כדי להפריד ביניהם</string>
-
+    <string name="promotioncode5">קוד הקידום נכון</string>
 </resources>
 <!--希伯来语  以色列-->

BaseLibrary/src/main/res/values-sv/strings.xml

@@ -1112,6 +1112,7 @@
     <string name="promo_code_duplication">Kampanjkoden skrivs in upprepade gånger, endast en kampanjkod kan användas för en enskild produkt</string>
     <string name="only_one_code">Kampanjkoden kan endast användas en gång per kopp</string>
     <string name="more_code">Om det finns flera kampanjkoder, använd symbolen "#" för att skilja dem åt</string>
+    <string name="promotioncode5">Kampanjkoden är korrekt</string>
 
 </resources>
 <!--瑞典语-->

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

@@ -782,24 +782,24 @@
     <string name="discountscode"> รหัสโปรโมชั่น</string>
     <string name="inputdiscountscode"> ใส่รหัสส่วนลด</string>
     <string name="discountscodeTipe">คลิกที่ไอคอนการชำระเงินด้วยบัตรเครดิตหรือธนบัตร</string>
-    <string name="mixed_promotion_code"> ชำระรวม + ป </string>
-    <string name="special_discount"> ส่วนลดพิเศษ </string>
-    <string name="nayax_apple_pay">nayax apple pay</string>
-    <string name="discount_message1"> ส่วนลดไม่สามารถใช้ได้กับราคาต่ำกว่า 1หยวน</string>
-    <string name="discount_message2"> ไม่สามารถใช้รหัสส่วนลดได้ </string>
-    <string name="discount_message3"> รหัสส่วนลดนี้ไม่มี!</string>
-    <string name="discount_message4"> รหัสส่วนลดนี้ถูกใช้ไปแล้ว!</string>
-    <string name="discount_message5"> รหัสส่วนลดนี้ไม่ใช่สำหรับธุรกิจนี้</string>
-    <string name="discount_message6"> รหัสส่วนลดหมดอายุแล้ว!</string>
-    <string name="coin_pulse_multiply_message"> สวัสดี, กรุณาใส่ 1,10,100</string>
-    <string name="mdb_credit_card_E_wallet">บัตรเครดิต mdb + กระเป๋าเงินอิเล็กทรอนิกส์</string>
-    <string name="uniform_pricing">Uniform pricing</string>
-    <string name="value_type">Please select a currency value type</string>
-    <string name="russia">Russia</string>
-    <string name="malaysia">Malaysia</string>
-    <string name="america">United States</string>
-    <string name="rmb">RMB</string>
-    <string name="singapore">Singapore</string>
+<!--    <string name="mixed_promotion_code"> ชำระรวม + ป </string>-->
+<!--    <string name="special_discount"> ส่วนลดพิเศษ </string>-->
+<!--    <string name="nayax_apple_pay">nayax apple pay</string>-->
+<!--    <string name="discount_message1"> ส่วนลดไม่สามารถใช้ได้กับราคาต่ำกว่า 1หยวน</string>-->
+<!--    <string name="discount_message2"> ไม่สามารถใช้รหัสส่วนลดได้ </string>-->
+<!--    <string name="discount_message3"> รหัสส่วนลดนี้ไม่มี!</string>-->
+<!--    <string name="discount_message4"> รหัสส่วนลดนี้ถูกใช้ไปแล้ว!</string>-->
+<!--    <string name="discount_message5"> รหัสส่วนลดนี้ไม่ใช่สำหรับธุรกิจนี้</string>-->
+<!--    <string name="discount_message6"> รหัสส่วนลดหมดอายุแล้ว!</string>-->
+<!--    <string name="coin_pulse_multiply_message"> สวัสดี, กรุณาใส่ 1,10,100</string>-->
+<!--    <string name="mdb_credit_card_E_wallet">บัตรเครดิต mdb + กระเป๋าเงินอิเล็กทรอนิกส์</string>-->
+<!--    <string name="uniform_pricing">Uniform pricing</string>-->
+<!--    <string name="value_type">Please select a currency value type</string>-->
+<!--    <string name="russia">Russia</string>-->
+<!--    <string name="malaysia">Malaysia</string>-->
+<!--    <string name="america">United States</string>-->
+<!--    <string name="rmb">RMB</string>-->
+<!--    <string name="singapore">Singapore</string>-->
     <string name="pay_zhibi_epayment">ผู้เรียกเก็บเงิน/การชำระเงินทางอิเล็กทรอนิกส์</string>
     <string name="pay_xinyongkazhibicode">บัตรเครดิต/การชำระเงินแบบผสม/รหัสโปรโมชั่น</string>
     <string name="w_mdb_03">บัตรเครดิต W-MDB + ธนบัตร 03</string>
@@ -1143,6 +1143,7 @@
     <string name="promo_code_duplication">มีการป้อนรหัสโปรโมชั่นซ้ำหลายครั้ง สามารถใช้รหัสโปรโมชั่นได้เพียงรหัสเดียวต่อผลิตภัณฑ์เดียว</string>
     <string name="only_one_code">รหัสโปรโมชั่นใช้ได้เพียงครั้งเดียวต่อแก้ว</string>
     <string name="more_code">หากมีรหัสโปรโมชั่นหลายรหัส ให้ใช้สัญลักษณ์ "#" เพื่อคั่น</string>
+    <string name="promotioncode5">รหัสโปรโมชั่นถูกต้อง</string>
 
 </resources>
     <!--泰语-->

BaseLibrary/src/main/res/values-tr/strings.xml

@@ -752,17 +752,17 @@
     <string name="discountscode"> promosyon kodu</string>
     <string name="inputdiscountscode"> indirim kodu gir </string>
     <string name="discountscodeTipe"> Kredi kartı veya banknot ödeme simgesine tıklayın </string>
-    <string name="mixed_promotion_code"> karışık ödeme + indirim kodu </string>
-    <string name="special_discount"> tercihli indirim </string>
-    <string name="nayax_apple_pay"> nayax elma ödeme </string>
-    <string name="discount_message1"> 10 TL nin altındaki fiyatlar için indirim yapılmaz. </string>
-    <string name="discount_message2"> indirim kodlarını kullanamaz </string>
-    <string name="discount_message3"> İndirim kodu mevcut değil!</string>
-    <string name="discount_message4"> Bu İndirim kodu kullanılmış!</string>
-    <string name="discount_message5"> Bu indirim kodu bu işletme için değil!</string>
-    <string name="discount_message6"> İndirim kodunun süresi doldu!</string>
-    <string name="coin_pulse_multiply_message"> merhaba, lütfen 1,10,100 girin</string>
-    <string name="mdb_credit_card_E_wallet"> mdb kredi kartı + elektronik cüzdan </string>
+<!--    <string name="mixed_promotion_code"> karışık ödeme + indirim kodu </string>-->
+<!--    <string name="special_discount"> tercihli indirim </string>-->
+<!--    <string name="nayax_apple_pay"> nayax elma ödeme </string>-->
+<!--    <string name="discount_message1"> 10 TL nin altındaki fiyatlar için indirim yapılmaz. </string>-->
+<!--    <string name="discount_message2"> indirim kodlarını kullanamaz </string>-->
+<!--    <string name="discount_message3"> İndirim kodu mevcut değil!</string>-->
+<!--    <string name="discount_message4"> Bu İndirim kodu kullanılmış!</string>-->
+<!--    <string name="discount_message5"> Bu indirim kodu bu işletme için değil!</string>-->
+<!--    <string name="discount_message6"> İndirim kodunun süresi doldu!</string>-->
+<!--    <string name="coin_pulse_multiply_message"> merhaba, lütfen 1,10,100 girin</string>-->
+<!--    <string name="mdb_credit_card_E_wallet"> mdb kredi kartı + elektronik cüzdan </string>-->
     <string name="w_mdb_credit_card_note_machine">W-MDB kredi kartı+not makinesi</string>
     <string name="mdb_cc_ep">mdb kredi kartı+mdb elektronik ödeme</string>
     <string name="electronicpayment_context1">1. Aperte F2 teclado yok.\n\n 2. Klik "Tamam" yok.</string>
@@ -1112,6 +1112,7 @@
     <string name="promo_code_duplication">Promosyon kodu tekrar tekrar girilir, tek bir ürün için yalnızca bir promosyon kodu kullanılabilir</string>
     <string name="only_one_code">Promosyon kodu her fincan için yalnızca bir kez kullanılabilir</string>
     <string name="more_code">Birden fazla promosyon kodu varsa, bunları ayırmak için "#" sembolünü kullanın</string>
+    <string name="promotioncode5">Promosyon kodu doğru</string>
 
 </resources>
 <!--土耳其-->

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

@@ -1101,6 +1101,7 @@
     <string name="promo_code_duplication">Промокод вводиться багаторазово, для одного продукту можна використовувати лише один промокод</string>
     <string name="only_one_code">Промокод можна використати лише один раз на чашку</string>
     <string name="more_code">Якщо є кілька промо-кодів, використовуйте символ "#", щоб розділити їх</string>
+    <string name="promotioncode5">Промокод правильний</string>
 
 </resources>
     <!--乌克兰语-->

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

@@ -1191,5 +1191,6 @@
     <string name="only_one_code">每杯只能使用一次优惠码</string>
     <string name="more_code">如果有多个优惠码,使用符号"#"进行分隔</string>
     <string name="voice_meal_pickup_prompts">取餐语音提示</string>
+    <string name="promotioncode5">优惠码正确</string>
 
 </resources>

app/src/main/java/com/bgy/autosale/entitys/ProductShowBean.java

@@ -0,0 +1,78 @@
+package com.bgy.autosale.entitys;
+
+import java.io.Serializable;
+
+/**
+ * @author whw
+ * @time 2019/4/11
+ * @Description 推送过来的商品价格
+ */
+public class ProductShowBean implements Serializable {
+
+    private String clientId;
+    private String no;
+    private String showType;
+    private String codePrice;
+    private String rmbPrice;
+    private boolean sellStatus;
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public String getShowType() {
+        return showType;
+    }
+
+    public void setShowType(String showType) {
+        this.showType = showType;
+    }
+
+    public String getCodePrice() {
+        return codePrice;
+    }
+
+    public void setCodePrice(String codePrice) {
+        this.codePrice = codePrice;
+    }
+
+    public String getRmbPrice() {
+        return rmbPrice;
+    }
+
+    public void setRmbPrice(String rmbPrice) {
+        this.rmbPrice = rmbPrice;
+    }
+
+    public boolean isSellStatus() {
+        return sellStatus;
+    }
+
+    public void setSellStatus(boolean sellStatus) {
+        this.sellStatus = sellStatus;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    @Override
+    public String toString() {
+        return "ProductShowBean{" +
+                "clientId='" + clientId + '\'' +
+                ", no='" + no + '\'' +
+                ", showType='" + showType + '\'' +
+                ", codePrice='" + codePrice + '\'' +
+                ", rmbPrice='" + rmbPrice + '\'' +
+                ", sellStatus=" + sellStatus +
+                '}';
+    }
+}

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

@@ -31,6 +31,7 @@ import com.bgy.autosale.IceCreamDeviceConstants;
 import com.bgy.autosale.R;
 import com.bgy.autosale.RemoteSupportService;
 import com.bgy.autosale.entitys.MakeIceCreamBean;
+import com.bgy.autosale.entitys.ProductShowBean;
 import com.bgy.autosale.entitys.Result;
 import com.bgy.autosale.helpers.CommunicationHelper;
 import com.bgy.autosale.interfaces.SendCallback;
@@ -149,7 +150,7 @@ public class MQService extends Service implements SendCallback,Callback<Result>
         switch (kind) {
             //显示花型
             case "updateProductsShow":
-//                updateProductsShow(gson, baseBean, kind);
+                updateProductsShow(gson, baseBean, kind);
                 break;
             case "products":
                 //保存价格到本地
@@ -372,11 +373,62 @@ public class MQService extends Service implements SendCallback,Callback<Result>
                     },500);
                 }
                 break;
+            case "smokeJam":
+                String[] smokeJam = baseBean.getKind_data().split("-");
+                String name = smokeJam[0];
+                int param1 = Integer.parseInt(smokeJam[1]);
+                int id = 0;
+                if (name.equals("J01")){
+                    id=IceCreamDeviceConstants.ORDER_SAUCE_1;
+                } else if (name.equals("J02")) {
+                    id=IceCreamDeviceConstants.ORDER_SAUCE_2;
+                } else if (name.equals("J03")) {
+                    id=IceCreamDeviceConstants.ORDER_SAUCE_3;
+                }
+                Log.d(TAG, "smokeJam: "+id+":"+param1);
+                CommunicationHelper.getInstance().sendControl(id, param1, 0, 0, this);
+                break;
             default:
                 break;
         }
     }
 
+    private void updateProductsShow(Gson gson, BaseBean baseBean, String kind) {
+        String kind_data = baseBean.getKind_data();
+        ArrayList<ProductShowBean> list = gson.fromJson(kind_data, new TypeToken<List<ProductShowBean>>() {
+        }.getType());
+        for (int i = 0; i < list.size(); i++) {
+            ProductShowBean productShowBean = list.get(i);
+            Log.d(TAG, "updateProductsShow1: " + productShowBean.getNo());
+            Log.d(TAG, "updateProductsShow1: " + productShowBean.getShowType());
+            String no=productShowBean.getNo();
+            boolean b=true;
+            if (productShowBean.getShowType().equals("0")){
+                b=true;
+            }else if (productShowBean.getShowType().equals("1")){
+                b=false;
+            }
+            String s = getString(no);
+            SPUtils.getInstance(App.app).putBoolean(s,b);
+        }
+    }
+
+    private static String getString(String no) {
+        String s="";
+        if (no.equals("J01")){
+            s=PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_1;
+        } else if (no.equals("J02")) {
+            s=PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_2;
+        } else if (no.equals("J03")) {
+            s=PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_2;
+        } else if (no.equals("C01")) {
+            s=PriceFragment.SHARED_PREFERENCE_SWITCH_KERNEL_1;
+        } else if (no.equals("C02")) {
+            s=PriceFragment.SHARED_PREFERENCE_SWITCH_KERNEL_2;
+        }
+        return s;
+    }
+
     private boolean isManualMode() {
         return App.app.payChannel != Constant.PAY_FREE;
     }

app/src/main/java/com/bgy/autosale/payutil/dialog/ShoppingTrolleyDialogChoosePay.java

@@ -114,6 +114,7 @@ public class ShoppingTrolleyDialogChoosePay extends FrameLayout implements View.
 //                    }
 //                }
 //        });
+        view.findViewById(R.id.btn_discounts_code).setOnClickListener(this);
     }
 
     private EditText etDiscountsCode;
@@ -160,6 +161,11 @@ public class ShoppingTrolleyDialogChoosePay extends FrameLayout implements View.
                     listener.onClickListener(125);
                 }
                 break;
+            case R.id.btn_discounts_code:
+                if (listener != null) {
+                    listener.onClickListener(R.id.btn_discounts_code);
+                }
+                break;
             default:
                 break;
         }

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

@@ -566,7 +566,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                 public void onComplete() {
                 }
             });
-        }else {
+        } else {
             LogUtils.logWrite("没有MDB硬币器");
         }
         Log.d(TAG, "MDB_COIN: 4");
@@ -778,6 +778,9 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                         Log.d(TAG, "onClickListener: 1");
                         handlePaymentSelection(5, R.id.iv_qr_code, () -> carsPay(str()));//国内二码合一支付
                         break;
+                    case R.id.btn_discounts_code:
+                        handlePaymentSelection(0, R.id.btn_discounts_code, null);
+                        break;
                 }
             }
         });
@@ -799,18 +802,20 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                     return; // 直接返回，不继续执行
                 } else {
                     if (PreventSpeedClickUtil.isFastClick()) {
-                        Log.d(TAG, "PreventSpeedClickUtil:1 ");
                         getDiscountCodeOverseas(arrayCode[shoppingNumber], id);
                     } else {
-                        Log.d(TAG, "PreventSpeedClickUtil:2 ");
                     }
                 }
             } else {
 //                manualMake();
-                fallbackAction.run(); // 执行对应的回调方法
+                if (fallbackAction != null) {
+                    fallbackAction.run(); // 执行对应的回调方法
+                }
             }
         } else {
-            fallbackAction.run(); // 执行对应的回调方法
+            if (fallbackAction != null) {
+                fallbackAction.run(); // 执行对应的回调方法
+            }
         }
     }
 
@@ -2569,6 +2574,9 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                         Log.d(TAG, "type onNext: " + type);
                         switch (type) {
                             case "0":
+                                if (R.id.btn_discounts_code == id) {
+                                    showToast(UiUtil.getStringRes(R.string.promotioncode5));
+                                }
                                 //成功
                                 getConfirmCodeOverseas(code, id);
                                 break;
@@ -2597,11 +2605,16 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                                 LogUtil.d("优惠码过期了哦!", type + "");
                                 break;
                             case "success":
-                                if (Global.isVersions == 2) {
-                                    getConfirmCodeOverseas(code, id);
+                                if (R.id.btn_discounts_code == id) {
+                                    showToast(UiUtil.getStringRes(R.string.promotioncode5));
                                 } else {
-                                    getConfirmCodeSuccess(1, id);
+                                    if (Global.isVersions == 2) {
+                                        getConfirmCodeOverseas(code, id);
+                                    } else {
+                                        getConfirmCodeSuccess(1, id);
+                                    }
                                 }
+
                                 break;
 
                         }
@@ -2640,8 +2653,13 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                             type = "0"; // 设置为默认值
                         }
                         Log.d(TAG, "onClick:orderHelper:0 " + priceList);
-
-                        double price = priceList.get(shoppingNumber);
+                        double price;
+                        if (!priceList.isEmpty()) {
+                            price = priceList.get(shoppingNumber);
+                        } else {
+                            price = pri;
+                            Log.d(TAG, "onNext:关闭购物车 " + price);
+                        }
                         double total = 0;
                         double total1 = 0;
 
@@ -2694,6 +2712,9 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         } else if (id == R.id.iv_qr_code) {
             carsPay(str());
         }
+        if (pri == 0 && id == R.id.btn_discounts_code) {
+            manualMake();
+        }
     }
 
     public void updateCode(String code) {

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

@@ -244,8 +244,6 @@ public class PaySuccessFragment extends BaseAutoExitFragment implements Callback
     // 订单完成界面数据
     private void updateFinishInfo() {
         UISoundHelper.getInstance().playOrderFinish();
-
-
         homeView.setVisibility(View.VISIBLE);
         homeView.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -100,12 +100,15 @@
                 android:id="@+id/ll_discounts_code"
                 android:layout_width="wrap_content"
                 android:layout_marginTop="@dimen/dp_20"
-                android:layout_height="@dimen/dp_20"
+                android:layout_height="wrap_content"
                 android:layout_below="@id/ll_pay_choose_img"
                 android:gravity="center"
-                android:orientation="horizontal"
+                android:orientation="vertical"
                 android:scaleType="centerInside"
                 android:visibility="gone">
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -144,18 +147,20 @@
                         android:src="@drawable/icon_guanbi"
                         android:visibility="invisible" />
                 </RelativeLayout>
+                    <Button
+                        android:id="@+id/btn_discounts_code"
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:layout_marginLeft="@dimen/dp_5"
+                        android:background="@drawable/shape_btn_login"
+                        android:padding="@dimen/dp_2"
+                        android:text="@string/confirm"
+                        android:visibility="visible"
+                        android:textColor="@color/white"
+                        android:textSize="15sp" />
+                </LinearLayout>
+
 
-                <Button
-                    android:id="@+id/btn_discounts_code"
-                    android:layout_width="@dimen/dp_20"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/dp_5"
-                    android:background="@drawable/shape_btn_login"
-                    android:padding="@dimen/dp_2"
-                    android:text="@string/confirm"
-                    android:visibility="gone"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/dp_6" />
 
                 <TextView
                     android:id="@+id/tv_discounts_code_clean"

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

@@ -229,7 +229,7 @@
     <string name="setting_run_offline">离线模式</string>
     <string name="setting_pay_mode">收款方式</string>
     <string name="setting_pay_free">免费模式</string>
-    <string name="setting_pay_pos">POS机/钱柜模式</string>
+    <string name="setting_pay_pos">MDB刷卡器</string>
     <string name="setting_pay_online">在线收款模式</string>
 
     <string name="setting_clean_title">清洗配置</string>

config.gradle

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