commit 2d6738cceed36988bf0c97492263cae9faf18b5a
author guangcheng.qin <guangcheng.qin@supwisdom.com> 周三 9月 25 17:38:15 2019 +0800
committer guangcheng.qin <guangcheng.qin@supwisdom.com> 周三 9月 25 17:38:15 2019 +0800
tree 31f16e6b256fef143a1ed1ea43f0989227fb597b
parent 323c1b1189d168f933de2b8bd39c397205f5a56c

修复刷卡报错问题和二维码有效期bug

supwisdom/sp_display.c

diff --git a/supwisdom/sp_display.c b/supwisdom/sp_display.c
index 676e27d..860a451 100644
--- a/supwisdom/sp_display.c
+++ b/supwisdom/sp_display.c
@@ -162,120 +162,124 @@
   switch(errcode)
   {
   case RC_PSAM_ERR:
-    sprintf(msg,"%s", "SAM¸´Î»Ê§°Ü");
+    sprintf(msg, "%s", "SAM¸´Î»Ê§°Ü");
     break;
   case RC_CARD_LOGIN:
-    sprintf(msg,"%s", "ÑéÖ¤ÃØԿʧ°Ü");
+    sprintf(msg, "%s", "ÑéÖ¤ÃØԿʧ°Ü");
     break;
   case RC_CARD_READ:
-    sprintf(msg,"%s", "¶Á¿¨Ê§°Ü");
+    sprintf(msg, "%s", "¶Á¿¨Ê§°Ü");
     break;
   case RC_CARD_WRITE:
-    sprintf(msg,"%s", "д¿¨Ê§°Ü");
+    sprintf(msg, "%s", "д¿¨Ê§°Ü");
     break;
   case RC_FLASH_ERR:
-    sprintf(msg,"%s", "FLASHÒì³£");
+    sprintf(msg, "%s", "FLASHÒì³£");
     break;
   case RC_HARDWARE_ERR:
-    sprintf(msg,"%s", "¹Ì¼þÒì³£");
+    sprintf(msg, "%s", "¹Ì¼þÒì³£");
     break;
   case RC_FLASH_NO_RIGHT:
-    sprintf(msg,"%s", "FLASHÏÞÖÆ");
+    sprintf(msg, "%s", "FLASHÏÞÖÆ");
     break;
   case RC_CARD_NORIGHT:
-    sprintf(msg,"%s", "¿¨ÎÞȨÏÞ");
+    sprintf(msg, "%s", "¿¨ÎÞȨÏÞ");
     break;
   case RC_CARD_EXPIRED:
-    sprintf(msg,"%s", "¿¨ÒѹýÆÚ");
+    sprintf(msg, "%s", "¿¨ÒѹýÆÚ");
     break;
   case RC_CARD_LOST:
-    sprintf(msg,"%s", "¿¨ÒÑËø¶¨");
+    sprintf(msg, "%s", "¿¨ÒÑËø¶¨");
     break;
   case RC_CARDNO_EXCEPT:
-    sprintf(msg,"%s", "¿¨Òì³£");
+    sprintf(msg, "%s", "¿¨Òì³£");
     break;
   case RC_CARD_TIMEOUT:
-    sprintf(msg,"%s", "ʹÓÃÌ«¾Ã");
+    sprintf(msg, "%s", "ʹÓÃÌ«¾Ã");
     break;
   case RC_CARDBAL_EXCEPT:
-    sprintf(msg,"%s", "Óà¶îÒì³£");
+    sprintf(msg, "%s", "Óà¶îÒì³£");
     break;
   case RC_CARDBAL_LACK:
-    sprintf(msg,"%s", "ÇëÁª»úÏû·Ñ");
+    sprintf(msg, "%s", "ÇëÁª»úÏû·Ñ");
     break;
   case RC_DEVPHYID_NOTSET:
-    sprintf(msg,"%s", "δÉèÖûúºÅ");
+    sprintf(msg, "%s", "δÉèÖûúºÅ");
     break;
   case RC_FEERATE_NOTSET:
-    sprintf(msg,"%s", "δÉèÖ÷ÑÂÊ");
+    sprintf(msg, "%s", "δÉèÖ÷ÑÂÊ");
     break;
   case RC_DEV_OFFLINE_ERROR:
-    sprintf(msg,"%s", "É豸ÍÑ»úÌ«¾Ã");
+    sprintf(msg, "%s", "É豸ÍÑ»úÌ«¾Ã");
     break;
   case RC_TRANSDTL_FULL:
-    sprintf(msg,"%s", "Á÷Ë®ÒÑÂú");
+    sprintf(msg, "%s", "Á÷Ë®ÒÑÂú");
     break;
   case RC_FILE09_CRC_ERR:
-    sprintf(msg,"%s", "09CRC´íÎó");
+    sprintf(msg, "%s", "09CRC´íÎó");
     break;
   case RC_FILE10_CRC_ERR:
-    sprintf(msg,"%s", "10CRC´íÎó");
+    sprintf(msg, "%s", "10CRC´íÎó");
     break;
   case RC_CARD_INVALID:
-    sprintf(msg,"%s", "ÎÞЧ¿¨");
+    sprintf(msg, "%s", "ÎÞЧ¿¨");
     break;
   case RC_FEENUM_ERROR:
-    sprintf(msg,"%s", "·ÑÂʸöÊý´íÎó");
+    sprintf(msg, "%s", "·ÑÂʸöÊý´íÎó");
     break;
   case RC_NOTSUPPORT:
-    sprintf(msg,"%s", "²»Ö§³Ö");
+    sprintf(msg, "%s", "²»Ö§³Ö");
     break;
   case RC_NOT_SAME_CARD:
-    sprintf(msg,"%s", "²»Í¬¿¨");
+    sprintf(msg, "%s", "²»Í¬¿¨");
     break;
   case RC_MODE_NOT_SUPPORT:
-    sprintf(msg,"%s", "ģʽ²»Ö§³Ö");
+    sprintf(msg, "%s", "ģʽ²»Ö§³Ö");
     break;
   case RC_UPDPROG_ERR:
-    sprintf(msg,"%s", "Éý¼¶Ê§°Ü");
+    sprintf(msg, "%s", "Éý¼¶Ê§°Ü");
     break;
   case RC_CONFPARA_CRC_ERR:
-    sprintf(msg,"%s", "ÅäÖÃCRC´íÎó");
+    sprintf(msg, "%s", "ÅäÖÃCRC´íÎó");
     break;
   case RC_TRANSDTL_NO_ERR:
-    sprintf(msg,"%s", "Á÷Ë®ºÅÒì³£");
+    sprintf(msg, "%s", "Á÷Ë®ºÅÒì³£");
     break;
   case RC_DEVICENO_OUT:
-    sprintf(msg,"%s", "»úºÅ¹ý´ó");
+    sprintf(msg, "%s", "»úºÅ¹ý´ó");
     break;
   case RC_QRCODE_FAILURE:
-  	sprintf(msg,"%s", "¶þάÂë»ñȡʧ°Ü");
-	break;
+    sprintf(msg, "%s", "¶þάÂë»ñȡʧ°Ü");
+    break;
   case RC_QRCODE_TIMEOUT:
-  	sprintf(msg,"%s", "¶þάÂ볬ʱ");
-	break;
+    sprintf(msg, "%s", "¶þάÂ볬ʱ");
+    break;
   case RC_QRCODE_QUERY_FAIL:
-  	sprintf(msg,"%s", "¶þάÂëÈÏ֤ʧ°Ü");
-	break;
+    sprintf(msg, "%s", "¶þάÂëÈÏ֤ʧ°Ü");
+    break;
   case RC_DEV_NOT_LOGIN:
-  	sprintf(msg,"%s", "É豸δǩµ½");
-	break;
+    sprintf(msg, "%s", "É豸δǩµ½");
+    break;
   case RC_DEV_FAULT:
-  	sprintf(msg,"%s", "É豸ÒÉËƹÊÕÏ");
-	break;
+    sprintf(msg, "%s", "É豸ÒÉËƹÊÕÏ");
+    break;
   case RC_DEV_NOSET_FLOWSENSOR_UNIT:
-  	sprintf(msg,"%s", "Á÷Á¿¼ÆË㵥λδÉèÖÃ");
-	break;
+    sprintf(msg, "%s", "Á÷Á¿¼ÆË㵥λδÉèÖÃ");
+    break;
   case RC_CARD_AUTHENTICATION:
-  	sprintf(msg,"%s", "¿¨ÈÏ֤ʧ°Ü");
-	break;
+    sprintf(msg, "%s", "¿¨ÈÏ֤ʧ°Ü");
+    break;
+  case RC_LIMIT_CONSUMPTION:
+    sprintf(msg, "%s", "¸ÃÓû§±»ÏÞÖÆÏû·Ñ");
+    break;
   default:
     sprintf(msg,"´íÎóÂë=0x%04x",errcode);
   }
   disp_hint_info_two(pos,hint,msg,DELAY_TIME3s);
 }
 
-void disp_hint_info_three(sp_pos_t* pos,const char* msg1,const char* msg2,const char* msg3,uint32 ms)
+void disp_hint_info_three(sp_pos_t* pos,const char* msg1,const char* msg2,
+                          const char* msg3,uint32 ms)
 {
   show_title();
   show_bottom(pos);