diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b86273d..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d403a80..f2a715a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 83a7158..7e6b1da 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
minSdk 29
targetSdk 34
versionCode 1
- versionName "1.6.5 beta"
+ versionName "2.0.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@@ -27,7 +27,7 @@ android {
}
buildTypes {
release {
- minifyEnabled false
+ minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 481bb43..e8aba72 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,21 +1,21 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
+# 保护除指定类外的所有类和成员不被混淆
+-keep class !org.astral.findmaimaiultra.service.InMemoryJarLoader, !org.astral.findmaimaiultra.been.faker.SegaApi2025, * { *; }
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
+# 保留必要的属性(这些是Android运行所必需的)
+-keepattributes Signature
+-keepattributes *Annotation*
+-keepattributes Exceptions
+-keepattributes SourceFile,LineNumberTable
+-keepattributes EnclosingMethod
+-keepattributes InnerClasses
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+# 添加 missing_rules.txt 中的规则以解决警告
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
diff --git a/app/src/main/java/org/astral/findmaimaiultra/been/faker/MaimaiConfig.java b/app/src/main/java/org/astral/findmaimaiultra/been/faker/MaimaiConfig.java
index 1270741..135279c 100644
--- a/app/src/main/java/org/astral/findmaimaiultra/been/faker/MaimaiConfig.java
+++ b/app/src/main/java/org/astral/findmaimaiultra/been/faker/MaimaiConfig.java
@@ -1,24 +1,30 @@
package org.astral.findmaimaiultra.been.faker;
+import com.google.gson.annotations.SerializedName;
+
public class MaimaiConfig {
/**
* API接口地址
*/
+ @SerializedName("api")
private String api ;
/**
* AES加密密钥
*/
+ @SerializedName("AES_KEY")
private String AES_KEY;
/**
* AES加密初始向量
*/
+ @SerializedName("AES_IV")
private String AES_IV ;
/**
* 混淆参数
*/
+ @SerializedName("OBFUSCATE_PARAM")
private String OBFUSCATE_PARAM;
public String getApi() {
diff --git a/app/src/main/java/org/astral/findmaimaiultra/service/InMemoryJarLoader.java b/app/src/main/java/org/astral/findmaimaiultra/service/InMemoryJarLoader.java
index 60cb9ee..8ab93d2 100644
--- a/app/src/main/java/org/astral/findmaimaiultra/service/InMemoryJarLoader.java
+++ b/app/src/main/java/org/astral/findmaimaiultra/service/InMemoryJarLoader.java
@@ -31,7 +31,7 @@ public class InMemoryJarLoader {
public static SegaApi2025 segaApi2025 = new SegaApi2025();
private static final String TAG = "JarClient";
- private static final String SERVER_URL = "http://100.95.217.4:23942/api/asserts";
+ private static final String SERVER_URL = "https://union.godserver.cn/api/asserts";
private final OkHttpClient client;
private final Context mContext;
diff --git a/build.gradle b/build.gradle
index 91dc460..0c9b2e6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
-id 'com.android.application' version '8.8.0' apply false
+ id 'com.android.application' version '8.0.0' apply false
}