1
0
drake 3 жил өмнө
parent
commit
9d983d403c

+ 1 - 1
README.md

@@ -106,7 +106,7 @@ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
 // 支持自动下拉刷新和缺省页的(可选)
 implementation 'com.github.liangjingkanji:BRV:1.3.19'
 
-implementation 'com.github.liangjingkanji:Net:2.3.15'
+implementation 'com.github.liangjingkanji:Net:2.3.16'
 ```
 
 <br>

+ 5 - 5
kalle/src/main/java/com/yanzhenjie/kalle/Url.java

@@ -201,7 +201,7 @@ public class Url {
         URI newUri = URI.create(location);
         if (location.startsWith("/")) {
             return builder().setPath(newUri.getPath())
-                    .setQuery(newUri.getRawQuery())
+                    .setQuery(newUri.getQuery())
                     .setFragment(newUri.getFragment())
                     .build();
         } else if (location.contains("../")) {
@@ -216,15 +216,15 @@ public class Url {
                 oldPathList = oldPathList.subList(0, oldPathList.size() - start - 2);
                 oldPathList.addAll(newPathList);
                 String path = TextUtils.join("/", oldPathList);
-                return builder().setPath(path).setQuery(newUri.getRawQuery()).setFragment(newUri.getFragment()).build();
+                return builder().setPath(path).setQuery(newUri.getQuery()).setFragment(newUri.getFragment()).build();
             }
 
             String path = TextUtils.join("/", newPathList);
 
-            return builder().setPath(path).setQuery(newUri.getRawQuery()).setFragment(newUri.getFragment()).build();
+            return builder().setPath(path).setQuery(newUri.getQuery()).setFragment(newUri.getFragment()).build();
         } else {
             String path = (getPath() + newUri.getPath()).replace("//", "/");
-            return builder().setPath(path).setQuery(newUri.getRawQuery()).setFragment(newUri.getFragment()).build();
+            return builder().setPath(path).setQuery(newUri.getQuery()).setFragment(newUri.getFragment()).build();
         }
     }
 
@@ -244,7 +244,7 @@ public class Url {
             this.mHost = uri.getHost();
             this.mPort = convertPort(uri.getPort());
             this.mPath = uri.getPath();
-            this.mQuery = convertQuery(uri.getRawQuery()).builder();
+            this.mQuery = convertQuery(uri.getQuery()).builder();
             this.mFragment = uri.getFragment();
         }
 

+ 1 - 1
kalle/src/main/java/com/yanzhenjie/kalle/urlconnect/URLConnectionFactory.java

@@ -55,7 +55,7 @@ public class URLConnectionFactory implements ConnectFactory {
     @Override
     public Connection connect(Request request) throws IOException {
         HttpURLConnection connection;
-        URL url = new URL(request.url().toString(false));
+        URL url = new URL(request.url().toString(true));
 
         Proxy proxy = request.proxy();
         if (proxy == null)