1、新增巧克力下果碎动画效果

2、新增越南语
3、优化制作后清零的已投金额价格不变的问题
4、UI优化

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

@@ -34,7 +34,7 @@ public class LanguageUtil {
             "it", "ab", "ko", "pl", "uk", "hy",
             "ar", "th", "sq", "ka", "aa", "ba",
             "tr", "lv", "ak", "et", "mn", "am", "kk",
-            "ms","lt","sr"};
+            "ms","lt","sr","vi"};
     public static final String CHINESE = language[0]; //中文
     public static final String ENGLISH = language[1]; //英文
     public static final String GERMAN = language[2]; //德语
@@ -76,23 +76,16 @@ public class LanguageUtil {
     public static final String malai = language[37];//马来西亚，马来语
     public static final String litaowan = language[38];//立陶宛
     public static final String saierweiya = language[39];//塞尔维亚
+    public static final String yuenan = language[40];//越南
 
-
-    public static final String[] LANGUAGE_TEXT = {
-            "中文", "English(英语)", "Deutsch(德语)", "русский(俄语)", "日本語(日语)", "Español(西班牙语)",
-            "Français(法语)", "България(保加利亚语)", "Dansk(丹麦语)", "Suomalainen(芬兰语)", "Nederlands(荷兰语)", "Česky(捷克语)",
-            "Românesc(罗马尼亚语)", "Norsk språk(挪威语)", "Português(葡萄牙语)", "Svenska(瑞典语)", "Slovenského(斯洛伐克语)", "Magyar(匈牙利语)",
-            "Lingua italiana(意大利语)", "繁體中文", "한국어(韩语)", "Polska(波兰语)", "Ukrainian(乌克兰语)", "Հայաստան(亚美尼亚语)",
-            "(阿拉伯语)عرب", "ไทย(泰语)", "(希伯来语)יִשׂרְאֵלִי", "Brazil-2DHR(巴西语)", "საქართველოს(格鲁吉亚语)", "Brazil-3(巴西语)",
-            "turkey(土耳其语)", "Latvija(拉脱维亚语)", "Portugal-RA(葡萄牙语)", "Eesti(爱沙尼亚)", "Монгол(蒙古语)", "فارسی(波斯语)", "қазақ(哈萨克语)"
-    };
     public static final String[] LANGUAGE_TEXT2 = {
             "中文", "English", "Deutsch", "русский", "日本語", "Español",
             "Français", "България", "Dansk", "Suomalainen", "Nederlands", "Česky",
             "Românesc", "Norsk språk", "Português", "Svenska", "Slovenského", "Magyar",
             "Lingua italiana", "繁體中文", "한국어", "Polska", "Ukrainian", "Հայաստան",
             "عرب", "ไทย", "יִשׂרְאֵלִי", "Brazil", "საქართველოს", "Brazil",
-            "turkey", "Latvija", "Portugal", "Eesti", "Монгол", "فارسی", "қазақ","Melayu","lietuvių","Српски"
+            "turkey", "Latvija", "Portugal", "Eesti", "Монгол", "فارسی", "қазақ","Melayu","lietuvių","Српски",
+            "Tiếng Việt"
     };
 
     //第二语言：后台显示
@@ -105,7 +98,7 @@ public class LanguageUtil {
             "繁體中文", "한국어(韩语)", "Polska(波兰语)", "Ukrainian(乌克兰语)", "Հայաստան(亚美尼亚语)",
             "ไทย(泰语)", "(希伯来语)יִשׂרְאֵלִי", "Brazil-2DHR(巴西语)", "საქართველოს(格鲁吉亚语)", "Brazil-3(巴西语)",
             "turkey(土耳其语)", "Latvija(拉脱维亚语)", "Portugal-RA(葡萄牙语)", "Монгол(蒙古语)","eesti keel(爱沙尼亚语)", "فارسی(波斯语)",
-            "қазақ(哈萨克语)", "Melayu(马来语)","lietuvių(立陶宛语)","Српски(塞尔维亚语)"
+            "қазақ(哈萨克语)", "Melayu(马来语)","lietuvių(立陶宛语)","Српски(塞尔维亚语)","Tiếng Việt(越南语)"
     };
     //第二语言：前台显示
     public static final String[] LANGUAGE3 = {
@@ -117,7 +110,7 @@ public class LanguageUtil {
             "繁體中文", "한국어", "Polska", "Ukrainian", "Հայաստան",
             "ไทย", "יִשׂרְאֵלִי", "Brazil-2DHR", "საქართველოს", "Brazil-3",
             "turkey", "Latvija", "Portugal-RA", "Монгол", "eesti keel","فارسی",
-            "қазақ", "Melayu","lietuvių","Српски"
+            "қазақ", "Melayu","lietuvių","Српски","Tiếng Việt"
     };
 
     public static void setLanguage() {
@@ -204,6 +197,8 @@ public class LanguageUtil {
             changeAppLanguage(LanguageUtil.litaowan);
         } else if (languageType == 40) {
             changeAppLanguage(LanguageUtil.saierweiya);
+        } else if (languageType == 41) {
+            changeAppLanguage(LanguageUtil.yuenan);
         }else {
             changeAppLanguage(LanguageUtil.CHINESE);
             SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, 1);

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

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

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

@@ -1102,5 +1102,7 @@
     <string name="only_one_code">每杯只能使用一次優惠碼</string>
     <string name="more_code">如果有多個優惠碼,使用符號"#"分隔</string>
     <string name="promotioncode5">優惠碼正確</string>
+    <string name="voice_meal_pickup_prompts">取餐語音提示</string>
+
 </resources>
 <!--繁体-->

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

@@ -1075,5 +1075,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Avisos de voz para retirada de refeição</string>
+
 </resources>
     <!--葡萄牙语-->

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

@@ -1532,5 +1532,7 @@
     <string name="only_one_code">کد تخفیف فقط یک بار در هر فنجان قابل استفاده است</string>
     <string name="more_code">اگر چندین کد تخفیف وجود دارد، از نماد "#" برای جدا کردن آنها استفاده کنید</string>
     <string name="promotioncode5">کد تخفیف صحیح است</string>
+    <string name="voice_meal_pickup_prompts">دستورالعمل‌های صوتی برای دریافت غذا</string>
+
 </resources>
 <!--    波斯语-->

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

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

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

@@ -1100,6 +1100,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Avisos de voz para retirada de refeição</string>
 
 </resources>
         <!--葡萄牙语-->

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

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

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

@@ -1113,6 +1113,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Hlasové pokyny pro vyzvednutí jídla</string>
 
 </resources>
         <!--捷克语-->

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

@@ -1114,6 +1114,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Stemmemeddelelser til afhentning af måltid</string>
 
 </resources>
 <!--丹麦语-->

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

@@ -1129,6 +1129,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Sprachansagen zur Essensabholung</string>
 
 </resources>
 <!--德语-->

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

@@ -1,15 +1,12 @@
 <resources>
-    <string name="app_name">MG320 Marshmallow</string>
-
+    <string name="app_name">ICE CREAM</string>
     <string name="warring_msg">Alarm prompt</string>
     <string name="warring_content">If the machine is faulty, please contact the:</string>
     <string name="warring_content1"></string>
-
     <string name="wendu">Cabinet temp</string>
     <string name="shidu">Cabinet humidity</string>
     <string name="lutou">Furnace temp</string>
     <string name="zhuansu">Burner rotating speed</string>
-
     <string name="fancy_1">Paeony Pizzazz</string>
     <string name="fancy_2">Rosebuds</string>
     <string name="fancy_3">Color Bloom</string>
@@ -28,8 +25,6 @@
     <string name="fancy_16">Icy blue</string>
     <string name="fancy_17">Sparkle</string>
     <string name="fancy_18">Warmth</string>
-
-
     <string name="fancy_19">Butterfly Elf</string>
     <string name="fancy_20">Rainbow Coral</string>
     <string name="fancy_21">Color Burst</string>
@@ -57,7 +52,6 @@
     <string name="fancy_42">Bandwagon</string>
 
     <string name="pay_choose">Choose Payment Method</string>
-    <string name="pay_choose_df">“Acepte el cargo (antes) de hacer el Pago”\n\n“Accept the charge (before) making the Payment”</string>
     <string name="welcome">Welcome</string>
 
     <string name="user_login">User login</string>
@@ -794,9 +788,6 @@
     <string name="want_to_buy">I want to buy icons</string>
     <string name="section_new">New humidity adjustment</string>
     <string name="applay_qianbi">Nayax Always Idle+Mixed Payment</string>
-<!--    <string name="qianbi_hint">Klik på ikonet nedenfor for at bruge valuta</string>-->
-<!--    <string name="xinyongkaqianbi_hint">Klik på det venstre ikon for at bruge et betalings-/kreditkort\n\nKlik på det højre ikon for at bruge kontanter</string>-->
-<!--    <string name="nayax_hint">Klik på ikonet nedenfor for at bruge et betalings-/kreditkort</string>-->
     <string name="qianbi_hint">Click the icon below to use currency</string>
     <string name="xinyongkaqianbi_hint">Click the left icon to use a debit/credit card\n\nClick the right icon to use cash</string>
     <string name="nayax_hint">Click the icon below to use a debit/credit card</string>
@@ -1122,6 +1113,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Voice prompts for meal pickup</string>
 
 </resources>
 <!--英语-->

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

@@ -1167,6 +1167,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Indicaciones de voz para recoger comida</string>
 
 </resources>
 <!--西班牙语-->

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

@@ -1116,5 +1116,6 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Hääljuhised toidu järeletulemiseks</string>
 
 </resources><!--爱沙尼亚-->

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

@@ -1114,6 +1114,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Äänikehotteet aterian noutoa varten</string>
 
 </resources>
 <!--芬兰语-->

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

@@ -1130,6 +1130,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Invites vocales pour le ramassage des repas</string>
 
 </resources>
 <!--法语-->

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

@@ -1113,6 +1113,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Hangüzenetek az étkezés átvételéhez</string>
 
 </resources>
 <!--匈牙利语-->

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

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

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

@@ -1092,6 +1092,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Avvisi vocali per il ritiro del pasto</string>
 
 </resources>
 <!--意大利-->

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

@@ -1122,5 +1122,6 @@
     <string name="only_one_code">プロモーション コードは 1 杯につき 1 回のみ使用できます</string>
     <string name="more_code">プロモーション コードが複数ある場合は、記号「#」を使用して区切ります</string>
     <string name="promotioncode5">プロモーションコードは正しいです</string>
+    <string name="voice_meal_pickup_prompts">食事の受け取りに関する音声プロンプト</string>
 
 </resources><!--日语-->

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

@@ -1110,6 +1110,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Avisos de voz para retirada de refeição</string>
 
 </resources>
     <!--巴西2-葡萄牙语-->

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

@@ -1110,5 +1110,6 @@
     <string name="only_one_code">프로모 코드는 컵당 한 번만 사용할 수 있습니다.</string>
     <string name="more_code">프로모 코드가 여러 개 있는 경우, "#" 기호를 사용하여 구분합니다.</string>
     <string name="promotioncode5">프로모션 코드가 정확합니다.</string>
+    <string name="voice_meal_pickup_prompts">식사 픽업을 위한 음성 안내</string>
 
 </resources><!--韩语-->

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

@@ -1191,6 +1191,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Balso raginimai atsiimti maistą</string>
 
 </resources>
 <!--立陶宛-->

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

@@ -1115,6 +1115,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Balss norādes ēdiena saņemšanai</string>
 
 </resources>
 <!--拉脱维亚-->

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

@@ -1114,5 +1114,6 @@
     <string name = "only_one_code" >Урамшууллын кодыг нэг аяга тутамд нэг л удаа ашиглах боломжтой</string>
     <string name = "more_code">Хэрэв олон сурталчилгааны код байгаа бол тэдгээрийг тусгаарлахын тулд "#" тэмдгийг ашиглаарай</string>
     <string name="promotioncode5">Урамшууллын код зөв</string>
+    <string name = "voice_meal_pickup_prompts">Хоол авах дуут сануулга</string>
 
 </resources><!--蒙古语-->

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

@@ -53,5 +53,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Gesaan suara untuk pengambilan makanan</string>
+
 </resources>
 <!--马来语-->

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

@@ -1115,6 +1115,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Gesproken instructies voor het ophalen van maaltijden</string>
 
 </resources>
 <!--荷兰语-->

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

@@ -1115,6 +1115,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Stemmemeldinger for henting av måltid</string>
 
 </resources>
 <!--挪威语-->

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

@@ -1571,5 +1571,6 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Podpowiedzi głosowe dotyczące odbioru posiłków</string>
 
 </resources><!--波兰语-->

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

@@ -1126,5 +1126,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Avisos de voz para retirada de refeição</string>
+
 </resources>
 <!--葡萄牙语-->

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

@@ -1116,6 +1116,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Indicații vocale pentru ridicarea mesei</string>
 
 </resources>
 <!--罗马尼亚-->

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

@@ -1088,6 +1088,7 @@
     <string name="promo_code_duplication">Промокод вводится многократно, для одного продукта можно использовать только один промокод</string>
     <string name="only_one_code">Промокод можно использовать только один раз на чашку</string>
     <string name="more_code">Если есть несколько промокодов, используйте символ "#" для их разделения</string>
+    <string name="voice_meal_pickup_prompts">Голосовые подсказки для самовывоза еды</string>
 
 </resources>
 <!--俄语-->

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

@@ -1116,6 +1116,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Hlasové pokyny na vyzdvihnutie jedla</string>
 
 </resources>
     <!--斯洛伐克-->

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

@@ -1069,5 +1069,7 @@
     <string name="only_one_code">ניתן להשתמש בקוד ההטבה רק פעם אחת לכל כוס</string>
     <string name="more_code">אם ישנם קודי קידום מכירות מרובים, השתמש בסמל "#" כדי להפריד ביניהם</string>
     <string name="promotioncode5">קוד הקידום נכון</string>
+    <string name="voice_meal_pickup_prompts">הנחיות קוליות לאיסוף ארוחה</string>
+
 </resources>
 <!--希伯来语  以色列-->

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

@@ -65,5 +65,5 @@
     <string name="promotioncode3">Овај промотивни код није за овог продавца!</string>
     <string name="promotioncode4">Промотивни код је истекао!</string>
 
-
-</resources>
+</resources>
+<!--    塞尔维亚-->

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

@@ -1113,6 +1113,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Röstmeddelanden för matupphämtning</string>
 
 </resources>
 <!--瑞典语-->

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

@@ -1144,6 +1144,7 @@
     <string name="only_one_code">รหัสโปรโมชั่นใช้ได้เพียงครั้งเดียวต่อแก้ว</string>
     <string name="more_code">หากมีรหัสโปรโมชั่นหลายรหัส ให้ใช้สัญลักษณ์ "#" เพื่อคั่น</string>
     <string name="promotioncode5">รหัสโปรโมชั่นถูกต้อง</string>
+    <string name="voice_meal_pickup_prompts">เสียงแจ้งเตือนสำหรับการรับอาหาร</string>
 
 </resources>
     <!--泰语-->

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

@@ -1113,6 +1113,7 @@
     <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>
+    <string name="voice_meal_pickup_prompts">Yemek alımı için sesli komutlar</string>
 
 </resources>
 <!--土耳其-->

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

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

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

@@ -1190,7 +1190,7 @@
     <string name="promo_code_duplication">优惠码输入重复，单个商品只能使用一个优惠码</string>
     <string name="only_one_code">每杯只能使用一次优惠码</string>
     <string name="more_code">如果有多个优惠码,使用符号"#"进行分隔</string>
-    <string name="voice_meal_pickup_prompts">取餐语音提示</string>
     <string name="promotioncode5">优惠码正确</string>
+    <string name="voice_meal_pickup_prompts">取餐语音提示</string>
 
 </resources>

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

@@ -264,6 +264,7 @@ public class CommunicationHelper {
         agreement.setImmediateCallbak(new Callback<int[]>() {
             @Override
             public void onResult(int[] content) {
+                Log.d(TAG, "onResult:agreement "+content);
                 parserImmediateStatus(content);
             }
         });
@@ -586,6 +587,7 @@ public class CommunicationHelper {
                 break;
             case 2: // 温度
                 currentTemperature = content[1];
+                Log.d(TAG, "parserImmediateStatus: "+currentTemperature);
                 if (currentTemperature > 43 || currentTemperature < 10) {
                     if (!temperatureLock) {
                         temperatureLock = true;

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

@@ -10,8 +10,11 @@ import com.bgy.autosale.App;
 import com.bgy.autosale.Constant;
 import com.hboxs.base_library.constant.Global;
 import com.hboxs.base_library.constant.Name;
+import com.hboxs.base_library.event.ApiMessageEvent;
 import com.orhanobut.hawk.Hawk;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -275,11 +278,13 @@ public class UISoundHelper implements Handler.Callback, MediaPlayer.OnPreparedLi
     /**
      * 播放订单完成提示
      */
-    public void playOrderFinish() {
+    public void
+        playOrderFinish() {
         play(SCENE_TAKE_FINISH);
         if (Hawk.get(Name.VALUE_ZERO,false)){
             Global.hasmoney = new BigDecimal("0").setScale(2, RoundingMode.HALF_UP);
             Global.hascoin = new BigDecimal("0").setScale(2, RoundingMode.HALF_UP);
+            EventBus.getDefault().post(new ApiMessageEvent("RefreshUI",""));
         }
     }
 

app/src/main/java/com/bgy/autosale/plc/BasePlcAgreement.java

@@ -2,6 +2,7 @@ package com.bgy.autosale.plc;
 
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.util.SparseArray;
 
 import com.bgy.autosale.App;
@@ -123,7 +124,6 @@ public abstract class BasePlcAgreement implements ConnectedCallback, Handler.Cal
     @Override
     public byte[] onReceive(DataInputStream dataInputStream) {
         synchronized (BasePlcAgreement.class) {
-
             byte[] response = null;
             try {
                 int count = dataInputStream.available();
@@ -170,12 +170,14 @@ public abstract class BasePlcAgreement implements ConnectedCallback, Handler.Cal
 
                 // 检查命令
                 response = checkAction(action, random, content);
+                Log.d(TAG, "onReceive: BasePlcAgreement1 "+response);
 
             } catch (SocketException e) {
                 e.printStackTrace();
             } catch (IOException e) {
                 e.printStackTrace();
             }
+            Log.d(TAG, "onReceive: BasePlcAgreement2 "+response);
             return response;
         }
     }

app/src/main/java/com/bgy/autosale/plc/IceCreamAgreement.java

@@ -2,6 +2,7 @@ package com.bgy.autosale.plc;
 
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 
 import com.bgy.autosale.App;
 import com.bgy.autosale.R;
@@ -194,7 +195,7 @@ public class IceCreamAgreement extends BasePlcAgreement {
         final int PLC_ACTION_STATUS = 3;
 
         byte[] response = null;
-
+        Log.d(TAG, "checkAction: "+action);
         // 检查命令
         switch (action) {
             case PLC_ACTION_HEART:
@@ -209,6 +210,7 @@ public class IceCreamAgreement extends BasePlcAgreement {
                 response = parserStatus(content, PLC_ACTION_REPORT, random);
                 break;
             case PLC_ACTION_IMMEDIATE:
+                Log.d(TAG, "checkAction: PLC_ACTION_IMMEDIATE");
                 response = parserImmediate(content, random);
                 break;
             case PLC_ACTION_CONTROL://解析控制指令
@@ -378,8 +380,10 @@ public class IceCreamAgreement extends BasePlcAgreement {
     // 解析即时状态上报
     private byte[] parserImmediate(int[] content, int random) {
         if (immediateCallback != null) {
+            Log.d(TAG, "parserImmediate1: ");
             immediateCallback.onResult(content);
         }
+        Log.d(TAG, "parserImmediate2: ");
         return generateData(getHeaderCode(), PLC_ACTION_IMMEDIATE, random, 0);
     }
 

app/src/main/java/com/bgy/autosale/ui/MainActivity.java

@@ -479,7 +479,7 @@ public class MainActivity extends BaseScanGunActivity  implements SendCallback,
         UISoundHelper.getInstance();
         findViewById(R.id.main_fragment).setVisibility(View.VISIBLE);
         if (!SPUtils.getInstance(App.app).getBoolean(Constant.LOCK_IN_ERROR, false)) {
-            App.app.initDeviceStateListener();//是否开机
+//            App.app.initDeviceStateListener();//是否开机
             Log.d(TAG, "initMainView: ");
         }
 

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

@@ -690,7 +690,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
 //            }
             if (!CommunicationHelper.getInstance().canGenerateOrder()) {
                 ToastUtil.getInstance().showText(CommunicationHelper.getInstance().getWhyCanOrderText());
-                return;//是否开机
+//                return;//是否开机
             }
             if (Hawk.get(Name.SHOPPING_TROLLEY, true)) {
                 addShopCart();
@@ -1078,13 +1078,13 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                 selectCount++;
             }
         }
-        // 添加果酱的动效和视觉图
+        // 添加果碎的动效和视觉图
         if (batchingView.isSelected()) {
-            AppCompatImageView effectView = kernelEffectViews[selectCount - 1];
-            effectView.setImageResource(batchingView.getEffectIcons()[selectCount - 1]);
+            AppCompatImageView effectView = kernelEffectViews[position];
+            effectView.setImageResource(batchingView.getEffectIcons()[position]);
             effectView.startAnimation(pullFlavorAnim);
         } else {
-            AppCompatImageView effectView = kernelEffectViews[selectCount];
+            AppCompatImageView effectView = kernelEffectViews[position];
             effectView.setImageBitmap(null);
         }
         initIceCream();
@@ -1590,7 +1590,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         }
     }
 
-    @SuppressLint("ResourceType")
+    @SuppressLint({"ResourceType", "SetTextI18n"})
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void event(ApiMessageEvent messageEvent) {
         Log.d(TAG, "setPaperDriverListener event: " + messageEvent);
@@ -1613,6 +1613,11 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                 }
                 resetIceCreamView();
                 break;
+            case "RefreshUI":
+                if (Hawk.get(Name.VALUE_ZERO,false)) {
+                    tvMoney.setText(UiUtil.getStringRes(R.string.have_money) + Global.hasmoney.setScale(2, RoundingMode.HALF_UP));
+                }
+                break;
             case "updateUI":
                 exit();
                 break;

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

@@ -301,6 +301,9 @@ public class LanguageActivity extends StaticActivity implements View.OnClickList
         } else if (checkedId == R.id.rb_sewy) {
             languageType = 40;
             languageValue = LanguageUtil.saierweiya;
+        } else if (checkedId == R.id.rb_yny) {
+            languageType = 41;
+            languageValue = LanguageUtil.yuenan;
         } else {
             languageType = 1;
             languageValue = LanguageUtil.CHINESE;
@@ -314,9 +317,7 @@ public class LanguageActivity extends StaticActivity implements View.OnClickList
         Log.d(TAG, "setLanguage: " + languageType);
         SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE, languageType);
         SharedPreferencesUtils.setParam(Name.LANGUAGE_TYPE2, languageType);
-
         changeLanguage(languageValue);
-
     }
 
     private void changeLanguage(String type) {
@@ -422,6 +423,12 @@ public class LanguageActivity extends StaticActivity implements View.OnClickList
             binding.rbHsky.setChecked(true);
         } else if (languageType == 38) {
             binding.rbMlxy.setChecked(true);
+        } else if (languageType == 39) {
+            binding.rbLtw.setChecked(true);
+        } else if (languageType == 40) {
+            binding.rbSewy.setChecked(true);
+        } else if (languageType == 41) {
+            binding.rbYny.setChecked(true);
         }
     }
 

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

@@ -161,13 +161,23 @@ public class BatchingView extends FrameLayout {
         }
         int icon = 0;
         if (DishesBean.SPEC_CATEGORY_KERNEL.equals(specBean.categoryCode)) {
-            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_2,
-                    R.drawable.vector_kernel_3
-            };
+            if (specBean.name.contains(App.app.getString(R.string.chocolates))) {
+                icon = R.drawable.vector_chocolate;
+                specBean.name = App.app.getString(R.string.chocolates);
+                specBean.effectImage = new int[]{
+                        R.drawable.vector_kernel_4,
+                        R.drawable.vector_kernel_5,
+                        R.drawable.vector_kernel_6
+                };
+            }else {
+                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_2,
+                        R.drawable.vector_kernel_3
+                };
+            }
         } else if (DishesBean.SPEC_CATEGORY_SAUCE.equals(specBean.categoryCode)){
             if (specBean.name.contains(App.app.getString(R.string.pineapple))) {
                 specBean.effectImage = new int[]{

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:focusable="true"
@@ -39,14 +38,15 @@
                 android:id="@+id/fl_language"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
+
                 <RadioButton
                     android:id="@+id/rb_chinese"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
-                    android:background="@drawable/selector_language_bg"
                     android:text="@string/chinese"
                     android:textSize="@dimen/dp_12" />
 
@@ -56,8 +56,8 @@
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
-                    android:button="@null"
                     android:background="@drawable/selector_language_bg"
+                    android:button="@null"
                     android:gravity="center"
                     android:text="@string/english"
                     android:textSize="@dimen/dp_12" />
@@ -68,8 +68,8 @@
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
-                    android:button="@null"
                     android:background="@drawable/selector_language_bg"
+                    android:button="@null"
                     android:gravity="center"
                     android:text="Deutsch(德语)"
                     android:textSize="@dimen/dp_12" />
@@ -79,8 +79,8 @@
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="русский язык(俄语)"
@@ -89,13 +89,13 @@
 
                 <RadioButton
                     android:id="@+id/rb_japanese"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_alignStart="@+id/rg_language2"
                     android:layout_alignTop="@+id/rg_language2"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="日本語(日语)"
@@ -107,9 +107,9 @@
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginStart="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
-                    android:background="@drawable/selector_language_bg"
                     android:text="Español(西班牙语)"
                     android:textSize="@dimen/dp_12" />
 
@@ -117,20 +117,20 @@
                     android:id="@+id/rb_french"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Français(法语)"
                     android:textSize="@dimen/dp_12" />
 
                 <RadioButton
-                    android:background="@drawable/selector_language_bg"
                     android:id="@+id/rb_bulgaria"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="България(保加利亚语)"
@@ -140,9 +140,9 @@
                     android:id="@+id/rb_danmai"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Dansk(丹麦语)"
@@ -150,11 +150,11 @@
 
                 <RadioButton
                     android:id="@+id/rb_fenlan"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Suomalainen(芬兰语)"
@@ -165,8 +165,8 @@
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Nederlands(荷兰语)"
@@ -175,10 +175,10 @@
                 <RadioButton
                     android:id="@+id/rb_jieke"
                     android:layout_width="@dimen/dp_68"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Česky(捷克语)"
@@ -187,9 +187,9 @@
                 <RadioButton
                     android:id="@+id/rb_luomaniya"
                     android:layout_width="@dimen/dp_68"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Românesc(罗马尼亚语)"
@@ -197,11 +197,11 @@
 
                 <RadioButton
                     android:id="@+id/rb_nuowei"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Norsk språk(挪威语)"
@@ -213,8 +213,8 @@
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
-                    android:button="@null"
                     android:background="@drawable/selector_language_bg"
+                    android:button="@null"
                     android:gravity="center"
                     android:text="Português(葡萄牙语)"
                     android:textSize="@dimen/dp_12" />
@@ -225,8 +225,8 @@
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
-                    android:button="@null"
                     android:background="@drawable/selector_language_bg"
+                    android:button="@null"
                     android:gravity="center"
                     android:text="Svenska(瑞典语)"
                     android:textSize="@dimen/dp_12" />
@@ -235,9 +235,9 @@
                     android:id="@+id/rb_sifaluoke"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Slovenského jazyk(斯洛伐克语)"
@@ -246,10 +246,10 @@
                 <RadioButton
                     android:id="@+id/rb_xiongyali"
                     android:layout_width="@dimen/dp_68"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Magyar(匈牙利语)"
@@ -261,19 +261,19 @@
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
-                    android:background="@drawable/selector_language_bg"
                     android:text="Lingua italiana(意大利语)"
                     android:textSize="@dimen/dp_12" />
 
                 <RadioButton
                     android:id="@+id/rb_taiwang"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="繁体中文"
@@ -283,10 +283,10 @@
                 <RadioButton
                     android:id="@+id/rb_hany"
                     android:layout_width="@dimen/dp_68"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="한국어(韩语)"
@@ -295,10 +295,10 @@
                 <RadioButton
                     android:id="@+id/rb_bolan"
                     android:layout_width="@dimen/dp_68"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Polska(波兰语)"
@@ -309,8 +309,8 @@
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Ukrainian(乌克兰语)"
@@ -321,8 +321,8 @@
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
-                    android:background="@drawable/selector_language_bg"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Հայաստան(亚美尼亚语)"
@@ -330,196 +330,210 @@
 
 
                 <RadioButton
-                    android:background="@drawable/selector_language_bg"
                     android:id="@+id/rb_alb"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="عرب(阿拉伯语)"
                     android:textSize="@dimen/dp_12" />
 
-               <RadioButton
-                    android:background="@drawable/selector_language_bg"
+                <RadioButton
                     android:id="@+id/rb_tg"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="ไทย(泰语)"
                     android:textSize="@dimen/dp_12" />
 
 
-               <RadioButton
-                    android:background="@drawable/selector_language_bg"
+                <RadioButton
                     android:id="@+id/rb_ysl"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="(希伯来语)יִשׂרְאֵלִ"
                     android:textSize="@dimen/dp_12" />
 
-               <RadioButton
-                    android:background="@drawable/selector_language_bg"
+                <RadioButton
                     android:id="@+id/rb_brazil2"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Brasil-2DHR(巴西语)"
                     android:textSize="@dimen/dp_12" />
 
-               <RadioButton
-                    android:background="@drawable/selector_language_bg"
+                <RadioButton
                     android:id="@+id/rb_gljy"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="საქართველოს(格鲁吉亚语)"
                     android:textSize="@dimen/dp_12" />
 
-               <RadioButton
-                    android:background="@drawable/selector_language_bg"
+                <RadioButton
                     android:id="@+id/rb_brazil3"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Brasil-3(巴西语)"
                     android:textSize="@dimen/dp_12" />
 
-               <RadioButton
-                    android:background="@drawable/selector_language_bg"
+                <RadioButton
                     android:id="@+id/rb_turkey"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Türkiye(土耳其语)"
                     android:textSize="@dimen/dp_12" />
 
-               <RadioButton
-                    android:background="@drawable/selector_language_bg"
+                <RadioButton
                     android:id="@+id/rb_latvia"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Latvija(拉脱维亚语)"
                     android:textSize="@dimen/dp_12" />
 
 
-               <RadioButton
-                    android:background="@drawable/selector_language_bg"
+                <RadioButton
                     android:id="@+id/rb_portugal_ra"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Portugal RA(葡萄牙语)"
                     android:textSize="@dimen/dp_12" />
 
-               <RadioButton
-                    android:background="@drawable/selector_language_bg"
+                <RadioButton
                     android:id="@+id/rb_eesti"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Eesti(爱沙尼亚)"
                     android:textSize="@dimen/dp_12" />
 
 
-               <RadioButton
-                    android:background="@drawable/selector_language_bg"
+                <RadioButton
                     android:id="@+id/rb_mgy"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Монгол(蒙古语)"
                     android:textSize="@dimen/dp_12" />
 
-               <RadioButton
-                    android:background="@drawable/selector_language_bg"
+                <RadioButton
                     android:id="@+id/rb_bsy"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="فارسی(波斯语)"
                     android:textSize="@dimen/dp_12" />
+
                 <RadioButton
-                    android:background="@drawable/selector_language_bg"
                     android:id="@+id/rb_hsky"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="қазақ(哈萨克语)"
                     android:textSize="@dimen/dp_12" />
+
                 <RadioButton
-                    android:background="@drawable/selector_language_bg"
                     android:id="@+id/rb_mlxy"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Melayu(马来语)"
                     android:textSize="@dimen/dp_12" />
 
                 <RadioButton
-                    android:background="@drawable/selector_language_bg"
                     android:id="@+id/rb_ltw"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="lietuvių(立陶宛语)"
                     android:textSize="@dimen/dp_12" />
 
                 <RadioButton
-                    android:background="@drawable/selector_language_bg"
                     android:id="@+id/rb_sewy"
                     android:layout_width="@dimen/dp_68"
                     android:layout_height="@dimen/dp_84"
                     android:layout_marginLeft="@dimen/dp_18"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
                     android:button="@null"
                     android:gravity="center"
                     android:text="Српски(塞尔维亚语)"
                     android:textSize="@dimen/dp_12" />
 
+                <RadioButton
+                    android:id="@+id/rb_yny"
+                    android:layout_width="@dimen/dp_68"
+                    android:layout_height="@dimen/dp_84"
+                    android:layout_marginLeft="@dimen/dp_18"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/selector_language_bg"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="Tiếng Việt(越南语)"
+                    android:textSize="@dimen/dp_12" />
+
             </com.bgy.autosale.utils.FlowRadioGroup>
         </ScrollView>
 
@@ -537,7 +551,6 @@
             android:textSize="@dimen/dp_10" />
 
 
-
     </RelativeLayout>
 
 </layout>

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

@@ -43,7 +43,7 @@
                 android:textSize="@dimen/sp_15"
                 android:textStyle="bold" />
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="1300dp"
                 android:layout_gravity="center"
                 android:layout_height="wrap_content"
                 android:text="@string/material_tpis"
@@ -346,14 +346,13 @@
                     android:layout_marginTop="@dimen/dp_10"
                     android:background="@drawable/bg_config_confirm"
                     android:gravity="center"
-                    android:text="@string/confirm_revision"
+                    android:text="@string/clock_change"
                     android:textColor="#FE5DBB"
                     android:textSize="@dimen/sp_12"
                     android:textStyle="bold" />
             </LinearLayout>
 
         </LinearLayout>
-
     </LinearLayout>
 
 </android.support.constraint.ConstraintLayout>

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

@@ -7,6 +7,359 @@
     android:focusable="true"
     android:focusableInTouchMode="true">
 
+    <ScrollView
+        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                tools:ignore="MissingConstraints">
+
+                <LinearLayout
+                    android:layout_width="500dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:orientation="vertical"
+                    tools:ignore="MissingConstraints">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/dp_8"
+                        android:text="@string/automatically_upload_orders"
+                        android:textColor="#333"
+                        android:textSize="@dimen/sp_14"
+                        android:textStyle="bold" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_auto_upload"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <RadioButton
+                            android:id="@+id/rb_auto_upload_yes"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_on"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+
+                        <RadioButton
+                            android:id="@+id/rb_auto_upload_no"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:layout_marginLeft="@dimen/dp_20"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_off"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+                    </RadioGroup>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="500dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="@dimen/dp_20"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/dp_20"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:gravity="right"
+                        android:text="@string/language_2"
+                        android:textColor="#576478"
+                        android:textSize="@dimen/dp_10" />
+
+                    <Spinner
+                        android:id="@+id/sp_language_2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/dp_20"
+                        android:layout_marginBottom="@dimen/dp_10" />
+
+                    <Button
+                        android:id="@+id/btn_language_2"
+                        android:layout_width="@dimen/dp_44"
+                        android:layout_height="@dimen/dp_22"
+                        android:layout_marginLeft="@dimen/dp_20"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:background="@drawable/shape_message_normal"
+                        android:text="@string/update"
+                        android:textColor="#333"
+                        android:textSize="@dimen/dp_8"
+                        android:visibility="gone" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_select_language"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <RadioButton
+                            android:id="@+id/rb_language_yes"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_on"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+
+                        <RadioButton
+                            android:id="@+id/rb_language_no"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:layout_marginLeft="@dimen/dp_20"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_off"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+                    </RadioGroup>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="500dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:orientation="vertical"
+                    tools:ignore="MissingConstraints">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/dp_8"
+                        android:text="@string/value_of_zero"
+                        android:textColor="#333"
+                        android:textSize="@dimen/sp_14"
+                        android:textStyle="bold" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_coin_cash_reset"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <RadioButton
+                            android:id="@+id/rb_coin_cash_reset_yes"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_on"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+
+                        <RadioButton
+                            android:id="@+id/rb_coin_cash_reset_no"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:layout_marginLeft="@dimen/dp_20"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_off"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+                    </RadioGroup>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="500dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:orientation="vertical"
+                    tools:ignore="MissingConstraints">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/dp_8"
+                        android:text="@string/promotion_code"
+                        android:textColor="#333"
+                        android:textSize="@dimen/sp_14"
+                        android:textStyle="bold" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_promotion_code"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <RadioButton
+                            android:id="@+id/rb_promotion_code_yes"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_on"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+
+                        <RadioButton
+                            android:id="@+id/rb_promotion_code_no"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:layout_marginLeft="@dimen/dp_20"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_off"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+                    </RadioGroup>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="500dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:orientation="vertical"
+                    tools:ignore="MissingConstraints">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/dp_8"
+                        android:text="@string/voice_meal_pickup_prompts"
+                        android:textColor="#333"
+                        android:textSize="@dimen/sp_14"
+                        android:textStyle="bold" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_voice"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <RadioButton
+                            android:id="@+id/rb_voice_yes"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_on"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+
+                        <RadioButton
+                            android:id="@+id/rb_voice_no"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:layout_marginLeft="@dimen/dp_20"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_off"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+                    </RadioGroup>
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                tools:ignore="MissingConstraints">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:orientation="vertical"
+                    tools:ignore="MissingConstraints">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/dp_8"
+                        android:text="@string/shop_cart"
+                        android:textColor="#333"
+                        android:textSize="@dimen/sp_14"
+                        android:textStyle="bold" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_shop_cart"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <RadioButton
+                            android:id="@+id/rb_shop_cart_yes"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_on"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+
+                        <RadioButton
+                            android:id="@+id/rb_shop_cart_no"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:layout_marginLeft="@dimen/dp_20"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_off"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+                    </RadioGroup>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:orientation="vertical"
+                    tools:ignore="MissingConstraints">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/dp_8"
+                        android:text="ICT MDB model"
+                        android:textColor="#333"
+                        android:textSize="@dimen/sp_14"
+                        android:textStyle="bold" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_ict_mdb"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <RadioButton
+                            android:id="@+id/rb_ict_mdb_yes"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_on"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+
+                        <RadioButton
+                            android:id="@+id/rb_ict_mdb_no"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:layout_marginLeft="@dimen/dp_20"
+                            android:gravity="center"
+                            android:text="@string/setting_switch_off"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+                    </RadioGroup>
+                </LinearLayout>
+
+            </LinearLayout>
+
+    </LinearLayout>
+    </ScrollView>
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -21,353 +374,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:srcCompat="@drawable/vector_btn_back" />
     </RelativeLayout>
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:ignore="MissingConstraints">
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/dp_20"
-        android:orientation="vertical"
-        tools:ignore="MissingConstraints">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:orientation="vertical"
-            tools:ignore="MissingConstraints">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_8"
-                android:text="@string/automatically_upload_orders"
-                android:textColor="#333"
-                android:textSize="@dimen/sp_14"
-                android:textStyle="bold" />
-
-            <RadioGroup
-                android:id="@+id/rg_auto_upload"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <RadioButton
-                    android:id="@+id/rb_auto_upload_yes"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_on"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-
-                <RadioButton
-                    android:id="@+id/rb_auto_upload_no"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:layout_marginLeft="@dimen/dp_20"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_off"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-            </RadioGroup>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="@dimen/dp_20">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_20"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:gravity="right"
-                android:text="@string/language_2"
-                android:textColor="#576478"
-                android:textSize="@dimen/dp_10" />
-
-            <Spinner
-                android:id="@+id/sp_language_2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_20"
-                android:layout_marginBottom="@dimen/dp_10" />
-
-            <Button
-                android:visibility="gone"
-                android:id="@+id/btn_language_2"
-                android:layout_width="@dimen/dp_44"
-                android:layout_height="@dimen/dp_22"
-                android:layout_marginLeft="@dimen/dp_20"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="@drawable/shape_message_normal"
-                android:text="@string/update"
-                android:textColor="#333"
-                android:textSize="@dimen/dp_8" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center">
-
-            <RadioGroup
-                android:id="@+id/rg_select_language"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <RadioButton
-                    android:id="@+id/rb_language_yes"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_on"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-
-                <RadioButton
-                    android:id="@+id/rb_language_no"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:layout_marginLeft="@dimen/dp_20"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_off"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-            </RadioGroup>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:orientation="vertical"
-            tools:ignore="MissingConstraints">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_8"
-                android:text="@string/value_of_zero"
-                android:textColor="#333"
-                android:textSize="@dimen/sp_14"
-                android:textStyle="bold" />
-
-            <RadioGroup
-                android:id="@+id/rg_coin_cash_reset"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <RadioButton
-                    android:id="@+id/rb_coin_cash_reset_yes"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_on"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-
-                <RadioButton
-                    android:id="@+id/rb_coin_cash_reset_no"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:layout_marginLeft="@dimen/dp_20"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_off"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-            </RadioGroup>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:orientation="vertical"
-            tools:ignore="MissingConstraints">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_8"
-                android:text="@string/promotion_code"
-                android:textColor="#333"
-                android:textSize="@dimen/sp_14"
-                android:textStyle="bold" />
-
-            <RadioGroup
-                android:id="@+id/rg_promotion_code"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <RadioButton
-                    android:id="@+id/rb_promotion_code_yes"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_on"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-
-                <RadioButton
-                    android:id="@+id/rb_promotion_code_no"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:layout_marginLeft="@dimen/dp_20"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_off"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-            </RadioGroup>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:orientation="vertical"
-            tools:ignore="MissingConstraints">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_8"
-                android:text="@string/voice_meal_pickup_prompts"
-                android:textColor="#333"
-                android:textSize="@dimen/sp_14"
-                android:textStyle="bold" />
-
-            <RadioGroup
-                android:id="@+id/rg_voice"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <RadioButton
-                    android:id="@+id/rb_voice_yes"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_on"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-
-                <RadioButton
-                    android:id="@+id/rb_voice_no"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:layout_marginLeft="@dimen/dp_20"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_off"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-            </RadioGroup>
-        </LinearLayout>
-
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/dp_20"
-        android:orientation="vertical"
-        tools:ignore="MissingConstraints">
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:orientation="vertical"
-            tools:ignore="MissingConstraints">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_8"
-                android:text="@string/shop_cart"
-                android:textColor="#333"
-                android:textSize="@dimen/sp_14"
-                android:textStyle="bold" />
-
-            <RadioGroup
-                android:id="@+id/rg_shop_cart"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <RadioButton
-                    android:id="@+id/rb_shop_cart_yes"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_on"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-
-                <RadioButton
-                    android:id="@+id/rb_shop_cart_no"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:layout_marginLeft="@dimen/dp_20"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_off"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-            </RadioGroup>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:orientation="vertical"
-            tools:ignore="MissingConstraints">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_8"
-                android:text="ICT MDB model"
-                android:textColor="#333"
-                android:textSize="@dimen/sp_14"
-                android:textStyle="bold" />
-
-            <RadioGroup
-                android:id="@+id/rg_ict_mdb"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <RadioButton
-                    android:id="@+id/rb_ict_mdb_yes"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_on"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-
-                <RadioButton
-                    android:id="@+id/rb_ict_mdb_no"
-                    android:layout_width="@dimen/dp_60"
-                    android:layout_height="@dimen/dp_26"
-                    android:layout_marginLeft="@dimen/dp_20"
-                    android:gravity="center"
-                    android:text="@string/setting_switch_off"
-                    android:textColor="#576478"
-                    android:textSize="@dimen/sp_8" />
-            </RadioGroup>
-        </LinearLayout>
-
-    </LinearLayout>
-    </LinearLayout>
-
 </android.support.constraint.ConstraintLayout>

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

@@ -29,18 +29,20 @@
         tools:ignore="MissingConstraints">
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="1500dp"
+            android:layout_height="@dimen/dp_50"
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/dp_10"
+            android:gravity="right"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/sleep_tip"
-                android:layout_width="@dimen/dp_80"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_50"
-                android:gravity="center"
                 android:layout_gravity="center"
+                android:gravity="center"
+                android:maxWidth="400dp"
                 android:text="@string/hibernation"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="@dimen/sp_12"
@@ -54,35 +56,36 @@
                 android:gravity="center"
                 android:singleLine="true"
                 android:textColor="@color/colorPrimaryDark"
-                android:textSize="@dimen/sp_24"
+                android:textSize="@dimen/sp_12"
                 android:textStyle="bold"
                 tools:ignore="MissingConstraints" />
 
-
             <TextView
                 android:id="@+id/sleep_save"
                 android:layout_width="@dimen/dp_150"
-                android:layout_height="@dimen/dp_50"
+                android:layout_height="@dimen/dp_40"
                 android:background="@drawable/bg_config_confirm"
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22" />
+                android:textSize="@dimen/sp_18" />
         </LinearLayout>
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="1500dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/dp_10"
+            android:gravity="right"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/phone_tip"
-                android:layout_width="@dimen/dp_80"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_50"
                 android:layout_gravity="center"
                 android:gravity="center"
+                android:maxWidth="400dp"
                 android:text="@string/contacts"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="@dimen/sp_12"
@@ -96,7 +99,7 @@
                 android:gravity="center"
                 android:singleLine="true"
                 android:textColor="@color/colorPrimaryDark"
-                android:textSize="@dimen/sp_24"
+                android:textSize="@dimen/sp_12"
                 android:textStyle="bold"
                 tools:ignore="MissingConstraints" />
 
@@ -104,27 +107,29 @@
             <TextView
                 android:id="@+id/phone_save"
                 android:layout_width="@dimen/dp_150"
-                android:layout_height="@dimen/dp_50"
+                android:layout_height="@dimen/dp_40"
                 android:background="@drawable/bg_config_confirm"
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22" />
+                android:textSize="@dimen/sp_18" />
         </LinearLayout>
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="1500dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/dp_10"
+            android:gravity="right"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/people_tip"
-                android:layout_gravity="center"
-                android:layout_width="@dimen/dp_80"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_50"
+                android:layout_gravity="center"
                 android:gravity="center"
+                android:maxWidth="400dp"
                 android:text="@string/way_contacts"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="@dimen/sp_12"
@@ -138,7 +143,7 @@
                 android:gravity="center"
                 android:singleLine="true"
                 android:textColor="@color/colorPrimaryDark"
-                android:textSize="@dimen/sp_24"
+                android:textSize="@dimen/sp_12"
                 android:textStyle="bold"
                 tools:ignore="MissingConstraints" />
 
@@ -146,27 +151,29 @@
             <TextView
                 android:id="@+id/people_save"
                 android:layout_width="@dimen/dp_150"
-                android:layout_height="@dimen/dp_50"
+                android:layout_height="@dimen/dp_40"
                 android:background="@drawable/bg_config_confirm"
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22" />
+                android:textSize="@dimen/sp_18" />
         </LinearLayout>
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="1500dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/dp_10"
+            android:gravity="right"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/credit_tip"
-                android:layout_width="@dimen/dp_80"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_50"
-                android:gravity="center"
                 android:layout_gravity="center"
+                android:gravity="center"
+                android:maxWidth="400dp"
                 android:text="@string/credit_card_text_description"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="@dimen/sp_12"
@@ -180,7 +187,7 @@
                 android:gravity="center"
                 android:singleLine="true"
                 android:textColor="@color/colorPrimaryDark"
-                android:textSize="@dimen/sp_24"
+                android:textSize="@dimen/sp_12"
                 android:textStyle="bold"
                 tools:ignore="MissingConstraints" />
 
@@ -188,26 +195,28 @@
             <TextView
                 android:id="@+id/credit_save"
                 android:layout_width="@dimen/dp_150"
-                android:layout_height="@dimen/dp_50"
+                android:layout_height="@dimen/dp_40"
                 android:background="@drawable/bg_config_confirm"
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22" />
+                android:textSize="@dimen/sp_18" />
         </LinearLayout>
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="1500dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/dp_10"
+            android:gravity="right"
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="@dimen/dp_80"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_50"
                 android:layout_gravity="center"
                 android:gravity="center"
+                android:maxWidth="400dp"
                 android:text="@string/unit"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="@dimen/sp_12"
@@ -221,7 +230,7 @@
                 android:gravity="center"
                 android:singleLine="true"
                 android:textColor="@color/colorPrimaryDark"
-                android:textSize="@dimen/sp_24"
+                android:textSize="@dimen/sp_12"
                 android:textStyle="bold"
                 tools:ignore="MissingConstraints" />
 
@@ -229,28 +238,29 @@
             <TextView
                 android:id="@+id/unit_save"
                 android:layout_width="@dimen/dp_150"
-                android:layout_height="@dimen/dp_50"
+                android:layout_height="@dimen/dp_40"
                 android:background="@drawable/bg_config_confirm"
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22" />
-
+                android:textSize="@dimen/sp_18" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="1500dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/dp_10"
+            android:gravity="right"
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="@dimen/dp_80"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_50"
                 android:layout_gravity="center"
                 android:gravity="center"
+                android:maxWidth="400dp"
                 android:text="@string/ic_icon_text"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="@dimen/sp_12"
@@ -264,7 +274,7 @@
                 android:gravity="center"
                 android:singleLine="true"
                 android:textColor="@color/colorPrimaryDark"
-                android:textSize="@dimen/sp_24"
+                android:textSize="@dimen/sp_12"
                 android:textStyle="bold"
                 tools:ignore="MissingConstraints" />
 
@@ -272,13 +282,12 @@
             <TextView
                 android:id="@+id/ic_save"
                 android:layout_width="@dimen/dp_150"
-                android:layout_height="@dimen/dp_50"
+                android:layout_height="@dimen/dp_40"
                 android:background="@drawable/bg_config_confirm"
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22" />
-
+                android:textSize="@dimen/sp_18" />
 
         </LinearLayout>
 

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

@@ -28,13 +28,15 @@
 
         <LinearLayout
             android:layout_marginTop="@dimen/dp_10"
-            android:layout_width="wrap_content"
+            android:layout_width="1300dp"
             android:layout_height="@dimen/dp_50"
             android:orientation="horizontal"
-            android:layout_gravity="center">
+            android:layout_gravity="center"
+            android:gravity="right">
 
             <TextView
-                android:layout_width="@dimen/dp_80"
+                android:layout_width="wrap_content"
+                android:maxWidth="600dp"
                 android:layout_height="match_parent"
                 android:text="@string/cash_time"
                 android:gravity="center"
@@ -45,7 +47,7 @@
 
             <android.support.v7.widget.AppCompatEditText
                 android:id="@+id/et_cash_time"
-                android:layout_width="@dimen/dp_200"
+                android:layout_width="@dimen/dp_100"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:singleLine="true"
@@ -58,22 +60,25 @@
             <TextView
                 android:id="@+id/cash_time_save"
                 android:layout_width="@dimen/dp_150"
-                android:layout_height="@dimen/dp_50"
+                android:layout_height="@dimen/dp_40"
                 android:background="@drawable/bg_config_confirm"
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22"/>
+                android:textSize="@dimen/sp_18"/>
         </LinearLayout>
         <LinearLayout
             android:layout_marginTop="@dimen/dp_10"
-            android:layout_width="wrap_content"
+            android:layout_width="1300dp"
+            android:gravity="right"
             android:layout_height="@dimen/dp_50"
             android:orientation="horizontal"
-            android:layout_gravity="center">
+            android:layout_gravity="center"
+           >
 
             <TextView
-                android:layout_width="@dimen/dp_80"
+                android:maxWidth="600dp"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:text="@string/card_time"
                 android:gravity="center"
@@ -84,7 +89,7 @@
 
             <android.support.v7.widget.AppCompatEditText
                 android:id="@+id/et_card_time"
-                android:layout_width="@dimen/dp_200"
+                android:layout_width="@dimen/dp_100"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:singleLine="true"
@@ -97,22 +102,24 @@
             <TextView
                 android:id="@+id/card_time_save"
                 android:layout_width="@dimen/dp_150"
-                android:layout_height="@dimen/dp_50"
+                android:layout_height="@dimen/dp_40"
                 android:background="@drawable/bg_config_confirm"
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22"/>
+                android:textSize="@dimen/sp_18"/>
         </LinearLayout>
         <LinearLayout
             android:layout_marginTop="@dimen/dp_10"
-            android:layout_width="wrap_content"
+            android:layout_width="1300dp"
+            android:gravity="right"
             android:layout_height="@dimen/dp_50"
             android:orientation="horizontal"
             android:layout_gravity="center">
 
             <TextView
-                android:layout_width="@dimen/dp_80"
+                android:maxWidth="600dp"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:text="@string/nayax_time"
                 android:gravity="center"
@@ -123,7 +130,7 @@
 
             <android.support.v7.widget.AppCompatEditText
                 android:id="@+id/et_nayax_card_time"
-                android:layout_width="@dimen/dp_200"
+                android:layout_width="@dimen/dp_100"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:singleLine="true"
@@ -136,23 +143,25 @@
             <TextView
                 android:id="@+id/nayax_card_time_save"
                 android:layout_width="@dimen/dp_150"
-                android:layout_height="@dimen/dp_50"
+                android:layout_height="@dimen/dp_40"
                 android:background="@drawable/bg_config_confirm"
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22"/>
+                android:textSize="@dimen/sp_18"/>
         </LinearLayout>
 
         <LinearLayout
             android:layout_marginTop="@dimen/dp_10"
-            android:layout_width="wrap_content"
+            android:layout_width="1300dp"
+            android:gravity="right"
             android:layout_height="@dimen/dp_50"
             android:orientation="horizontal"
             android:layout_gravity="center">
 
             <TextView
-                android:layout_width="@dimen/dp_80"
+                android:layout_width="wrap_content"
+                android:maxWidth="600dp"
                 android:layout_height="match_parent"
                 android:text="@string/automatic_back_time"
                 android:gravity="center"
@@ -163,7 +172,7 @@
 
             <android.support.v7.widget.AppCompatEditText
                 android:id="@+id/et_automatic_back_time1"
-                android:layout_width="@dimen/dp_200"
+                android:layout_width="@dimen/dp_100"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:singleLine="true"
@@ -176,23 +185,25 @@
             <TextView
                 android:id="@+id/automatic_back_time_save1"
                 android:layout_width="@dimen/dp_150"
-                android:layout_height="@dimen/dp_50"
+                android:layout_height="@dimen/dp_40"
                 android:background="@drawable/bg_config_confirm"
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22"/>
+                android:textSize="@dimen/sp_18"/>
         </LinearLayout>
 
         <LinearLayout
             android:layout_marginTop="@dimen/dp_10"
-            android:layout_width="wrap_content"
+            android:layout_width="1300dp"
+            android:gravity="right"
             android:layout_height="@dimen/dp_50"
             android:orientation="horizontal"
             android:layout_gravity="center">
 
             <TextView
-                android:layout_width="@dimen/dp_80"
+                android:layout_width="wrap_content"
+                android:maxWidth="600dp"
                 android:layout_height="match_parent"
                 android:text="@string/manual_back_time"
                 android:gravity="center"
@@ -203,7 +214,7 @@
 
             <android.support.v7.widget.AppCompatEditText
                 android:id="@+id/et_automatic_back_time2"
-                android:layout_width="@dimen/dp_200"
+                android:layout_width="@dimen/dp_100"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:singleLine="true"
@@ -216,12 +227,12 @@
             <TextView
                 android:id="@+id/automatic_back_time_save2"
                 android:layout_width="@dimen/dp_150"
-                android:layout_height="@dimen/dp_50"
+                android:layout_height="@dimen/dp_40"
                 android:background="@drawable/bg_config_confirm"
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22"/>
+                android:textSize="@dimen/sp_18"/>
         </LinearLayout>
 
     </LinearLayout>

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

@@ -0,0 +1,516 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="setting_technology_language_describe">Tiếng Anh</string>
+
+    <!-- 配置差分的主app名称-->
+    <string name="app_name">Khoa học máy tính</string>
+    <string name="bd" translatable="false">19900521</string>
+    <string name="un" translatable="false">ChenJinXu</string>
+    <string name="pos_no_ready" translatable="false">Thiết bị POS chưa sẵn sàng!</string>
+    <string name="pay_way_tip_marshall" translatable="false">Vui lòng hoàn tất thanh toán trên POS.</string>
+    <string name="pay_error_pos" translatable="false">Ủy quyền bị từ chối</string>
+    <string name="cache_file_name" translatable="false">Kem</string>
+    <string name="error_device_clean">Lỗi thiết bị sạch sẽ</string>
+
+    <!-- Lỗi thiết bị sạch -->
+    <string name="plc_send_action_again">Gửi lại >>> </string>
+    <string name="plc_connect_status">kết nối: %s; mô tả:%s</string>
+    <string name="plc_header_length_error">lỗi độ dài tiêu đề: %d</string>
+    <string name="plc_header_error">lỗi tiêu đề: %d != %d; Dữ liệu src: %s %s</string>
+    <string name="plc_message_length_error">Lỗi độ dài tin nhắn: %d</string>
+    <string name="plc_body_empty">tin nhắn không phải nội dung</string>
+    <string name="plc_body_length_error">Lỗi độ dài nội dung tin nhắn: %d != %d</string>
+
+    <string name="plc_disconnect_initiative">chủ động ngắt kết nối</string>
+    <string name="plc_disconnect">ngắt kết nối thiết bị</string>
+    <string name="plc_has_other_order">có đơn hàng khác >> </string>
+    <string name="plc_send_order_again">gửi lại >> </string>
+    <string name="plc_make_error_not_status">gây lỗi vì không phải trạng thái >> </string>
+    <string name="plc_message_body_empty">Nội dung tin nhắn trống!</string>
+    <string name="plc_order_empty">đơn hàng không có giá trị!</string>
+    <string name="plc_order_result_empty">kết quả đơn hàng trống!</string>
+    <string name="plc_order_start">bắt đầu: %s</string>
+    <string name="plc_order_making">đang thực hiện: %s</string>
+    <string name="plc_order_prepare">đang thực hiện: %s</string>
+    <string name="plc_order_taked">đã thực hiện: %s</string>
+    <string name="plc_order_busy">đang bận: %s</string>
+    <string name="plc_order_error">lỗi đơn hàng con!</string>
+    <string name="plc_order_error2">lỗi đơn hàng!</string>
+    <string name="plc_prepare">thiết bị đang chuẩn bị!</string>
+    <string name="plc_not_order">đơn hàng trống!</string>
+    <string name="plc_order_receive">nhận đơn hàng >> %s</string>
+    <string name="plc_order_no_response">đơn hàng không phản hồi!</string>
+
+    <!-- 广告页 -->
+    <string name="guide_touch">Chạm để bắt đầu</string>
+    <string name="no_ready">Trạng thái thiết bị bất thường</string>
+    <string name="is_in_sale_view">Vui lòng thoát khỏi trang đặt hàng và thử lại.</string>
+    <string name="is_in_get_dishes_info">Đang tải thông tin sản phẩm~</string>
+    <string name="is_click_too_fast">Nhấp quá nhanh.</string>
+    <string name="is_used_code">Mã nhận hàng đã sử dụng</string>
+    <string name="is_invalid_code">Mã nhận hàng không hợp lệ</string>
+    <string name="check_fail">Kiểm tra đơn hàng không thành công.</string>
+    <string name="guide_text_1">Chào bạn, rất vui được gặp bạn!</string>
+    <string name="guide_text_2">Chào bạn, bạn có Giống như kem vậy!</string>
+
+    <!-- 点餐页 -->
+    <string name="price_unit"></string>
+    <string name="ice_cream">kem</string>
+    <string name="buy_too_much">Giới hạn 6 cốc!</string>
+    <string name="no_dishes_info">Quá nhiều món ăn ngon!</string>
+    <string name="flavor_original">Kem vani</string>
+    <string name="flavor_original_hw">Kem mềm không đường</string>
+    <string name="flavor_multi">Kem nhiều vị</string>
+    <string name="flavor_sauce">Syrup +</string>
+    <string name="flavor_kernel">+ Topping</string>
+    <string name="shop_cart_add">Thêm vào giỏ hàng</string>
+    <string name="make_now">Đang làm</string>
+    <string name="shop_cart">Giỏ hàng</string>
+    <string name="shop_cart_pay">Thanh toán</string>
+    <string name="shop_cart_price">%d kem, tổng cộng %1%2</string>
+    <string name="shop_cart_half_price_tip">Kem thứ hai (cùng loại) GIẢM 50%!</string>
+    <string name="peanut">Đậu phộng</string>
+    <string name="filbert">Hạt phỉ</string>
+    <string name="cashew">Hạt điều</string>
+    <string name="pineapple">Dứa</string>
+    <string name="strawberry">Dâu tây</string>
+    <string name="blueberry">Việt quất</string>
+    <string name="mango">Xoài</string>
+    <string name="chocolates">Sô cô la</string>
+    <string name="oreo">Oreo</string>
+    <string name="flavor_invalid">Đã rút</string>
+    <string name="flavor_stock_empty">Hết hàng</string>
+    <string name="spec_stock_empty">Hết hàng %s</string>
+    <string name="spec_invalid">Chúng tôi không còn %s nào</string>
+    <string name="flavor_stock">Còn %d cốc</string>
+    <string name="material_milk">sữa bột nhão</string>
+    <string name="material_cup">cốc</string>
+
+    <!-- Không rõ -->
+    <string name="pay_init_error">Giỏ hàng đã hết hàng, vui lòng đặt hàng lại.</string>
+    <string name="pay_close">Tự động đóng sau %d giây.</string>
+    <string name="pay_go">Checkout</string>
+    <string name="pay_price">Tổng số tiền đã thanh toán:</string>
+    <string name="pay_way_tip">Vui lòng mở WeChat/Alipay để quét và thanh toán.</string>
+    <string name="pay_way_tip2">Vui lòng xuất trình mã QR thanh toán cho máy quét.</string>
+    <string name="pay_way">Phương thức thanh toán:</string>
+    <string name="pay_way_wechat">WeChat</string>
+    <string name="pay_way_alipay">Alipay</string>
+    <string name="paying_tip">Thông báo thanh toán</string>
+    <string name="paying_close">Đơn hàng sẽ bị hủy sau %d giây.</string>
+    <string name="paying_describe">Đang thanh toán, vui lòng đợi···</string>
+    <string name="paying_success_tip">Thanh toán thành công, đơn hàng đang được xử lý.</string>
+    <string name="paying_fail_tip">Thanh toán không thành công, vui lòng thử lại.</string>
+    <string name="paying_back">Quay lại Trang Trước</string>
+    <string name="paying_again">Thử lại Thanh toán</string>
+    <string name="pay_way_only">Chỉ thanh toán WeChat và Alipay</string>
+    <string name="pay_time_out">Hết thời gian thanh toán</string>
+    <string name="pay_cancel">Hủy Thanh toán</string>
+
+    <!-- 出餐页 -->
+    <string name="error_plc_order_err">Lỗi Sản xuất</string>
+    <string name="take_tip">Nhắc nhở Nhận hàng</string>
+    <string name="take_back">Quay lại Trang chủ</string>
+    <string name="pay_success">Thanh toán đã hoàn tất</string>
+    <string name="order_complete">Đơn hàng đã hoàn tất</string>
+    <string name="make_describe_ing">Kem của bạn đang được sản xuất, vui lòng chờ···</string>
+    <string name="make_ing">Đang chuẩn bị</string>
+    <string name="take_describe_complete">Kem của bạn đã hoàn thành, vui lòng đến nhận đơn hàng.</string>
+    <string name="take_complete">Vui lòng đến nhận.</string>
+    <string name="take_describe_close">THẬN TRỌNG - Khu vực nhận hàng đang đóng.</string>
+    <string name="take_close">Đang đặt lại</string>
+    <string name="take_describe_finish">Đơn hàng đã hoàn tất. Hy vọng được gặp lại bạn!</string>
+    <string name="take_finish">Đã nhận đơn hàng</string>
+    <string name="make_fail_tip">Rất tiếc, có lỗi trong quá trình xử lý.</string>
+    <string name="make_fail_describe">Nếu bạn có bất kỳ câu hỏi nào, vui lòng liên hệ với bộ phận chăm sóc khách hàng~</string>
+    <string name="make_fail_describe_refund">Kem chưa làm sẽ được hoàn tiền theo đường bộ ban đầu, nếu bạn có bất kỳ câu hỏi nào, vui lòng liên hệ với bộ phận chăm sóc khách hàng.</string>
+
+    <!-- 后台登录 -->
+    <string name="auth_login_type_scan">Đơn hàng đã được xác nhận</string>
+    <string name="auth_login_type_phone">Đơn hàng đã được xác nhận</string>
+    <string name="auth_login_type_phone_hint">请输入手机号码</string>
+    <string name="auth_login_type_pwd_hint">Bạn có thể đăng nhập</string>
+    <string name="auth_login_type_pwd_get_way">查看动态密码获取方式 >></string>
+    <string name="auth_login_return">返回点餐屏</string>
+    <string name="auth_login_confirm">Xác nhận</string>
+    <string name="auth_login_scan_hint">请出示登录二维码,置于扫码口</string>
+    <string name="auth_login_scan_code_get_way">查看登录二维码获取方式 >></string>
+    <string name="auth_login_fail">Có thể đăng nhập được</string>
+    <string name="auth_login_understand">Bạn có thể hiểu được</string>
+    <string name="operate_reason_title">请选择操作原因</string>
+
+    <!-- 后台管理 -->
+    <string name="auth_old_pwd">Vui lòng nhập mật khẩu cũ</string>
+    <string name="auth_old_pwd_fail">Xác minh mật khẩu cũ không thành công</string>
+    <string name="auth_new_pwd">Vui lòng nhập mật khẩu mới</string>
+    <string name="auth_new_pwd_again">Vui lòng nhập lại mật khẩu mới</string>
+    <string name="auth_new_pwd_different">Hai mật khẩu không khớp, vui lòng thử lại</string>
+    <string name="auth_new_pwd_success">Sửa đổi thành công</string>
+    <string name="auth_fail">Xác thực không thành công!</string>
+    <string name="ice_cream_setting">Cài đặt máy</string>
+    <string name="return_start">Trở về</string>
+    <string name="exit_app">Thoát</string>
+    <string name="guide_video">VIDEO HƯỚNG DẪN</string>
+
+    <string name="setting_temperature_anomaly">Nhiệt độ bất thường</string>
+    <string name="realtime_warnings">Thông tin thời gian thực:</string>
+    <string name="setting_common">Cài đặt hoạt động</string>
+    <string name="setting_warnings">Cảnh báo thiết bị</string>
+    <string name="setting_machine">Quản lý</string>
+    <string name="setting_switch">Chế độ đã được thiết lập</string>
+    <string name="setting_price">Kế hoạch bán hàng</string>
+    <string name="error_plc_disconnect">Thiết bị đã bị ngắt kết nối</string>
+    <string name="setting_select_manual">Vui lòng chuyển sang chế độ thủ công trước!</string>
+    <string name="setting_plc_connect">Đã kết nối</string>
+    <string name="setting_plc_un_connect">Đã ngắt kết nối</string>
+    <string name="setting_common_reset">Đặt lại</string>
+    <string name="setting_common_manual">Thủ công</string>
+    <string name="setting_common_auto">Tự động</string>
+    <string name="setting_common_clean">Vệ sinh máy</string>
+    <string name="setting_common_check">Kiểm tra hoạt động</string>
+    <string name="setting_common_order">Đặt hàng thủ công</string>
+    <string name="setting_common_config">Cấu hình tham số</string>
+    <string name="setting_version_un_support">Thông số kỹ thuậtPhiên bản này không hỗ trợ tính năng ified.</string>
+    <string name="setting_reset_ing">Đang đặt lại</string>
+    <string name="setting_reset_success">Đã đặt lại xong</string>
+    <string name="setting_reset_fail">Đặt lại không thành công</string>
+    <string name="setting_check_prepare">Vui lòng xóa các điểm bất thường khỏi thiết bị trước!</string>
+    <string name="setting_plc_send_ing">Đang gửi···</string>
+    <string name="setting_plc_send_success">Đã gửi!</string>
+    <string name="setting_plc_send_fail">Gửi không thành công!</string>
+    <string name="setting_plc_send_busy">Đang xử lý các lệnh khác~</string>
+
+    <string name="setting_control_device">Quản lý máy</string>
+    <string name="setting_control_cut_down">Tiết kiệm điện năng</string>
+    <string name="setting_control_power_on">BẬT nguồn</string>
+    <string name="setting_control_refrigeration">Làm lạnh</string>
+    <string name="setting_control_keep_fresh">Bảo quản</string>
+    <string name="setting_control_clean_mode">Rửa sạch ổ cắm</string>
+    <string name="setting_control_keep_device">Chờ</string>
+    <string name="setting_control_sauce_1">Quản lý siro 1</string>
+    <string name="setting_control_sauce_2">Quản lý siro 2</string>
+    <string name="setting_control_sauce_3">Quản lý siro 3</string>
+    <string name="setting_control_kernel_1">Quản lý topping 1</string>
+    <string name="setting_control_kernel_2">Quản lý topping 2</string>
+    <string name="setting_control_kernel_3">Quản lý topping 3</string>
+    <string name="setting_control_positive">Đang bơm</string>
+    <string name="setting_control_negative">Bơm ngược</string>
+    <string name="setting_control_stop">dừng</string>
+    <string name="setting_control_open">Bật</string>
+    <string name="setting_control_close">Tắt</string>
+    <string name="setting_control_cut_down_tip">Ngắt kết nối tất cả các nguồn điện trừ nguồn dự phòng?</string>
+    <string name="setting_control_cut_down_success">Chuyển sang chế độ tiết kiệm điện</string>
+
+    <string name="setting_switch_on">BẬT</string>
+    <string name="setting_switch_off">TẮT</string>
+    <string name="setting_technology_version">Phiên bản hiện tại: %s</string>
+    <string name="setting_technology_version_not_new">Đã cập nhật lên phiên bản mới nhất</string>
+    <string name="setting_technology_version_new">Phiên bản mới nhất:%s</string>
+    <string name="setting_technology_version_update">Cập nhật</string>
+    <string name="setting_technology_num">Số hiệu nhà máy</string>
+    <string name="setting_technology_num_reset">Đặt lại</string>
+    <string name="setting_technology_system_reset">Đặt lại hệ thống</string>
+    <string name="setting_technology_update_pwd">Đặt lại mật khẩu</string>
+    <string name="setting_technology_upload_log">Nhật ký chương trình</string>
+    <string name="setting_technology_clean_config">Dọn dẹp cấu hình</string>
+    <string name="setting_technology">Hỗ trợ kỹ thuật</string>
+    <string name="setting_technology_upload_success">Đã tải lên xong</string>
+    <string name="setting_technology_mcu_debug">Gỡ lỗi MCU</string>
+    <string name="setting_technology_mcu_debug_fail">Khởi động không thành công. Vui lòng cài đặt và thử lại.</string>
+    <string name="setting_technology_language">Ngôn ngữ ứng dụng</string>
+    <string name="setting_technology_sn_input">Vui lòng nhập số thiết bị thực</string>
+    <string name="setting_technology_sn_update">Ứng dụng sẽ tự động khởi động lại sau 5 giây để có hiệu lực!</string>
+    <string name="setting_technology_debug">Chế độ gỡ lỗi</string>
+
+    <string name="setting_run_mode">Chế độ chạy</string>
+    <string name="setting_run_online">Trực tuyến</string>
+    <string name="setting_run_offline">Ngoại tuyến</string>
+    <string name="setting_pay_mode">Chế độ thanh toán</string>
+    <string name="setting_pay_free">Miễn phí</string>
+    <string name="setting_pay_pos">POS</string>
+    <string name="setting_pay_online">Trực tuyến</string>
+
+    <string name="setting_clean_title">Cấu hình sạch</string>
+    <string name="setting_clean_switch">Công tắc sạch</string>
+
+    <string name="setting_lock_switch">Khóa công tắc</string>
+    <string name="setting_clean_schedule_day">Lịch trình dọn dẹp (Ngày)</string>
+    <string name="setting_clean_warn_first_time">Thời gian cảnh báo đầu tiên (Giờ)</string>
+    <string name="setting_clean_warn_second_time">Thời gian cảnh báo thứ hai (Giờ)</string>
+    <string name="setting_clean_warn_last_time">Thời gian cảnh báo cuối cùng (Giờ)</string>
+
+    <string name="setting_icecream_title">Kem</string>
+    <string name="setting_icecream_name">Tên kem</string>
+    <string name="setting_icecream_price">Giá kem</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">Tên hạt nhân (1)</string>
+    <string name="setting_kernel_name_2">Tên hạt nhân (2)</string>
+    <string name="setting_kernel_price_1">Giá hạt nhân (1)</string>
+    <string name="setting_kernel_price_2">Giá hạt nhân (2)</string>
+    <string name="setting_sauce_title_1">Nước sốt (1)</string>
+    <string name="setting_sauce_title_2">Nước sốt (2)</string>
+    <string name="setting_sauce_title_3">Nước sốt (3)</string>
+    <string name="setting_sauce_name_1">Tên nước sốt (1)</string>
+    <string name="setting_sauce_name_2">Tên nước sốt (2)</string>
+    <string name="setting_sauce_name_3">Tên nước sốt (3)</string>
+    <string name="setting_sauce_price_1">Giá nước sốt (1)</string>
+    <string name="setting_sauce_price_2">Giá nước sốt (2)</string>
+    <string name="setting_sauce_price_3">Giá nước sốt (3)</string>
+
+    <string name="setting_clean_countdown_time">Đếm ngược thời gian làm sạch:</string>
+    <string name="setting_clean_countdown_time_hour">Giờ</string>
+
+    <string name="setting_clean_countdown_time_minute">Phút</string>
+    <string name="setting_clean_countdown_time_out">Đã hết thời gian vệ sinh</string>
+    <string name="setting_clean_countdown_error_tip">Thiết bị đang ở chế độ ngủ</string>
+    <string name="setting_clean_countdown_error_describe">Đang chờ đánh thức~</string>
+
+    <string name="setting_clean_recent_time">Thời gian vệ sinh gần nhất: %s</string>
+    <string name="setting_clean_stir_time">Thời gian trộn:</string>
+    <string name="setting_clean_clean_time">Số lần vệ sinh bể: %d</string>
+    <string name="setting_clean_button_pull_stop">Dừng\nxả</string>
+    <string name="setting_clean_button_pull_start">Bắt đầu\nxả</string>
+    <string name="setting_clean_button_stir_stop">Dừng\nxay</string>
+    <string name="setting_clean_button_stir_start">Bắt đầu\ntrộn</string>
+    <string name="setting_clean_tip">Lần trộn đầu tiên mất 3 phút.</string>
+    <string name="setting_clean_describe">Lưu ý:\n1. Chỉ xả ở chế độ trộn.\n2. Vui lòng rửa sạch bằng nước sạch sau khi hỗn hợp sữa đã được xả hết\n3. Vui lòng đặt cốc đong ngay bên dưới lỗ xả.\n4. Vui lòng nhấn “%s” khi cốc đầy 80%.</string>
+    <string name="setting_clean_complete">Hoàn tất việc vệ sinh bình chứa</string>
+    <string name="setting_clean_finish">Hoàn tất</string>
+    <string name="setting_clean_finish_tip">Vui lòng nhấn nút sau khi vệ sinh</string>
+
+    <string name="setting_operate_check_start">Bắt đầu</string>
+    <string name="setting_operate_check_tip">Kiểm tra chất lượng sữa tại nhà···</string>
+    <string name="setting_operate_check_progress_ing">Đang kiểm tra</string>
+    <string name="setting_operate_check_complete">Hoàn tất</string>
+    <string name="setting_operate_check_complete_return">Hoàn tất kiểm tra, tự động trả về sau 5 giây</string>
+    <string name="setting_operate_check_exception">Ngoại lệ</string>
+    <string name="setting_operate_check_fail">Không thành công</string>
+
+    <string name="setting_config_sauce_1">Thời gian xả siro 1</string>
+    <string name="setting_config_sauce_2">Thời gian xả siro 2</string>
+    <string name="setting_config_sauce_3">Thời gian xả siro 3</string>
+    <string name="setting_config_kernel_1">Thời gian xả toppings 1</string>
+    <string name="setting_config_kernel_2">Thời gian xả toppings 2</string>
+    <string name="setting_config_kernel_3">Thời gian xả của 3 lớp phủ</string>
+    <string name="setting_config_milk">Thời gian xả của hỗn hợp sữa</string>
+    <string name="setting_config_cup">Thời gian cho cốc đầu tiên</string>
+    <string name="setting_config_free">Thời gian rảnh</string>
+    <string name="setting_config_recommend">Cài đặt được đề xuất</string>
+    <string name="setting_config_sauce_1_recommend">Cài đặt được đề xuất là 4000 ms</string>
+    <string name="setting_config_sauce_2_recommend">Cài đặt được đề xuất là 3000 ms</string>
+    <string name="setting_config_sauce_3_recommend">Cài đặt được đề xuất là 5000 ms</string>
+    <string name="setting_config_kernel_1_recommend">Cài đặt được đề xuất là 1600 ms</string>
+    <string name="setting_config_kernel_2_recommend">Cài đặt được đề xuất là 1600 ms</string>
+    <string name="setting_config_kernel_3_recommend">Cài đặt khuyến nghị là 1600 ms</string>
+    <string name="setting_config_milk_recommend">Cài đặt khuyến nghị là 2800 ms</string>
+    <string name="setting_config_cup_recommend">Cài đặt khuyến nghị là 2400 ms</string>
+    <string name="setting_config_free_recommend">Cài đặt khuyến nghị là 6 phút</string>
+
+    <string name="remote_operate_success">Thao tác thành công</string>
+    <string name="remote_operate_failed">Thao tác thất bại</string>
+    <string name="remote_shutdown_flavor_stock">Hết sữa pha sẵn, thao tác không thành công!</string>
+    <string name="remote_shutdown_in_sale">Đang giảm giá, thao tác không thành công!</string>
+
+    <!-- 设备异常-->
+    <string name="error_contact_format">%s-Nếu có bất kỳ thắc mắc nào, vui lòng liên hệ nhân viên cửa hàng.(%s)</string>
+    <string name="error_milk_slurry_empty_tip">Đang chờ đổ đầy hỗn hợp sữa</string>
+    <string name="error_cup_empty_tip">Đang chờ đổ đầy cốc kem</string>
+    <string name="error_power_saving">Số 1 Tiết kiệm điện</string>
+    <string name="error_wait">Số 2 Thiết bị không ở trạng thái bán tự động</string>
+    <string name="error_door_un_close">Số 3 Thiết bịCửa không đóng</string>
+    <string name="error_toke_order_time_out">Số 4 Hết thời gian lấy hàng</string>
+    <string name="error_milk_slurry_lack">Số 5: Sữa pha sẵn sắp hết</string>
+    <string name="error_cup_lack">Số 6: Cốc sắp hết</string>
+    <string name="error_cup_1_lack">Số 7: Cốc sắp hết trong khay đựng 1</string>
+    <string name="error_cup_2_lack">Số 8: Cốc sắp hết trong khay đựng 2</string>
+    <string name="error_high_pressure">Số 9: Báo động áp suất cao của máy ép</string>
+    <string name="error_nuts_1_lack">Số 10: Bột phủ sắp hết</string>
+    <string name="error_nuts_2_lack">Số 11: Bột phủ sắp hết</string>
+    <string name="error_nuts_3_lack">Số 12: Bột phủ sắp hết Topping 3</string>
+    <string name="error_jam_1_lack">Số 13: Hết siro 1</string>
+    <string name="error_jam_2_lack">Số 14: Hết siro 2</string>
+    <string name="error_jam_3_lack">Số 15: Hết siro 3</string>
+    <string name="error_reset">Số 16: Không đặt lại được</string>
+    <string name="error_cup_empty">Số 17: Không có cốc</string>
+    <string name="error_cup_1_empty">Số 18: Khay đựng cốc 1 trống</string>
+    <string name="error_cup_2_empty">Số 19: Khay đựng cốc 2 trống</string>
+    <string name="error_no_in_refrigeration">Số 20: Không có trong tủ lạnh</string>
+    <string name="error_milk_slurry_empty">Số 21: Sữa pha sẵn đã hết</string>
+    <string name="error_machine_fault">Số 22 Máy bị trục trặc</string>
+    <string name="error_machine_offline">Số 23 Máy bị gián đoạn</string>
+    <string name="error_order_time_out">Số 24 Hết thời gian sản xuất</string>
+    <string name="error_door_obstacle">Số 25 Chướng ngại vật tại khe lấy hàng</string>
+    <string name="error_claw_no_cup">Số 26 Máy tự động gắp hết</string>
+    <string name="error_rotate_machine">Số 27 Báo động động cơ quay</string>
+    <string name="error_elevator_machine">Số 28 Báo động động cơ nâng</string>
+    <string name="error_door_machine">Số 29 Báo động động cơ cửa</string>
+    <string name="error_door_slip_fail">Số 30 Không làm rơi cốc</string>
+    <string name="error_rotate_time_out">Số 31 Hết thời gian bàn xoay</string>
+    <string name="error_contact_phone">Điện thoại:</string>
+
+    <!-- 初始化 -->
+    <string name="init_sn_input">Xác định vị trí</string>
+    <string name="init_sn_check">Hãy để ý đến điều đó</string>
+    <string name="init_sn_save">保存重启生效</string>
+    <string name="init_check_activation">Kiểm tra kích hoạt···</string>
+    <string name="init_activation">Kích hoạt thiết bị···</string>
+    <string name="init_activation_error">Kích hoạt không thành công: %s</string>
+    <string name="init_power">Nhận thiết bị permission···</string>
+    <string name="init_power_error">Không xin được quyền thiết bị: %s</string>
+    <string name="init_synchronization">Đang đồng bộ hóa dữ liệu···</string>
+    <string name="init_synchronization_error">Lỗi đồng bộ hóa dữ liệu: %s</string>
+    <string name="init_synchronization_error_dishes">Không có thông tin menu</string>
+    <string name="init_synchronization_error_stock">Không có thông tin vị trí kho thiết bị</string>
+    <string name="init_synchronization_error_material">Không có thông tin nguyên liệu</string>
+    <string name="init_synchronization_error_spec">Không có thông tin công thức</string>
+    <string name="init_startup">Khởi tạo chương trình···</string>
+    <string name="init_complete">Đã khởi tạo xong···</string>
+    <string name="init_store_config">Kiểm tra cấu hình cửa hàng···</string>
+    <string name="init_store_config_error">Cấu hình kho lưu trữ bất thường: %s</string>
+    <string name="init_store_connect">Kết nối hệ thống kho lưu trữ···</string>
+    <string name="init_store_connect_error">Kết nối kho lưu trữ bất thường: %s</string>
+    <string name="init_resource_download">Tải xuống tệp tài nguyên: %s，Tiến trình tải xuống: %s</string>
+    <string name="init_update_tip">Đang bảo trì nâng cấp tự động, vui lòng chờ!</string>
+    <string name="init_update_install">Đang cài đặt chương trình mới nhất</string>
+    <string name="init_update_install_success">Quá trình cài đặt đã hoàn tất, chương trình sẽ tự động khởi động lại sau.</string>
+    <string name="init_update_install_fail">Cài đặt không thành công, vui lòng thử lại.</string>
+    <string name="initiate_device" translatable="false">khởi tạo thiết bị POS</string>
+
+    <!-- Lưu ý -->
+    <string name="tip">Nhắc nhở</string>
+    <string name="tip_empty_order">Không tìm thấy thông tin đơn hàng</string>
+    <string name="tip_used_order">Mã nhận hàng đã sử dụng</string>
+    <string name="tip_search_order_failed">Không thể truy xuất dữ liệu đơn hàng</string>
+    <string name="tip_use_technology">"Vui lòng áp dụng chế độ được chỉ định với bộ phận hỗ trợ kỹ thuật!</string>
+    <string name="describe_shop_cart_clear_tip">Bạn có muốn xóa giỏ hàng không?</string>
+    <string name="describe_update_password">"Mật khẩu mặc định hiện tại có nguy cơ bảo mật, bạn có muốn thay đổi ngay lập tức không?</string>
+    <string name="describe_paying_give_up_tip">Việc sản xuất sẽ KHÔNG bắt đầu sau khi hủy đơn hàng. Nếu đã thanh toán, vui lòng liên hệ với nhân viên. Chắc chắn sẽ hủy đơn hàng.r?</string>
+    <string name="describe_open_spec_multiple">Để có chất lượng tốt hơn, chức năng này sẽ điều chỉnh tỷ lệ phần trăm của mỗi hương vị lên 80%.\n Bạn có muốn bật chức năng này không?</string>
+    <string name="describe_open_free_mode">Bạn có muốn mở chế độ miễn phí cho thiết bị này không?</string>
+    <string name="button_back">Quay lại</string>
+    <string name="button_update">Sửa đổi</string>
+    <string name="button_open">Mở</string>
+    <string name="button_start">Bắt đầu</string>
+    <string name="button_clear">Xóa</string>
+    <string name="button_delete">Xóa</string>
+    <string name="button_confirm">Xác nhận</string>
+    <string name="button_cancel">Hủy</string>
+    <string name="button_un_set_pwd">Để sau</string>
+    <string name="button_set_pwd">Thiết lập</string>
+    <string name="button_paying_give_up">Hủy đơn hàng</string>
+    <string name="button_paying_keep_on">Tiếp tục thanh toán</string>
+    <string name="button_setting">Cài đặt</string>
+
+    <string name="plc_errTip1">Chế độ thủ công của thiết bị</string>
+    <string name="plc_errTip2">Trạng thái bất thường</string>
+    <string name="plc_errTip3">Thiết bị đang bận</string>
+    <string name="plc_errTip4">Ổ cắm cảm ứng</string>
+
+    <string name="setting_jam_set">Cài đặt</string>
+    <string name="setting_ker_map">Đổi sang topping</string>
+    <string name="setting_jam_map">Đổi sang siro</string>
+    <string name="setting_ker_def">Topping mặc định</string>
+    <string name="setting_jam_def">Siro mặc định</string>
+
+    <string name="time_ready">Thời gian sẵn sàng</string>
+    <string name="maxcount_tips_start">为了保障口感,请取完6杯后再次扫码制作哦~</string>
+    <string name="maxcount_tips_end">您还有剩余雪糕需要继续扫码喔~</string>
+
+    <string name="setting_warn_real_time">Cảnh báo:</string>
+    <string name="setting_error_log">Nhật ký lỗi:</string>
+    <string name="setting_make_fail_title">Gây thất bại !</string>
+    <string name="setting_make_fail">Cảnh báo:</string>
+    <string name="setting_make_fail_insert">Chèn cảnh báo:</string>
+    <string name="setting_make_fail_warn">Cảnh báo</string>
+
+    <!-- 日志 -->
+    <string name="making_error">Lỗi ra</string>
+    <string name="making_ing">Đang pha</string>
+    <string name="making_out_cup">Cốc ra</string>
+    <string name="making_out_flavor">Hương vị ra</string>
+    <string name="making_taking">Đang pha</string>
+    <string name="making_taked">Đang pha</string>
+    <string name="making_finish">Hoàn tất</string>
+    <string name="making_next">Đang pha. có %d</string>
+    <string name="mcu_connect">kết nối thiết bị</string>
+    <string name="mcu_disconnect">ngắt kết nối thiết bị</string>
+    <string name="mcu_waring_message">Cảnh báo: %s, tin nhắn:%s</string>
+
+    <string name="setting_select_icon">Chọn biểu tượng</string>
+    <string name="setting_select_kernel_icon">Chọn biểu tượng Kernel</string>
+    <string name="setting_select_sauce_icon">Chọn biểu tượng Nước sốt</string>
+
+    <string name="clean_recycle">Ngày tái chế sạch: %d</string>
+    <string name="clean_lock_warning_last">Cảnh báo lần cuối</string>
+    <string name="clean_lock_warning_first">Cảnh báo lần đầu</string>
+    <string name="clean_lock_warning_second">Cảnh báo lần thứ hai</string>
+    <string name="clean_lock_notify_last">Thông báo lần cuối</string>
+    <string name="clean_lock_notify_first">Thông báo lần đầu</string>
+    <string name="clean_lock_notify_second">Thông báo lần thứ hai</string>
+    <string name="scan_code">Mã quét: %s</string>
+
+    <string name="update_channel">Cập nhật kênh thanh toán: %d</string>
+    <string name="update_mode">Chế độ chạy cập nhật: %d</string>
+
+    <string name="credit_failed">Kết nối đầu đọc thẻ không thành công, vui lòng thử lại sau.</string>
+    <string name="system_link">Kết nối hệ thống</string>
+    <string name="system_divorce">Rời khỏi hệ thống</string>
+    <string name="update_app">Kiểm tra cập nhật</string>
+    <string name="price_model">Thanh toán hỗn hợp tiền giấy và tiền xu</string>
+    <string name="nayax_model1">Nayax không hoạt động</string>
+    <string name="nayax_model2">Nayax không hoạt động</string>
+    <string name="have_money">Số tiền mặt:</string>
+    <string name="nayax_model">Mô hình NaYax:</string>
+    <string name="nayax_pay">Thanh toán NaYax</string>
+    <string name="nayax_pay_mix">Thanh toán NaYax + hỗn hợp</string>
+    <string name="setting_pay_pos_pay_mix">Đầu đọc thẻ MDB + thanh toán hỗn hợp</string>
+    <string name="online_and_price_model">Hai mã trong một lần thanh toán + thanh toán bằng tiền giấy</string>
+    <string name="ict_currency_selection">Lựa chọn tiền tệ ICT</string>
+    <string name="banknote_exchange_protocol">Giao thức đổi tiền giấy</string>
+    <string name="mdb_level">Mức MDB</string>
+    <string name="coin_x">Cơn sốt tiền xu nhân với X</string>
+    <string name="coin_divide_x">Chia tiền xu cho X</string>
+    <string name="setting_text_message">Sửa đổi một số văn bản</string>
+    <string name="sleep_msg">Máy đang ngủ.....</string>
+    <string name="setting_flavor_config">Cài đặt hương vị</string>
+    <string name="setting_flavor_multiple_choice">Nhiều lựa chọn hương vị</string>
+    <string name="setting_sale_service">Dịch vụ bán hàng</string>
+    <string name="setting_service_visibility">Hiển thị dịch vụ</string>
+    <string name="setting_service_title">Tên dịch vụ</string>
+    <string name="setting_service_content">Nội dung dịch vụ</string>
+    <string name="coin_rate">Tỷ giá tiền xu</string>
+    <string name="confirm_name">Đổi tên</string>
+    <string name="setting_technology_other">Khác</string>
+    <string name="alarm_clock_setting">Báo thức hẹn giờ</string>
+    <string name="change_cooling">Chuyển chế độ làm mát</string>
+    <string name="change_freshness">Chuyển chế độ tươi</string>
+    <string name="credit_describe">Sửa đổi lời nhắc quẹt thẻ tín dụng</string>
+    <string name="time_set">Cài đặt liên quan đến thời gian</string>
+    <string name="card_time">Thời gian quẹt thẻ MDB</string>
+    <string name="cash_time">Thời gian quẹt tiền mặt</string>
+    <string name="automatic_back_time">Chế độ tự động: Tự động trở về thời gian giao diện chờ</string>
+    <string name="manual_back_time">Chế độ thủ công: Tự động trở về thời gian giao diện chờ</string>
+    <string name="unit">Đơn vị tiền tệ</string>
+    <string name="nayax_time">Thời gian phiên Nayax</string>
+    <string name="nayax_card_pay">Thanh toán bằng thẻ</string>
+    <string name="nayax_scan_pay">Quét mã thanh toán</string>
+    <string name="nayax_pay_icon_choice">Chuyển đổi biểu tượng thanh toán Nayax</string>
+    <string name="ic_icon_text">Thay đổi văn bản biểu tượng kem</string>
+    <string name="credit_card_text_description">Mô tả văn bản thẻ tín dụng</string>
+    <string name="function_switch_setting">Chuyển đổi cài đặt chức năng</string>
+    <string name="other_param_setting">Các cài đặt tham số khác</string>
+    <string name="other_materiel_setting">Cài đặt vật liệu</string>
+    <string name="residual_materials">Vật liệu còn lại</string>
+    <string name="material_monitor">Theo dõi vật liệu</string>
+    <string name="jamless1">Còn 1 mứt</string>
+    <string name="jamless2">Còn 2 mứt</string>
+    <string name="jamless3">Còn 3 mứt</string>
+    <string name="nutletless1">Trái cây nghiền (còn 1)</string>
+    <string name="nutletless2">Còn 2 mứt</string>
+    <string name="customiz_set">Cài đặt chức năng tùy chỉnh</string>
+    <string name="member_code_input">Hộp nhập mã thành viên</string>
+    <string name="member_code_length_error">Độ dài mã thành viên không chính xác</string>
+    <string name="material_tpis">Lưu ý: Dữ liệu này chỉ mang tính chất tham khảo, vui lòng tham khảo dữ liệu thực tế. </string>
+    <string name="member_code_input_here">Nhập mã thành viên tại đây</string>
+</resources>

config.gradle

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