v361

xiaoyuanhost · Mar 3, 2021 · c8d4031 · c8d4031
1 parent 5460737
commit c8d4031
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -68,6 +68,8 @@ APP下载 [https://pan.baidu.com/s/1kbelTFIf5nwkOY9g6itkvA]
 ![应用更新](pic/update-dingdingsecret.jpg "应用更新")
 
 ### 更新记录：
+> [v3.6.1](app/release/TSMS_release_20210303_3.6.0.apk) 1，添加多重规则。\r\n2，添加规则测试按钮。\r\n3，转发规则发送方列表页面支持长按删除。\r\n4，整合逻辑。\r\n5，修复部分错误文字。
+>
 > [v3.5.3](app/release/TSMS_release_20210227_3.5.3.apk) 1，修复Post通知验签
 
 > [v3.5.2](app/release/TSMS_release_20210226_3.5.2.apk) 1，修复Post通知验签。2，修复Post通知允许http

diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.tim.tsms.transpondsms"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 354
-        versionName "3.5.4"
+        versionCode 361
+        versionName "3.6.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/release/TSMS_release_20210303_3.6.1.apk b/app/release/TSMS_release_20210303_3.6.1.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":353,"versionName":"3.5.3","enabled":true,"outputFile":"TSMS_release_20210227_3.5.3.apk","fullName":"release","baseName":"release"},"path":"TSMS_release_20210227_3.5.3.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":361,"versionName":"3.6.1","enabled":true,"outputFile":"TSMS_release_20210303_3.6.1.apk","fullName":"release","baseName":"release"},"path":"TSMS_release_20210303_3.6.1.apk","properties":{}}]
diff --git a/app/src/main/java/com/tim/tsms/transpondsms/utils/RuleLineUtils.java b/app/src/main/java/com/tim/tsms/transpondsms/utils/RuleLineUtils.java
@@ -11,7 +11,7 @@
 
 public class RuleLineUtils {
     static String TAG = "RuleLineUtils";
-    static Boolean STARTLOG = true;
+    static Boolean STARTLOG = false;
 
     public static void main(String[] args) throws Exception {
         String a = "并且 是 手机号 相等 10086\n" +

diff --git a/app/src/main/java/com/tim/tsms/transpondsms/utils/SettingUtil.java b/app/src/main/java/com/tim/tsms/transpondsms/utils/SettingUtil.java
@@ -58,7 +58,7 @@ public static void set_send_util_email(String host,String port,String from_add,S
     public static String get_send_util_email(String key){
         Log.d(TAG,"get_send_util_email  key"+key);
         String defaultstt ="";
-        if(key.equals(Define.SP_MSG_SEND_UTIL_EMAIL_HOST_KEY)) defaultstt = "stmp服务器";
+        if(key.equals(Define.SP_MSG_SEND_UTIL_EMAIL_HOST_KEY)) defaultstt = "smtp服务器";
         if(key.equals(Define.SP_MSG_SEND_UTIL_EMAIL_PORT_KEY)) defaultstt = "端口";
         if(key.equals(Define.SP_MSG_SEND_UTIL_EMAIL_FROMADD_KEY)) defaultstt = "发送邮箱";
         if(key.equals(Define.SP_MSG_SEND_UTIL_EMAIL_PSW_KEY)) defaultstt = "密码";

diff --git a/app/src/main/res/layout/activity_alter_dialog_setview_email.xml b/app/src/main/res/layout/activity_alter_dialog_setview_email.xml
@@ -35,7 +35,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="2dp"
-            android:text="stmp服务器" />
+            android:text="smtp服务器" />
 
         <EditText
             android:id="@+id/editTextEmailHost"
@@ -138,7 +138,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="2dp"
-            android:text="发到哪个邮件去" />
+            android:text="发到哪个邮箱去" />
 
         <EditText
             android:id="@+id/editTextEmailToAdd"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":353,"versionName":"3.5.3","enabled":true,"outputFile":"TSMS_release_20210227_3.5.3.apk","fullName":"release","baseName":"release"},"path":"TSMS_release_20210227_3.5.3.apk","properties":{}}]
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":361,"versionName":"3.6.1","enabled":true,"outputFile":"TSMS_release_20210303_3.6.1.apk","fullName":"release","baseName":"release"},"path":"TSMS_release_20210303_3.6.1.apk","properties":{}}]