From 13209848296b68b36bbe41158df13d355b1954f4 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 9 Jun 2025 11:17:21 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AE=BE=E7=BD=AE=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d0852a..3044c2e 100644 --- a/README.md +++ b/README.md @@ -115,9 +115,9 @@ # 本项目要实际运用需要注意以下几个步骤： # 在项目根目录下： ## ★. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。 +## ★. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。 ## ★. 应用签名密钥 keystore 设置问题。一般调试编译只需用【Termux】cd 进 GenKeyStore 目录执行 $ bash gen_debug_keystore.sh 命令即可完成设置。 ## ☆. 应用 WiBoLL 签名密钥配置问题<非必须考虑>。设置时需要 clone 【keystore】模块源码并拷贝模块目录的 appkey.jks 与 appkey.keystore 到项目根目录即可。 -## ☆. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。 ## ☆. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoLL Maven 库登录用户信息。 From 46de24447f28dc5b1bdf96acb60140f632e4ef1d Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 19 Jun 2025 20:40:41 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 ++-- libaes/build.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index db9036a..6f3e6d6 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Jun 09 01:44:28 HKT 2025 +#Thu Jun 19 12:39:46 GMT 2025 stageCount=1 libraryProject=libaes baseVersion=15.9 publishVersion=15.9.0 -buildCount=0 +buildCount=1 baseBetaVersion=15.9.1 diff --git a/libaes/build.properties b/libaes/build.properties index db9036a..6f3e6d6 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Jun 09 01:44:28 HKT 2025 +#Thu Jun 19 12:39:46 GMT 2025 stageCount=1 libraryProject=libaes baseVersion=15.9 publishVersion=15.9.0 -buildCount=0 +buildCount=1 baseBetaVersion=15.9.1 From 24a578a9d24734919e264f31b818e8f56524f2cd Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 19 Jun 2025 20:42:26 +0800 Subject: [PATCH 3/9] APK 15.9.1 release Publish. --- aes/build.properties | 10 +++++----- libaes/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index 6f3e6d6..8af0db4 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jun 19 12:39:46 GMT 2025 -stageCount=1 +#Thu Jun 19 20:42:26 HKT 2025 +stageCount=2 libraryProject=libaes baseVersion=15.9 -publishVersion=15.9.0 -buildCount=1 -baseBetaVersion=15.9.1 +publishVersion=15.9.1 +buildCount=0 +baseBetaVersion=15.9.2 diff --git a/libaes/build.properties b/libaes/build.properties index 6f3e6d6..8af0db4 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jun 19 12:39:46 GMT 2025 -stageCount=1 +#Thu Jun 19 20:42:26 HKT 2025 +stageCount=2 libraryProject=libaes baseVersion=15.9 -publishVersion=15.9.0 -buildCount=1 -baseBetaVersion=15.9.1 +publishVersion=15.9.1 +buildCount=0 +baseBetaVersion=15.9.2 From 198b0975cec398c74d3c1fb9ce8936f8f3809628 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 19 Jun 2025 20:42:45 +0800 Subject: [PATCH 4/9] Library Release 15.9.1 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index 8af0db4..0765515 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jun 19 20:42:26 HKT 2025 +#Thu Jun 19 20:42:40 HKT 2025 stageCount=2 libraryProject=libaes baseVersion=15.9 From 2e4003dae08e0909c16085de7242c7ec1aed4754 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 19 Jun 2025 20:52:02 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androidxdemo/build.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/androidxdemo/build.properties b/androidxdemo/build.properties index 1417738..1d922c0 100644 --- a/androidxdemo/build.properties +++ b/androidxdemo/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jun 01 08:03:56 GMT 2025 +#Thu Jun 19 12:49:47 GMT 2025 stageCount=0 libraryProject= baseVersion=15.0 publishVersion=15.0.0 -buildCount=24 +buildCount=26 baseBetaVersion=15.0.1 From 0e464495fdd7c03460569a6305c30bd97f5ce233 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 24 Jun 2025 09:45:47 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- autoinstaller/build.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoinstaller/build.properties b/autoinstaller/build.properties index d987d28..798134d 100644 --- a/autoinstaller/build.properties +++ b/autoinstaller/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun May 04 05:32:00 GMT 2025 +#Tue Jun 24 01:45:05 GMT 2025 stageCount=1 libraryProject= baseVersion=15.2 publishVersion=15.2.0 -buildCount=74 +buildCount=80 baseBetaVersion=15.2.1 From 945bacb82599e8d3dd2e73d61ec05906b84f7779 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 24 Jun 2025 09:49:39 +0800 Subject: [PATCH 7/9] APK 15.2.1 release Publish. --- autoinstaller/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autoinstaller/build.properties b/autoinstaller/build.properties index d987d28..cf3423d 100644 --- a/autoinstaller/build.properties +++ b/autoinstaller/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun May 04 05:32:00 GMT 2025 -stageCount=1 +#Tue Jun 24 09:49:39 HKT 2025 +stageCount=2 libraryProject= baseVersion=15.2 -publishVersion=15.2.0 -buildCount=74 -baseBetaVersion=15.2.1 +publishVersion=15.2.1 +buildCount=0 +baseBetaVersion=15.2.2 From 08d9d92ae4556e12593f66a111b73cc2e83d7325 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 24 Jun 2025 09:54:47 +0800 Subject: [PATCH 8/9] APK 15.2.2 release Publish. --- autoinstaller/build.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autoinstaller/build.properties b/autoinstaller/build.properties index 250c6ab..c20578c 100644 --- a/autoinstaller/build.properties +++ b/autoinstaller/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jun 24 09:49:39 HKT 2025 -stageCount=2 +#Tue Jun 24 09:54:47 HKT 2025 +stageCount=3 libraryProject= baseVersion=15.2 -publishVersion=15.2.1 +publishVersion=15.2.2 buildCount=0 -baseBetaVersion=15.2.2 \ No newline at end of file +baseBetaVersion=15.2.3 From c4e88e95932a56e58992e1209124c4b32c9c30b2 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 24 Jun 2025 19:18:23 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jc/build.gradle | 15 ++++++++------- jc/build.properties | 4 ++-- .../java/cc/winboll/studio/jc/MainActivity.java | 6 +++--- libjc/build.properties | 4 ++-- .../main/java/cc/winboll/studio/libjc/Main.java | 2 +- settings.gradle-demo | 1 + 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/jc/build.gradle b/jc/build.gradle index d5a23cd..dcf49e4 100644 --- a/jc/build.gradle +++ b/jc/build.gradle @@ -42,23 +42,24 @@ android { } } - compileOptions { + /*compileOptions { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 - } + }*/ } dependencies { + api fileTree(dir: 'libs', include: ['*.jar']) + api project(':libjc') + api 'cc.winboll.studio:libaes:15.9.1' + api 'cc.winboll.studio:libapputils:15.8.4' + api 'cc.winboll.studio:libappbase:15.8.4' + // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on //implementation 'org.bouncycastle:bcprov-jdk15on:1.70' implementation 'org.bouncycastle:bcprov-jdk15to18:1.69' implementation 'org.bouncycastle:bcpkix-jdk15to18:1.69' - api project(':libjc') api 'androidx.appcompat:appcompat:1.0.0' api 'com.google.android.material:material:1.0.0' - - api 'cc.winboll.studio:libapputils:9.1.0' - api 'cc.winboll.studio:libappbase:1.0.3' - api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/jc/build.properties b/jc/build.properties index 1be8de6..85fc83c 100644 --- a/jc/build.properties +++ b/jc/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Jan 10 22:03:57 GMT 2025 +#Tue Jun 24 11:17:30 GMT 2025 stageCount=0 libraryProject=libjc baseVersion=1.0 publishVersion=1.0.0 -buildCount=133 +buildCount=135 baseBetaVersion=1.0.1 diff --git a/jc/src/main/java/cc/winboll/studio/jc/MainActivity.java b/jc/src/main/java/cc/winboll/studio/jc/MainActivity.java index e853b68..b10f42d 100644 --- a/jc/src/main/java/cc/winboll/studio/jc/MainActivity.java +++ b/jc/src/main/java/cc/winboll/studio/jc/MainActivity.java @@ -15,10 +15,10 @@ import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; import cc.winboll.studio.jc.R; -import cc.winboll.studio.libapputils.log.LogUtils; -import cc.winboll.studio.libjc.JAR_RUNNING_MODE; import cc.winboll.studio.libjc.JCMainThread; import cc.winboll.studio.libjc.net.JCSocketClient; +import cc.winboll.studio.libjc.util.LogUtils; +import cc.winboll.studio.libjc.Main; final public class MainActivity extends Activity implements JCMainThread.OnMessageListener { @@ -77,7 +77,7 @@ final public class MainActivity extends Activity implements JCMainThread.OnMessa // 启动主线程 _JCMainThread = JCMainThread.getInstance(getPackageName()); _JCMainThread.setOnLogListener(this); - _JCMainThread.setRunningMode(JAR_RUNNING_MODE.JC); + //_JCMainThread.setRunningMode(Main.JAR_RUNNING_MODE.JC); _JCMainThread.start(); // 设置 WinBoll 应用 UI 类型 diff --git a/libjc/build.properties b/libjc/build.properties index 1be8de6..85fc83c 100644 --- a/libjc/build.properties +++ b/libjc/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Jan 10 22:03:57 GMT 2025 +#Tue Jun 24 11:17:30 GMT 2025 stageCount=0 libraryProject=libjc baseVersion=1.0 publishVersion=1.0.0 -buildCount=133 +buildCount=135 baseBetaVersion=1.0.1 diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/Main.java b/libjc/src/main/java/cc/winboll/studio/libjc/Main.java index b362c56..9cf0d31 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/Main.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/Main.java @@ -21,7 +21,7 @@ public class Main { public final static int JAR_RUNNING_MODE_JCNDK_DEBUG = 4; public final static int JAR_RUNNING_MODE_JC = 5; public final static int JAR_RUNNING_MODE_JC_DEBUG = 6; - public enum JAR_RUNNING_MODE { + public static enum JAR_RUNNING_MODE { UNKNOWN(JAR_RUNNING_MODE_UNKNOWN), CONSOLE(JAR_RUNNING_MODE_CONSOLE), CONSOLE_DEBUG(JAR_RUNNING_MODE_CONSOLE_DEBUG), diff --git a/settings.gradle-demo b/settings.gradle-demo index fcf8de4..43fcb4c 100644 --- a/settings.gradle-demo +++ b/settings.gradle-demo @@ -22,6 +22,7 @@ // JC 项目编译设置 //include ':jc' +//include ':libjc' //rootProject.name = "jc" // AES 项目编译设置