fix: 修复zdc1输入ota地址无效的问题

a2633063 · Jun 9, 2020 · 16fceae · 16fceae
1 parent a59c0ed
commit 16fceae
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.zyc.zcontrol"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 38
-        versionName "v1.4.0"
+        versionCode 39
+        versionName "v1.4.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":38,"versionName":"v1.4.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":39,"versionName":"v1.4.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
diff --git a/app/src/main/java/com/zyc/zcontrol/deviceItem/dc1/DC1SettingFragment.java b/app/src/main/java/com/zyc/zcontrol/deviceItem/dc1/DC1SettingFragment.java
@@ -327,7 +327,7 @@ void debugFWUpdate() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         String uri = et.getText().toString();
                         //if (uri.length() < 1) return;
-                        String[] ota = uri.split("\r\n");
+                        String[] ota = uri.replace("\r\n","\n").split("\n");
 
                         if (ota.length < 2
                                 || (ota.length >= 2 && (!ota[0].startsWith("http") || !ota[1].startsWith("http")))