From 33045ffa48a3b5dd251cf78f2967420af529c3dd Mon Sep 17 00:00:00 2001 From: aBuild Date: Sun, 24 May 2026 20:44:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20libaes/libappbase=20?= =?UTF-8?q?=E8=87=B3=2015.20.9/15.20.21=EF=BC=8CBaseBean=20=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E8=BF=81=E7=A7=BB=E8=87=B3=20libs1520000=20=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 4 个模型类的 BaseBean 导入路径： cc.winboll.studio.libappbase.BaseBean → cc.winboll.studio.libappbase.models.libs1520000.BaseBean - 升级依赖：libaes 15.20.4 → 15.20.9，libappbase 15.20.15 → 15.20.21 - contacts/build.gradle：添加 buildToolsVersion "30.0.3"，修复 compileOptions 缩进 - gradlew：添加可执行权限（644 → 755） --- contacts/build.gradle | 14 ++++++++------ contacts/build.properties | 4 ++-- .../studio/contacts/model/MainServiceBean.java | 2 +- .../contacts/model/PhoneConnectRuleBean.java | 2 +- .../studio/contacts/model/RingTongBean.java | 2 +- .../studio/contacts/model/SettingsBean.java | 2 +- gradlew | 0 7 files changed, 14 insertions(+), 12 deletions(-) mode change 100644 => 100755 gradlew diff --git a/contacts/build.gradle b/contacts/build.gradle index ac8cacf..da21b9a 100644 --- a/contacts/build.gradle +++ b/contacts/build.gradle @@ -19,10 +19,12 @@ def genVersionName(def versionName){ android { compileSdkVersion 30 - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } + buildToolsVersion "30.0.3" + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } defaultConfig { applicationId "cc.winboll.studio.contacts" @@ -73,8 +75,8 @@ dependencies { //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libaes:15.20.4' - api 'cc.winboll.studio:libappbase:15.20.15' + api 'cc.winboll.studio:libaes:15.20.9' + api 'cc.winboll.studio:libappbase:15.20.21' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/contacts/build.properties b/contacts/build.properties index d594623..985b557 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue May 19 12:25:36 HKT 2026 +#Sun May 24 20:43:00 HKT 2026 stageCount=7 libraryProject= baseVersion=15.20 publishVersion=15.20.6 -buildCount=0 +buildCount=4 baseBetaVersion=15.20.7 diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/model/MainServiceBean.java b/contacts/src/main/java/cc/winboll/studio/contacts/model/MainServiceBean.java index 63b24ff..58dff97 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/model/MainServiceBean.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/model/MainServiceBean.java @@ -2,7 +2,7 @@ package cc.winboll.studio.contacts.model; import android.util.JsonReader; import android.util.JsonWriter; -import cc.winboll.studio.libappbase.BaseBean; +import cc.winboll.studio.libappbase.models.libs1520000.BaseBean; import cc.winboll.studio.libappbase.LogUtils; import java.io.IOException; diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/model/PhoneConnectRuleBean.java b/contacts/src/main/java/cc/winboll/studio/contacts/model/PhoneConnectRuleBean.java index 6d3c765..f959082 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/model/PhoneConnectRuleBean.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/model/PhoneConnectRuleBean.java @@ -2,7 +2,7 @@ package cc.winboll.studio.contacts.model; import android.util.JsonReader; import android.util.JsonWriter; -import cc.winboll.studio.libappbase.BaseBean; +import cc.winboll.studio.libappbase.models.libs1520000.BaseBean; import cc.winboll.studio.libappbase.LogUtils; import java.io.IOException; diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/model/RingTongBean.java b/contacts/src/main/java/cc/winboll/studio/contacts/model/RingTongBean.java index ab633ed..f9246c6 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/model/RingTongBean.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/model/RingTongBean.java @@ -2,7 +2,7 @@ package cc.winboll.studio.contacts.model; import android.util.JsonReader; import android.util.JsonWriter; -import cc.winboll.studio.libappbase.BaseBean; +import cc.winboll.studio.libappbase.models.libs1520000.BaseBean; import cc.winboll.studio.libappbase.LogUtils; import java.io.IOException; diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/model/SettingsBean.java b/contacts/src/main/java/cc/winboll/studio/contacts/model/SettingsBean.java index 2b40c8c..cf4254e 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/model/SettingsBean.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/model/SettingsBean.java @@ -6,7 +6,7 @@ import android.util.JsonWriter; import java.io.IOException; import cc.winboll.studio.contacts.utils.IntUtils; -import cc.winboll.studio.libappbase.BaseBean; +import cc.winboll.studio.libappbase.models.libs1520000.BaseBean; import cc.winboll.studio.libappbase.LogUtils; /** diff --git a/gradlew b/gradlew old mode 100644 new mode 100755