fix reverse proxy

Lazyeraser · Mar 4, 2019 · 8027296 · 8027296
1 parent 5a3f552
commit 8027296
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.lazyeraser.imas.derehelper"
         minSdkVersion 17
         targetSdkVersion 25
-        versionCode 16
-        versionName "1.0.6"
+        versionCode 17
+        versionName "1.0.7"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/java/com/lazyeraser/imas/cgss/service/CGSSService.java b/app/src/main/java/com/lazyeraser/imas/cgss/service/CGSSService.java
@@ -27,6 +27,6 @@ public interface CGSSService {
     @GET("http://346lab.org/dl/cgss_assets/{version}/manifests/Android_AHigh_SHigh")
     Observable<ResponseBody> getManifestsRP(@Path("version") String version);
 
-    @GET("http://346lab.org/dl/cgss_assets/resources/Generic/{hash}")
-    Observable<ResponseBody> getResourcesRP(@Path("hash") String hash);
+    @GET("http://346lab.org/dl/cgss_assets/resources/Generic/{head}/{hash}")
+    Observable<ResponseBody> getResourcesRP(@Path("head") String head, @Path("hash") String hash);
 }
diff --git a/app/src/main/java/com/lazyeraser/imas/cgss/viewmodel/LiveVm.java b/app/src/main/java/com/lazyeraser/imas/cgss/viewmodel/LiveVm.java
@@ -109,7 +109,7 @@ private void updateBeatMapFile(int liveId, int diffcult){
                     .subscribe(o -> {
                         Manifest manifest = (Manifest)o;
                         Observable<ResponseBody> file = umi.getSP(SharedHelper.KEY_USE_REVERSE_PROXY) ?
-                                RetrofitProvider.getInstance(false).create(CGSSService.class).getResourcesRP(manifest.getHash()) :
+                                RetrofitProvider.getInstance(false).create(CGSSService.class).getResourcesRP(manifest.getHash().substring(0, 2), manifest.getHash()) :
                                 RetrofitProvider.getInstance(false).create(CGSSService.class).getResources(manifest.getHash().substring(0, 2), manifest.getHash(), umi.spRead(SharedHelper.KEY_UNITY_VERSION));
                         file.subscribeOn(Schedulers.io())
                                 .subscribe(responseBody -> {

diff --git a/app/src/main/java/com/lazyeraser/imas/cgss/viewmodel/MainViewModel.java b/app/src/main/java/com/lazyeraser/imas/cgss/viewmodel/MainViewModel.java
@@ -259,7 +259,7 @@ private void downLoadFiles(int i, String masterHash, String truthVersion){
         if (i < hashToDownload.size()){
             String hash = hashToDownload.get(i);
             Observable<ResponseBody> file = useReverseProxy ?
-                    RetrofitProvider.getInstance(false).create(CGSSService.class).getResourcesRP(hash) :
+                    RetrofitProvider.getInstance(false).create(CGSSService.class).getResourcesRP(hash.substring(0, 2), hash) :
                     RetrofitProvider.getInstance(false).create(CGSSService.class).getResources(hash.substring(0, 2), hash, umi.spRead(SharedHelper.KEY_UNITY_VERSION));
             file.subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())

diff --git a/appupdate/version.json b/appupdate/version.json
@@ -1,11 +1,11 @@
 {
 	"appname": "DereHelper",
-	"apkname": "DereHelper-1.0.6.apk",
-	"verName": " 1.0.6",
-	"md5": "60d047b1e0947317d11e6552395325d4",
-	"url": "http://346lab.org/derehelper/apk/DereHelper-1.0.6.apk",
-	"verInfo": "1.修复数据下载逻辑\n2.修复Android 9.0闪退",
+	"apkname": "DereHelper-1.0.7.apk",
+	"verName": " 1.0.7",
+	"md5": "1b8aa9af9834cbe59ca250be3ec43888",
+	"url": "http://346lab.org/derehelper/apk/DereHelper-1.0.7.apk",
+	"verInfo": "1.修复逆向代理",
 	"verInfo_jp": "1.不具合の修正",
 	"verInfo_en": "1.Bug fixes",
-	"verCode": 16
+	"verCode": 17
 }