Commit 73c1baf2 authored by fallenstardust's avatar fallenstardust

升级zipEntery提高zip读取数据长度并支持GBK编码格式

parent ea6af759
......@@ -9,8 +9,8 @@ android {
minSdkVersion 23
//noinspection ExpiredTargetSdkVersion
targetSdkVersion 29
versionCode 311120003
versionName "3.11.12"
versionCode 311120004
versionName "3.11.12fix1"
flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true
ndkVersion "20.1.5948944"
......@@ -98,7 +98,7 @@ dependencies {
implementation "org.igniterealtime.smack:smack-tcp:4.3.0"
//
implementation 'org.greenrobot:eventbus:3.0.0'
implementation 'com.tubb.smrv:swipemenu-recyclerview:5.4.0'
implementation 'com.tubb.smrv:swipemenu-recyclerview:5.4.8'
//
implementation(name: 'libWindbot', ext: 'aar')
......@@ -107,7 +107,7 @@ dependencies {
//dialog库
implementation 'com.github.feihuaduo:DialogUtils:1.8.9.23'
//recyclerview的adapter库
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.4'
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:4.1.4'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
//图片选择
......
......@@ -12,6 +12,9 @@ import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
import com.file.zip.ZipEntry;
import com.file.zip.ZipFile;
import org.greenrobot.eventbus.EventBus;
import java.io.BufferedReader;
......@@ -25,8 +28,6 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import cn.garymb.ygomobile.AppsSettings;
import cn.garymb.ygomobile.Constants;
......@@ -112,8 +113,8 @@ public class ServerUtil {
LogUtil.e("GameUriManager", "读取压缩包");
try {
String serverName = null, serverDesc = null, serverHost = null, serverPort = null;
ZipFile zipFile = new ZipFile(file.getAbsoluteFile());
Enumeration<? extends ZipEntry> entris = zipFile.entries();
ZipFile zipFile = new ZipFile(file.getAbsoluteFile(), "GBK");
Enumeration<ZipEntry> entris = zipFile.getEntries();
ZipEntry entry;
StringBuilder content = new StringBuilder();
while (entris.hasMoreElements()) {
......
......@@ -8,6 +8,9 @@ import android.util.SparseArray;
import androidx.annotation.WorkerThread;
import com.file.zip.ZipEntry;
import com.file.zip.ZipFile;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
......@@ -19,8 +22,6 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream;
import cn.garymb.ygomobile.App;
......@@ -85,11 +86,11 @@ public class CardManager {
String savePath = App.get().getExternalCacheDir().getAbsolutePath();
List<File> fileList = new ArrayList<>();
ZipFile zf = new ZipFile(zipPath);
ZipFile zf = new ZipFile(zipPath, "GBK");
InputStream in = new BufferedInputStream(new FileInputStream(zipPath));
ZipInputStream zin = new ZipInputStream(in);
ZipEntry ze;
Enumeration<? extends ZipEntry> entris = zf.entries();
Enumeration<ZipEntry> entris = zf.getEntries();
while (entris.hasMoreElements()) {
ze = entris.nextElement();
if (ze.isDirectory()) {
......
......@@ -16,8 +16,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import com.file.zip.ZipEntry;
import com.file.zip.ZipFile;
import cn.garymb.ygomobile.AppsSettings;
import cn.garymb.ygomobile.Constants;
......@@ -63,8 +63,8 @@ public class StringManager implements Closeable {
if (file.isFile() && (file.getName().endsWith(".zip") || file.getName().endsWith(".ypk"))) {
Log.e("StringManager", "读取压缩包");
try {
ZipFile zipFile = new ZipFile(file.getAbsoluteFile());
Enumeration<? extends ZipEntry> entris = zipFile.entries();
ZipFile zipFile = new ZipFile(file.getAbsoluteFile(), "GBK");
Enumeration<ZipEntry> entris = zipFile.getEntries();
ZipEntry entry;
while (entris.hasMoreElements()) {
entry = entris.nextElement();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment