nayax支付图标修改

.idea/misc.xml

@@ -48,7 +48,7 @@
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_pay_select.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_price.xml" value="0.2" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_service.xml" value="0.2484375" />
-        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_switch.xml" value="0.1" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_switch.xml" value="0.264" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_technology_support.xml" value="0.176" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/fragment_warnings.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/item_alarm_clock.xml" value="0.2" />

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

@@ -6,6 +6,7 @@ import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Html;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -57,12 +58,20 @@ public class CreditCardDialog extends BaseDialogNoDatabinding implements View.On
         tvScanTip = findViewById(R.id.tv_scan_tip);
         tvScanTip.setText(Html.fromHtml(UiUtil.getStringRes(R.string.dont_coin1)));
         tvScanNow = findViewById(R.id.tv_scan_now);
-        tvScanNow.setText(Html.fromHtml(UiUtil.getStringRes(R.string.credit_card_payment)));
+        ivQrCode = findViewById(R.id.iv_qr_code);
+        if (Hawk.get("isScan",false)){
+            ivQrCode.setImageResource(R.drawable.icon_scan);
+            tvScanNow.setText(Html.fromHtml(UiUtil.getStringRes(R.string.scan_now)));
+            Log.d(TAG, "initView: isScan");
+        }else {
+            tvScanNow.setText(Html.fromHtml(UiUtil.getStringRes(R.string.credit_card_payment)));
+            ivQrCode.setImageResource(R.drawable.icon_xinyongka_pay);
+        }
+
         String s = Hawk.get(Name.CREDIT_CARD_PAYMENT_TEXT_DESCRIPTION, "");
         if (!"".equals(s)) {
             tvScanNow.setText(Html.fromHtml(s));
         }
-        ivQrCode = findViewById(R.id.iv_qr_code);
         isLoop = true;
         btnCancel.setOnClickListener(this);
         ivQrCode.setOnClickListener(this);

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

@@ -2,6 +2,8 @@ package com.bgy.autosale.payutil.dialog;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.text.Html;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,11 +11,14 @@ import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 
 import com.bgy.autosale.App;
 import com.bgy.autosale.Constant;
 import com.bgy.autosale.R;
 import com.hboxs.base_library.callback.DialogClickListener;
