修复7.0以下安卓版本机器无法打包har的bug

zbx911 · Nov 15, 2018 · 10aa448 · 10aa448
1 parent 48449b3
commit 10aa448
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
             storeFile file('./darkal.jks')
             storePassword '333333'
             v1SigningEnabled true
-            v2SigningEnabled true
+            v2SigningEnabled false
         }
     }
     dexOptions {
@@ -22,7 +22,7 @@ android {
     defaultConfig {
         applicationId "cn.darkal.networkdiagnosis"
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 22
         versionCode 31
         versionName "3.2.31"
         // Enabling multidex support.

diff --git a/app/src/main/java/net/lightbody/bmp/core/har/HarCookie.java b/app/src/main/java/net/lightbody/bmp/core/har/HarCookie.java
@@ -57,7 +57,7 @@ public void setDomain(String domain) {
         this.domain = domain;
     }
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.ssZ")
     public Date getExpires() {
         return expires;
     }

diff --git a/app/src/main/java/net/lightbody/bmp/core/har/HarEntry.java b/app/src/main/java/net/lightbody/bmp/core/har/HarEntry.java
@@ -35,7 +35,7 @@ public void setPageref(String pageref) {
         this.pageref = pageref;
     }
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssZ")
     public Date getStartedDateTime() {
         return startedDateTime;
     }

diff --git a/app/src/main/java/net/lightbody/bmp/core/har/HarPage.java b/app/src/main/java/net/lightbody/bmp/core/har/HarPage.java
@@ -34,7 +34,7 @@ public void setId(String id) {
         this.id = id;
     }
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.ssZ")
     public Date getStartedDateTime() {
         return startedDateTime;
     }