修改冰淇淋上图标的文字

.idea/misc.xml

@@ -42,7 +42,7 @@
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_clean_finish.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_clean_schedule.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_common.xml" value="0.1358695652173913" />
-        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_ice_cream.xml" value="0.136" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_ice_cream.xml" value="0.18895348837209303" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_lock.xml" value="0.176" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_log.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_main.xml" value="0.152" />

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

@@ -33,7 +33,7 @@ public abstract class Global {
      * 1：
      * 2：国外线上
      */
-    public static final int isVersions = 1;
+    public static final int isVersions = 2;
 
     /**
      * 信用卡支付方式user

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

@@ -349,5 +349,7 @@ public interface Name {
     String ADVERTISING_TIME1 = "ADVERTISING_TIME1";//回到广告页面的时间
     String ADVERTISING_TIME2 = "ADVERTISING_TIME2";//回到广告页面的时间
 
+    String IC_TEXT = "IC_TEXT";//冰淇淋杯子上的文本设置
+
 }
 

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

@@ -343,6 +343,10 @@ public class DrawableSelectorUtils {
             logoF = R.drawable.logo_laixue;
             width = R.dimen.dp_65;
             height = R.dimen.dp_30;
+        }else if ("7786".equals(logo)){
+            logoF = R.drawable.logo_umimatic;
+            width = R.dimen.dp_65;
+            height = R.dimen.dp_30;
         }
         ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
         layoutParams.width = UiUtil.getDimensionPixelRes(width);

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

@@ -1229,7 +1229,7 @@ public class MQService extends Service implements SendCallback {
                 || "2019".equals(s) || "7391".equals(s) || "0924".equals(s) || "9427".equals(s) || "0735".equals(s)
                 || "5769".equals(s) || "6894".equals(s) || "8123".equals(s) || "5217".equals(s) || "6431".equals(s)
                 || "7777".equals(s) || "8080".equals(s) || "6702".equals(s) || "7772".equals(s) || "7761".equals(s)
-                ||"7773".equals(s)||"7774".equals(s)) {
+                ||"7773".equals(s)||"7774".equals(s)||"7786".equals(s)) {
             Hawk.put("logo", s);
             Hawk.get("logo", "7777");
         }

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

@@ -168,7 +168,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
     private TextView tvDeviceId1;
     //海外新加
 //    private LinearLayout contain_1, contain_2, contain_3, contain_4, contain_5;
-    private ImageView logo_hw_iv;
+    private TextView logo_hw_iv;
 
     private Animation pullFlavorAnim;
     private ArrayList<AppCompatImageView> sauceDownViews;
@@ -288,8 +288,20 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
 //            contain_4.setVisibility(View.VISIBLE);
 //            contain_5.setVisibility(View.VISIBLE);
         }
-        if (!Constant.LANGUAGE_ZH.equals(App.app.language)) {
-            logo_hw_iv.setVisibility(View.VISIBLE);
+//        if (!Constant.LANGUAGE_ZH.equals(App.app.language)) {
+//            logo_hw_iv.setVisibility(View.VISIBLE);
+//        }
+        if (Hawk.get(Name.IC_TEXT,"").equals("")){
+            logo_hw_iv.setBackground(UiUtil.getDrawableRes(R.drawable.logo_hw));
+        }else {
+            logo_hw_iv.setBackground(null);
+            if (Hawk.get(Name.IC_TEXT,"").length()>27&&Hawk.get(Name.IC_TEXT,"").length()<=76){
+                logo_hw_iv.setTextSize(25);
+            }else if (Hawk.get(Name.IC_TEXT,"").length()>76){
+                logo_hw_iv.setTextSize(19);
+            }
+            logo_hw_iv.setText(Hawk.get(Name.IC_TEXT,""));
+            Log.d(TAG, "onViewCreated00: "+Hawk.get(Name.IC_TEXT,""));
         }
 
         kernelEffectViews = new AppCompatImageView[]{

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

@@ -24,6 +24,7 @@ public class TextSettingActivity extends BaseScanGunActivity implements View.OnC
     private EditText etPhoneText;
     private EditText etCreditTest;
     private EditText etUnitTest;
+    private EditText etIcText;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -33,6 +34,11 @@ public class TextSettingActivity extends BaseScanGunActivity implements View.OnC
         etSleepText = findViewById(R.id.et_sleep_test);
         etPeopleText = findViewById(R.id.et_people_test);
         etPhoneText = findViewById(R.id.et_phone_test);
+        if (Hawk.get(Name.HIBERNATION,"").length()>27&&Hawk.get(Name.HIBERNATION,"").length()<=76){
+            etSleepText.setTextSize(25);
+        }else if (Hawk.get(Name.HIBERNATION,"").length()>76){
+            etSleepText.setTextSize(19);
+        }
         etSleepText.setText(Hawk.get(Name.HIBERNATION, "休眠中..."));
         etPeopleText.setText(Hawk.get(Name.CONTACTS_NAME,""));
         etPhoneText.setText(Hawk.get(Name.CONTACTS_NUM,""));
@@ -42,6 +48,11 @@ public class TextSettingActivity extends BaseScanGunActivity implements View.OnC
         findViewById(R.id.phone_save).setOnClickListener(this);
 
         etCreditTest=findViewById(R.id.et_credit_test);
+        if (Hawk.get(Name.CREDIT_CARD_PAYMENT_TEXT_DESCRIPTION,"").length()>27&&Hawk.get(Name.CREDIT_CARD_PAYMENT_TEXT_DESCRIPTION,"").length()<=76){
+            etCreditTest.setTextSize(25);
+        }else if (Hawk.get(Name.CREDIT_CARD_PAYMENT_TEXT_DESCRIPTION,"").length()>76){
+            etCreditTest.setTextSize(19);
+        }
         etCreditTest.setText(Hawk.get(Name.CREDIT_CARD_PAYMENT_TEXT_DESCRIPTION,""));
         findViewById(R.id.credit_save).setOnClickListener(this);
 
@@ -49,6 +60,16 @@ public class TextSettingActivity extends BaseScanGunActivity implements View.OnC
         etUnitTest.setText(Hawk.get(Name.UNIT_OF_CURRENCY_TIME,""));
         findViewById(R.id.unit_save).setOnClickListener(this);
 
+
+        etIcText=findViewById(R.id.et_ic_text);
+        if (Hawk.get(Name.IC_TEXT,"").length()>27&&Hawk.get(Name.IC_TEXT,"").length()<=76){
+            etIcText.setTextSize(25);
+        }else if (Hawk.get(Name.IC_TEXT,"").length()>76){
+            etIcText.setTextSize(19);
+        }
+        etIcText.setText(Hawk.get(Name.IC_TEXT,""));
+        findViewById(R.id.ic_save).setOnClickListener(this);
+
     }
 
     @Override
@@ -77,6 +98,10 @@ public class TextSettingActivity extends BaseScanGunActivity implements View.OnC
             String contacts = etUnitTest.getText().toString();
             Hawk.put(Name.UNIT_OF_CURRENCY_TIME, contacts);
             showToast(getString(R.string.modified_success));
+        }else if (id == R.id.ic_save) {
+            String contacts = etIcText.getText().toString();
+            Hawk.put(Name.IC_TEXT, contacts);
+            showToast(getString(R.string.modified_success));
         }
     }
 

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

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

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

@@ -4,11 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:focusableInTouchMode="true"
-    android:focusable="true">
+    android:focusable="true"
+    android:focusableInTouchMode="true">
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+
         <android.support.v7.widget.AppCompatImageView
             android:id="@+id/setting_back"
             android:layout_width="@dimen/dp_35"
@@ -25,19 +27,21 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         tools:ignore="MissingConstraints">
+
         <LinearLayout
-            android:layout_marginTop="@dimen/dp_10"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_gravity="center">
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/dp_10"
+            android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/sleep_tip"
                 android:layout_width="@dimen/dp_80"
                 android:layout_height="@dimen/dp_50"
-                android:text="@string/hibernation"
                 android:gravity="center"
+                android:layout_gravity="center"
+                android:text="@string/hibernation"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="@dimen/sp_12"
                 android:textStyle="bold"
@@ -63,21 +67,23 @@
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22"/>
+                android:textSize="@dimen/sp_22" />
         </LinearLayout>
+
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_marginTop="@dimen/dp_10"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_gravity="center">
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/dp_10"
+            android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/phone_tip"
                 android:layout_width="@dimen/dp_80"
                 android:layout_height="@dimen/dp_50"
-                android:text="@string/contacts"
+                android:layout_gravity="center"
                 android:gravity="center"
+                android:text="@string/contacts"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="@dimen/sp_12"
                 android:textStyle="bold"
@@ -103,21 +109,23 @@
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22"/>
+                android:textSize="@dimen/sp_22" />
         </LinearLayout>
+
         <LinearLayout
-            android:layout_marginTop="@dimen/dp_10"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_gravity="center">
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/dp_10"
+            android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/people_tip"
+                android:layout_gravity="center"
                 android:layout_width="@dimen/dp_80"
                 android:layout_height="@dimen/dp_50"
-                android:text="@string/way_contacts"
                 android:gravity="center"
+                android:text="@string/way_contacts"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="@dimen/sp_12"
                 android:textStyle="bold"
@@ -143,21 +151,23 @@
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22"/>
+                android:textSize="@dimen/sp_22" />
         </LinearLayout>
+
         <LinearLayout
-            android:layout_marginTop="@dimen/dp_10"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_gravity="center">
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/dp_10"
+            android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/credit_tip"
                 android:layout_width="@dimen/dp_80"
                 android:layout_height="@dimen/dp_50"
-                android:text="@string/describe"
                 android:gravity="center"
+                android:layout_gravity="center"
+                android:text="@string/credit_card_text_description"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="@dimen/sp_12"
                 android:textStyle="bold"
@@ -183,21 +193,22 @@
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22"/>
+                android:textSize="@dimen/sp_22" />
         </LinearLayout>
+
         <LinearLayout
-            android:layout_marginTop="@dimen/dp_10"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_gravity="center">
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/dp_10"
+            android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/unit_tip"
                 android:layout_width="@dimen/dp_80"
                 android:layout_height="@dimen/dp_50"
-                android:text="@string/unit"
+                android:layout_gravity="center"
                 android:gravity="center"
+                android:text="@string/unit"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="@dimen/sp_12"
                 android:textStyle="bold"
@@ -223,7 +234,52 @@
                 android:gravity="center"
                 android:text="@string/confirm_revision"
                 android:textColor="#FE5DBB"
-                android:textSize="@dimen/sp_22"/>
+                android:textSize="@dimen/sp_22" />
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/dp_10"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="@dimen/dp_80"
+                android:layout_height="@dimen/dp_50"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/ic_icon_text"
+                android:textColor="@color/colorPrimaryDark"
+                android:textSize="@dimen/sp_12"
+                android:textStyle="bold"
+                tools:ignore="MissingConstraints" />
+
+            <android.support.v7.widget.AppCompatEditText
+                android:id="@+id/et_ic_text"
+                android:layout_width="@dimen/dp_200"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:singleLine="true"
+                android:textColor="@color/colorPrimaryDark"
+                android:textSize="@dimen/sp_24"
+                android:textStyle="bold"
+                tools:ignore="MissingConstraints" />
+
+
+            <TextView
+                android:id="@+id/ic_save"
+                android:layout_width="@dimen/dp_150"
+                android:layout_height="@dimen/dp_50"
+                android:background="@drawable/bg_config_confirm"
+                android:gravity="center"
+                android:text="@string/confirm_revision"
+                android:textColor="#FE5DBB"
+                android:textSize="@dimen/sp_22" />
+
+
         </LinearLayout>
 
     </LinearLayout>

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

@@ -21,13 +21,16 @@
             android:layout_marginTop="@dimen/dp_67"
             app:srcCompat="@drawable/ic_ice_cream" />
 
-        <ImageView
+        <TextView
             android:id="@+id/logo_hw_iv"
-            android:layout_width="@dimen/dp_90"
-            android:layout_height="@dimen/dp_45"
+            android:layout_width="@dimen/dp_100"
+            android:layout_height="@dimen/dp_60"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="@dimen/dp_192"
-            android:src="@drawable/logo_hw" />
+            android:textSize="@dimen/sp_14"
+            android:textStyle="bold"
+            android:gravity="center"
+            android:background="@drawable/logo_hw"/>
 
         <android.support.v7.widget.AppCompatImageView
             android:id="@+id/dishes_ice_cream_sauce_3"

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

@@ -490,6 +490,8 @@
     <string name="nayax_card_pay">الدفع بالبطاقة</string>
     <string name="nayax_scan_pay">امسح رمز QR ضوئيًا للدفع</string>
     <string name="nayax_pay_icon_choice">تبديل رمز الدفع Nayax</string>
+    <string name="ic_icon_text">تغيير نص أيقونة الآيس كريم</string>
+    <string name="credit_card_text_description">الوصف النصي لبطاقة الائتمان</string>
 
 </resources>
 <!--阿拉伯语-->

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

@@ -493,6 +493,8 @@
     <string name="nayax_card_pay">Platba kartou</string>
     <string name="nayax_scan_pay">Zaplaťte naskenováním QR kódu</string>
     <string name="nayax_pay_icon_choice">Přepínač platební ikony Nayax</string>
+    <string name="ic_icon_text">Změna textu ikony zmrzliny</string>
+    <string name="credit_card_text_description">Textový popis kreditní karty</string>
 
 </resources>
 <!--捷克语-->

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

@@ -494,6 +494,8 @@
     <string name="nayax_card_pay">Mit Karte bezahlen</string>
     <string name="nayax_scan_pay">QR-Code zum Bezahlen scannen</string>
     <string name="nayax_pay_icon_choice">Nayax-Zahlungssymbolwechsel</string>
+    <string name="ic_icon_text">Änderung des Textes des Eiscreme-Symbols</string>
+    <string name="credit_card_text_description">Textbeschreibung der Kreditkarte</string>
 
 </resources>
 <!--德语-->

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

@@ -494,6 +494,8 @@
     <string name="nayax_card_pay">Card payment</string>
     <string name="nayax_scan_pay">Scan code payment</string>
     <string name="nayax_pay_icon_choice">Nayax payment icon switch</string>
+    <string name="ic_icon_text">Ice cream icon text change</string>
+    <string name="credit_card_text_description">Credit card text description</string>
 
 </resources>
 <!--英语-->

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

@@ -497,5 +497,8 @@
     <string name="nayax_scan_pay">Escanear código QR para pagar</string>
     <string name="nayax_pay_icon_choice">Interruptor del icono de pago de Nayax</string>
 
+    <string name="ic_icon_text">Cambio de texto del icono de helado</string>
+    <string name="credit_card_text_description">Descripción del texto de la tarjeta de crédito</string>
+
 </resources>
 <!--西班牙语-->

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

@@ -492,6 +492,8 @@
     <string name="nayax_card_pay">Makske kaardiga</string>
     <string name="nayax_scan_pay">Skannige maksmiseks QR-kood</string>
     <string name="nayax_pay_icon_choice">Nayaxi makseikooni lüliti</string>
+    <string name="ic_icon_text">Jäätiseikooni teksti muutmine</string>
+    <string name="credit_card_text_description">Krediitkaardi teksti kirjeldus</string>
 
 </resources>
 <!--爱沙尼亚语-->

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

@@ -494,6 +494,8 @@
     <string name="nayax_card_pay">Վճարեք քարտով</string>
     <string name="nayax_scan_pay">Վճարելու համար սկանավորեք QR կոդը</string>
     <string name="nayax_pay_icon_choice">Նայաքս վճարման պատկերակի անջատիչ</string>
+    <string name="ic_icon_text">Պաղպաղակի պատկերակի տեքստի փոփոխություն</string>
+    <string name="credit_card_text_description">Վարկային քարտի տեքստային նկարագրություն</string>
 
 </resources>
 <!--亚美尼亚语-->

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

@@ -498,6 +498,8 @@
     <string name="nayax_card_pay">카드로 결제</string>
     <string name="nayax_scan_pay">결제하려면 QR 코드를 스캔하세요</string>
     <string name="nayax_pay_icon_choice">Nayax 결제 아이콘 스위치</string>
+    <string name="ic_icon_text">아이스크림 아이콘 텍스트 변경</string>
+    <string name="credit_card_text_description">신용카드 텍스트 설명</string>
 
 </resources>
     <!--韩语-->

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

@@ -492,6 +492,8 @@
     <string name="nayax_card_pay">Mokėkite kortele</string>
     <string name="nayax_scan_pay">Norėdami sumokėti, nuskaitykite QR kodą</string>
     <string name="nayax_pay_icon_choice">Nayax mokėjimo piktogramos jungiklis</string>
+    <string name="ic_icon_text">Ledų piktogramos teksto keitimas</string>
+    <string name="credit_card_text_description">Kredito kortelės teksto aprašas</string>
 
 </resources>
 <!--立陶宛-->

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

@@ -488,6 +488,8 @@
     <string name="nayax_card_pay">Maksājiet ar karti</string>
     <string name="nayax_scan_pay">Skenējiet QR kodu, lai samaksātu</string>
     <string name="nayax_pay_icon_choice">Nayax maksājumu ikonas slēdzis</string>
+    <string name="ic_icon_text">Saldējuma ikonas teksta maiņa</string>
+    <string name="credit_card_text_description">Kredītkartes teksta apraksts</string>
 
 </resources>
 <!--拉脱维亚-->

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

@@ -493,6 +493,8 @@
     <string name="nayax_card_pay">Bayar dengan kad</string>
     <string name="nayax_scan_pay">Imbas kod QR untuk membayar</string>
     <string name="nayax_pay_icon_choice">Suis ikon pembayaran Nayax</string>
+    <string name="ic_icon_text">Perubahan teks ikon aiskrim</string>
+    <string name="credit_card_text_description">Penerangan teks kad kredit</string>
 
 </resources>
 <!--马来语-->

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

@@ -495,6 +495,8 @@
     <string name="nayax_card_pay">Plătiți cu cardul</string>
     <string name="nayax_scan_pay">Scanați codul QR pentru a plăti</string>
     <string name="nayax_pay_icon_choice">Comutator pictogramă de plată Nayax</string>
+    <string name="ic_icon_text">Schimbarea textului pictogramei înghețată</string>
+    <string name="credit_card_text_description">Descrierea textului cardului de credit</string>
 
 </resources>
 <!--罗马尼亚语-->

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

@@ -491,6 +491,8 @@
     <string name="nayax_card_pay">Оплата картой</string>
     <string name="nayax_scan_pay">Сканируйте QR-код для оплаты</string>
     <string name="nayax_pay_icon_choice">Переключатель значка платежа Nayax</string>
+    <string name="ic_icon_text">Изменение текста значка мороженого</string>
+    <string name="credit_card_text_description">Текстовое описание кредитной карты</string>
 
 </resources>
     <!--俄语-->

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

@@ -486,6 +486,8 @@
     <string name="nayax_card_pay">ชำระเงินด้วยบัตร</string>
     <string name="nayax_scan_pay">สแกนรหัส QR เพื่อชำระเงิน</string>
     <string name="nayax_pay_icon_choice">สลับไอคอนการชำระเงินของ Nayax</string>
+    <string name="ic_icon_text">ข้อความเปลี่ยนไอคอนไอศกรีม</string>
+    <string name="credit_card_text_description">คำอธิบายข้อความบัตรเครดิต</string>
 
 </resources>
 <!--泰语-->

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

@@ -491,5 +491,7 @@
     <string name="nayax_card_pay">刷卡支付</string>
     <string name="nayax_scan_pay">扫码支付</string>
     <string name="nayax_pay_icon_choice">Nayax支付图标切换</string>
+    <string name="ic_icon_text">冰淇淋图标文字更改</string>
+    <string name="credit_card_text_description">信用卡文本描述</string>
 </resources>
 <!--中文-->

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

@@ -500,6 +500,8 @@
     <string name="nayax_card_pay">刷卡支付</string>
     <string name="nayax_scan_pay">扫码支付</string>
     <string name="nayax_pay_icon_choice">Nayax支付图标切换</string>
+    <string name="ic_icon_text">冰淇淋图标文字更改</string>
+    <string name="credit_card_text_description">信用卡文本描述</string>
 
 </resources>
 <!--中文-->

config.gradle

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