+import com.hboxs.base_library.util.UiUtil;
+import com.orhanobut.hawk.Hawk;
 
 /**
  * @author whw
@@ -24,6 +29,7 @@ public class ShoppingTrolleyDialogChoosePay extends FrameLayout implements View.
 
     private View view;
     private boolean canTouchOutsideDismiss = true;
+    ImageView ivNayax;
 
     public void setListener(DialogClickListener listener) {
         this.listener = listener;
@@ -52,8 +58,15 @@ public class ShoppingTrolleyDialogChoosePay extends FrameLayout implements View.
         layoutParams.gravity = Gravity.CENTER;
         addView(view, layoutParams);
 
+        ivNayax=view.findViewById(R.id.iv_nayax);
+        if (Hawk.get("isScan",false)){
+            ivNayax.setImageResource(R.drawable.icon_scan);
+        }else {
+            ivNayax.setImageResource(R.drawable.icon_xinyongka_pay);
+        }
     }
 
+
     public void show(ViewGroup parent) {
         if (parent == null) {
             return;

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

@@ -1473,7 +1473,12 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         paySuccessDialog.setCanceledOnTouchOutside(false);
         paySuccessDialog.show();
         startPayPaper = true;
-        manualMake();
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                manualMake();
+            }
+        }, 3000);
 
     }
 
@@ -1925,10 +1930,15 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         for (String part : parts) {
             Log.d(TAG, "onClick0: " + part);
             String[] getFlavorCombinations = part.split(priceBeans.get(0).getChineseName());
+            Log.d(TAG, "getStr13: ");
             for (String getFlavorCombination : getFlavorCombinations) {
                 Log.d(TAG, "getStr:10 " + getFlavorCombination);
                 if (getFlavorCombinations.length == 1) {
                     getOneTaste = getFlavorCombination;
+                    Log.d(TAG, "getStr:14 " + getOneTaste);
+                }else {
+                    Log.d(TAG, "getStr:15 " + getOneTaste);
+
                 }
             }
             if (part.contains("_")) {

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

@@ -95,7 +95,7 @@ public class SwitchFragment extends BaseFragment implements RadioGroup.OnChecked
     RadioButton rbMdbLevel3;
     RadioButton rbMdbLevel2;
     EditText etChanglog;
-
+    RadioButton rbCardPay,rbScanPay;
     @Override
     public int getViewId() {
         return R.layout.fragment_switch;
@@ -165,6 +165,17 @@ public class SwitchFragment extends BaseFragment implements RadioGroup.OnChecked
         } else {
             rbMdbLevel2.setChecked(true);
         }
+        RadioGroup rgNayaxPaySelect = view.findViewById(R.id.rg_nayax_pay_select);
+        rgNayaxPaySelect.setOnCheckedChangeListener(this);
+        rbCardPay = view.findViewById(R.id.rb_card_pay);
+        rbScanPay = view.findViewById(R.id.rb_scan_pay);
+
+        Boolean nayaxPayicon = Hawk.get("isScan", false);
+        if (nayaxPayicon) {
+            rbScanPay.setChecked(true);
+        } else {
+            rbCardPay.setChecked(true);
+        }
 
         Button btnMdbRate = view.findViewById(R.id.btn_mdb_rate);
         EditText etMdbRate = view.findViewById(R.id.et_mdb_rate);
@@ -417,6 +428,10 @@ public class SwitchFragment extends BaseFragment implements RadioGroup.OnChecked
             Hawk.put(Name.MDB_LEVEL, true);
         } else if (checkedId == R.id.rb_mdb_level_2) {
             Hawk.put(Name.MDB_LEVEL, false);
+        } else if (checkedId == R.id.rb_card_pay) {
+            Hawk.put("isScan", false);
+        } else if (checkedId == R.id.rb_scan_pay) {
+            Hawk.put("isScan", true);
         }
     }
 

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

@@ -273,6 +273,48 @@
                             android:textSize="@dimen/sp_8" />
                     </RadioGroup>
                 </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/ll_naxya_pay_select"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    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/nayax_pay_icon_choice"
+                        android:textColor="#333"
+                        android:textSize="@dimen/sp_14"
+                        android:textStyle="bold" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_nayax_pay_select"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <RadioButton
+                            android:id="@+id/rb_card_pay"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:gravity="center"
+                            android:text="@string/nayax_card_pay"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+
+                        <RadioButton
+                            android:id="@+id/rb_scan_pay"
+                            android:layout_width="@dimen/dp_60"
+                            android:layout_height="@dimen/dp_26"
+                            android:layout_marginLeft="@dimen/dp_20"
+                            android:gravity="center"
+                            android:text="@string/nayax_scan_pay"
+                            android:textColor="#576478"
+                            android:textSize="@dimen/sp_8" />
+                    </RadioGroup>
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/ll_mdb_ratio"

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

@@ -485,5 +485,11 @@
     <string name="automatic_back_time">الوضع التلقائي: العودة تلقائيًا إلى وقت واجهة الاستعداد</string>
     <string name = "manual_back_time">الوضع اليدوي: العودة تلقائيًا إلى وقت واجهة الاستعداد</string>
     <string name="unit">وحدة العملة</string>
+
+    <string name="nayax_time">وقت جلسة ناياكس</string>
+    <string name="nayax_card_pay">الدفع بالبطاقة</string>
+    <string name="nayax_scan_pay">امسح رمز QR ضوئيًا للدفع</string>
+    <string name="nayax_pay_icon_choice">تبديل رمز الدفع Nayax</string>
+
 </resources>
 <!--阿拉伯语-->

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

@@ -489,5 +489,10 @@
     <string name="automatic_back_time">Automatický režim: Automaticky se vrátí do pohotovostního režimu rozhraní</string>
     <string name="manual_back_time">Ruční režim: automatický návrat do pohotovostního režimu rozhraní</string>
     <string name="unit">Jednotka měny</string>
+    <string name="nayax_time">Čas relace Nayax</string>
+    <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>
+
 </resources>
 <!--捷克语-->

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

@@ -490,5 +490,10 @@
     <string name="manual_back_time">Manueller Modus: Automatische Rückkehr zur Standby-Schnittstellenzeit</string>
     <string name="unit">Währungseinheit</string>
 
+    <string name="nayax_time">Nayax-Sitzungszeit</string>
+    <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>
+
 </resources>
 <!--德语-->

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

@@ -490,6 +490,10 @@
     <string name="automatic_back_time">Automatic mode: Automatic return to standby interface time</string>
     <string name="manual_back_time">Manual mode: Automatic return to standby interface time</string>
     <string name="unit">Currency unit</string>
+    <string name="nayax_time">Nayax session time</string>
+    <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>
 
 </resources>
 <!--英语-->

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

@@ -492,5 +492,10 @@
     <string name="manual_back_time">Modo manual: retorno automático al tiempo de interfaz en espera</string>
     <string name="unit">Unidad monetaria</string>
 
+    <string name="nayax_time">Tiempo de sesión de Nayax</string>
+    <string name="nayax_card_pay">Pagar con tarjeta</string>
+    <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>
+
 </resources>
 <!--西班牙语-->

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

@@ -488,6 +488,10 @@
     <string name="automatic_back_time">Automaatrežiim: ooterežiimi liidese automaatne naasmine</string>
     <string name="manual_back_time">Käsitsirežiim: automaatne ooterežiimi liidese naasmise aeg</string>
     <string name="unit">Valuutaühik</string>
+    <string name="nayax_time">Nayaxi seansi aeg</string>
+    <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>
 
 </resources>
 <!--爱沙尼亚语-->

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

@@ -490,6 +490,10 @@
     <string name="automatic_back_time">Ավտոմատ ռեժիմ. ավտոմատ կերպով վերադառնալ սպասման միջերեսի ժամանակին</string>
     <string name="manual_back_time">Ձեռքով ռեժիմ. ավտոմատ վերադարձ սպասման ինտերֆեյսի ժամանակին</string>
     <string name="unit">Արժույթի միավոր</string>
+    <string name="nayax_time">Նայաքսի նստաշրջանի ժամանակը</string>
+    <string name="nayax_card_pay">Վճարեք քարտով</string>
+    <string name="nayax_scan_pay">Վճարելու համար սկանավորեք QR կոդը</string>
+    <string name="nayax_pay_icon_choice">Նայաքս վճարման պատկերակի անջատիչ</string>
 
 </resources>
 <!--亚美尼亚语-->

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

@@ -494,6 +494,10 @@
     <string name="automatic_back_time">자동 모드: 대기 인터페이스 시간으로 자동 복귀</string>
     <string name="manual_back_time">수동 모드: 대기 인터페이스 시간 자동 복귀</string>
     <string name="unit">통화 단위</string>
+    <string name="nayax_time">Nayax 세션 시간</string>
+    <string name="nayax_card_pay">카드로 결제</string>
+    <string name="nayax_scan_pay">결제하려면 QR 코드를 스캔하세요</string>
+    <string name="nayax_pay_icon_choice">Nayax 결제 아이콘 스위치</string>
 
 </resources>
     <!--韩语-->

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

@@ -488,6 +488,10 @@
     <string name="automatic_back_time">Automatinis režimas: automatiškai grįžti į budėjimo režimo sąsajos laiką</string>
     <string name="manual_back_time">Rankinis režimas: automatinio grįžimo į budėjimo režimą sąsajos laikas</string>
     <string name="unit">Valiutos vienetas</string>
+    <string name="nayax_time">Nayax seanso laikas</string>
+    <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>
 
 </resources>
 <!--立陶宛-->

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

@@ -484,6 +484,10 @@
     <string name="automatic_back_time">Automātiskais režīms: automātiski atgriezties gaidstāves interfeisa laikā</string>
     <string name="manual_back_time">Manuālais režīms: automātiska atgriešanās gaidstāves interfeisa režīmā</string>
     <string name="unit">Valūtas vienība</string>
+    <string name="nayax_time">Nayax sesijas laiks</string>
+    <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>
 
 </resources>
 <!--拉脱维亚-->

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

@@ -489,6 +489,10 @@
     <string name="automatic_back_time">Mod automatik: Kembali ke masa antara muka siap sedia secara automatik</string>
     <string name="manual_back_time">Mod manual: kembali automatik ke masa antara muka siap sedia</string>
     <string name="unit">Unit mata wang</string>
+    <string name="nayax_time">Masa sesi Nayax</string>
+    <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>
 
 </resources>
 <!--马来语-->

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

@@ -491,6 +491,10 @@
     <string name="automatic_back_time">Mod automat: reveniți automat la ora interfeței de așteptare</string>
     <string name="manual_back_time">Mod manual: revenire automată la timpul interfeței de așteptare</string>
     <string name="unit">Unitate valutară</string>
+    <string name="nayax_time">Durata sesiunii Nayax</string>
+    <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>
 
 </resources>
 <!--罗马尼亚语-->

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

@@ -487,6 +487,10 @@
     <string name="automatic_back_time">Автоматический режим: автоматический возврат к времени ожидания интерфейса</string>
     <string name="manual_back_time">Ручной режим: автоматический возврат к времени ожидания интерфейса</string>
     <string name="unit">Денежная единица</string>
+    <string name="nayax_time">Время сеанса Nayax</string>
+    <string name="nayax_card_pay">Оплата картой</string>
+    <string name="nayax_scan_pay">Сканируйте QR-код для оплаты</string>
+    <string name="nayax_pay_icon_choice">Переключатель значка платежа Nayax</string>
 
 </resources>
     <!--俄语-->

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

@@ -482,6 +482,10 @@
     <string name="automatic_back_time">โหมดอัตโนมัติ: กลับสู่เวลาอินเทอร์เฟซสแตนด์บายโดยอัตโนมัติ</string>
     <string name="manual_back_time">โหมดแมนนวล: กลับสู่เวลาอินเทอร์เฟซสแตนด์บายโดยอัตโนมัติ</string>
     <string name="unit">หน่วยสกุลเงิน</string>
+    <string name="nayax_time">เวลาเซสชันของ Nayax</string>
+    <string name="nayax_card_pay">ชำระเงินด้วยบัตร</string>
+    <string name="nayax_scan_pay">สแกนรหัส QR เพื่อชำระเงิน</string>
+    <string name="nayax_pay_icon_choice">สลับไอคอนการชำระเงินของ Nayax</string>
 
 </resources>
 <!--泰语-->

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

@@ -487,6 +487,9 @@
     <string name="automatic_back_time">自动模式：自动返回待机界面时间</string>
     <string name="manual_back_time">手动模式：自动返回待机界面时间</string>
     <string name="unit">货币单位</string>
-
+    <string name="nayax_time">Nayax会话时间</string>
+    <string name="nayax_card_pay">刷卡支付</string>
+    <string name="nayax_scan_pay">扫码支付</string>
+    <string name="nayax_pay_icon_choice">Nayax支付图标切换</string>
 </resources>
 <!--中文-->

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

@@ -497,6 +497,9 @@
     <string name="manual_back_time">手动模式：自动返回待机界面时间</string>
     <string name="unit">货币单位</string>
     <string name="nayax_time">Nayax会话时间</string>
+    <string name="nayax_card_pay">刷卡支付</string>
+    <string name="nayax_scan_pay">扫码支付</string>
+    <string name="nayax_pay_icon_choice">Nayax支付图标切换</string>
 
 </resources>
 <!--中文-->

config.gradle

@@ -5,7 +5,7 @@ ext {
             "minSdkVersion"                : 19,
             "targetSdkVersion"             : 28,
             "versionCode"                  : 110,
-            "versionName"                  : "1.0.28",
+            "versionName"                  : "1.0.29",
 
             "androidSupport"               : "28.0.0",
             "constraint-layout"            : "1.1.3",