改进判断

Author: RikkaW

app/src/main/java/rikka/smscodehelper/utils/SMSCode.java

@@ -43,7 +43,7 @@ public int compare(String o1, String o2) {
 
         // 分出每个句子 并在有关键词的句子里找验证码
         ArrayList<String> sentence;
-        sentence = findCodeSentence(content);
+        sentence = findSentence(content);
 
         for (String str : sentence) {
             if (findKeyWord(str) != -1) {
@@ -98,7 +98,7 @@ private static int findKeyWord(String content) {
         return codeFindStart;
     }
 
-    private static ArrayList<String> findCodeSentence(String content) {
+    private static ArrayList<String> findSentence(String content) {
         ArrayList<String> list = new ArrayList<>();
 
         int last = 0;
@@ -124,9 +124,23 @@ private static boolean isCodeChar(char ch) {
         return ((ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9'));
     }
 
+    private static String getStringAfter(String content, String string) {
+        int startPos = content.indexOf(string);
+        if (startPos == -1) {
+            return content;
+        } else {
+            return content.substring(startPos);
+        }
+    }
+
     private static String findCode(String content) {
         content += " ";
 
+        // 如果有冒号
+        content = getStringAfter(content, "：");
+        content = getStringAfter(content, ":");
+
+
         int startPos = -1;
         for (int i = 0; i < content.length(); i++) {
             char ch = content.charAt(i);

app/src/test/java/rikka/smscodehelper/utils/SMSCodeTest.java

@@ -41,5 +41,7 @@ private void setSmsContact() {
         SmsContactCodeMap.put(SMSContact5, "060973");
         String SMSContact6 = "您在付款，为防诈骗千万不要告诉他人验证码505513，商户为汇付天下，金额80元。如有疑问请停止操作。（短信编号：245747）【工商银行】";
         SmsContactCodeMap.put(SMSContact6, "505513");
+        String SMSContact7 = "任何向你索要验证码的都是骗子，千万别给！您正在向www（尾号4832）转账，验证码370000，100元。";
+        SmsContactCodeMap.put(SMSContact7, "370000");
     }
 }