From 098cc651235d004ddcfe003089f2df9f766206db Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Wed, 23 Dec 2020 20:07:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=83=AD=E6=9B=B4=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E8=BF=90=E8=A1=8C=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/hnjc/wjtx/LaunchActivity.java  | 4 ++--
 app/src/main/java/com/hnjc/wjtx/util/AssetsUtil.java | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hnjc/wjtx/LaunchActivity.java b/app/src/main/java/com/hnjc/wjtx/LaunchActivity.java
index e6bee53..34583f0 100644
--- a/app/src/main/java/com/hnjc/wjtx/LaunchActivity.java
+++ b/app/src/main/java/com/hnjc/wjtx/LaunchActivity.java
@@ -128,7 +128,7 @@ public class LaunchActivity extends Activity {
      */
     private void getLocalVersionInfo() {
         String fileName = gameUrl.replace("index.html", "version.json");
-        String realPath = getFileDirByUrl(fileName);
+        String realPath = preloadPath + "/" + getFileDirByUrl(fileName) + "version.json" ;
         File versionFile = new File(realPath);
         if (versionFile.exists()) {
             JSONObject data = AssetsUtil.readJsonFromFile(this, realPath);
@@ -198,7 +198,7 @@ public class LaunchActivity extends Activity {
         });
     }
     private void preloadGame() {
-        String dir = preloadPath + getFileDirByUrl(gameUrl);
+        String dir = preloadPath + "/" + getFileDirByUrl(gameUrl);
         File dirFile = new File(dir);
         if (!dirFile.exists()) {
             dirFile.mkdirs();
diff --git a/app/src/main/java/com/hnjc/wjtx/util/AssetsUtil.java b/app/src/main/java/com/hnjc/wjtx/util/AssetsUtil.java
index 73f1481..af52d0b 100644
--- a/app/src/main/java/com/hnjc/wjtx/util/AssetsUtil.java
+++ b/app/src/main/java/com/hnjc/wjtx/util/AssetsUtil.java
@@ -12,6 +12,7 @@ import org.json.JSONObject;
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -187,12 +188,15 @@ public class AssetsUtil {
      */
     public static String readFromFile(Context context, String path) {
         try {
-            InputStreamReader inputReader = new InputStreamReader(context.openFileInput(path));
+            FileInputStream fileInputStream = new FileInputStream(new File(path));
+            InputStreamReader inputReader = new InputStreamReader(fileInputStream);
             BufferedReader bufReader = new BufferedReader(inputReader);
+
             String line="";
             StringBuilder result= new StringBuilder();
             while((line = bufReader.readLine()) != null)
                 result.append(line);
+            fileInputStream.close();
             inputReader.close();
             bufReader.close();
             return result.toString();