diff --git a/appbase/build.gradle b/appbase/build.gradle
index 1a1874e..4632155 100644
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -18,8 +18,8 @@ def genVersionName(def versionName){
}
android {
- compileSdkVersion 30
- buildToolsVersion "30.0.3"
+ compileSdkVersion 32
+ buildToolsVersion "32.0.0"
defaultConfig {
applicationId "cc.winboll.studio.appbase"
diff --git a/appbase/build.properties b/appbase/build.properties
index 1a5b7a8..477e694 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Mon Mar 17 09:51:20 HKT 2025
-stageCount=4
+#Mon Mar 24 08:04:35 HKT 2025
+stageCount=9
libraryProject=libappbase
baseVersion=15.0
-publishVersion=15.0.3
+publishVersion=15.0.8
buildCount=0
-baseBetaVersion=15.0.4
+baseBetaVersion=15.0.9
diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml
index 36acd1a..072134c 100644
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
android:name=".App"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
- android:theme="@style/MyAppTheme"
+ android:theme="@style/MyAPPBaseTheme"
android:resizeableActivity="true">
+
+
+
+
@@ -81,13 +87,13 @@
-
+
-
+
-
+
@@ -97,12 +103,6 @@
android:name="android.max_aspect"
android:value="4.0"/>
-
-
-
-
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
index e8f0ee9..671889c 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -89,7 +89,7 @@ public class MainActivity extends Activity {
startService(intentService);
}
- public void onTestSOS(View view) {
+ public void onTestDemoServiceSOS(View view) {
Intent intent = new Intent(this, TestDemoService.class);
stopService(intent);
if (App.isDebuging()) {
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MyTileService.java b/appbase/src/main/java/cc/winboll/studio/appbase/MyTileService.java
index ab3b255..3f3fcca 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MyTileService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MyTileService.java
@@ -7,7 +7,7 @@ package cc.winboll.studio.appbase;
import android.content.Context;
import android.service.quicksettings.Tile;
import android.service.quicksettings.TileService;
-import cc.winboll.studio.appbase.beans.MainServiceBean;
+import cc.winboll.studio.appbase.models.MainServiceBean;
import cc.winboll.studio.appbase.services.MainService;
public class MyTileService extends TileService {
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/beans/MainServiceBean.java b/appbase/src/main/java/cc/winboll/studio/appbase/models/MainServiceBean.java
similarity index 97%
rename from appbase/src/main/java/cc/winboll/studio/appbase/beans/MainServiceBean.java
rename to appbase/src/main/java/cc/winboll/studio/appbase/models/MainServiceBean.java
index 580b6e5..5df134e 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/beans/MainServiceBean.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/models/MainServiceBean.java
@@ -1,4 +1,4 @@
-package cc.winboll.studio.appbase.beans;
+package cc.winboll.studio.appbase.models;
/**
* @Author ZhanGSKen@AliYun.Com
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/beans/TestDemoBindServiceBean.java b/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoBindServiceBean.java
similarity index 97%
rename from appbase/src/main/java/cc/winboll/studio/appbase/beans/TestDemoBindServiceBean.java
rename to appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoBindServiceBean.java
index 59649a6..f702494 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/beans/TestDemoBindServiceBean.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoBindServiceBean.java
@@ -1,4 +1,4 @@
-package cc.winboll.studio.appbase.beans;
+package cc.winboll.studio.appbase.models;
/**
* @Author ZhanGSKen@AliYun.Com
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/beans/TestDemoServiceBean.java b/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoServiceBean.java
similarity index 97%
rename from appbase/src/main/java/cc/winboll/studio/appbase/beans/TestDemoServiceBean.java
rename to appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoServiceBean.java
index 680d2e4..90f7518 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/beans/TestDemoServiceBean.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoServiceBean.java
@@ -1,4 +1,4 @@
-package cc.winboll.studio.appbase.beans;
+package cc.winboll.studio.appbase.models;
/**
* @Author ZhanGSKen@AliYun.Com
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/beans/WinBollNewsBean.java b/appbase/src/main/java/cc/winboll/studio/appbase/models/WinBollNewsBean.java
similarity index 97%
rename from appbase/src/main/java/cc/winboll/studio/appbase/beans/WinBollNewsBean.java
rename to appbase/src/main/java/cc/winboll/studio/appbase/models/WinBollNewsBean.java
index 713cc82..66ee6b6 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/beans/WinBollNewsBean.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/models/WinBollNewsBean.java
@@ -1,4 +1,4 @@
-package cc.winboll.studio.appbase.beans;
+package cc.winboll.studio.appbase.models;
/**
* @Author ZhanGSKen@AliYun.Com
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidgetClickListener.java b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/APPNewsWidgetClickListener.java
similarity index 89%
rename from appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidgetClickListener.java
rename to appbase/src/main/java/cc/winboll/studio/appbase/receivers/APPNewsWidgetClickListener.java
index bfe263f..70561c9 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidgetClickListener.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/APPNewsWidgetClickListener.java
@@ -1,13 +1,13 @@
-package cc.winboll.studio.appbase.widgets;
+package cc.winboll.studio.appbase.receivers;
/**
* @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/15 17:20:46
- * @Describe WidgetButtonClickListener
+ * @Date 2025/03/24 07:11:44
*/
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
+import cc.winboll.studio.appbase.widgets.APPNewsWidget;
import cc.winboll.studio.libappbase.LogUtils;
public class APPNewsWidgetClickListener extends BroadcastReceiver {
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java
index 1764c46..498f877 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java
@@ -10,7 +10,7 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import cc.winboll.studio.appbase.beans.WinBollNewsBean;
+import cc.winboll.studio.appbase.models.WinBollNewsBean;
import cc.winboll.studio.appbase.services.MainService;
import cc.winboll.studio.appbase.widgets.APPNewsWidget;
import cc.winboll.studio.libappbase.AppUtils;
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/services/AssistantService.java b/appbase/src/main/java/cc/winboll/studio/appbase/services/AssistantService.java
index b2e2f9b..8db3f50 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/AssistantService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/AssistantService.java
@@ -11,7 +11,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.IBinder;
-import cc.winboll.studio.appbase.beans.MainServiceBean;
+import cc.winboll.studio.appbase.models.MainServiceBean;
import cc.winboll.studio.appbase.services.AssistantService;
import cc.winboll.studio.appbase.services.MainService;
import cc.winboll.studio.libappbase.LogUtils;
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java b/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java
index 41949ef..fdbbd62 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java
@@ -18,7 +18,7 @@ import android.content.ServiceConnection;
import android.os.Binder;
import android.os.IBinder;
import cc.winboll.studio.appbase.MyTileService;
-import cc.winboll.studio.appbase.beans.MainServiceBean;
+import cc.winboll.studio.appbase.models.MainServiceBean;
import cc.winboll.studio.appbase.handlers.MainServiceHandler;
import cc.winboll.studio.appbase.receivers.MainReceiver;
import cc.winboll.studio.appbase.services.AssistantService;
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java
index a957afa..14209de 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java
@@ -10,7 +10,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.Binder;
import android.os.IBinder;
-import cc.winboll.studio.appbase.beans.TestDemoBindServiceBean;
+import cc.winboll.studio.appbase.models.TestDemoBindServiceBean;
import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libappbase.sos.WinBoll;
import cc.winboll.studio.appbase.App;
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java
index 4739f9c..6098dce 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java
@@ -10,7 +10,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.Binder;
import android.os.IBinder;
-import cc.winboll.studio.appbase.beans.TestDemoServiceBean;
+import cc.winboll.studio.appbase.models.TestDemoServiceBean;
import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libappbase.sos.WinBoll;
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java b/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java
index fa3da6e..c844983 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java
@@ -12,15 +12,16 @@ import android.content.Context;
import android.content.Intent;
import android.widget.RemoteViews;
import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.appbase.beans.WinBollNewsBean;
+import cc.winboll.studio.appbase.models.WinBollNewsBean;
+import cc.winboll.studio.appbase.receivers.APPNewsWidgetClickListener;
import cc.winboll.studio.libappbase.AppUtils;
import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.sos.APPModel;
+import cc.winboll.studio.libappbase.sos.WinBoll;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
-import cc.winboll.studio.libappbase.sos.APPModel;
-import cc.winboll.studio.libappbase.sos.WinBoll;
public class APPNewsWidget extends AppWidgetProvider {
diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml
index 3eaadd1..cb20da0 100644
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -72,6 +72,26 @@
android:layout_height="wrap_content"
android:gravity="right">
+
+
+
+
+
+
+
@@ -105,54 +125,41 @@
-
-
-
+
-
+
-
+
-
+
-
+
+
+
-
-
-
+ android:onClick="onTestDemoServiceSOS"/>
@@ -185,10 +192,10 @@
-
-
+
+
diff --git a/appbase/src/main/res/values/styles.xml b/appbase/src/main/res/values/styles.xml
index f065594..d8e7e1b 100644
--- a/appbase/src/main/res/values/styles.xml
+++ b/appbase/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
-
diff --git a/build.gradle b/build.gradle
index 5c58ec9..491faab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,12 @@
// 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/' }
@@ -9,13 +15,6 @@ 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 {
@@ -27,6 +26,12 @@ 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://maven.aliyun.com/repository/public/' }
maven { url 'https://maven.aliyun.com/repository/google/' }
maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
@@ -35,13 +40,6 @@ 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/gradle.properties-android-demo b/gradle.properties-android-demo
index 7d87c1c..cb39be8 100644
--- a/gradle.properties-android-demo
+++ b/gradle.properties-android-demo
@@ -17,3 +17,5 @@ org.gradle.jvmargs=-Xmx2048m
android.useAndroidX=false
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=false
+# 保持与旧版Gradle插件的兼容
+android.disableAutomaticComponentCreation=true
diff --git a/gradle.properties-androidx-demo b/gradle.properties-androidx-demo
index 2f26404..74b1f76 100644
--- a/gradle.properties-androidx-demo
+++ b/gradle.properties-androidx-demo
@@ -17,3 +17,5 @@ org.gradle.jvmargs=-Xmx2048m
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
+# 保持与旧版Gradle插件的兼容
+android.disableAutomaticComponentCreation=true
diff --git a/libappbase/build.gradle b/libappbase/build.gradle
index 4388acd..9d3ba1a 100644
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -4,8 +4,8 @@ apply from: '../.winboll/winboll_lib_build.gradle'
apply from: '../.winboll/winboll_lint_build.gradle'
android {
- compileSdkVersion 30
- buildToolsVersion "30.0.3"
+ compileSdkVersion 32
+ buildToolsVersion "32.0.0"
defaultConfig {
minSdkVersion 26
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 436c82c..715afc0 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Mon Mar 17 09:51:04 HKT 2025
-stageCount=4
+#Mon Mar 24 08:04:27 HKT 2025
+stageCount=9
libraryProject=libappbase
baseVersion=15.0
-publishVersion=15.0.3
+publishVersion=15.0.8
buildCount=0
-baseBetaVersion=15.0.4
+baseBetaVersion=15.0.9