From 6450faa556b659a86fa4dbd60f45fff9c045ef88 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 23 Jan 2025 12:44:36 +0800 Subject: [PATCH 001/163] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.gradle | 4 ++-- aes/build.properties | 4 ++-- aes/src/main/java/cc/winboll/studio/aes/App.java | 2 +- libaes/build.properties | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aes/build.gradle b/aes/build.gradle index c6a3a6c..d542f7b 100644 --- a/aes/build.gradle +++ b/aes/build.gradle @@ -62,8 +62,8 @@ dependencies { api 'androidx.fragment:fragment:1.0.0' api 'com.google.android.material:material:1.0.0' - api 'cc.winboll.studio:libapputils:9.2.1' - api 'cc.winboll.studio:libappbase:1.0.3' + api 'cc.winboll.studio:libapputils:9.2.5' + api 'cc.winboll.studio:libappbase:1.1.0' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/aes/build.properties b/aes/build.properties index 69caa9a..91b066e 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jan 19 04:58:59 GMT 2025 +#Thu Jan 23 04:42:14 GMT 2025 stageCount=3 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.2 -buildCount=4 +buildCount=5 baseBetaVersion=7.6.3 diff --git a/aes/src/main/java/cc/winboll/studio/aes/App.java b/aes/src/main/java/cc/winboll/studio/aes/App.java index 578f72d..8865b1a 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/App.java +++ b/aes/src/main/java/cc/winboll/studio/aes/App.java @@ -5,7 +5,7 @@ package cc.winboll.studio.aes; * @Date 2024/06/13 19:03:58 * @Describe AES应用类 */ -import cc.winboll.studio.libappbase.GlobalApplication; +import cc.winboll.studio.GlobalApplication; public class App extends GlobalApplication { diff --git a/libaes/build.properties b/libaes/build.properties index 69caa9a..91b066e 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jan 19 04:58:59 GMT 2025 +#Thu Jan 23 04:42:14 GMT 2025 stageCount=3 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.2 -buildCount=4 +buildCount=5 baseBetaVersion=7.6.3 From c91c9c9887ae1f65d653c4269ec142d1f8b888fe Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 23 Jan 2025 12:54:10 +0800 Subject: [PATCH 002/163] APK 7.6.3 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 91b066e..9c380e1 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jan 23 04:42:14 GMT 2025 -stageCount=3 +#Thu Jan 23 12:54:10 HKT 2025 +stageCount=4 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.2 -buildCount=5 -baseBetaVersion=7.6.3 +publishVersion=7.6.3 +buildCount=0 +baseBetaVersion=7.6.4 diff --git a/libaes/build.properties b/libaes/build.properties index 91b066e..9c380e1 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jan 23 04:42:14 GMT 2025 -stageCount=3 +#Thu Jan 23 12:54:10 HKT 2025 +stageCount=4 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.2 -buildCount=5 -baseBetaVersion=7.6.3 +publishVersion=7.6.3 +buildCount=0 +baseBetaVersion=7.6.4 From 6410eda84eb7707961f5a9b580cab7e0b9bcbe62 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 23 Jan 2025 12:54:30 +0800 Subject: [PATCH 003/163] Library Release 7.6.3 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index 9c380e1..b37776f 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jan 23 12:54:10 HKT 2025 +#Thu Jan 23 12:54:25 HKT 2025 stageCount=4 libraryProject=libaes baseVersion=7.6 From 0a7a26d3cd2dbfdbb99ba52fe125e5b8a105dc54 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 26 Jan 2025 14:17:28 +0800 Subject: [PATCH 004/163] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E7=B1=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.gradle | 4 ++-- aes/build.properties | 4 ++-- libaes/build.gradle | 4 ++-- libaes/build.properties | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aes/build.gradle b/aes/build.gradle index d542f7b..e85100e 100644 --- a/aes/build.gradle +++ b/aes/build.gradle @@ -62,8 +62,8 @@ dependencies { api 'androidx.fragment:fragment:1.0.0' api 'com.google.android.material:material:1.0.0' - api 'cc.winboll.studio:libapputils:9.2.5' - api 'cc.winboll.studio:libappbase:1.1.0' + api 'cc.winboll.studio:libapputils:9.2.17' + api 'cc.winboll.studio:libappbase:1.1.2' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/aes/build.properties b/aes/build.properties index b37776f..f488b38 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jan 23 12:54:25 HKT 2025 +#Sun Jan 26 06:16:16 GMT 2025 stageCount=4 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.3 -buildCount=0 +buildCount=4 baseBetaVersion=7.6.4 diff --git a/libaes/build.gradle b/libaes/build.gradle index 07ed99e..8a746a6 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -41,8 +41,8 @@ dependencies { // https://github.com/baoyongzhang/android-PullRefreshLayout api 'com.baoyz.pullrefreshlayout:library:1.2.0' - api 'cc.winboll.studio:libapputils:9.2.1' - api 'cc.winboll.studio:libappbase:1.0.3' + api 'cc.winboll.studio:libapputils:9.2.17' + api 'cc.winboll.studio:libappbase:1.1.2' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/libaes/build.properties b/libaes/build.properties index 9c380e1..f488b38 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jan 23 12:54:10 HKT 2025 +#Sun Jan 26 06:16:16 GMT 2025 stageCount=4 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.3 -buildCount=0 +buildCount=4 baseBetaVersion=7.6.4 From ebee402c841ed646fbaf0173f9404fbe81af3a26 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 26 Jan 2025 14:19:55 +0800 Subject: [PATCH 005/163] APK 7.6.4 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 f488b38..0ca2160 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jan 26 06:16:16 GMT 2025 -stageCount=4 +#Sun Jan 26 14:19:55 HKT 2025 +stageCount=5 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.3 -buildCount=4 -baseBetaVersion=7.6.4 +publishVersion=7.6.4 +buildCount=0 +baseBetaVersion=7.6.5 diff --git a/libaes/build.properties b/libaes/build.properties index f488b38..0ca2160 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jan 26 06:16:16 GMT 2025 -stageCount=4 +#Sun Jan 26 14:19:55 HKT 2025 +stageCount=5 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.3 -buildCount=4 -baseBetaVersion=7.6.4 +publishVersion=7.6.4 +buildCount=0 +baseBetaVersion=7.6.5 From 61200c37be203d298a27e9474942837313172194 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 26 Jan 2025 14:20:24 +0800 Subject: [PATCH 006/163] Library Release 7.6.4 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index 0ca2160..b3cf5a9 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jan 26 14:19:55 HKT 2025 +#Sun Jan 26 14:20:15 HKT 2025 stageCount=5 libraryProject=libaes baseVersion=7.6 From 8f8c3c6c97a84d272a2e1ae34fd6e2f58f702f9f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 4 Feb 2025 08:24:06 +0800 Subject: [PATCH 007/163] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 +- aes/src/main/AndroidManifest.xml | 2 +- libaes/build.properties | 4 +- .../studio/libaes/beans/AESThemeBean.java | 16 +- .../studio/libaes/utils/AESThemeUtil.java | 8 +- libaes/src/main/res/values/attrs.xml | 7 + libaes/src/main/res/values/styles.xml | 270 ++++++++++-------- 7 files changed, 178 insertions(+), 133 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index b3cf5a9..9cb10b4 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jan 26 14:20:15 HKT 2025 +#Tue Feb 04 00:22:34 GMT 2025 stageCount=5 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.4 -buildCount=0 +buildCount=10 baseBetaVersion=7.6.5 diff --git a/aes/src/main/AndroidManifest.xml b/aes/src/main/AndroidManifest.xml index cc00d93..0113548 100644 --- a/aes/src/main/AndroidManifest.xml +++ b/aes/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:theme="@style/WinBoll.SupportThemeNoActionBar" + android:theme="@style/AESTheme" android:requestLegacyExternalStorage="true" android:supportsRtl="true"> diff --git a/libaes/build.properties b/libaes/build.properties index 0ca2160..9cb10b4 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jan 26 14:19:55 HKT 2025 +#Tue Feb 04 00:22:34 GMT 2025 stageCount=5 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.4 -buildCount=0 +buildCount=10 baseBetaVersion=7.6.5 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java b/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java index 2d3a474..fe23895 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java @@ -16,7 +16,7 @@ public class AESThemeBean extends BaseBean { public static final String TAG = "AESThemeBean"; public enum ThemeType { - DEFAULT("默认主题"), + AES("默认主题"), DEPTH("深奥主题"), SKY("天空主题"), GOLDEN("辉煌主题"), @@ -42,7 +42,7 @@ public class AESThemeBean extends BaseBean { } // 保存当前主题 - int currentThemeStyleID = getThemeStyleID(ThemeType.DEFAULT); + int currentThemeStyleID = getThemeStyleID(ThemeType.AES); public AESThemeBean() { } @@ -99,7 +99,7 @@ public class AESThemeBean extends BaseBean { } public static int getThemeStyleID(ThemeType themeType) { - int themeStyleID = R.style.DefaultAESTheme; + int themeStyleID = R.style.AESTheme; if (AESThemeBean.ThemeType.DEPTH == themeType) { themeStyleID = R.style.DepthAESTheme; } else if (AESThemeBean.ThemeType.SKY == themeType) { @@ -110,15 +110,15 @@ public class AESThemeBean extends BaseBean { themeStyleID = R.style.MemorAESTheme; } else if (AESThemeBean.ThemeType.TAO == themeType) { themeStyleID = R.style.TaoAESTheme; - } else if (AESThemeBean.ThemeType.DEFAULT == themeType) { - themeStyleID = R.style.DefaultAESTheme; + } else if (AESThemeBean.ThemeType.AES == themeType) { + themeStyleID = R.style.AESTheme; } //LogUtils.d(TAG, "themeStyleID " + Integer.toString(themeStyleID)); return themeStyleID; } public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) { - AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.DEFAULT; + AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.AES; if (R.style.DepthAESTheme == nThemeStyleID) { themeStyle = AESThemeBean.ThemeType.DEPTH ; } else if (R.style.SkyAESTheme == nThemeStyleID) { @@ -129,8 +129,8 @@ public class AESThemeBean extends BaseBean { themeStyle = AESThemeBean.ThemeType.MEMOR ; } else if (R.style.TaoAESTheme == nThemeStyleID) { themeStyle = AESThemeBean.ThemeType.TAO ; - } else if (R.style.DefaultAESTheme == nThemeStyleID) { - themeStyle = AESThemeBean.ThemeType.DEFAULT; + } else if (R.style.AESTheme == nThemeStyleID) { + themeStyle = AESThemeBean.ThemeType.AES; } //LogUtils.d(TAG, "themeStyle " + Integer.toString(themeStyle.ordinal())); return themeStyle; diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java index 68f3dd1..ccc22ec 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java @@ -25,7 +25,7 @@ public class AESThemeUtil { public static int getThemeTypeID(T context) { AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class); - return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT): bean.getCurrentThemeTypeID(); + return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES): bean.getCurrentThemeTypeID(); } public static void saveThemeStyleID(T context, int nThemeTypeID) { @@ -92,7 +92,7 @@ public class AESThemeUtil { saveThemeStyleID(activity, nThemeStyleID); return true; } else if (R.id.item_defaulttheme == item.getItemId()) { - nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT); + nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES); saveThemeStyleID(activity, nThemeStyleID); return true; } @@ -123,7 +123,7 @@ public class AESThemeUtil { saveThemeStyleID(activity, nThemeStyleID); return true; } else if (R.id.item_defaulttheme == item.getItemId()) { - nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT); + nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES); saveThemeStyleID(activity, nThemeStyleID); return true; } @@ -154,7 +154,7 @@ public class AESThemeUtil { saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID); return true; } else if (R.id.item_defaulttheme == item.getItemId()) { - nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT); + nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES); saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID); return true; } diff --git a/libaes/src/main/res/values/attrs.xml b/libaes/src/main/res/values/attrs.xml index 4dfb542..c3a273d 100644 --- a/libaes/src/main/res/values/attrs.xml +++ b/libaes/src/main/res/values/attrs.xml @@ -32,6 +32,13 @@ + + + + + + + + + + From f3d97fc94bb9f7150e0570c4a4279f78ac785d12 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 4 Feb 2025 08:26:00 +0800 Subject: [PATCH 008/163] APK 7.6.5 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 9cb10b4..5013642 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Feb 04 00:22:34 GMT 2025 -stageCount=5 +#Tue Feb 04 08:26:00 HKT 2025 +stageCount=6 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.4 -buildCount=10 -baseBetaVersion=7.6.5 +publishVersion=7.6.5 +buildCount=0 +baseBetaVersion=7.6.6 diff --git a/libaes/build.properties b/libaes/build.properties index 9cb10b4..5013642 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Feb 04 00:22:34 GMT 2025 -stageCount=5 +#Tue Feb 04 08:26:00 HKT 2025 +stageCount=6 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.4 -buildCount=10 -baseBetaVersion=7.6.5 +publishVersion=7.6.5 +buildCount=0 +baseBetaVersion=7.6.6 From c90d8549b41533171f8717e81cdadb49dad86f26 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 4 Feb 2025 08:26:21 +0800 Subject: [PATCH 009/163] Library Release 7.6.5 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index 5013642..5da4074 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Feb 04 08:26:00 HKT 2025 +#Tue Feb 04 08:26:11 HKT 2025 stageCount=6 libraryProject=libaes baseVersion=7.6 From 7f8ee8d6de623f34c2bbcd310b043cd89946cab1 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 4 Feb 2025 09:00:34 +0800 Subject: [PATCH 010/163] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.gradle | 14 -------------- aes/build.properties | 4 ++-- aes/src/main/java/cc/winboll/studio/aes/App.java | 5 +++-- libaes/build.gradle | 6 ++---- libaes/build.properties | 4 ++-- 5 files changed, 9 insertions(+), 24 deletions(-) diff --git a/aes/build.gradle b/aes/build.gradle index e85100e..246a6f8 100644 --- a/aes/build.gradle +++ b/aes/build.gradle @@ -51,19 +51,5 @@ android { dependencies { api project(':libaes') - //api 'cc.winboll.studio:winboll-shared:1.6.5' - api 'io.github.medyo:android-about-page:2.0.0' - api 'com.github.getActivity:ToastUtils:10.5' - api 'com.jcraft:jsch:0.1.55' - api 'org.jsoup:jsoup:1.13.1' - api 'com.squareup.okhttp3:okhttp:4.4.1' - - api 'androidx.appcompat:appcompat:1.0.0' - api 'androidx.fragment:fragment:1.0.0' - api 'com.google.android.material:material:1.0.0' - - api 'cc.winboll.studio:libapputils:9.2.17' - api 'cc.winboll.studio:libappbase:1.1.2' - api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/aes/build.properties b/aes/build.properties index 5da4074..b476654 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Feb 04 08:26:11 HKT 2025 +#Tue Feb 04 01:00:08 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.5 -buildCount=0 +buildCount=3 baseBetaVersion=7.6.6 diff --git a/aes/src/main/java/cc/winboll/studio/aes/App.java b/aes/src/main/java/cc/winboll/studio/aes/App.java index 8865b1a..566a2f9 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/App.java +++ b/aes/src/main/java/cc/winboll/studio/aes/App.java @@ -5,9 +5,10 @@ package cc.winboll.studio.aes; * @Date 2024/06/13 19:03:58 * @Describe AES应用类 */ -import cc.winboll.studio.GlobalApplication; +import cc.winboll.studio.libappbase.GlobalApplication; +import cc.winboll.studio.libapputils.app.WinBollGlobalApplication; -public class App extends GlobalApplication { +public class App extends WinBollGlobalApplication { public static final String TAG = "App"; diff --git a/libaes/build.gradle b/libaes/build.gradle index 8a746a6..5bda1f2 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -26,8 +26,6 @@ android { } dependencies { - //api 'cc.winboll.studio:winboll-shared:1.6.5' - api 'io.github.medyo:android-about-page:2.0.0' api 'com.github.getActivity:ToastUtils:10.5' api 'com.jcraft:jsch:0.1.55' @@ -41,8 +39,8 @@ dependencies { // https://github.com/baoyongzhang/android-PullRefreshLayout api 'com.baoyz.pullrefreshlayout:library:1.2.0' - api 'cc.winboll.studio:libapputils:9.2.17' - api 'cc.winboll.studio:libappbase:1.1.2' + api 'cc.winboll.studio:libapputils:9.3.0' + api 'cc.winboll.studio:libappbase:1.1.3' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/libaes/build.properties b/libaes/build.properties index 5013642..b476654 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Feb 04 08:26:00 HKT 2025 +#Tue Feb 04 01:00:08 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.5 -buildCount=0 +buildCount=3 baseBetaVersion=7.6.6 From c01a739b9d0b6758cada904dfd48f46f88c8ad5d Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 6 Feb 2025 11:29:46 +0800 Subject: [PATCH 011/163] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=BA=93?= =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E8=B0=83=E8=AF=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 +- .../main/java/cc/winboll/studio/aes/App.java | 3 +- .../cc/winboll/studio/aes/MainActivity.java | 221 +++++++++++++++++- .../src/main/res/menu/toolbar_library.xml | 2 +- libaes/build.gradle | 4 +- libaes/build.properties | 4 +- .../activitys/DrawerFragmentActivity.java | 29 +-- .../libaes/unittests/LibraryActivity.java | 170 -------------- .../unittests/SecondaryLibraryActivity.java | 35 ++- .../unittests/TestDrawerFragmentActivity.java | 40 +++- .../studio/libaes/utils/AESThemeUtil.java | 47 +++- .../src/main/res/layout/activity_library.xml | 14 -- 12 files changed, 349 insertions(+), 224 deletions(-) rename {libaes => aes}/src/main/res/menu/toolbar_library.xml (99%) delete mode 100644 libaes/src/main/java/cc/winboll/studio/libaes/unittests/LibraryActivity.java delete mode 100644 libaes/src/main/res/layout/activity_library.xml diff --git a/aes/build.properties b/aes/build.properties index b476654..d882e77 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Feb 04 01:00:08 GMT 2025 +#Thu Feb 06 03:29:07 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.5 -buildCount=3 +buildCount=16 baseBetaVersion=7.6.6 diff --git a/aes/src/main/java/cc/winboll/studio/aes/App.java b/aes/src/main/java/cc/winboll/studio/aes/App.java index 566a2f9..578f72d 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/App.java +++ b/aes/src/main/java/cc/winboll/studio/aes/App.java @@ -6,9 +6,8 @@ package cc.winboll.studio.aes; * @Describe AES应用类 */ import cc.winboll.studio.libappbase.GlobalApplication; -import cc.winboll.studio.libapputils.app.WinBollGlobalApplication; -public class App extends WinBollGlobalApplication { +public class App extends GlobalApplication { public static final String TAG = "App"; diff --git a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java index cafaf1e..4a8c511 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java @@ -5,12 +5,221 @@ package cc.winboll.studio.aes; * @Date 2024/06/13 19:05:52 * @Describe 应用主窗口 */ -import cc.winboll.studio.libaes.unittests.LibraryActivity; +import android.content.Intent; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.widget.AdapterView; +import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; +import cc.winboll.studio.aes.R; +import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; +import cc.winboll.studio.libaes.beans.DrawerMenuBean; +import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog; +import cc.winboll.studio.libaes.dialogs.StoragePathDialog; +import cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity; +import cc.winboll.studio.libaes.unittests.TestAButtonFragment; +import cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity; +import cc.winboll.studio.libaes.unittests.TestAToolbarActivity; +import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity; +import cc.winboll.studio.libaes.unittests.TestViewPageFragment; +import cc.winboll.studio.libapputils.app.IWinBollActivity; +import cc.winboll.studio.libapputils.bean.APPInfo; +import cc.winboll.studio.libapputils.log.LogUtils; +import com.a4455jkjh.colorpicker.ColorPickerDialog; +import java.util.ArrayList; +import androidx.appcompat.widget.Toolbar; +import cc.winboll.studio.libapputils.app.AboutActivityFactory; + +public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity { -public class MainActivity extends LibraryActivity { - public static final String TAG = "MainActivity"; - - - + + TestAButtonFragment mTestAButtonFragment; + TestViewPageFragment mTestViewPageFragment; + + @Override + public AppCompatActivity getActivity() { + return this; + } + + @Override + public APPInfo getAppInfo() { + String szBranchName = "aes"; + + APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo(); + appInfo.setAppName("AES"); + appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll); + appInfo.setAppDescription("AES Description"); + appInfo.setAppGitName("APP"); + appInfo.setAppGitOwner("Studio"); + appInfo.setAppGitAPPBranch(szBranchName); + appInfo.setAppGitAPPSubProjectFolder(szBranchName); + appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=AES"); + appInfo.setAppAPKName("AES"); + appInfo.setAppAPKFolderName("AES"); + return appInfo; + //return null; + } + + @Override + public String getTag() { + return null; + } + + @Override + public Toolbar initToolBar() { + return null; + } + + @Override + public boolean isAddWinBollToolBar() { + return false; + } + + @Override + public boolean isEnableDisplayHomeAsUp() { + return false; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (mTestAButtonFragment == null) { + mTestAButtonFragment = new TestAButtonFragment(); + addFragment(mTestAButtonFragment); + } + showFragment(mTestAButtonFragment); + //setSubtitle(TAG); + } + + @Override + public void initDrawerMenuItemList(ArrayList listDrawerMenu) { + super.initDrawerMenuItemList(listDrawerMenu); + LogUtils.d(TAG, "initDrawerMenuItemList"); + //listDrawerMenu.clear(); + // 添加抽屉菜单项 + listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG)); + listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG)); + notifyDrawerMenuDataChanged(); + } + + @Override + public void reinitDrawerMenuItemList(ArrayList listDrawerMenu) { + super.reinitDrawerMenuItemList(listDrawerMenu); + LogUtils.d(TAG, "reinitDrawerMenuItemList"); + //listDrawerMenu.clear(); + // 添加抽屉菜单项 + listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG)); + listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG)); + notifyDrawerMenuDataChanged(); + } + + @Override + public DrawerFragmentActivity.ActivityType initActivityType() { + return DrawerFragmentActivity.ActivityType.Main; + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.toolbar_library, menu); + return super.onCreateOptionsMenu(menu); + } + + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + super.onItemClick(parent, view, position, id); + switch (position) { + case 0 : { + if (mTestAButtonFragment == null) { + mTestAButtonFragment = new TestAButtonFragment(); + addFragment(mTestAButtonFragment); + } + showFragment(mTestAButtonFragment); + break; + } + case 1 : { + if (mTestViewPageFragment == null) { + mTestViewPageFragment = new TestViewPageFragment(); + addFragment(mTestViewPageFragment); + } + showFragment(mTestViewPageFragment); + break; + } + } + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int nItemId = item.getItemId(); +// if (item.getItemId() == R.id.item_log) { +// WinBollActivityManager.getInstance(this).startWinBollActivity(getApplicationContext(), LogActivity.class); +// } else + if (nItemId == R.id.item_atoast) { + Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show(); + } else if (nItemId == R.id.item_atoolbar) { + Intent intent = new Intent(this, TestAToolbarActivity.class); + startActivity(intent); + + } else if (nItemId == R.id.item_asupporttoolbar) { + Intent intent = new Intent(this, TestASupportToolbarActivity.class); + startActivity(intent); + + } else if (nItemId == R.id.item_colordialog) { + ColorPickerDialog dlg = new ColorPickerDialog(this, getResources().getColor(R.color.colorPrimary)); + dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() { + + @Override + public void beforeColorChanged() { + } + + @Override + public void onColorChanged(int color) { + + } + + @Override + public void afterColorChanged() { + } + + + }); + dlg.show(); + + } else if (nItemId == R.id.item_dialogstoragepath) { + final StoragePathDialog dialog = new StoragePathDialog(this, 0); + dialog.setOnOKClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dialog.dismiss(); + } + }); + dialog.show(); + + } else if (nItemId == R.id.item_localfileselectdialog) { + final LocalFileSelectDialog dialog = new LocalFileSelectDialog(this); + dialog.setOnOKClickListener(new LocalFileSelectDialog.OKClickListener() { + @Override + public void onOKClick(String sz) { + Toast.makeText(getApplication(), sz, Toast.LENGTH_SHORT).show(); + //dialog.dismiss(); + } + }); + dialog.open(); + + } else if (nItemId == R.id.item_secondarylibraryactivity) { + Intent intent = new Intent(this, SecondaryLibraryActivity.class); + startActivity(intent); + } else if (nItemId == R.id.item_drawerfragmentactivity) { + Intent intent = new Intent(this, TestDrawerFragmentActivity.class); + startActivity(intent); + } + else if (nItemId == R.id.item_about) { + AboutActivityFactory.showAboutActivity(this, getAppInfo()); + return true; + } + + return super.onOptionsItemSelected(item); + } } diff --git a/libaes/src/main/res/menu/toolbar_library.xml b/aes/src/main/res/menu/toolbar_library.xml similarity index 99% rename from libaes/src/main/res/menu/toolbar_library.xml rename to aes/src/main/res/menu/toolbar_library.xml index d01cea5..b12aef8 100644 --- a/libaes/src/main/res/menu/toolbar_library.xml +++ b/aes/src/main/res/menu/toolbar_library.xml @@ -13,7 +13,7 @@ - + diff --git a/libaes/build.gradle b/libaes/build.gradle index 5bda1f2..df32ee1 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -39,8 +39,8 @@ dependencies { // https://github.com/baoyongzhang/android-PullRefreshLayout api 'com.baoyz.pullrefreshlayout:library:1.2.0' - api 'cc.winboll.studio:libapputils:9.3.0' - api 'cc.winboll.studio:libappbase:1.1.3' + api 'cc.winboll.studio:libapputils:9.3.1' + api 'cc.winboll.studio:libappbase:1.2.0' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/libaes/build.properties b/libaes/build.properties index b476654..d882e77 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Feb 04 01:00:08 GMT 2025 +#Thu Feb 06 03:29:07 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.5 -buildCount=3 +buildCount=16 baseBetaVersion=7.6.6 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java index ff63941..5731d87 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java @@ -15,7 +15,6 @@ import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; import androidx.appcompat.app.ActionBarDrawerToggle; -import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; @@ -30,15 +29,17 @@ import cc.winboll.studio.libaes.views.ADrawerMenuListView; import cc.winboll.studio.libapputils.log.LogUtils; import com.baoyz.widget.PullRefreshLayout; import java.util.ArrayList; +import androidx.appcompat.app.AppCompatActivity; +import cc.winboll.studio.libapputils.app.IWinBollActivity; -public abstract class DrawerFragmentActivity extends AppCompatActivity implements AdapterView.OnItemClickListener { +public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBollActivity,AdapterView.OnItemClickListener { public static final String TAG = "DrawerFragmentActivity"; static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME"; static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE"; - protected Context mContext; + //protected Context mContext; ActivityType mActivityType; ActionBarDrawerToggle mActionBarDrawerToggle; DrawerLayout mDrawerLayout; @@ -58,7 +59,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement @Override protected void onCreate(Bundle savedInstanceState) { - mContext = this; + //mContext = this; mThemeType = getThemeType(); setThemeStyle(); super.onCreate(savedInstanceState); @@ -72,7 +73,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement super.onDestroy(); } - @Override + /*@Override public Intent getIntent() { // TODO: Implement this method return super.getIntent(); @@ -80,7 +81,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement public Context getContext() { return this.mContext; - } + }*/ @Override public MenuInflater getMenuInflater() { @@ -88,20 +89,20 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement return super.getMenuInflater(); } - public void setSubtitle(CharSequence context) { + /*public void setSubtitle(CharSequence context) { // TODO: Implement this method getSupportActionBar().setSubtitle(context); - } + }*/ @Override public void recreate() { super.recreate(); } - @Override + /*@Override public boolean moveTaskToBack(boolean nonRoot) { return super.moveTaskToBack(nonRoot); - } + }*/ @Override public void startActivity(Intent intent) { @@ -113,7 +114,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement super.startActivityForResult(intent, requestCode, options); } - @Override + /*@Override public FragmentManager getSupportFragmentManager() { return super.getSupportFragmentManager(); } @@ -131,7 +132,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement public void setTitle(int resId) { // TODO: Implement this method getSupportActionBar().setTitle(resId); - } + }*/ @Override public SharedPreferences getSharedPreferences(String name, int mode) { @@ -151,7 +152,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement void setThemeStyle() { //setTheme(AESThemeBean.getThemeStyle(getThemeType())); - setTheme(AESThemeUtil.getThemeTypeID(this)); + setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext())); } boolean checkThemeStyleChange() { @@ -163,7 +164,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement SHAREDPREFERENCES_NAME, MODE_PRIVATE); return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))]; */ - return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(this)); + return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext())); } @Override diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/LibraryActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/LibraryActivity.java deleted file mode 100644 index 6e611bf..0000000 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/LibraryActivity.java +++ /dev/null @@ -1,170 +0,0 @@ -package cc.winboll.studio.libaes.unittests; - -/** - * @Author ZhanGSKen@QQ.COM - * @Date 2024/06/14 03:43:23 - * @Describe AES类库主窗口 - */ -import android.content.Intent; -import android.os.Bundle; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.widget.AdapterView; -import android.widget.Toast; -import cc.winboll.studio.libaes.R; -import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; -import cc.winboll.studio.libaes.beans.DrawerMenuBean; -import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog; -import cc.winboll.studio.libaes.dialogs.StoragePathDialog; -import cc.winboll.studio.libapputils.log.LogUtils; -import com.a4455jkjh.colorpicker.ColorPickerDialog; -import java.util.ArrayList; - -public class LibraryActivity extends DrawerFragmentActivity { - - public static final String TAG = "LibraryActivity"; - - TestAButtonFragment mTestAButtonFragment; - TestViewPageFragment mTestViewPageFragment; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (mTestAButtonFragment == null) { - mTestAButtonFragment = new TestAButtonFragment(); - addFragment(mTestAButtonFragment); - } - showFragment(mTestAButtonFragment); - setSubtitle(TAG); - } - - @Override - public void initDrawerMenuItemList(ArrayList listDrawerMenu) { - super.initDrawerMenuItemList(listDrawerMenu); - LogUtils.d(TAG, "initDrawerMenuItemList"); - //listDrawerMenu.clear(); - // 添加抽屉菜单项 - listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG)); - listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG)); - notifyDrawerMenuDataChanged(); - } - - @Override - public void reinitDrawerMenuItemList(ArrayList listDrawerMenu) { - super.reinitDrawerMenuItemList(listDrawerMenu); - LogUtils.d(TAG, "reinitDrawerMenuItemList"); - //listDrawerMenu.clear(); - // 添加抽屉菜单项 - listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG)); - listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG)); - notifyDrawerMenuDataChanged(); - } - - @Override - public DrawerFragmentActivity.ActivityType initActivityType() { - return DrawerFragmentActivity.ActivityType.Main; - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.toolbar_library, menu); - return super.onCreateOptionsMenu(menu); - } - - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - super.onItemClick(parent, view, position, id); - switch (position) { - case 0 : { - if (mTestAButtonFragment == null) { - mTestAButtonFragment = new TestAButtonFragment(); - addFragment(mTestAButtonFragment); - } - showFragment(mTestAButtonFragment); - break; - } - case 1 : { - if (mTestViewPageFragment == null) { - mTestViewPageFragment = new TestViewPageFragment(); - addFragment(mTestViewPageFragment); - } - showFragment(mTestViewPageFragment); - break; - } - } - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - int nItemId = item.getItemId(); -// if (item.getItemId() == R.id.item_log) { -// WinBollActivityManager.getInstance(this).startWinBollActivity(getApplicationContext(), LogActivity.class); -// } else - if (nItemId == R.id.item_atoast) { - Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show(); - } else if (nItemId == R.id.item_atoolbar) { - Intent intent = new Intent(this, TestAToolbarActivity.class); - startActivity(intent); - - } else if (nItemId == R.id.item_asupporttoolbar) { - Intent intent = new Intent(this, TestASupportToolbarActivity.class); - startActivity(intent); - - } else if (nItemId == R.id.item_colordialog) { - ColorPickerDialog dlg = new ColorPickerDialog(this, getResources().getColor(R.color.colorPrimary)); - dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() { - - @Override - public void beforeColorChanged() { - } - - @Override - public void onColorChanged(int color) { - - } - - @Override - public void afterColorChanged() { - } - - - }); - dlg.show(); - - } else if (nItemId == R.id.item_dialogstoragepath) { - final StoragePathDialog dialog = new StoragePathDialog(this, 0); - dialog.setOnOKClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - dialog.dismiss(); - } - }); - dialog.show(); - - } else if (nItemId == R.id.item_localfileselectdialog) { - final LocalFileSelectDialog dialog = new LocalFileSelectDialog(this); - dialog.setOnOKClickListener(new LocalFileSelectDialog.OKClickListener() { - @Override - public void onOKClick(String sz) { - Toast.makeText(getApplication(), sz, Toast.LENGTH_SHORT).show(); - //dialog.dismiss(); - } - }); - dialog.open(); - - } else if (nItemId == R.id.item_secondarylibraryactivity) { - Intent intent = new Intent(this, SecondaryLibraryActivity.class); - startActivity(intent); - } else if (nItemId == R.id.item_drawerfragmentactivity) { - Intent intent = new Intent(this, TestDrawerFragmentActivity.class); - startActivity(intent); - } -// else if (nItemId == R.id.item_about) { -// Intent intent = new Intent(this, AboutActivity.class); -// startActivity(intent); -// } - - return super.onOptionsItemSelected(item); - } -} diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java index 64db217..81ec509 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java @@ -6,6 +6,9 @@ import android.view.MenuItem; import android.widget.Toast; import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; +import cc.winboll.studio.libapputils.bean.APPInfo; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; /** * @Author ZhanGSKen@QQ.COM @@ -18,6 +21,36 @@ public class SecondaryLibraryActivity extends DrawerFragmentActivity { SecondaryLibraryFragment mSecondaryLibraryFragment; + @Override + public AppCompatActivity getActivity() { + return this; + } + + @Override + public APPInfo getAppInfo() { + return null; + } + + @Override + public String getTag() { + return null; + } + + @Override + public Toolbar initToolBar() { + return null; + } + + @Override + public boolean isAddWinBollToolBar() { + return false; + } + + @Override + public boolean isEnableDisplayHomeAsUp() { + return false; + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -43,7 +76,7 @@ public class SecondaryLibraryActivity extends DrawerFragmentActivity { public boolean onOptionsItemSelected(MenuItem item) { int nItemId = item.getItemId(); if (nItemId == R.id.item_test) { - Toast.makeText(getApplication(), "item_test", Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), "item_test", Toast.LENGTH_SHORT).show(); } return super.onOptionsItemSelected(item); } diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java index b49c28d..3413f00 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java @@ -16,14 +16,50 @@ import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libaes.beans.DrawerMenuBean; import cc.winboll.studio.libapputils.log.LogUtils; import java.util.ArrayList; +import cc.winboll.studio.libapputils.app.IWinBollActivity; +import cc.winboll.studio.libapputils.bean.APPInfo; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; -public class TestDrawerFragmentActivity extends DrawerFragmentActivity { +public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBollActivity { + + @Override + public AppCompatActivity getActivity() { + return this; + } + + @Override + public APPInfo getAppInfo() { + return null; + } + + @Override + public String getTag() { + return null; + } + + @Override + public Toolbar initToolBar() { + return null; + } + + @Override + public boolean isAddWinBollToolBar() { + return false; + } + + @Override + public boolean isEnableDisplayHomeAsUp() { + return false; + } + public static final String TAG = "TestDrawerFragmentActivity"; TestFragment1 mTestFragment1; TestFragment2 mTestFragment2; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -66,7 +102,7 @@ public class TestDrawerFragmentActivity extends DrawerFragmentActivity { super.onItemClick(parent, view, position, id); switch (position) { case 0 : { - Toast.makeText(getContext(), "0", Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), "0", Toast.LENGTH_SHORT).show(); //LogUtils.d(TAG, "MenuItem 1"); showFragment(mTestFragment1); break; diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java index ccc22ec..1ed8022 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java @@ -11,8 +11,8 @@ import android.view.Menu; import android.view.MenuItem; import androidx.appcompat.app.AppCompatActivity; import cc.winboll.studio.libaes.R; +import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libaes.beans.AESThemeBean; -import cc.winboll.studio.libapputils.app.WinBollActivity; public class AESThemeUtil { @@ -41,9 +41,9 @@ public class AESThemeUtil { activity.setTheme(getThemeTypeID(activity)); } - public static void applyWinBollTheme(T activity) { + /*public static void applyWinBollTheme(T activity) { activity.setTheme(getThemeTypeID(activity.getApplicationContext())); - } + }*/ public static void applyAppTheme(Activity activity, AESThemeBean.ThemeType themeType) { activity.setTheme(AESThemeBean.getThemeStyleID(themeType)); @@ -53,9 +53,9 @@ public class AESThemeUtil { activity.setTheme(AESThemeBean.getThemeStyleID(themeType)); } - public static void applyWinBollTheme(Activity activity, AESThemeBean.ThemeType themeType) { + /*public static void applyWinBollTheme(Activity activity, AESThemeBean.ThemeType themeType) { activity.setTheme(AESThemeBean.getThemeStyleID(themeType)); - } + }*/ public static void inflateMenu(T activity, Menu menu) { activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu); @@ -65,9 +65,9 @@ public class AESThemeUtil { activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu); } - public static void inflateWinBollMenu(T activity, Menu menu) { + /*public static void inflateWinBollMenu(T activity, Menu menu) { activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu); - } + }*/ public static boolean onAppThemeItemSelected(T activity, MenuItem item) { int nThemeStyleID; @@ -131,7 +131,38 @@ public class AESThemeUtil { return false; } - public static boolean onWinBollThemeItemSelected(T activity, MenuItem item) { + public static boolean onWinBollThemeItemSelected(T activity, MenuItem item) { + int nThemeStyleID; + if (R.id.item_depththeme == item.getItemId()) { + nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH); + saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID); + return true; + } else if (R.id.item_skytheme == item.getItemId()) { + nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY); + saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID); + return true; + } else if (R.id.item_goldentheme == item.getItemId()) { + nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN); + saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID); + return true; + } else if (R.id.item_memortheme == item.getItemId()) { + nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR); + saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID); + return true; + } else if (R.id.item_taotheme == item.getItemId()) { + nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO); + saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID); + return true; + } else if (R.id.item_defaulttheme == item.getItemId()) { + nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES); + saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID); + return true; + } + + return false; + } + + public static boolean onWinBollThemeItemSelected(T activity, MenuItem item) { int nThemeStyleID; if (R.id.item_depththeme == item.getItemId()) { nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH); diff --git a/libaes/src/main/res/layout/activity_library.xml b/libaes/src/main/res/layout/activity_library.xml deleted file mode 100644 index 856c0cc..0000000 --- a/libaes/src/main/res/layout/activity_library.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - From e98f62149df51b8c99039e39609474de76671e4e Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 7 Mar 2025 09:33:34 +0800 Subject: [PATCH 012/163] 0933 --- aes/build.gradle | 39 +++++++++++----- aes/build.properties | 4 +- .../cc/winboll/studio/aes/MainActivity.java | 9 ++-- libaes/build.gradle | 44 +++++++++---------- libaes/build.properties | 4 +- .../activitys/DrawerFragmentActivity.java | 6 +-- .../libaes/dialogs/LocalFileSelectDialog.java | 2 +- .../libaes/unittests/TestAButtonFragment.java | 2 +- .../unittests/TestDrawerFragmentActivity.java | 8 ++-- 9 files changed, 69 insertions(+), 49 deletions(-) diff --git a/aes/build.gradle b/aes/build.gradle index 246a6f8..527a43c 100644 --- a/aes/build.gradle +++ b/aes/build.gradle @@ -18,13 +18,13 @@ def genVersionName(def versionName){ } android { - compileSdkVersion 32 - buildToolsVersion "33.0.3" + compileSdkVersion 30 + buildToolsVersion "30.0.3" defaultConfig { applicationId "cc.winboll.studio.aes" - minSdkVersion 24 - targetSdkVersion 30 + minSdkVersion 26 + targetSdkVersion 29 versionCode 1 // versionName 更新后需要手动设置 // 项目模块目录的 build.gradle 文件的 stageCount=0 @@ -41,15 +41,32 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } } dependencies { - api project(':libaes') + implementation project(':libaes') - api fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) + + implementation 'com.squareup.okhttp3:okhttp:4.4.1' + + // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j + implementation 'com.github.open-android:pinyin4j:2.5.0' + + // https://github.com/baoyongzhang/android-PullRefreshLayout + implementation 'com.baoyz.pullrefreshlayout:library:1.2.0' + + implementation 'io.github.medyo:android-about-page:2.0.0' + implementation 'com.github.getActivity:ToastUtils:10.5' + + implementation 'com.jcraft:jsch:0.1.55' + implementation 'org.jsoup:jsoup:1.13.1' + + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.viewpager:viewpager:1.0.0' + implementation 'androidx.fragment:fragment:1.1.0' + implementation 'com.google.android.material:material:1.4.0' + + implementation 'cc.winboll.studio:libapputils:9.3.2' + implementation 'cc.winboll.studio:libappbase:1.5.6' } diff --git a/aes/build.properties b/aes/build.properties index d882e77..7ab792e 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Feb 06 03:29:07 GMT 2025 +#Fri Mar 07 01:30:12 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.5 -buildCount=16 +buildCount=20 baseBetaVersion=7.6.6 diff --git a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java index 4a8c511..dc032af 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java @@ -26,11 +26,11 @@ import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity; import cc.winboll.studio.libaes.unittests.TestViewPageFragment; import cc.winboll.studio.libapputils.app.IWinBollActivity; import cc.winboll.studio.libapputils.bean.APPInfo; -import cc.winboll.studio.libapputils.log.LogUtils; import com.a4455jkjh.colorpicker.ColorPickerDialog; import java.util.ArrayList; import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.libapputils.app.AboutActivityFactory; +import cc.winboll.studio.libappbase.LogUtils; public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity { @@ -65,12 +65,12 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBollActi @Override public String getTag() { - return null; + return TAG; } @Override public Toolbar initToolBar() { - return null; + return mToolbar; } @Override @@ -124,6 +124,9 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBollActi @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.toolbar_library, menu); + if(App.isDebuging()) { + getMenuInflater().inflate(cc.winboll.studio.libapputils.R.menu.toolbar_studio_debug, menu); + } return super.onCreateOptionsMenu(menu); } diff --git a/libaes/build.gradle b/libaes/build.gradle index df32ee1..34f139b 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -4,14 +4,12 @@ apply from: '../.winboll/winboll_lib_build.gradle' apply from: '../.winboll/winboll_lint_build.gradle' android { - namespace 'cc.winboll.studio.libaes' - - compileSdkVersion 32 - buildToolsVersion "33.0.3" + compileSdkVersion 30 + buildToolsVersion "30.0.3" defaultConfig { - minSdkVersion 24 - targetSdkVersion 30 + minSdkVersion 26 + targetSdkVersion 29 } buildTypes { release { @@ -19,28 +17,30 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } } dependencies { - api 'io.github.medyo:android-about-page:2.0.0' - api 'com.github.getActivity:ToastUtils:10.5' - api 'com.jcraft:jsch:0.1.55' - api 'org.jsoup:jsoup:1.13.1' - api 'com.squareup.okhttp3:okhttp:4.4.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) - api 'androidx.appcompat:appcompat:1.0.0' - api 'androidx.fragment:fragment:1.0.0' - api 'com.google.android.material:material:1.0.0' + implementation 'com.squareup.okhttp3:okhttp:4.4.1' + // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j + implementation 'com.github.open-android:pinyin4j:2.5.0' + // https://github.com/baoyongzhang/android-PullRefreshLayout - api 'com.baoyz.pullrefreshlayout:library:1.2.0' + implementation 'com.baoyz.pullrefreshlayout:library:1.2.0' - api 'cc.winboll.studio:libapputils:9.3.1' - api 'cc.winboll.studio:libappbase:1.2.0' + implementation 'io.github.medyo:android-about-page:2.0.0' + implementation 'com.github.getActivity:ToastUtils:10.5' - api fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.jcraft:jsch:0.1.55' + implementation 'org.jsoup:jsoup:1.13.1' + + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.viewpager:viewpager:1.0.0' + implementation 'androidx.fragment:fragment:1.1.0' + implementation 'com.google.android.material:material:1.4.0' + + implementation 'cc.winboll.studio:libapputils:9.3.2' + implementation 'cc.winboll.studio:libappbase:1.5.6' } diff --git a/libaes/build.properties b/libaes/build.properties index d882e77..8cd354a 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Feb 06 03:29:07 GMT 2025 +#Thu Feb 06 04:51:56 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.5 -buildCount=16 +buildCount=20 baseBetaVersion=7.6.6 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java index 5731d87..0a5825f 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java @@ -15,6 +15,7 @@ import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; @@ -26,11 +27,10 @@ import cc.winboll.studio.libaes.beans.AESThemeBean; import cc.winboll.studio.libaes.beans.DrawerMenuBean; import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.libaes.views.ADrawerMenuListView; -import cc.winboll.studio.libapputils.log.LogUtils; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libapputils.app.IWinBollActivity; import com.baoyz.widget.PullRefreshLayout; import java.util.ArrayList; -import androidx.appcompat.app.AppCompatActivity; -import cc.winboll.studio.libapputils.app.IWinBollActivity; public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBollActivity,AdapterView.OnItemClickListener { diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/dialogs/LocalFileSelectDialog.java b/libaes/src/main/java/cc/winboll/studio/libaes/dialogs/LocalFileSelectDialog.java index 2f6b613..c181865 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/dialogs/LocalFileSelectDialog.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/dialogs/LocalFileSelectDialog.java @@ -5,7 +5,7 @@ import android.content.DialogInterface; import android.widget.TextView; import android.widget.Toast; import androidx.appcompat.app.AlertDialog; -import cc.winboll.studio.libapputils.log.LogUtils; +import cc.winboll.studio.libappbase.LogUtils; import java.io.File; import java.lang.reflect.Field; import java.text.Collator; diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java index 64e125c..a378d51 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java @@ -13,7 +13,7 @@ import android.widget.Toast; import androidx.fragment.app.Fragment; import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.views.AButton; -import cc.winboll.studio.libapputils.log.LogUtils; +import cc.winboll.studio.libappbase.LogUtils; public class TestAButtonFragment extends Fragment { diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java index 3413f00..00be255 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java @@ -10,16 +10,16 @@ import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libaes.beans.DrawerMenuBean; -import cc.winboll.studio.libapputils.log.LogUtils; -import java.util.ArrayList; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libapputils.app.IWinBollActivity; import cc.winboll.studio.libapputils.bean.APPInfo; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; +import java.util.ArrayList; public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBollActivity { From 9afb1751a665842d61d8cf4b0605d2dad8371679 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 03:28:00 +0800 Subject: [PATCH 013/163] 0327 --- aes/build.gradle | 32 ++++++++++++------- aes/build.properties | 2 +- libaes/build.gradle | 32 ++++++++++++------- .../studio/libaes/beans/AESThemeBean.java | 2 +- 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/aes/build.gradle b/aes/build.gradle index 527a43c..34cf6c1 100644 --- a/aes/build.gradle +++ b/aes/build.gradle @@ -48,25 +48,35 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.squareup.okhttp3:okhttp:4.4.1' - + // 权限请求框架：https://github.com/getActivity/XXPermissions + implementation 'com.github.getActivity:XXPermissions:18.63' + // 下拉控件 + implementation 'com.baoyz.pullrefreshlayout:library:1.2.0' + // 拼音搜索 // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j implementation 'com.github.open-android:pinyin4j:2.5.0' - - // https://github.com/baoyongzhang/android-PullRefreshLayout - implementation 'com.baoyz.pullrefreshlayout:library:1.2.0' - - implementation 'io.github.medyo:android-about-page:2.0.0' - implementation 'com.github.getActivity:ToastUtils:10.5' - + // SSH implementation 'com.jcraft:jsch:0.1.55' + // Html 解析 implementation 'org.jsoup:jsoup:1.13.1' + // 二维码类库 + implementation 'com.google.zxing:core:3.4.1' + implementation 'com.journeyapps:zxing-android-embedded:3.6.0' + // 应用介绍页类库 + implementation 'io.github.medyo:android-about-page:2.0.0' + // 吐司类库 + implementation 'com.github.getActivity:ToastUtils:10.5' + // 网络连接类库 + implementation 'com.squareup.okhttp3:okhttp:4.4.1' + // Android 类库 implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.viewpager:viewpager:1.0.0' + implementation 'androidx.vectordrawable:vectordrawable:1.1.0' + implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0' implementation 'androidx.fragment:fragment:1.1.0' implementation 'com.google.android.material:material:1.4.0' - implementation 'cc.winboll.studio:libapputils:9.3.2' - implementation 'cc.winboll.studio:libappbase:1.5.6' + implementation 'cc.winboll.studio:libappbase:2.1.1' + implementation 'cc.winboll.studio:libapputils:9.4.0' } diff --git a/aes/build.properties b/aes/build.properties index 7ab792e..c60980f 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 01:30:12 GMT 2025 +#Fri Mar 07 01:35:23 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=7.6 diff --git a/libaes/build.gradle b/libaes/build.gradle index 34f139b..3fb5059 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -22,25 +22,35 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.squareup.okhttp3:okhttp:4.4.1' - + // 权限请求框架：https://github.com/getActivity/XXPermissions + implementation 'com.github.getActivity:XXPermissions:18.63' + // 下拉控件 + implementation 'com.baoyz.pullrefreshlayout:library:1.2.0' + // 拼音搜索 // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j implementation 'com.github.open-android:pinyin4j:2.5.0' - - // https://github.com/baoyongzhang/android-PullRefreshLayout - implementation 'com.baoyz.pullrefreshlayout:library:1.2.0' - - implementation 'io.github.medyo:android-about-page:2.0.0' - implementation 'com.github.getActivity:ToastUtils:10.5' - + // SSH implementation 'com.jcraft:jsch:0.1.55' + // Html 解析 implementation 'org.jsoup:jsoup:1.13.1' + // 二维码类库 + implementation 'com.google.zxing:core:3.4.1' + implementation 'com.journeyapps:zxing-android-embedded:3.6.0' + // 应用介绍页类库 + implementation 'io.github.medyo:android-about-page:2.0.0' + // 吐司类库 + implementation 'com.github.getActivity:ToastUtils:10.5' + // 网络连接类库 + implementation 'com.squareup.okhttp3:okhttp:4.4.1' + // Android 类库 implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.viewpager:viewpager:1.0.0' + implementation 'androidx.vectordrawable:vectordrawable:1.1.0' + implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0' implementation 'androidx.fragment:fragment:1.1.0' implementation 'com.google.android.material:material:1.4.0' - implementation 'cc.winboll.studio:libapputils:9.3.2' - implementation 'cc.winboll.studio:libappbase:1.5.6' + implementation 'cc.winboll.studio:libappbase:2.1.1' + implementation 'cc.winboll.studio:libapputils:9.4.0' } diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java b/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java index fe23895..44fd998 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java @@ -8,7 +8,7 @@ package cc.winboll.studio.libaes.beans; import android.util.JsonReader; import android.util.JsonWriter; import cc.winboll.studio.libaes.R; -import cc.winboll.studio.libapputils.bean.BaseBean; +import cc.winboll.studio.libappbase.BaseBean; import java.io.IOException; public class AESThemeBean extends BaseBean { From 32d3960e032ec6326d43a1ed2d809cb77a8297d7 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 03:35:07 +0800 Subject: [PATCH 014/163] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.gradle | 2 +- aes/build.properties | 4 ++-- aes/src/main/java/cc/winboll/studio/aes/MainActivity.java | 6 +++--- libaes/build.gradle | 2 +- libaes/build.properties | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/aes/build.gradle b/aes/build.gradle index 34cf6c1..7a1c309 100644 --- a/aes/build.gradle +++ b/aes/build.gradle @@ -46,7 +46,7 @@ android { dependencies { implementation project(':libaes') - implementation fileTree(dir: 'libs', include: ['*.jar']) + api fileTree(dir: 'libs', include: ['*.jar']) // 权限请求框架：https://github.com/getActivity/XXPermissions implementation 'com.github.getActivity:XXPermissions:18.63' diff --git a/aes/build.properties b/aes/build.properties index c60980f..539e9ed 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 01:35:23 GMT 2025 +#Fri Mar 07 19:33:27 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.5 -buildCount=20 +buildCount=21 baseBetaVersion=7.6.6 diff --git a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java index dc032af..c0477b9 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java @@ -13,6 +13,7 @@ import android.view.View; import android.widget.AdapterView; import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.aes.R; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libaes.beans.DrawerMenuBean; @@ -24,13 +25,12 @@ import cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity; import cc.winboll.studio.libaes.unittests.TestAToolbarActivity; import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity; import cc.winboll.studio.libaes.unittests.TestViewPageFragment; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libapputils.app.AboutActivityFactory; import cc.winboll.studio.libapputils.app.IWinBollActivity; import cc.winboll.studio.libapputils.bean.APPInfo; import com.a4455jkjh.colorpicker.ColorPickerDialog; import java.util.ArrayList; -import androidx.appcompat.widget.Toolbar; -import cc.winboll.studio.libapputils.app.AboutActivityFactory; -import cc.winboll.studio.libappbase.LogUtils; public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity { diff --git a/libaes/build.gradle b/libaes/build.gradle index 3fb5059..4755109 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -20,7 +20,7 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + api fileTree(dir: 'libs', include: ['*.jar']) // 权限请求框架：https://github.com/getActivity/XXPermissions implementation 'com.github.getActivity:XXPermissions:18.63' diff --git a/libaes/build.properties b/libaes/build.properties index 8cd354a..539e9ed 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Feb 06 04:51:56 GMT 2025 +#Fri Mar 07 19:33:27 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.5 -buildCount=20 +buildCount=21 baseBetaVersion=7.6.6 From fbd6ed9cf4bbef11820bda52885af3614c1d47a9 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 04:19:48 +0800 Subject: [PATCH 015/163] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=B1=BB=E5=BA=93?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F,=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=B1=BB=E5=BA=93=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.gradle | 7 +++---- aes/build.properties | 4 ++-- libaes/build.gradle | 4 ++-- libaes/build.properties | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/aes/build.gradle b/aes/build.gradle index 7a1c309..d3c1e77 100644 --- a/aes/build.gradle +++ b/aes/build.gradle @@ -44,8 +44,7 @@ android { } dependencies { - implementation project(':libaes') - + api project(':libaes') api fileTree(dir: 'libs', include: ['*.jar']) // 权限请求框架：https://github.com/getActivity/XXPermissions @@ -77,6 +76,6 @@ dependencies { implementation 'androidx.fragment:fragment:1.1.0' implementation 'com.google.android.material:material:1.4.0' - implementation 'cc.winboll.studio:libappbase:2.1.1' - implementation 'cc.winboll.studio:libapputils:9.4.0' + implementation 'cc.winboll.studio:libappbase:2.1.3' + implementation 'cc.winboll.studio:libapputils:9.4.2' } diff --git a/aes/build.properties b/aes/build.properties index 539e9ed..21ac29a 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 19:33:27 GMT 2025 +#Fri Mar 07 20:17:23 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.5 -buildCount=21 +buildCount=23 baseBetaVersion=7.6.6 diff --git a/libaes/build.gradle b/libaes/build.gradle index 4755109..d694f70 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -51,6 +51,6 @@ dependencies { implementation 'androidx.fragment:fragment:1.1.0' implementation 'com.google.android.material:material:1.4.0' - implementation 'cc.winboll.studio:libappbase:2.1.1' - implementation 'cc.winboll.studio:libapputils:9.4.0' + implementation 'cc.winboll.studio:libappbase:2.1.3' + implementation 'cc.winboll.studio:libapputils:9.4.2' } diff --git a/libaes/build.properties b/libaes/build.properties index 539e9ed..21ac29a 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 19:33:27 GMT 2025 +#Fri Mar 07 20:17:23 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.5 -buildCount=21 +buildCount=23 baseBetaVersion=7.6.6 From 1204f295e1a635cab58f245b7b720757b9a9a1a8 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 04:21:16 +0800 Subject: [PATCH 016/163] APK 7.6.6 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 21ac29a..988785e 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 20:17:23 GMT 2025 -stageCount=6 +#Sat Mar 08 04:21:16 HKT 2025 +stageCount=7 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.5 -buildCount=23 -baseBetaVersion=7.6.6 +publishVersion=7.6.6 +buildCount=0 +baseBetaVersion=7.6.7 diff --git a/libaes/build.properties b/libaes/build.properties index 21ac29a..988785e 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 20:17:23 GMT 2025 -stageCount=6 +#Sat Mar 08 04:21:16 HKT 2025 +stageCount=7 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.5 -buildCount=23 -baseBetaVersion=7.6.6 +publishVersion=7.6.6 +buildCount=0 +baseBetaVersion=7.6.7 From c55183b10c30e726aa8413fa1afe6f8b62930c24 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 8 Mar 2025 04:21:39 +0800 Subject: [PATCH 017/163] Library Release 7.6.6 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index 988785e..11cd620 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 04:21:16 HKT 2025 +#Sat Mar 08 04:21:32 HKT 2025 stageCount=7 libraryProject=libaes baseVersion=7.6 From 3765154f60960a43a8a7d84029a9d97b875fb2b5 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 11:26:55 +0800 Subject: [PATCH 018/163] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94=E6=8B=89=E5=8A=A8seekbar=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.gradle | 4 +- aes/build.properties | 4 +- libaes/build.gradle | 4 +- libaes/build.properties | 4 +- .../unittests/TestViewPageFragment.java | 26 +++- .../studio/libaes/views/AOHPCTCSeekBar.java | 117 ++++++++++++++---- libaes/src/main/res/drawable/ic_call.xml | 11 ++ .../src/main/res/layout/fragment_viewpage.xml | 92 ++++++++------ 8 files changed, 195 insertions(+), 67 deletions(-) create mode 100644 libaes/src/main/res/drawable/ic_call.xml diff --git a/aes/build.gradle b/aes/build.gradle index d3c1e77..a81e6ad 100644 --- a/aes/build.gradle +++ b/aes/build.gradle @@ -76,6 +76,6 @@ dependencies { implementation 'androidx.fragment:fragment:1.1.0' implementation 'com.google.android.material:material:1.4.0' - implementation 'cc.winboll.studio:libappbase:2.1.3' - implementation 'cc.winboll.studio:libapputils:9.4.2' + implementation 'cc.winboll.studio:libappbase:2.1.5' + implementation 'cc.winboll.studio:libapputils:9.4.4' } diff --git a/aes/build.properties b/aes/build.properties index 11cd620..c78882a 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 04:21:32 HKT 2025 +#Sun Mar 09 03:25:41 GMT 2025 stageCount=7 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.6 -buildCount=0 +buildCount=66 baseBetaVersion=7.6.7 diff --git a/libaes/build.gradle b/libaes/build.gradle index d694f70..447b1b2 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -51,6 +51,6 @@ dependencies { implementation 'androidx.fragment:fragment:1.1.0' implementation 'com.google.android.material:material:1.4.0' - implementation 'cc.winboll.studio:libappbase:2.1.3' - implementation 'cc.winboll.studio:libapputils:9.4.2' + implementation 'cc.winboll.studio:libappbase:2.1.5' + implementation 'cc.winboll.studio:libapputils:9.4.4' } diff --git a/libaes/build.properties b/libaes/build.properties index 988785e..c78882a 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 08 04:21:16 HKT 2025 +#Sun Mar 09 03:25:41 GMT 2025 stageCount=7 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.6 -buildCount=0 +buildCount=66 baseBetaVersion=7.6.7 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java index 290ee9d..a86e697 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java @@ -19,10 +19,13 @@ import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.views.AOHPCTCSeekBar; import java.util.ArrayList; import java.util.List; +import cc.winboll.studio.libappbase.LogView; public class TestViewPageFragment extends Fragment implements ViewPager.OnPageChangeListener, View.OnClickListener { public static final String TAG = "TestViewPageFragment"; + + LogView mLogView; private ViewPager viewPager; private List views; //用来存放放进ViewPager里面的布局 @@ -36,6 +39,9 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { mView = inflater.inflate(R.layout.fragment_viewpage, container, false); + + mLogView = mView.findViewById(R.id.logview); + mLogView.start(); //viewPager = findViewById(R.id.activitymainViewPager1); initData(); @@ -60,6 +66,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh initPoint();//初始化页面下方的点 viewPager.setOnPageChangeListener(this); initAOHPCTCSeekBar(); + initAOHPCTCSeekBar2(); } //初始化所要显示的布局 @@ -187,7 +194,9 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh void initAOHPCTCSeekBar() { AOHPCTCSeekBar seekbar = mView.findViewById(R.id.fragmentviewpageAOHPCTCSeekBar1); seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_launcher)); - seekbar.setThumbOffset(10); + //seekbar.setThumbOffset(200); + //seekbar.setThumbOffset(1); + seekbar.setBlurRightDP(50); seekbar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() { @Override @@ -196,4 +205,19 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh } }); } + + void initAOHPCTCSeekBar2() { + AOHPCTCSeekBar seekbar = mView.findViewById(R.id.fragmentviewpageAOHPCTCSeekBar2); + seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_call)); + //seekbar.setThumbOffset(200); + //seekbar.setThumbOffset(1); + seekbar.setBlurRightDP(50); + seekbar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() { + + @Override + public void onOHPCommit() { + Toast.makeText(getActivity(), "onOHPCommit 2", Toast.LENGTH_SHORT).show(); + } + }); + } } diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java index fc17539..7ba3d3f 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java @@ -6,18 +6,28 @@ package cc.winboll.studio.libaes.views; * @Describe AOneHundredPercantClickToCommitSeekBar */ import android.content.Context; +import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.SeekBar; +import cc.winboll.studio.libappbase.LogUtils; public class AOHPCTCSeekBar extends SeekBar { public static final String TAG = "AOHPCTCSeekBar"; + Context mContext; + + int thumbWidth = 1; + int progressBarWidth = 1; + // 设置按钮模糊右边边缘像素 + int blurRightDP = 1; + // 可开始拉动的起始位置(百分比值) - static final int ENABLE_POST_PERCENT_X = 20; + //static final int ENABLE_POST_PERCENT_X = 20; + //int seekablePosition; // 最小拉动值，滑块拉动值要超过这个值，确定事件才会提交。 - static final int TO_MIN_VALUE = 15; + //static final int TO_MIN_VALUE = 15; // 外部接口对象，确定事件提交会调用该对象的方法 OnOHPCListener mOnOHPCListener; // 是否从起点拉动的标志 @@ -25,6 +35,10 @@ public class AOHPCTCSeekBar extends SeekBar { // 拉动的滑动值 int mnTo = 0; + public void setBlurRightDP(int blurRight) { + this.blurRightDP = blurRight; + } + public void setOnOHPCListener(OnOHPCListener listener) { mOnOHPCListener = listener; } @@ -35,10 +49,12 @@ public class AOHPCTCSeekBar extends SeekBar { public AOHPCTCSeekBar(Context context) { super(context); + initView(context); } public AOHPCTCSeekBar(Context context, AttributeSet attrs) { super(context, attrs); + initView(context); //LogUtils.d(TAG, "AOHPCTCSeekBar(...)"); @@ -61,12 +77,23 @@ public class AOHPCTCSeekBar extends SeekBar { public AOHPCTCSeekBar(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); + initView(context); + } + + void initView(Context context) { + LogUtils.d(TAG, "initView(...)"); + mContext = context; +// Drawable thumbDrawable = getThumb(); +// if (thumbDrawable!= null) { +// int iconWidth = thumbDrawable.getIntrinsicWidth(); +// LogUtils.d(TAG, String.format("iconWidth %d", iconWidth)); +// seekablePosition = iconWidth; +// } } @Override protected void onFinishInflate() { super.onFinishInflate(); - } @Override @@ -74,33 +101,52 @@ public class AOHPCTCSeekBar extends SeekBar { if (event.getAction() == MotionEvent.ACTION_DOWN) { //LogUtils.d(TAG, "ACTION_DOWN"); // 有效的拖动起始位置(ENABLE_POST_PERCENT_X)% - int nEnablePostX = ((getRight() - getLeft()) * ENABLE_POST_PERCENT_X / 100) + getLeft(); - - if ((getLeft() < event.getX()) - && (event.getX() < nEnablePostX)) { - //LogUtils.d(TAG, "event.getX() is " + Float.toString(event.getX())); + //int nEnablePostX = ((getRight() - getLeft()) * ENABLE_POST_PERCENT_X / 100) + getLeft(); + //int nEnablePostX = ((getRight() - getLeft()) * seekablePosition / 100) + getLeft(); + /*LogUtils.d(TAG, "event.getX() is " + Float.toString(event.getX())); + LogUtils.d(TAG, String.format("thumbWidth %d progressBarWidth %d", thumbWidth, progressBarWidth)); + LogUtils.d(TAG, String.format("mIsStartTo %s", mIsStartTo)); + */ + if (thumbWidth + blurRightDP > event.getX() && event.getX() > 0) { mIsStartTo = true; - return super.dispatchTouchEvent(event); - } - if (!mIsStartTo) { - resetView(); - return false; + return true; + //return super.dispatchTouchEvent(event); } +// if (!mIsStartTo) { +// resetView(); +// return false; +// } } else if (event.getAction() == MotionEvent.ACTION_MOVE) { //LogUtils.d(TAG, "ACTION_MOVE"); + /*LogUtils.d(TAG, "event.getX() is " + Float.toString(event.getX())); + LogUtils.d(TAG, String.format("thumbWidth %d progressBarWidth %d", thumbWidth, progressBarWidth)); + LogUtils.d(TAG, String.format("mIsStartTo %s", mIsStartTo)); + */ if (mIsStartTo) { - mnTo++; + return super.dispatchTouchEvent(event); + } else { + return false; } - } else if (event.getAction() == MotionEvent.ACTION_UP) { + } else if (event.getAction() == MotionEvent.ACTION_UP + || event.getAction() == MotionEvent.ACTION_CANCEL) { //LogUtils.d(TAG, Integer.toString(getProgress())); // 提交100%确定事件 - if ((getProgress() == 100) && (mnTo > TO_MIN_VALUE)) { - //LogUtils.d(TAG, "Commit mnTo is " + Integer.toString(mnTo)); - mOnOHPCListener.onOHPCommit(); - //resetView(); - //return true; - } - resetView(); +// if (getProgress() == progressBarWidth) { +// //((getProgress() == 100) && (mnTo > TO_MIN_VALUE)) { +// //LogUtils.d(TAG, "Commit mnTo is " + Integer.toString(mnTo)); +// mOnOHPCListener.onOHPCommit(); +// resetView(); +// //return true; +// } else { +// resetView(); +// mIsStartTo = false; +// } +// + if (getProgress() == progressBarWidth) { + mOnOHPCListener.onOHPCommit(); + } + mIsStartTo = false; + resetView(); return false; } //LogUtils.d(TAG, "dispatchTouchEvent End"); @@ -114,4 +160,31 @@ public class AOHPCTCSeekBar extends SeekBar { mnTo = 0; mIsStartTo = false; } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + int width = MeasureSpec.getSize(widthMeasureSpec); + int height = MeasureSpec.getSize(heightMeasureSpec); + LogUtils.d(TAG, String.format("width %d height %d", width, height)); + + // 使用width和height进行后续操作 + + // 获取SeekBar的图标 + Drawable thumbDrawable = getThumb(); + if (thumbDrawable != null) { + // 获取图标宽度 + thumbWidth = thumbDrawable.getIntrinsicWidth(); + // 获取进度条宽度 + progressBarWidth = width;//getWidth();// - getPaddingLeft() - getPaddingRight(); + // 计算百分比 + //float percentage = (float) thumbWidth / progressBarWidth * 100; + LogUtils.d(TAG, String.format("thumbWidth %d progressBarWidth %d", thumbWidth, progressBarWidth)); + //LogUtils.d(TAG, String.format("Thumb width / ProgressBar width percentage: %f", percentage)); + + //seekablePosition = (int)percentage; + setThumbOffset(0); + setMax(progressBarWidth); + } + } } diff --git a/libaes/src/main/res/drawable/ic_call.xml b/libaes/src/main/res/drawable/ic_call.xml new file mode 100644 index 0000000..c5802bb --- /dev/null +++ b/libaes/src/main/res/drawable/ic_call.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/libaes/src/main/res/layout/fragment_viewpage.xml b/libaes/src/main/res/layout/fragment_viewpage.xml index 3e25494..c5efc52 100644 --- a/libaes/src/main/res/layout/fragment_viewpage.xml +++ b/libaes/src/main/res/layout/fragment_viewpage.xml @@ -2,7 +2,7 @@ @@ -12,49 +12,69 @@ android:layout_height="wrap_content" android:text="AOHPCTCSeekBar"/> - + android:gravity="center"> - + - + - + - + - + - + - + + + + + + + + + From e8921350fda0a0c1f9db6174590c00fa375cf79c Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 11:28:39 +0800 Subject: [PATCH 019/163] APK 7.6.7 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 c78882a..3b174a9 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 03:25:41 GMT 2025 -stageCount=7 +#Sun Mar 09 11:28:39 HKT 2025 +stageCount=8 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.6 -buildCount=66 -baseBetaVersion=7.6.7 +publishVersion=7.6.7 +buildCount=0 +baseBetaVersion=7.6.8 diff --git a/libaes/build.properties b/libaes/build.properties index c78882a..3b174a9 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 03:25:41 GMT 2025 -stageCount=7 +#Sun Mar 09 11:28:39 HKT 2025 +stageCount=8 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.6 -buildCount=66 -baseBetaVersion=7.6.7 +publishVersion=7.6.7 +buildCount=0 +baseBetaVersion=7.6.8 From cd2450413150905eae340dc5f79be81c5c3dc083 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 11:28:58 +0800 Subject: [PATCH 020/163] Library Release 7.6.7 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index 3b174a9..af79187 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 11:28:39 HKT 2025 +#Sun Mar 09 11:28:52 HKT 2025 stageCount=8 libraryProject=libaes baseVersion=7.6 From d83abd7c831447d9860628eb999f55afb1c2f485 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 11:30:09 +0800 Subject: [PATCH 021/163] APK 7.6.8 release Publish. --- aes/build.properties | 8 ++++---- libaes/build.properties | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index af79187..24d0718 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 11:28:52 HKT 2025 -stageCount=8 +#Sun Mar 09 11:30:09 HKT 2025 +stageCount=9 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.7 +publishVersion=7.6.8 buildCount=0 -baseBetaVersion=7.6.8 +baseBetaVersion=7.6.9 diff --git a/libaes/build.properties b/libaes/build.properties index 3b174a9..24d0718 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 11:28:39 HKT 2025 -stageCount=8 +#Sun Mar 09 11:30:09 HKT 2025 +stageCount=9 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.7 +publishVersion=7.6.8 buildCount=0 -baseBetaVersion=7.6.8 +baseBetaVersion=7.6.9 From 334da4300130ee24c67b395c2d76887a42ee2716 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 11:30:22 +0800 Subject: [PATCH 022/163] Library Release 7.6.8 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index 24d0718..4e72951 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 11:30:09 HKT 2025 +#Sun Mar 09 11:30:17 HKT 2025 stageCount=9 libraryProject=libaes baseVersion=7.6 From 4756226a56b936d63a8e7deb96abe57bc0bcd1d6 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 13:44:44 +0800 Subject: [PATCH 023/163] =?UTF-8?q?=E6=8F=90=E9=AB=98=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94=E6=8B=89=E5=8A=A8=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=B8=8E?= =?UTF-8?q?ViewPager=E5=85=BC=E5=AE=B9=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 +- libaes/build.properties | 4 +- .../unittests/TestViewPageFragment.java | 4 +- .../studio/libaes/views/AOHPCTCSeekBar.java | 145 ++++-------------- .../src/main/res/layout/fragment_viewpage.xml | 20 --- .../main/res/layout/viewpage_aohpctcsb.xml | 19 +++ 6 files changed, 57 insertions(+), 139 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index 4e72951..f7372af 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 11:30:17 HKT 2025 +#Sun Mar 09 05:43:05 GMT 2025 stageCount=9 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.8 -buildCount=0 +buildCount=24 baseBetaVersion=7.6.9 diff --git a/libaes/build.properties b/libaes/build.properties index 24d0718..f7372af 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 11:30:09 HKT 2025 +#Sun Mar 09 05:43:05 GMT 2025 stageCount=9 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.8 -buildCount=0 +buildCount=24 baseBetaVersion=7.6.9 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java index a86e697..1c3b39f 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java @@ -192,7 +192,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh } void initAOHPCTCSeekBar() { - AOHPCTCSeekBar seekbar = mView.findViewById(R.id.fragmentviewpageAOHPCTCSeekBar1); + AOHPCTCSeekBar seekbar = views.get(3).findViewById(R.id.fragmentviewpageAOHPCTCSeekBar1); seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_launcher)); //seekbar.setThumbOffset(200); //seekbar.setThumbOffset(1); @@ -207,7 +207,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh } void initAOHPCTCSeekBar2() { - AOHPCTCSeekBar seekbar = mView.findViewById(R.id.fragmentviewpageAOHPCTCSeekBar2); + AOHPCTCSeekBar seekbar = views.get(3).findViewById(R.id.fragmentviewpageAOHPCTCSeekBar2); seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_call)); //seekbar.setThumbOffset(200); //seekbar.setThumbOffset(1); diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java index 7ba3d3f..a0b26b3 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java @@ -16,29 +16,21 @@ public class AOHPCTCSeekBar extends SeekBar { public static final String TAG = "AOHPCTCSeekBar"; - Context mContext; - - int thumbWidth = 1; - int progressBarWidth = 1; + volatile int thumbWidth = 1; + volatile int progressBarWidth = 1; // 设置按钮模糊右边边缘像素 - int blurRightDP = 1; + volatile int blurRightDP = 1; + // 是否从起点拉动的标志 + volatile boolean isStartSeek = false; - // 可开始拉动的起始位置(百分比值) - //static final int ENABLE_POST_PERCENT_X = 20; - //int seekablePosition; - // 最小拉动值，滑块拉动值要超过这个值，确定事件才会提交。 - //static final int TO_MIN_VALUE = 15; // 外部接口对象，确定事件提交会调用该对象的方法 OnOHPCListener mOnOHPCListener; - // 是否从起点拉动的标志 - boolean mIsStartTo = false; - // 拉动的滑动值 - int mnTo = 0; + public void setBlurRightDP(int blurRight) { this.blurRightDP = blurRight; } - + public void setOnOHPCListener(OnOHPCListener listener) { mOnOHPCListener = listener; } @@ -55,24 +47,6 @@ public class AOHPCTCSeekBar extends SeekBar { public AOHPCTCSeekBar(Context context, AttributeSet attrs) { super(context, attrs); initView(context); - - //LogUtils.d(TAG, "AOHPCTCSeekBar(...)"); - - // 获得TypedArray - //TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.AToolbar); - // 获得attrs.xml里面的属性值,格式为:名称_属性名,后面是默认值 - //int colorBackgroud = a.getColor(R.styleable.ACard_backgroudColor, context.getColor(R.color.colorACardBackgroung)); - //int centerColor = a.getColor(R.styleable.AToolbar_centerColor, context.getColor(R.color.colorAToolbarCenterColor)); - //int endColor = a.getColor(R.styleable.AToolbar_endColor, context.getColor(R.color.colorAToolbarEndColor)); - //float tSize = a.getDimension(R.styleable.CustomView_tSize, 35); - //p.setColor(tColor); - //p.setTextSize(tSize); - //Drawable drawable = context.getDrawable(R.drawable.frame_atoolbar); - - //setBackground(context.getDrawable(R.drawable.acard_frame_main)); - - // 返回一个绑定资源结束的信号给资源 - //a.recycle(); } public AOHPCTCSeekBar(Context context, AttributeSet attrs, int defStyleAttr) { @@ -81,110 +55,55 @@ public class AOHPCTCSeekBar extends SeekBar { } void initView(Context context) { - LogUtils.d(TAG, "initView(...)"); - mContext = context; -// Drawable thumbDrawable = getThumb(); -// if (thumbDrawable!= null) { -// int iconWidth = thumbDrawable.getIntrinsicWidth(); -// LogUtils.d(TAG, String.format("iconWidth %d", iconWidth)); -// seekablePosition = iconWidth; -// } - } - @Override - protected void onFinishInflate() { - super.onFinishInflate(); } @Override public boolean dispatchTouchEvent(MotionEvent event) { if (event.getAction() == MotionEvent.ACTION_DOWN) { - //LogUtils.d(TAG, "ACTION_DOWN"); - // 有效的拖动起始位置(ENABLE_POST_PERCENT_X)% - //int nEnablePostX = ((getRight() - getLeft()) * ENABLE_POST_PERCENT_X / 100) + getLeft(); - //int nEnablePostX = ((getRight() - getLeft()) * seekablePosition / 100) + getLeft(); - /*LogUtils.d(TAG, "event.getX() is " + Float.toString(event.getX())); - LogUtils.d(TAG, String.format("thumbWidth %d progressBarWidth %d", thumbWidth, progressBarWidth)); - LogUtils.d(TAG, String.format("mIsStartTo %s", mIsStartTo)); - */ + getParent().requestDisallowInterceptTouchEvent(true); if (thumbWidth + blurRightDP > event.getX() && event.getX() > 0) { - mIsStartTo = true; - return true; - //return super.dispatchTouchEvent(event); + isStartSeek = true; } -// if (!mIsStartTo) { -// resetView(); -// return false; -// } } else if (event.getAction() == MotionEvent.ACTION_MOVE) { - //LogUtils.d(TAG, "ACTION_MOVE"); - /*LogUtils.d(TAG, "event.getX() is " + Float.toString(event.getX())); - LogUtils.d(TAG, String.format("thumbWidth %d progressBarWidth %d", thumbWidth, progressBarWidth)); - LogUtils.d(TAG, String.format("mIsStartTo %s", mIsStartTo)); - */ - if (mIsStartTo) { - return super.dispatchTouchEvent(event); - } else { - return false; + if (isStartSeek) { + super.dispatchTouchEvent(event); } } else if (event.getAction() == MotionEvent.ACTION_UP || event.getAction() == MotionEvent.ACTION_CANCEL) { - //LogUtils.d(TAG, Integer.toString(getProgress())); - // 提交100%确定事件 -// if (getProgress() == progressBarWidth) { -// //((getProgress() == 100) && (mnTo > TO_MIN_VALUE)) { -// //LogUtils.d(TAG, "Commit mnTo is " + Integer.toString(mnTo)); -// mOnOHPCListener.onOHPCommit(); -// resetView(); -// //return true; -// } else { -// resetView(); -// mIsStartTo = false; -// } -// - if (getProgress() == progressBarWidth) { - mOnOHPCListener.onOHPCommit(); - } - mIsStartTo = false; - resetView(); - return false; + getParent().requestDisallowInterceptTouchEvent(false); + if (getProgress() == progressBarWidth) { + mOnOHPCListener.onOHPCommit(); + } + // 重置控件状态 + setProgress(0); + isStartSeek = false; } - //LogUtils.d(TAG, "dispatchTouchEvent End"); - return super.dispatchTouchEvent(event); - } - - // 重置控件状态 - // - void resetView() { - setProgress(0); - mnTo = 0; - mIsStartTo = false; + return true; } @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { super.onMeasure(widthMeasureSpec, heightMeasureSpec); int width = MeasureSpec.getSize(widthMeasureSpec); - int height = MeasureSpec.getSize(heightMeasureSpec); - LogUtils.d(TAG, String.format("width %d height %d", width, height)); + //int height = MeasureSpec.getSize(heightMeasureSpec); + //LogUtils.d(TAG, String.format("width %d height %d", width, height)); - // 使用width和height进行后续操作 - - // 获取SeekBar的图标 + // 获取SeekBar的图标宽度 Drawable thumbDrawable = getThumb(); if (thumbDrawable != null) { // 获取图标宽度 thumbWidth = thumbDrawable.getIntrinsicWidth(); - // 获取进度条宽度 - progressBarWidth = width;//getWidth();// - getPaddingLeft() - getPaddingRight(); - // 计算百分比 - //float percentage = (float) thumbWidth / progressBarWidth * 100; - LogUtils.d(TAG, String.format("thumbWidth %d progressBarWidth %d", thumbWidth, progressBarWidth)); - //LogUtils.d(TAG, String.format("Thumb width / ProgressBar width percentage: %f", percentage)); - - //seekablePosition = (int)percentage; - setThumbOffset(0); - setMax(progressBarWidth); } + + // 获取进度条宽度 + progressBarWidth = width; + + //LogUtils.d(TAG, String.format("thumbWidth %d progressBarWidth %d", thumbWidth, progressBarWidth)); + + // 设置图标位置 + setThumbOffset(0); + // 设置进度条刻度 + setMax(progressBarWidth); } } diff --git a/libaes/src/main/res/layout/fragment_viewpage.xml b/libaes/src/main/res/layout/fragment_viewpage.xml index c5efc52..33b577a 100644 --- a/libaes/src/main/res/layout/fragment_viewpage.xml +++ b/libaes/src/main/res/layout/fragment_viewpage.xml @@ -12,26 +12,6 @@ android:layout_height="wrap_content" android:text="AOHPCTCSeekBar"/> - - - - - - - - + + + + + + + From 7c6dc87cf4169b1c4ac83f38a1d83317b6bd6dc3 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 13:45:52 +0800 Subject: [PATCH 024/163] APK 7.6.9 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 f7372af..869eab3 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 05:43:05 GMT 2025 -stageCount=9 +#Sun Mar 09 13:45:52 HKT 2025 +stageCount=10 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.8 -buildCount=24 -baseBetaVersion=7.6.9 +publishVersion=7.6.9 +buildCount=0 +baseBetaVersion=7.6.10 diff --git a/libaes/build.properties b/libaes/build.properties index f7372af..869eab3 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 05:43:05 GMT 2025 -stageCount=9 +#Sun Mar 09 13:45:52 HKT 2025 +stageCount=10 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.8 -buildCount=24 -baseBetaVersion=7.6.9 +publishVersion=7.6.9 +buildCount=0 +baseBetaVersion=7.6.10 From f30470e46fc72f37e228b153690128399dc7eaf8 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 13:47:14 +0800 Subject: [PATCH 025/163] Library Release 7.6.9 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index 869eab3..631f06a 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 13:45:52 HKT 2025 +#Sun Mar 09 13:47:09 HKT 2025 stageCount=10 libraryProject=libaes baseVersion=7.6 From 57973b7210267dad8bd16f2090ecbcecd692d40c Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 13:55:25 +0800 Subject: [PATCH 026/163] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94=E6=8B=89=E5=8A=A8=E6=8E=A7=E4=BB=B6=E9=99=A4=E4=BA=86?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=BB=A5=E5=A4=96=E7=9A=84=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=9A=84=E5=93=8D=E5=BA=94=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 ++-- libaes/build.properties | 4 ++-- .../java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index 631f06a..ee22086 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 13:47:09 HKT 2025 +#Sun Mar 09 05:53:35 GMT 2025 stageCount=10 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.9 -buildCount=0 +buildCount=1 baseBetaVersion=7.6.10 diff --git a/libaes/build.properties b/libaes/build.properties index 869eab3..ee22086 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 13:45:52 HKT 2025 +#Sun Mar 09 05:53:35 GMT 2025 stageCount=10 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.9 -buildCount=0 +buildCount=1 baseBetaVersion=7.6.10 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java index a0b26b3..cd61a1b 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java @@ -61,8 +61,8 @@ public class AOHPCTCSeekBar extends SeekBar { @Override public boolean dispatchTouchEvent(MotionEvent event) { if (event.getAction() == MotionEvent.ACTION_DOWN) { - getParent().requestDisallowInterceptTouchEvent(true); if (thumbWidth + blurRightDP > event.getX() && event.getX() > 0) { + getParent().requestDisallowInterceptTouchEvent(true); isStartSeek = true; } } else if (event.getAction() == MotionEvent.ACTION_MOVE) { From b13a3d4866e0fe0404c32ad0ed9fea633804d488 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 13:56:19 +0800 Subject: [PATCH 027/163] APK 7.6.10 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 ee22086..89edf0a 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 05:53:35 GMT 2025 -stageCount=10 +#Sun Mar 09 13:56:19 HKT 2025 +stageCount=11 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.9 -buildCount=1 -baseBetaVersion=7.6.10 +publishVersion=7.6.10 +buildCount=0 +baseBetaVersion=7.6.11 diff --git a/libaes/build.properties b/libaes/build.properties index ee22086..89edf0a 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 05:53:35 GMT 2025 -stageCount=10 +#Sun Mar 09 13:56:19 HKT 2025 +stageCount=11 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.9 -buildCount=1 -baseBetaVersion=7.6.10 +publishVersion=7.6.10 +buildCount=0 +baseBetaVersion=7.6.11 From 5a756a0f001c020188853a9af9b20c3563d0d312 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 13:56:33 +0800 Subject: [PATCH 028/163] Library Release 7.6.10 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index 89edf0a..12306d7 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 13:56:19 HKT 2025 +#Sun Mar 09 13:56:27 HKT 2025 stageCount=11 libraryProject=libaes baseVersion=7.6 From 6e6540698bc90cdae33cad93636e5372eda06462 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 20:14:06 +0800 Subject: [PATCH 029/163] =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=BD=8D=E7=BD=AE=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E8=AE=BE=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 ++-- libaes/build.properties | 4 ++-- .../java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index 12306d7..64fdcf3 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 13:56:27 HKT 2025 +#Sun Mar 09 12:12:05 GMT 2025 stageCount=11 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.10 -buildCount=0 +buildCount=1 baseBetaVersion=7.6.11 diff --git a/libaes/build.properties b/libaes/build.properties index 89edf0a..64fdcf3 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 13:56:19 HKT 2025 +#Sun Mar 09 12:12:05 GMT 2025 stageCount=11 libraryProject=libaes baseVersion=7.6 publishVersion=7.6.10 -buildCount=0 +buildCount=1 baseBetaVersion=7.6.11 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java index cd61a1b..3ad7072 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java @@ -55,7 +55,8 @@ public class AOHPCTCSeekBar extends SeekBar { } void initView(Context context) { - + // 初始化图标位置 + setThumbOffset(0); } @Override From df51422e422271a9d4dc000ef256c55655c285ed Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 20:15:48 +0800 Subject: [PATCH 030/163] APK 7.6.11 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 64fdcf3..cba7788 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 12:12:05 GMT 2025 -stageCount=11 +#Sun Mar 09 20:15:48 HKT 2025 +stageCount=12 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.10 -buildCount=1 -baseBetaVersion=7.6.11 +publishVersion=7.6.11 +buildCount=0 +baseBetaVersion=7.6.12 diff --git a/libaes/build.properties b/libaes/build.properties index 64fdcf3..cba7788 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 12:12:05 GMT 2025 -stageCount=11 +#Sun Mar 09 20:15:48 HKT 2025 +stageCount=12 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.10 -buildCount=1 -baseBetaVersion=7.6.11 +publishVersion=7.6.11 +buildCount=0 +baseBetaVersion=7.6.12 From 13f9f6d74483e4d24f9216c8d8811d2b8e3a7bb0 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 20:16:04 +0800 Subject: [PATCH 031/163] Library Release 7.6.11 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index cba7788..cf1f90d 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 20:15:48 HKT 2025 +#Sun Mar 09 20:15:58 HKT 2025 stageCount=12 libraryProject=libaes baseVersion=7.6 From e7749cb95d1ce103e3db81c779be7ae57a1df9ff Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 20:27:00 +0800 Subject: [PATCH 032/163] =?UTF-8?q?=E8=AF=A5=E9=83=A8=E5=88=86=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=9C=A8=E5=BA=94=E7=94=A8=E4=BA=8ERecyclerView?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=97=B6=EF=BC=8C=E6=8E=A7=E4=BB=B6=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E5=88=9D=E5=A7=8B=E4=BD=8D=E7=BD=AE=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=9C=AA=E6=9C=89=E8=B5=B7=E5=88=B0=E4=BD=9C=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java index 3ad7072..22344b8 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java @@ -55,8 +55,6 @@ public class AOHPCTCSeekBar extends SeekBar { } void initView(Context context) { - // 初始化图标位置 - setThumbOffset(0); } @Override From cd23d625e1e701468ed79c0fd9679d0f2ea41dea Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 20:28:09 +0800 Subject: [PATCH 033/163] APK 7.6.12 release Publish. --- aes/build.properties | 8 ++++---- libaes/build.properties | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index cf1f90d..5b0f637 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 20:15:58 HKT 2025 -stageCount=12 +#Sun Mar 09 20:28:09 HKT 2025 +stageCount=13 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.11 +publishVersion=7.6.12 buildCount=0 -baseBetaVersion=7.6.12 +baseBetaVersion=7.6.13 diff --git a/libaes/build.properties b/libaes/build.properties index cba7788..5b0f637 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 20:15:48 HKT 2025 -stageCount=12 +#Sun Mar 09 20:28:09 HKT 2025 +stageCount=13 libraryProject=libaes baseVersion=7.6 -publishVersion=7.6.11 +publishVersion=7.6.12 buildCount=0 -baseBetaVersion=7.6.12 +baseBetaVersion=7.6.13 From b3056e9d809d59c4186434d99218a3b696aaadbe Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 9 Mar 2025 20:28:25 +0800 Subject: [PATCH 034/163] Library Release 7.6.12 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index 5b0f637..41a9ff9 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 20:28:09 HKT 2025 +#Sun Mar 09 20:28:18 HKT 2025 stageCount=13 libraryProject=libaes baseVersion=7.6 From b497faa0b9cfe94d1ef5c23dcc115289275bb074 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 19 Mar 2025 01:27:22 +0800 Subject: [PATCH 035/163] 20250319_0127 --- aes/build.gradle | 10 ++----- aes/build.properties | 2 +- aes/src/main/AndroidManifest.xml | 2 +- .../cc/winboll/studio/aes/MainActivity.java | 2 +- aes/src/main/res/values/colors.xml | 7 +++++ aes/src/main/res/values/styles.xml | 2 +- libaes/build.gradle | 10 ++----- .../activitys/DrawerFragmentActivity.java | 3 +- .../unittests/SecondaryLibraryActivity.java | 2 +- .../libaes/unittests/TestAButtonFragment.java | 4 +-- .../unittests/TestDrawerFragmentActivity.java | 12 ++++---- .../unittests/TestViewPageFragment.java | 16 +++++++---- libaes/src/main/res/values/colors.xml | 14 ++++++---- libaes/src/main/res/values/styles.xml | 3 +- libappbase/build.gradle | 28 +++++++++++++++++++ 15 files changed, 74 insertions(+), 43 deletions(-) create mode 100644 aes/src/main/res/values/colors.xml diff --git a/aes/build.gradle b/aes/build.gradle index a81e6ad..4d3b680 100644 --- a/aes/build.gradle +++ b/aes/build.gradle @@ -61,10 +61,6 @@ dependencies { // 二维码类库 implementation 'com.google.zxing:core:3.4.1' implementation 'com.journeyapps:zxing-android-embedded:3.6.0' - // 应用介绍页类库 - implementation 'io.github.medyo:android-about-page:2.0.0' - // 吐司类库 - implementation 'com.github.getActivity:ToastUtils:10.5' // 网络连接类库 implementation 'com.squareup.okhttp3:okhttp:4.4.1' @@ -74,8 +70,8 @@ dependencies { implementation 'androidx.vectordrawable:vectordrawable:1.1.0' implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0' implementation 'androidx.fragment:fragment:1.1.0' - implementation 'com.google.android.material:material:1.4.0' + implementation 'com.google.android.material:material:1.0.0' - implementation 'cc.winboll.studio:libappbase:2.1.5' - implementation 'cc.winboll.studio:libapputils:9.4.4' + implementation 'cc.winboll.studio:libappbase:15.0.5' + implementation 'cc.winboll.studio:libapputils:15.0.6' } diff --git a/aes/build.properties b/aes/build.properties index 41a9ff9..7c62764 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 09 20:28:18 HKT 2025 +#Tue Mar 18 04:22:06 GMT 2025 stageCount=13 libraryProject=libaes baseVersion=7.6 diff --git a/aes/src/main/AndroidManifest.xml b/aes/src/main/AndroidManifest.xml index 0113548..bd314e6 100644 --- a/aes/src/main/AndroidManifest.xml +++ b/aes/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:theme="@style/AESTheme" + android:theme="@style/MyAESTheme" android:requestLegacyExternalStorage="true" android:supportsRtl="true"> diff --git a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java index c0477b9..fd4a7af 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java @@ -13,7 +13,6 @@ import android.view.View; import android.widget.AdapterView; import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.aes.R; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libaes.beans.DrawerMenuBean; @@ -31,6 +30,7 @@ import cc.winboll.studio.libapputils.app.IWinBollActivity; import cc.winboll.studio.libapputils.bean.APPInfo; import com.a4455jkjh.colorpicker.ColorPickerDialog; import java.util.ArrayList; +import android.widget.Toolbar; public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity { diff --git a/aes/src/main/res/values/colors.xml b/aes/src/main/res/values/colors.xml new file mode 100644 index 0000000..87d3836 --- /dev/null +++ b/aes/src/main/res/values/colors.xml @@ -0,0 +1,7 @@ + + + #FF00B322 + #FF005C12 + #FF8DFFA2 + #FFFFFB8D + diff --git a/aes/src/main/res/values/styles.xml b/aes/src/main/res/values/styles.xml index c5c6ef3..1da88ba 100644 --- a/aes/src/main/res/values/styles.xml +++ b/aes/src/main/res/values/styles.xml @@ -1,5 +1,5 @@ - diff --git a/libaes/build.gradle b/libaes/build.gradle index 447b1b2..222d5eb 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -36,10 +36,6 @@ dependencies { // 二维码类库 implementation 'com.google.zxing:core:3.4.1' implementation 'com.journeyapps:zxing-android-embedded:3.6.0' - // 应用介绍页类库 - implementation 'io.github.medyo:android-about-page:2.0.0' - // 吐司类库 - implementation 'com.github.getActivity:ToastUtils:10.5' // 网络连接类库 implementation 'com.squareup.okhttp3:okhttp:4.4.1' @@ -49,8 +45,8 @@ dependencies { implementation 'androidx.vectordrawable:vectordrawable:1.1.0' implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0' implementation 'androidx.fragment:fragment:1.1.0' - implementation 'com.google.android.material:material:1.4.0' + implementation 'com.google.android.material:material:1.0.0' - implementation 'cc.winboll.studio:libappbase:2.1.5' - implementation 'cc.winboll.studio:libapputils:9.4.4' + implementation 'cc.winboll.studio:libappbase:15.0.5' + implementation 'cc.winboll.studio:libapputils:15.0.6' } diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java index 0a5825f..910b68b 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java @@ -16,7 +16,6 @@ import android.view.View; import android.widget.AdapterView; import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; @@ -195,7 +194,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement setContentView(R.layout.activity_drawerfragment); mToolbar = findViewById(R.id.activitydrawerfragmentASupportToolbar1); - setSupportActionBar(mToolbar); + setActionBar(mToolbar); if (mActivityType == ActivityType.Main) { initMainRootView(); diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java index 81ec509..fe3f1c2 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java @@ -8,7 +8,7 @@ import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libapputils.bean.APPInfo; import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; +import android.widget.Toolbar; /** * @Author ZhanGSKen@QQ.COM diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java index a378d51..d79c186 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java @@ -9,11 +9,11 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Toast; import androidx.fragment.app.Fragment; import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.views.AButton; import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.utils.ToastUtils; public class TestAButtonFragment extends Fragment { @@ -28,7 +28,7 @@ public class TestAButtonFragment extends Fragment { @Override public void onClick(View view) { LogUtils.d(TAG, "onClick"); - Toast.makeText(getActivity(), "AButton", Toast.LENGTH_SHORT).show(); + ToastUtils.show("AButton"); } }); diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java index 00be255..57924e0 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java @@ -4,14 +4,14 @@ package cc.winboll.studio.libaes.unittests; * @Author ZhanGSKen@QQ.COM * @Date 2024/06/30 15:00:51 */ +import android.app.Activity; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.Toast; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; +import android.widget.Toolbar; import androidx.fragment.app.Fragment; import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; @@ -24,8 +24,8 @@ import java.util.ArrayList; public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBollActivity { @Override - public AppCompatActivity getActivity() { - return this; + public Activity getActivity() { + return g; } @Override @@ -42,7 +42,7 @@ public class TestDrawerFragmentActivity extends DrawerFragmentActivity implement public Toolbar initToolBar() { return null; } - + @Override public boolean isAddWinBollToolBar() { return false; @@ -52,7 +52,7 @@ public class TestDrawerFragmentActivity extends DrawerFragmentActivity implement public boolean isEnableDisplayHomeAsUp() { return false; } - + public static final String TAG = "TestDrawerFragmentActivity"; diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java index 1c3b39f..b2d73d2 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java @@ -5,6 +5,7 @@ package cc.winboll.studio.libaes.unittests; * @Date 2024/07/16 01:35:56 * @Describe TestViewPageFragment */ +import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -17,14 +18,16 @@ import androidx.viewpager.widget.ViewPager; import cc.winboll.studio.libaes.ImagePagerAdapter; import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.views.AOHPCTCSeekBar; +import cc.winboll.studio.libappbase.LogView; +import cc.winboll.studio.libappbase.utils.ToastUtils; import java.util.ArrayList; import java.util.List; -import cc.winboll.studio.libappbase.LogView; public class TestViewPageFragment extends Fragment implements ViewPager.OnPageChangeListener, View.OnClickListener { public static final String TAG = "TestViewPageFragment"; + Context mContext; LogView mLogView; private ViewPager viewPager; @@ -39,6 +42,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { mView = inflater.inflate(R.layout.fragment_viewpage, container, false); + mContext = getActivity().getContext(); mLogView = mView.findViewById(R.id.logview); mLogView.start(); @@ -72,7 +76,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh //初始化所要显示的布局 void initData() { ViewPager viewPager = mView.findViewById(R.id.fragmentviewpageViewPager1); - LayoutInflater inflater = LayoutInflater.from(getActivity()); + LayoutInflater inflater = LayoutInflater.from(mContext); View view1 = inflater.inflate(R.layout.viewpage_atickprogressbar, viewPager, false); View view2 = inflater.inflate(R.layout.viewpage_acard, viewPager, false); View view3 = inflater.inflate(R.layout.viewpage_aohpctccard, viewPager, false); @@ -193,7 +197,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh void initAOHPCTCSeekBar() { AOHPCTCSeekBar seekbar = views.get(3).findViewById(R.id.fragmentviewpageAOHPCTCSeekBar1); - seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_launcher)); + seekbar.setThumb(mContext.getDrawable(R.drawable.ic_launcher)); //seekbar.setThumbOffset(200); //seekbar.setThumbOffset(1); seekbar.setBlurRightDP(50); @@ -201,14 +205,14 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh @Override public void onOHPCommit() { - Toast.makeText(getActivity(), "onOHPCommit ", Toast.LENGTH_SHORT).show(); + ToastUtils.show("onOHPCommit"); } }); } void initAOHPCTCSeekBar2() { AOHPCTCSeekBar seekbar = views.get(3).findViewById(R.id.fragmentviewpageAOHPCTCSeekBar2); - seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_call)); + seekbar.setThumb(mContext.getDrawable(R.drawable.ic_call)); //seekbar.setThumbOffset(200); //seekbar.setThumbOffset(1); seekbar.setBlurRightDP(50); @@ -216,7 +220,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh @Override public void onOHPCommit() { - Toast.makeText(getActivity(), "onOHPCommit 2", Toast.LENGTH_SHORT).show(); + ToastUtils.show("onOHPCommit 2"); } }); } diff --git a/libaes/src/main/res/values/colors.xml b/libaes/src/main/res/values/colors.xml index f791df6..58d507b 100644 --- a/libaes/src/main/res/values/colors.xml +++ b/libaes/src/main/res/values/colors.xml @@ -1,10 +1,12 @@ + #FF03AB4E #FF027C39 #FF3DDC84 - #FFA9A9A9 + #FFFFFB8D + #FFA9A9A9 #FF000000 #FFFFFFFF #FF7D3F12 @@ -14,16 +16,16 @@ @color/colorPrimaryDark @color/colorPrimary @color/colorAccent - + @color/colorAccent @color/colorPrimary - + @color/colorAccent @color/colorPrimary @color/colorPrimaryDark - + - + + --> diff --git a/libaes/src/main/res/values/styles.xml b/libaes/src/main/res/values/styles.xml index 2149e55..9c736be 100644 --- a/libaes/src/main/res/values/styles.xml +++ b/libaes/src/main/res/values/styles.xml @@ -1,7 +1,6 @@ - - From 529f420668e138963c7a45290213a0bc9d272a3d Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 26 Mar 2025 15:36:49 +0800 Subject: [PATCH 092/163] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.gradle | 17 ----------------- appbase/build.properties | 4 ++-- libappbase/build.properties | 4 ++-- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/appbase/build.gradle b/appbase/build.gradle index 694a91a..5a0d1d3 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -47,21 +47,4 @@ android { dependencies { api project(':libappbase') api fileTree(dir: 'libs', include: ['*.jar']) - - // Android 类库 - api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity - // https://mvnrepository.com/artifact/com.android.support/support-compat - api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选） - // https://mvnrepository.com/artifact/com.android.support/support-v4 - api 'com.android.support:support-v4:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-media-compat - api 'com.android.support:support-media-compat:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-core-utils - api 'com.android.support:support-core-utils:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-core-ui - api 'com.android.support:support-core-ui:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-fragment - api 'com.android.support:support-fragment:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7 - api 'com.android.support:recyclerview-v7:28.0.0' } diff --git a/appbase/build.properties b/appbase/build.properties index 50787f7..5cce835 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 07:32:40 GMT 2025 +#Wed Mar 26 07:35:36 GMT 2025 stageCount=11 libraryProject=libappbase baseVersion=15.0 publishVersion=15.0.10 -buildCount=97 +buildCount=98 baseBetaVersion=15.0.11 diff --git a/libappbase/build.properties b/libappbase/build.properties index 50787f7..5cce835 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 07:32:40 GMT 2025 +#Wed Mar 26 07:35:36 GMT 2025 stageCount=11 libraryProject=libappbase baseVersion=15.0 publishVersion=15.0.10 -buildCount=97 +buildCount=98 baseBetaVersion=15.0.11 From d4986c6ba49cfc1f10335893a176991c1fd90665 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 26 Mar 2025 15:39:37 +0800 Subject: [PATCH 093/163] =?UTF-8?q?=E8=AE=BE=E5=AE=9A=E4=BD=BF=E7=94=A8Sup?= =?UTF-8?q?port=20V7=20=E7=89=88=E5=AE=89=E5=8D=93=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=89=88=E6=9C=AC=E5=8F=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.gradle | 2 +- appbase/build.properties | 12 ++++++------ libappbase/build.properties | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/appbase/build.gradle b/appbase/build.gradle index 5a0d1d3..85ff4b5 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -30,7 +30,7 @@ android { // versionName 更新后需要手动设置 // .winboll/winbollBuildProps.properties 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "15.0" + versionName "15.1" if(true) { versionName = genVersionName("${versionName}") } diff --git a/appbase/build.properties b/appbase/build.properties index 5cce835..52ccd85 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 07:35:36 GMT 2025 -stageCount=11 +#Wed Mar 26 07:38:00 GMT 2025 +stageCount=0 libraryProject=libappbase -baseVersion=15.0 -publishVersion=15.0.10 -buildCount=98 -baseBetaVersion=15.0.11 +baseVersion=15.1 +publishVersion=15.1.0 +buildCount=1 +baseBetaVersion=15.1.10 diff --git a/libappbase/build.properties b/libappbase/build.properties index 5cce835..52ccd85 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 07:35:36 GMT 2025 -stageCount=11 +#Wed Mar 26 07:38:00 GMT 2025 +stageCount=0 libraryProject=libappbase -baseVersion=15.0 -publishVersion=15.0.10 -buildCount=98 -baseBetaVersion=15.0.11 +baseVersion=15.1 +publishVersion=15.1.0 +buildCount=1 +baseBetaVersion=15.1.10 From 8bdd42ce682d79f00cb01badd65998b8f8ac94e0 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 26 Mar 2025 15:43:05 +0800 Subject: [PATCH 094/163] APK 15.1.0 release Publish. --- appbase/build.properties | 8 ++++---- libappbase/build.properties | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index 52ccd85..b15d5c7 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 07:38:00 GMT 2025 -stageCount=0 +#Wed Mar 26 15:43:05 HKT 2025 +stageCount=1 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.0 -buildCount=1 -baseBetaVersion=15.1.10 +buildCount=0 +baseBetaVersion=15.1.1 diff --git a/libappbase/build.properties b/libappbase/build.properties index 52ccd85..b15d5c7 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 07:38:00 GMT 2025 -stageCount=0 +#Wed Mar 26 15:43:05 HKT 2025 +stageCount=1 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.0 -buildCount=1 -baseBetaVersion=15.1.10 +buildCount=0 +baseBetaVersion=15.1.1 From 56a13b4a40142fd142cd5f36fdc98b678a3f8442 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 26 Mar 2025 15:43:27 +0800 Subject: [PATCH 095/163] Library Release 15.1.0 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index b15d5c7..18d898d 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 15:43:05 HKT 2025 +#Wed Mar 26 15:43:21 HKT 2025 stageCount=1 libraryProject=libappbase baseVersion=15.1 From 2074f68ef380f3d346f13c7154c6b2c360001912 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 26 Mar 2025 19:32:21 +0800 Subject: [PATCH 096/163] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 +-- .../winboll/studio/appbase/MainActivity.java | 22 ++----------- appbase/src/main/res/layout/activity_new2.xml | 7 ----- libappbase/build.properties | 4 +-- .../studio/libappbase/GlobalApplication.java | 10 +++--- .../winboll/WinBollActivityManager.java | 31 ++++++++++++++++++- 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index 18d898d..7aa16af 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 15:43:21 HKT 2025 +#Wed Mar 26 11:30:27 GMT 2025 stageCount=1 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.0 -buildCount=0 +buildCount=17 baseBetaVersion=15.1.1 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 cf0133e..7892864 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -71,7 +71,7 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { - onLogActivity(); + WinBollActivityManager.getInstance(this).startLogActivity(this); return true; } // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 @@ -176,23 +176,5 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class); } - public void onLogActivity() { - - - Intent intent = new Intent(MainActivity.this, LogActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT); - // Define the bounds. - Rect bounds = new Rect(500, 300, 100, 0); - -// Set the bounds as an activity option. - - ActivityOptions options = ActivityOptions.makeBasic(); - - options.setLaunchBounds(bounds); - - //Intent intent = new Intent(this, LpgActivity.class); - - startActivity(intent, options.toBundle()); - //WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class); - } + } diff --git a/appbase/src/main/res/layout/activity_new2.xml b/appbase/src/main/res/layout/activity_new2.xml index 1a610ed..b3352af 100644 --- a/appbase/src/main/res/layout/activity_new2.xml +++ b/appbase/src/main/res/layout/activity_new2.xml @@ -30,13 +30,6 @@ android:textAllCaps="false" android:onClick="onCloseAllActivity"/> -