Parcourir la source

自定义刷卡提示文本

ccc il y a 1 an
Parent
commit
1d687dc4c1

+ 1 - 1
.idea/misc.xml

@@ -29,7 +29,7 @@
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_alarm_clock_tp.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_coin_sucess.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_credit_card.xml" value="0.536" />
-        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_mdbcredit_card.xml" value="0.24947916666666667" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_mdbcredit_card.xml" value="0.6" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_mix_pay_now.xml" value="0.10400000000000001" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_pay.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_select_icon.xml" value="0.24947916666666667" />

+ 0 - 1
app/src/main/java/com/bgy/autosale/payutil/CreditCardDialog.java

@@ -61,7 +61,6 @@ public class CreditCardDialog extends BaseDialogNoDatabinding implements View.On
         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;

+ 9 - 0
app/src/main/java/com/bgy/autosale/payutil/MdbCreditCardDialog.java

@@ -6,6 +6,7 @@ import android.content.Context;
 import android.os.CountDownTimer;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
+import android.text.Html;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -30,6 +31,7 @@ import com.hboxs.base_library.constant.Name;
 import com.hboxs.base_library.util.LogUtil;
 import com.hboxs.base_library.util.ToastUtil;
 import com.hboxs.base_library.util.UiUtil;
+import com.orhanobut.hawk.Hawk;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -42,6 +44,7 @@ import java.util.TimerTask;
 public class MdbCreditCardDialog extends FrameLayout implements View.OnClickListener {
     private static final String TAG = "MdbCreditCardDialog";
     private TextView tvTime;
+    private TextView tvScanNow;
     private CountDownTimer countDownTimer;
     private static int time = 90;
     private View view;
@@ -62,6 +65,12 @@ public class MdbCreditCardDialog extends FrameLayout implements View.OnClickList
         view.findViewById(R.id.btn_cancel).setOnClickListener(this);
         view.findViewById(R.id.iv_qr_code).setOnClickListener(this);
         tvTime = view.findViewById(R.id.tv_time);
+        tvScanNow=view.findViewById(R.id.tv_scan_now);
+        tvScanNow.setText(Html.fromHtml(UiUtil.getStringRes(R.string.credit_card_payment)));
+        String s = Hawk.get(Name.CREDIT_CARD_PAYMENT_TEXT_DESCRIPTION, "");
+        if (!"".equals(s)) {
+            tvScanNow.setText(Html.fromHtml(s));
+        }
         LayoutParams layoutParams = new LayoutParams(getResources().getDimensionPixelOffset(R.dimen.dp_269), ViewGroup.LayoutParams.WRAP_CONTENT);
 //        layoutParams.width = (int) (outMetrics.widthPixels * 0.4f);
         layoutParams.gravity = Gravity.CENTER;

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

@@ -40,8 +40,8 @@ public class TextSettingActivity extends BaseScanGunActivity implements View.OnC
         findViewById(R.id.people_save).setOnClickListener(this);
         findViewById(R.id.phone_save).setOnClickListener(this);
         etCreditTest=findViewById(R.id.et_credit_test);
-        etPhoneText.setText(Hawk.get(Name.CREDIT_CARD_PAYMENT_TEXT_DESCRIPTION,""));
-        findViewById(R.id.et_credit_test).setOnClickListener(this);
+        etCreditTest.setText(Hawk.get(Name.CREDIT_CARD_PAYMENT_TEXT_DESCRIPTION,""));
+        findViewById(R.id.credit_save).setOnClickListener(this);
     }
 
     @Override
@@ -62,9 +62,9 @@ public class TextSettingActivity extends BaseScanGunActivity implements View.OnC
             Hawk.put(Name.CONTACTS_NUM, contacts);
             App.app.contactBean.hotServicePhone = Hawk.get(Name.CONTACTS_NUM,"");
             showToast(getString(R.string.modified_success));
-        }else if (id == R.id.et_credit_test) {
+        }else if (id == R.id.credit_save) {
             String contacts = etCreditTest.getText().toString();
-            Hawk.put(Name.CONTACTS_NUM, contacts);
+            Hawk.put(Name.CREDIT_CARD_PAYMENT_TEXT_DESCRIPTION, contacts);
             showToast(getString(R.string.modified_success));
         }
     }

+ 1 - 1
config.gradle

@@ -5,7 +5,7 @@ ext {
             "minSdkVersion"                : 19,
             "targetSdkVersion"             : 28,
             "versionCode"                  : 109,
-            "versionName"                  : "1.0.22",
+            "versionName"                  : "1.0.23",
 
             "androidSupport"               : "28.0.0",
             "constraint-layout"            : "1.1.3",