From 4f57678012633c5c9d6ccf78a56c6066211a59a1 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 03:36:43 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=B1=BB=E5=BA=93?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.gradle | 3 ++- appbase/build.properties | 4 ++-- libappbase/build.gradle | 2 +- libappbase/build.properties | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/appbase/build.gradle b/appbase/build.gradle index 1ad2cf5..33487c7 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -45,7 +45,8 @@ android { dependencies { implementation project(':libappbase') - implementation fileTree(dir: 'libs', include: ['*.jar']) + + api fileTree(dir: 'libs', include: ['*.jar']) // SSH implementation 'com.jcraft:jsch:0.1.55' diff --git a/appbase/build.properties b/appbase/build.properties index b044c5c..d0e4ba5 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 02:31:11 HKT 2025 +#Fri Mar 07 19:37:03 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=2.1 publishVersion=2.1.1 -buildCount=0 +buildCount=1 baseBetaVersion=2.1.2 diff --git a/libappbase/build.gradle b/libappbase/build.gradle index 1e0359f..2ced735 100644 --- a/libappbase/build.gradle +++ b/libappbase/build.gradle @@ -20,7 +20,7 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + api fileTree(dir: 'libs', include: ['*.jar']) // SSH implementation 'com.jcraft:jsch:0.1.55' diff --git a/libappbase/build.properties b/libappbase/build.properties index 697cc65..d0e4ba5 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 02:31:02 HKT 2025 +#Fri Mar 07 19:37:03 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=2.1 publishVersion=2.1.1 -buildCount=0 +buildCount=1 baseBetaVersion=2.1.2 From 89c4d0009163c44e84ffce47dc54f3e22d320e4f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 03:38:29 +0800 Subject: [PATCH 02/12] APK 2.1.2 release Publish. --- appbase/build.properties | 10 +++++----- libappbase/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index d0e4ba5..a8e9237 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 19:37:03 GMT 2025 -stageCount=2 +#Sat Mar 08 03:38:29 HKT 2025 +stageCount=3 libraryProject=libappbase baseVersion=2.1 -publishVersion=2.1.1 -buildCount=1 -baseBetaVersion=2.1.2 +publishVersion=2.1.2 +buildCount=0 +baseBetaVersion=2.1.3 diff --git a/libappbase/build.properties b/libappbase/build.properties index d0e4ba5..a8e9237 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 19:37:03 GMT 2025 -stageCount=2 +#Sat Mar 08 03:38:29 HKT 2025 +stageCount=3 libraryProject=libappbase baseVersion=2.1 -publishVersion=2.1.1 -buildCount=1 -baseBetaVersion=2.1.2 +publishVersion=2.1.2 +buildCount=0 +baseBetaVersion=2.1.3 From 38aee09f87c57f3c2b15b09d19bdecedaee41c85 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 03:38:53 +0800 Subject: [PATCH 03/12] Library Release 2.1.2 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index a8e9237..9626555 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 03:38:29 HKT 2025 +#Sat Mar 08 03:38:47 HKT 2025 stageCount=3 libraryProject=libappbase baseVersion=2.1 From 3b3ddbc8c9315238e035fded2b64e8b5dce72d2c Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 03:54:03 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=B1=BB=E5=BA=93?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.gradle | 4 +--- appbase/build.properties | 4 ++-- libappbase/build.properties | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/appbase/build.gradle b/appbase/build.gradle index 33487c7..cf07e1d 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -44,8 +44,7 @@ android { } dependencies { - implementation project(':libappbase') - + api project(':libappbase') api fileTree(dir: 'libs', include: ['*.jar']) // SSH @@ -61,7 +60,6 @@ dependencies { implementation 'com.github.getActivity:ToastUtils:10.5' // 网络连接类库 implementation 'com.squareup.okhttp3:okhttp:4.4.1' - // Android 类库 implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.viewpager:viewpager:1.0.0' diff --git a/appbase/build.properties b/appbase/build.properties index 9626555..c5df971 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 03:38:47 HKT 2025 +#Fri Mar 07 19:53:22 GMT 2025 stageCount=3 libraryProject=libappbase baseVersion=2.1 publishVersion=2.1.2 -buildCount=0 +buildCount=2 baseBetaVersion=2.1.3 diff --git a/libappbase/build.properties b/libappbase/build.properties index a8e9237..c5df971 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 03:38:29 HKT 2025 +#Fri Mar 07 19:53:22 GMT 2025 stageCount=3 libraryProject=libappbase baseVersion=2.1 publishVersion=2.1.2 -buildCount=0 +buildCount=2 baseBetaVersion=2.1.3 From 39b6c0ec89b6d5b01fc888ff0a7fd84f1aa54ad6 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 03:54:56 +0800 Subject: [PATCH 05/12] APK 2.1.3 release Publish. --- appbase/build.properties | 10 +++++----- libappbase/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index c5df971..9e7a7ca 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 19:53:22 GMT 2025 -stageCount=3 +#Sat Mar 08 03:54:56 HKT 2025 +stageCount=4 libraryProject=libappbase baseVersion=2.1 -publishVersion=2.1.2 -buildCount=2 -baseBetaVersion=2.1.3 +publishVersion=2.1.3 +buildCount=0 +baseBetaVersion=2.1.4 diff --git a/libappbase/build.properties b/libappbase/build.properties index c5df971..9e7a7ca 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 19:53:22 GMT 2025 -stageCount=3 +#Sat Mar 08 03:54:56 HKT 2025 +stageCount=4 libraryProject=libappbase baseVersion=2.1 -publishVersion=2.1.2 -buildCount=2 -baseBetaVersion=2.1.3 +publishVersion=2.1.3 +buildCount=0 +baseBetaVersion=2.1.4 From fd0cb05812c2e7072e69c577c940cd30bd861032 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 03:55:19 +0800 Subject: [PATCH 06/12] Library Release 2.1.3 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index 9e7a7ca..746dec0 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 03:54:56 HKT 2025 +#Sat Mar 08 03:55:13 HKT 2025 stageCount=4 libraryProject=libappbase baseVersion=2.1 From 28ab4e285958388b74c43322ba6507ad748ea844 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 04:45:18 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BABUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 ++-- libappbase/build.properties | 4 ++-- .../src/main/java/cc/winboll/studio/libappbase/LogUtils.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index 746dec0..02f0b81 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 03:55:13 HKT 2025 +#Fri Mar 07 20:44:02 GMT 2025 stageCount=4 libraryProject=libappbase baseVersion=2.1 publishVersion=2.1.3 -buildCount=0 +buildCount=3 baseBetaVersion=2.1.4 diff --git a/libappbase/build.properties b/libappbase/build.properties index 9e7a7ca..02f0b81 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 03:54:56 HKT 2025 +#Fri Mar 07 20:44:02 GMT 2025 stageCount=4 libraryProject=libappbase baseVersion=2.1 publishVersion=2.1.3 -buildCount=0 +buildCount=3 baseBetaVersion=2.1.4 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java index 7a529a4..a49ea55 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java @@ -38,7 +38,7 @@ public class LogUtils { static volatile boolean _IsInited = false; static Context _mContext; // 日志显示时间格式 - static SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("[yyyyMMdd_HHmmSS]", Locale.getDefault()); + static SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("[yyyyMMdd_HHmmss_SSS]", Locale.getDefault()); // 应用日志文件夹 static File _mfLogCacheDir; static File _mfLogDataDir; From 482f289df31a2c0f4860ed9e109228acb0c26565 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 04:46:23 +0800 Subject: [PATCH 08/12] APK 2.1.4 release Publish. --- appbase/build.properties | 10 +++++----- libappbase/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index 02f0b81..859ea5e 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 20:44:02 GMT 2025 -stageCount=4 +#Sat Mar 08 04:46:23 HKT 2025 +stageCount=5 libraryProject=libappbase baseVersion=2.1 -publishVersion=2.1.3 -buildCount=3 -baseBetaVersion=2.1.4 +publishVersion=2.1.4 +buildCount=0 +baseBetaVersion=2.1.5 diff --git a/libappbase/build.properties b/libappbase/build.properties index 02f0b81..859ea5e 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 20:44:02 GMT 2025 -stageCount=4 +#Sat Mar 08 04:46:23 HKT 2025 +stageCount=5 libraryProject=libappbase baseVersion=2.1 -publishVersion=2.1.3 -buildCount=3 -baseBetaVersion=2.1.4 +publishVersion=2.1.4 +buildCount=0 +baseBetaVersion=2.1.5 From 9b8d6ad46b6ace5cdb833d4da46ad1bc3f8434e2 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 04:46:49 +0800 Subject: [PATCH 09/12] Library Release 2.1.4 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index 859ea5e..ace6d28 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 04:46:23 HKT 2025 +#Sat Mar 08 04:46:42 HKT 2025 stageCount=5 libraryProject=libappbase baseVersion=2.1 From 498a8ae45853a53e8d584f18b6250027c5c2009f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 09:13:51 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0Gradle=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 ++-- build.gradle | 33 ++++++++++++++------------------- libappbase/build.properties | 4 ++-- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index ace6d28..c2dba8f 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 04:46:42 HKT 2025 +#Sun Mar 09 01:13:17 GMT 2025 stageCount=5 libraryProject=libappbase baseVersion=2.1 publishVersion=2.1.4 -buildCount=0 +buildCount=1 baseBetaVersion=2.1.5 diff --git a/build.gradle b/build.gradle index 4d5b285..5c58ec9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - // Nexus Maven 库地址 - // "WinBoll Release" - maven { url "https://nexus.winboll.cc/repository/maven-public/" } - // "WinBoll Snapshot" - maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" } - maven { url 'https://maven.aliyun.com/repository/public/' } maven { url 'https://maven.aliyun.com/repository/google/' } maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' } @@ -15,6 +9,13 @@ buildscript { maven { url "https://jitpack.io" } mavenCentral() google() + + // Nexus Maven 库地址 + // "WinBoll Release" + maven { url "https://nexus.winboll.cc/repository/maven-public/" } + // "WinBoll Snapshot" + maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" } + mavenLocal() } dependencies { @@ -26,19 +27,6 @@ buildscript { allprojects { repositories { - // Nexus Maven 库地址 - // "WinBoll Release" - maven { url "https://nexus.winboll.cc/repository/maven-public/" } - // "WinBoll Snapshot" - maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" } - - maven { - url "https://mirrors.tencent.com/repository/maven/tencent_public/" - } - maven { - url "https://mirrors.tencent.com/repository/maven/tencent_public_snapshots" - } - maven { url 'https://maven.aliyun.com/repository/public/' } maven { url 'https://maven.aliyun.com/repository/google/' } maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' } @@ -47,6 +35,13 @@ allprojects { maven { url "https://jitpack.io" } mavenCentral() google() + + // Nexus Maven 库地址 + // "WinBoll Release" + maven { url "https://nexus.winboll.cc/repository/maven-public/" } + // "WinBoll Snapshot" + maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" } + mavenLocal() } ext { diff --git a/libappbase/build.properties b/libappbase/build.properties index 859ea5e..c2dba8f 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 04:46:23 HKT 2025 +#Sun Mar 09 01:13:17 GMT 2025 stageCount=5 libraryProject=libappbase baseVersion=2.1 publishVersion=2.1.4 -buildCount=0 +buildCount=1 baseBetaVersion=2.1.5 From 3d9b2037604a0db932f19539fa196308ef82402b Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 09:15:24 +0800 Subject: [PATCH 11/12] APK 2.1.5 release Publish. --- appbase/build.properties | 10 +++++----- libappbase/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index c2dba8f..95f4ce3 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 01:13:17 GMT 2025 -stageCount=5 +#Sun Mar 09 09:15:24 HKT 2025 +stageCount=6 libraryProject=libappbase baseVersion=2.1 -publishVersion=2.1.4 -buildCount=1 -baseBetaVersion=2.1.5 +publishVersion=2.1.5 +buildCount=0 +baseBetaVersion=2.1.6 diff --git a/libappbase/build.properties b/libappbase/build.properties index c2dba8f..95f4ce3 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 01:13:17 GMT 2025 -stageCount=5 +#Sun Mar 09 09:15:24 HKT 2025 +stageCount=6 libraryProject=libappbase baseVersion=2.1 -publishVersion=2.1.4 -buildCount=1 -baseBetaVersion=2.1.5 +publishVersion=2.1.5 +buildCount=0 +baseBetaVersion=2.1.6 From 5623d2d341183c1ffa793ea53ee9846e4988fa57 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 09:15:47 +0800 Subject: [PATCH 12/12] Library Release 2.1.5 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index 95f4ce3..2fdff2f 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 09:15:24 HKT 2025 +#Sun Mar 09 09:15:39 HKT 2025 stageCount=6 libraryProject=libappbase baseVersion=2.1