内容匹配模式【不是】改为【不包含】

app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java

@@ -148,7 +148,7 @@ public class RuleActivity extends AppCompatActivity {
         final RadioGroup radioGroupRuleCheck2 = (RadioGroup) view1.findViewById(R.id.radioGroupRuleCheck2);
         if (ruleModel != null) {
             int ruleCheckCheckId = ruleModel.getRuleCheckCheckId();
-            if (ruleCheckCheckId == R.id.btnIs || ruleCheckCheckId == R.id.btnNotIs || ruleCheckCheckId == R.id.btnContain) {
+            if (ruleCheckCheckId == R.id.btnIs || ruleCheckCheckId == R.id.btnNotContain || ruleCheckCheckId == R.id.btnContain) {
                 radioGroupRuleCheck.check(ruleCheckCheckId);
             } else {
                 radioGroupRuleCheck2.check(ruleCheckCheckId);

app/src/main/java/com/idormy/sms/forwarder/model/RuleModel.java

@@ -23,6 +23,7 @@ public class RuleModel {
     public static final Map<String, String> FILED_MAP = new HashMap<String, String>();
     public static final String CHECK_IS = "is";
     public static final String CHECK_CONTAIN = "contain";
+    public static final String CHECK_NOT_CONTAIN = "notcontain";
     public static final String CHECK_START_WITH = "startwith";
     public static final String CHECK_END_WITH = "endwith";
     public static final String CHECK_NOT_IS = "notis";
@@ -42,10 +43,11 @@ public class RuleModel {
 
     static {
         CHECK_MAP.put("is", "是");
+        CHECK_MAP.put("notis", "不是");
         CHECK_MAP.put("contain", "包含");
         CHECK_MAP.put("startwith", "开头是");
         CHECK_MAP.put("endwith", "结尾是");
-        CHECK_MAP.put("notis", "不是");
+        CHECK_MAP.put("notcontain", "不包含");
         CHECK_MAP.put("regex", "正则匹配");
     }
 
@@ -96,8 +98,8 @@ public class RuleModel {
                 return CHECK_END_WITH;
             case R.id.btnRegex:
                 return CHECK_REGEX;
-            case R.id.btnNotIs:
-                return CHECK_NOT_IS;
+            case R.id.btnNotContain:
+                return CHECK_NOT_CONTAIN;
             default:
                 return CHECK_IS;
         }
@@ -155,11 +157,19 @@ public class RuleModel {
                 case CHECK_IS:
                     checked = this.value.equals(msgValue);
                     break;
+                case CHECK_NOT_IS:
+                    checked = !this.value.equals(msgValue);
+                    break;
                 case CHECK_CONTAIN:
                     if (msgValue != null) {
                         checked = msgValue.contains(this.value);
                     }
                     break;
+                case CHECK_NOT_CONTAIN:
+                    if (msgValue != null) {
+                        checked = !msgValue.contains(this.value);
+                    }
+                    break;
                 case CHECK_START_WITH:
                     if (msgValue != null) {
                         checked = msgValue.startsWith(this.value);
@@ -237,8 +247,8 @@ public class RuleModel {
                 return R.id.btnEndWith;
             case CHECK_REGEX:
                 return R.id.btnRegex;
-            case CHECK_NOT_IS:
-                return R.id.btnNotIs;
+            case CHECK_NOT_CONTAIN:
+                return R.id.btnNotContain;
             default:
                 return R.id.btnIs;
         }

app/src/main/java/com/idormy/sms/forwarder/utils/RuleLine.java

@@ -19,6 +19,7 @@ class RuleLine {
     public static final String SURE_NOT = "不是";
     public static final String CHECK_EQUALS = "相等";
     public static final String CHECK_CONTAIN = "包含";
+    public static final String CHECK_NOT_CONTAIN = "不包含";
     public static final String CHECK_START_WITH = "开头";
     public static final String CHECK_END_WITH = "结尾";
     public static final String CHECK_REGEX = "正则";
@@ -51,6 +52,8 @@ class RuleLine {
         CHECK_LIST.add("包含");
         CHECK_LIST.add("开头");
         CHECK_LIST.add("结尾");
+        CHECK_LIST.add("不包含");
+        CHECK_LIST.add("正则匹配");
     }
 
     //开头有几个空格

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

@@ -115,14 +115,14 @@
                     android:text="是　　　" />
 
                 <RadioButton
-                    android:id="@+id/btnNotIs"
+                    android:id="@+id/btnContain"
                     style="@style/rg_rb_style"
-                    android:text="不是　　" />
+                    android:text="包含　　" />
 
                 <RadioButton
-                    android:id="@+id/btnContain"
+                    android:id="@+id/btnNotContain"
                     style="@style/rg_rb_style"
-                    android:text="包含　　" />
+                    android:text="不包含　" />
             </RadioGroup>
 
             <RadioGroup