升级依赖、移除不使用的依赖

build.gradle

@@ -18,7 +18,7 @@ buildscript {
 }
 
 ext {
-    compileSdkVersion = 33
+    compileSdkVersion = 34
     //buildToolsVersion = compileSdkVersion+".0.0"
     supportVersion = "30.0.0"
 }

mobile/build.gradle

@@ -86,8 +86,8 @@ dependencies {
     implementation 'cn.hutool:hutool-all:latest.release'
     implementation 'org.jdeferred:jdeferred-android-aar:1.2.4'
     implementation 'com.github.bumptech.glide:glide:4.12.0'
-    implementation 'androidx.navigation:navigation-fragment:2.3.5'
-    implementation 'androidx.navigation:navigation-ui:2.3.5'
+    implementation 'androidx.navigation:navigation-fragment:2.8.1'
+    implementation 'androidx.navigation:navigation-ui:2.8.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
     implementation('com.github.chrisbanes.photoview:library:1.2.4') {
         implementation 'com.github.chrisbanes.photoview:library:1.2.4'
@@ -107,8 +107,8 @@ dependencies {
     implementation 'com.github.feihuaduo:DialogUtils:1.8.9.23'
     //recyclerview的adapter库
     implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.4'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
     //图片选择
     implementation 'com.yuyh.imgsel:library:2.1.0'
     //跨进程SharedPreferencesPlus工具

mobile/src/main/java/cn/garymb/ygomobile/utils/ServerUtil.java

@@ -11,9 +11,6 @@ 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;
@@ -27,6 +24,8 @@ 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;
@@ -123,8 +122,8 @@ public class ServerUtil {
             LogUtil.e("GameUriManager", "读取压缩包");
             try {
                 String serverName = null, serverDesc = null, serverHost = null, serverPort = null;
-                ZipFile zipFile = new ZipFile(file.getAbsoluteFile(), "GBK");
-                Enumeration<ZipEntry> entris = zipFile.getEntries();
+                ZipFile zipFile = new ZipFile(file.getAbsoluteFile());
+                Enumeration<? extends ZipEntry> entris = zipFile.entries();
                 ZipEntry entry;
                 StringBuilder content = new StringBuilder();
                 while (entris.hasMoreElements()) {

mobile/src/main/java/ocgcore/CardManager.java

@@ -8,9 +8,6 @@ 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;
@@ -22,6 +19,8 @@ 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;
@@ -86,11 +85,11 @@ public class CardManager {
         String savePath = App.get().getExternalCacheDir().getAbsolutePath();
         List<File> fileList = new ArrayList<>();
 
-        ZipFile zf = new ZipFile(zipPath, "GBK");
+        ZipFile zf = new ZipFile(zipPath);
         InputStream in = new BufferedInputStream(new FileInputStream(zipPath));
         ZipInputStream zin = new ZipInputStream(in);
         ZipEntry ze;
-        Enumeration<ZipEntry> entris = zf.getEntries();
+        Enumeration<? extends ZipEntry> entris = zf.entries();
         while (entris.hasMoreElements()) {
             ze = entris.nextElement();
             if (ze.isDirectory()) {

mobile/src/main/java/ocgcore/StringManager.java

@@ -4,9 +4,6 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.file.zip.ZipEntry;
-import com.file.zip.ZipFile;
-
 import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.File;
@@ -19,6 +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 cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
@@ -64,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(), "GBK");
-                            Enumeration<ZipEntry> entris = zipFile.getEntries();
+                            ZipFile zipFile = new ZipFile(file.getAbsoluteFile());
+                            Enumeration<? extends ZipEntry> entris = zipFile.entries();
                             ZipEntry entry;
                             while (entris.hasMoreElements()) {
                                 entry = entris.nextElement();