commit cb1f269acd03595214385a8ffc7123c544ef39b3
author zongqiang.zhang <zongqiang.zhang@supwisdom.com> 周二 11月 26 17:17:14 2019 +0800
committer zongqiang.zhang <zongqiang.zhang@supwisdom.com> 周二 11月 26 17:17:14 2019 +0800
tree d1afee69e581b8c862c360ca9a45e0ac6807e9be
parent dc02e6bf1982daf48cd39ab88e68891cfb240c9d

优化显示

supwisdom/sp_consume.c

diff --git a/supwisdom/sp_consume.c b/supwisdom/sp_consume.c
index 78dd02c..579a3af 100644
--- a/supwisdom/sp_consume.c
+++ b/supwisdom/sp_consume.c
@@ -438,7 +438,7 @@
     }
     if(pos->purchase.paid_num > card->waterlimit)
     {
-      disp_hint_info(pos,"ÒÑ´ïµ¥´Î³öË®ÉÏÏÞ",DELAY_TIME2s);
+      disp_hint_info_two(pos,"Í£Ö¹³öË®","ÒÑ´ïµ¥´Î³öË®ÉÏÏÞ",DELAY_TIME2s);
       cardWorkState->current_state = CARDWORKSTATUS_STOPPING;
     }
     cardWorkState->pause_tick = timer_get_ticker();
@@ -454,7 +454,7 @@
     cardWorkState->current_state = CARDWORKSTATUS_STOPPED;
     break;
   case CARDWORKSTATUS_STOPPED:
-    disp_hint_info(pos, "Çë°Î¿¨", DELAY_TIME2s);
+    disp_hint_info_two(pos,"Í£Ö¹³öË®", "ÇëÄÃ×ß¿¨", DELAY_TIME2s);
     break;
   case CARDWORKSTATUS_FEECARD_WORKING:
     if(MEMCMP(pos->cardState.snr, card->cardphyid, 4) != 0)
@@ -629,6 +629,7 @@
       cardWorkState->current_state = CARDWORKSTATUS_ERROR;
       break;
     }
+	disp_hint_info_two(pos, "ÇëÇó¶þάÂë","ÇëÉÔµÈ...",0);
     ret = sp_qrcode_init(pos, &CARD);
     if(ret)
     {
@@ -645,7 +646,7 @@
     }
     pos->sysconf.work_mode = 1;
     CARD.qrcode.starttime = sp_get_ticker();
-    disp_hint_info(pos, "ÕýÔÚÉú³É¶þάÂë", DELAY_TIME2s);
+    //disp_hint_info(pos, "Éú³É¶þάÂë", 0);
     cardWorkState->last_state = cardWorkState->current_state;
     cardWorkState->current_state = CARDWORKSTATUS_READY;
     break;
@@ -696,7 +697,7 @@
     }
     if(pos->purchase.paid_num > CARD.waterlimit)
     {
-      disp_hint_info(pos, "ÒÑ´ïµ¥´Î³öË®ÉÏÏÞ", DELAY_TIME2s);
+      disp_hint_info_two(pos, "Í£Ö¹³öË®","ÒÑ´ïµ¥´Î³öË®ÉÏÏÞ", DELAY_TIME2s);
       cardWorkState->current_state = CARDWORKSTATUS_STOPPING;
     }
     cardWorkState->last_state = cardWorkState->current_state;
@@ -706,7 +707,7 @@
     if(cardWorkState->last_state == CARDWORKSTATUS_NONE
         || cardWorkState->last_state == CARDWORKSTATUS_READY)
     {
-      disp_hint_info(pos,"È¡ÏûË¢Âë!", DELAY_TIME2s);
+      disp_hint_info_two(pos,"Í£Ö¹³öË®","È¡ÏûË¢Âë!", DELAY_TIME2s);
       pos->paymode = PAYMODE_INIT;
       pos->sysconf.work_mode = 0;
     }