.winboll/bashPublishAPKAddTag.sh

@@ -113,10 +113,10 @@ if [[ $? -eq 0 ]]; then
     # 如果Git已经提交了所有代码就执行标签和应用发布操作
 
     # 预先询问是否添加工作流标签
-    #echo "Add Github Workflows Tag? (yes/No)"
+    echo "Add Github Workflows Tag? (yes/No)"
-	#result=$(askAddWorkflowsTag)
+	result=$(askAddWorkflowsTag)
-	#nAskAddWorkflowsTag=$?
+	nAskAddWorkflowsTag=$?
-	#echo $result
+	echo $result
 
     # 发布应用
 	echo "Publishing WinBoLL APK ..."
@@ -138,17 +138,17 @@ if [[ $? -eq 0 ]]; then
 	fi
     
     # 添加 GitHub 工作流标签
-	#if [[ $nAskAddWorkflowsTag -eq 1 ]]; then
+	if [[ $nAskAddWorkflowsTag -eq 1 ]]; then
 	    # 如果用户选择添加工作流标签
-    	#result=$(addWorkflowsTag $1)
+    	result=$(addWorkflowsTag $1)
-		#if [[ $? -eq 0 ]]; then
+		if [[ $? -eq 0 ]]; then
-		#    echo $result
+		    echo $result
 		    # 工作流标签添加成功
-		#else
+		else
-			#echo -e "${0}: addWorkflowsTag $1\n${result}\nAdd workflows tag cancel."
+			echo -e "${0}: addWorkflowsTag $1\n${result}\nAdd workflows tag cancel."
-			#exit 1 # addWorkflowsTag 异常
+			exit 1 # addWorkflowsTag 异常
-		#fi
+		fi
-	#fi
+	fi
 	
 	## 清理更新描述文件内容
 	echo "" > $1/app_update_description.txt

README.md

@@ -114,11 +114,9 @@
 
 # 本项目要实际运用需要注意以下几个步骤：
 # 在项目根目录下：
-## ★. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。
+## 1. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。
-## ★. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
+## 2. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
-## ★. 应用签名密钥 keystore 设置问题。一般调试编译只需用【Termux】cd 进 GenKeyStore 目录执行 $ bash gen_debug_keystore.sh 命令即可完成设置。
+## 3. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoLL Maven 库登录用户信息。
-## ☆. 应用 WiBoLL 签名密钥配置问题<非必须考虑>。设置时需要 clone 【keystore】模块源码并拷贝模块目录的 appkey.jks 与 appkey.keystore 到项目根目录即可。
-## ☆. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoLL Maven 库登录用户信息。
 
 
 # ☆类库型项目编译方法

aes/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.9" 
+        versionName "15.8" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jun 19 20:42:40 HKT 2025
+#Sun Jun 08 21:14:52 HKT 2025
 stageCount=2
 libraryProject=libaes
-baseVersion=15.9
+baseVersion=15.8
-publishVersion=15.9.1
+publishVersion=15.8.1
 buildCount=0
-baseBetaVersion=15.9.2
+baseBetaVersion=15.8.2

androidxdemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jun 19 12:49:47 GMT 2025
+#Sun Jun 01 08:03:56 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=26
+buildCount=24
 baseBetaVersion=15.0.1

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Jun 09 09:38:19 HKT 2025
+#Thu Jun 05 08:59:45 GMT 2025
-stageCount=9
+stageCount=8
 libraryProject=libappbase
 baseVersion=15.8
-publishVersion=15.8.8
+publishVersion=15.8.7
-buildCount=0
+buildCount=14
-baseBetaVersion=15.8.9
+baseBetaVersion=15.8.8

autoinstaller/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 24 09:54:47 HKT 2025
+#Sun May 04 05:32:00 GMT 2025
-stageCount=3
+stageCount=1
 libraryProject=
 baseVersion=15.2
-publishVersion=15.2.2
+publishVersion=15.2.0
-buildCount=0
+buildCount=74
-baseBetaVersion=15.2.3
+baseBetaVersion=15.2.1

jc/build.gradle

@@ -42,24 +42,23 @@ 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'])
 }

jc/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 24 11:17:30 GMT 2025
+#Fri Jan 10 22:03:57 GMT 2025
 stageCount=0
 libraryProject=libjc
 baseVersion=1.0
 publishVersion=1.0.0
-buildCount=135
+buildCount=133
 baseBetaVersion=1.0.1

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(Main.JAR_RUNNING_MODE.JC);
+        _JCMainThread.setRunningMode(JAR_RUNNING_MODE.JC);
         _JCMainThread.start();
 
         // 设置 WinBoll 应用 UI 类型

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jun 19 20:42:26 HKT 2025
+#Tue Jun 03 19:16:41 HKT 2025
 stageCount=2
 libraryProject=libaes
-baseVersion=15.9
+baseVersion=15.8
-publishVersion=15.9.1
+publishVersion=15.8.1
 buildCount=0
-baseBetaVersion=15.9.2
+baseBetaVersion=15.8.2

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Jun 09 09:38:19 HKT 2025
+#Thu Jun 05 08:59:45 GMT 2025
-stageCount=9
+stageCount=8
 libraryProject=libappbase
 baseVersion=15.8
-publishVersion=15.8.8
+publishVersion=15.8.7
-buildCount=0
+buildCount=14
-baseBetaVersion=15.8.9
+baseBetaVersion=15.8.8

libjc/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 24 11:17:30 GMT 2025
+#Fri Jan 10 22:03:57 GMT 2025
 stageCount=0
 libraryProject=libjc
 baseVersion=1.0
 publishVersion=1.0.0
-buildCount=135
+buildCount=133
 baseBetaVersion=1.0.1

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 static enum JAR_RUNNING_MODE {
+    public enum JAR_RUNNING_MODE {
         UNKNOWN(JAR_RUNNING_MODE_UNKNOWN),
         CONSOLE(JAR_RUNNING_MODE_CONSOLE),
         CONSOLE_DEBUG(JAR_RUNNING_MODE_CONSOLE_DEBUG),

settings.gradle-demo

@@ -22,7 +22,6 @@
 
 // JC 项目编译设置
 //include ':jc'
-//include ':libjc'
 //rootProject.name = "jc"
 
 // AES 项目编译设置