From c4e88e95932a56e58992e1209124c4b32c9c30b2 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <zhangsken@188.com>
Date: Tue, 24 Jun 2025 19:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=85=8D=E7=BD=AE=E5=88=9D?=
 =?UTF-8?q?=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 d5a23cdb..dcf49e4a 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 1be8de68..85fc83ca 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 e853b681..b10f42dd 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 1be8de68..85fc83ca 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 b362c568..9cf0d31d 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 fcf8de4f..43fcb4c1 100644
--- a/settings.gradle-demo
+++ b/settings.gradle-demo
@@ -22,6 +22,7 @@
 
 // JC 项目编译设置
 //include ':jc'
+//include ':libjc'
 //rootProject.name = "jc"
 
 // AES 项目编译设置