.gitmodules

@@ -1,6 +1,3 @@
-[submodule "winboll-x"]
-	path = winboll-x
-	url = https://gitea.winboll.cc/Studio/WinBollX.git
 [submodule "libjc/jcc/libs"]
 	path = libjc/jcc/libs
 	url = https://gitea.winboll.cc/Studio/APP_libjc_jcc_libs.git

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 15:14:41 HKT 2025
+#Sat May 03 11:34:58 GMT 2025
 stageCount=1
 libraryProject=libaes
 baseVersion=15.6
 publishVersion=15.6.0
-buildCount=0
+buildCount=9
 baseBetaVersion=15.6.1

aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java

@@ -10,13 +10,14 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libaes.winboll.AboutView;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
+public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AboutActivity";
 

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 14:47:34 HKT 2025
+#Sat May 03 10:32:21 GMT 2025
 stageCount=7
 libraryProject=libappbase
 baseVersion=15.7
 publishVersion=15.7.6
-buildCount=0
+buildCount=4
 baseBetaVersion=15.7.7

build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         // 本地 Maven 仓库（默认路径为 ~/.m2/repository）
-        mavenLocal()
+        //mavenLocal()
         // 或自定义本地仓库路径
         maven { url "file:///sdcard/.m2/repository" }
         
@@ -31,6 +31,11 @@ buildscript {
 
 allprojects {
     repositories {
+        // 本地 Maven 仓库（默认路径为 ~/.m2/repository）
+        //mavenLocal()
+        // 或自定义本地仓库路径
+        maven { url "file:///sdcard/.m2/repository" }
+        
         // Nexus Maven 库地址
         // "WinBoLL Release"
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }

libaes/build.gradle

@@ -21,6 +21,9 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
+    //api 'cc.winboll.studio:libaes:15.6.0'
+    api 'cc.winboll.studio:libapputils:15.3.4'
+    api 'cc.winboll.studio:libappbase:15.7.6'
     
     // 吐司类库
     api 'com.github.getActivity:ToastUtils:10.5'
@@ -50,7 +53,4 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable:1.1.0'
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
-    
-    api 'cc.winboll.studio:libapputils:15.3.4'
-    api 'cc.winboll.studio:libappbase:15.7.6'
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 15:14:21 HKT 2025
+#Sat May 03 11:34:58 GMT 2025
 stageCount=1
 libraryProject=libaes
 baseVersion=15.6
 publishVersion=15.6.0
-buildCount=0
+buildCount=9
 baseBetaVersion=15.6.1

libaes/src/main/AndroidManifest.xml

@@ -5,27 +5,34 @@
 
     <application>
 
-        <activity android:name="cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity"
+        <activity
+            android:name="cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity"
             android:exported="true"/>
 
-        <activity android:name="cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity"
+        <activity
+            android:name="cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity"
             android:exported="true"/>
 
-        <activity android:name="cc.winboll.studio.libaes.unittests.TestAToolbarActivity"
+        <activity
+            android:name="cc.winboll.studio.libaes.unittests.TestAToolbarActivity"
             android:exported="true"/>
 
-        <activity android:name="cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity"
+        <activity
+            android:name="cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity"
             android:exported="true"/>
 
-        <service android:name="cc.winboll.studio.libaes.winboll.WinBoLLClientService"
+        <service
+            android:name="cc.winboll.studio.libaes.winboll.WinBoLLClientService"
             android:exported="true"/>
 
-        <service android:name="cc.winboll.studio.libaes.winboll.AssistantService"
+        <service
+            android:name="cc.winboll.studio.libaes.winboll.AssistantService"
             android:exported="true"/>
 
-        <service android:name="cc.winboll.studio.libaes.winboll.WinBoLLMail"
+        <service
+            android:name="cc.winboll.studio.libaes.winboll.WinBoLLMail"
             android:exported="true"/>
 
     </application>
 
-</manifest>
+</manifest>

libaes/src/main/java/cc/winboll/studio/libaes/beans/WinBoLLClientServiceBean.java

@@ -0,0 +1,78 @@
+package cc.winboll.studio.libaes.beans;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/05/03 19:16
+ */
+import android.content.Context;
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class WinBoLLClientServiceBean extends BaseBean {
+
+    public static final String TAG = "WinBoLLClientServiceBean";
+    
+    // 服务是否正在使用中
+    boolean isEnable;
+    
+    public WinBoLLClientServiceBean() {
+        this.isEnable = false;
+    }
+
+    public WinBoLLClientServiceBean(boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public void setIsEnable(boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+
+    @Override
+    public String getName() {
+        return WinBoLLClientServiceBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        WinBoLLClientServiceBean bean = this;
+        //jsonWriter.name("logLevel").value(bean.getLogLevel().ordinal());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+//            if (name.equals("logLevel")) {
+//                setLogLevel(LogUtils.LOG_LEVEL.values()[jsonReader.nextInt()]);
+//            } else {
+//                return false;
+//            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+
+    public static WinBoLLClientServiceBean loadWinBoLLClientServiceBean(Context context) {
+        return new WinBoLLClientServiceBean();
+    }
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java

@@ -11,7 +11,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import cc.winboll.studio.libaes.winboll.WinBoLLClientService;
+import cc.winboll.studio.libaes.beans.WinBoLLClientServiceBean;
+import cc.winboll.studio.libaes.winboll.AssistantService;
 import cc.winboll.studio.libappbase.utils.ServiceUtils;
 
 public class AssistantService extends Service {

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientService.java

@@ -0,0 +1,21 @@
+package cc.winboll.studio.libaes.winboll;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/05/03 19:28
+ */
+public class WinBoLLClientService extends Service {
+    
+    public static final String TAG = "WinBoLLClientService";
+    
+    @Override
+    public IBinder onBind(Intent intent) {
+        
+        return null;
+    }
+    
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServiceStatusView.java

@@ -0,0 +1,38 @@
+package cc.winboll.studio.libaes.winboll;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/05/03 19:14
+ */
+public class WinBoLLServiceStatusView extends LinearLayout {
+    
+    public static final String TAG = "WinBoLLServiceStatusView";
+    
+    public WinBoLLServiceStatusView(Context context) {
+        super(context);
+    }
+
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    
+    
+    void setServerHost(String szWinBoLLServerHost) {
+        
+    }
+    
+    void setAuthInfo(String szDevUserName, String szDevUserPassword) {
+        
+    }
+}

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 14:47:16 HKT 2025
+#Sat May 03 10:32:21 GMT 2025
 stageCount=7
 libraryProject=libappbase
 baseVersion=15.7
 publishVersion=15.7.6
-buildCount=0
+buildCount=4
 baseBetaVersion=15.7.7