From 3fe1ea7ff2be7b351b24670db0f9e78d37ee5e06 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 24 Mar 2025 13:20:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9AndroidDemo=E7=B1=BB?= =?UTF-8?q?=E5=BA=93=E4=BE=9D=E8=B5=96=E6=96=B9=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androiddemo/build.gradle | 27 ++++++++++----------------- androiddemo/build.properties | 4 ++-- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle index 8357611..d134caa 100644 --- a/androiddemo/build.gradle +++ b/androiddemo/build.gradle @@ -18,15 +18,8 @@ def genVersionName(def versionName){ } android { - productFlavors { - beta { - } - stage { - } - } - - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 32 + buildToolsVersion "32.0.0" defaultConfig { applicationId "cc.winboll.studio.androiddemo" @@ -54,21 +47,21 @@ dependencies { api fileTree(dir: 'libs', include: ['*.jar']) // 吐司类库 - implementation 'com.github.getActivity:ToastUtils:10.5' + api 'com.github.getActivity:ToastUtils:10.5' // Android 类库 // https://mvnrepository.com/artifact/com.android.support/support-v4 - implementation 'com.android.support:support-v4:28.0.0' + api 'com.android.support:support-v4:28.0.0' // https://mvnrepository.com/artifact/com.android.support/support-compat - implementation 'com.android.support:support-compat:28.0.0' + api 'com.android.support:support-compat:28.0.0' // https://mvnrepository.com/artifact/com.android.support/support-media-compat - implementation 'com.android.support:support-media-compat:28.0.0' + api 'com.android.support:support-media-compat:28.0.0' // https://mvnrepository.com/artifact/com.android.support/support-core-utils - implementation 'com.android.support:support-core-utils:28.0.0' + api 'com.android.support:support-core-utils:28.0.0' // https://mvnrepository.com/artifact/com.android.support/support-core-ui - implementation 'com.android.support:support-core-ui:28.0.0' + api 'com.android.support:support-core-ui:28.0.0' // https://mvnrepository.com/artifact/com.android.support/support-fragment - implementation 'com.android.support:support-fragment:28.0.0' + api 'com.android.support:support-fragment:28.0.0' // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7 - implementation 'com.android.support:recyclerview-v7:28.0.0' + api 'com.android.support:recyclerview-v7:28.0.0' } diff --git a/androiddemo/build.properties b/androiddemo/build.properties index 4d98e2f..9c7bb10 100644 --- a/androiddemo/build.properties +++ b/androiddemo/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 11 18:02:14 GMT 2025 +#Mon Mar 24 05:17:16 GMT 2025 stageCount=0 libraryProject= baseVersion=1.0 publishVersion=1.0.0 -buildCount=1 +buildCount=2 baseBetaVersion=1.0.1 From ec6926f629d30af73aa8dccdb7c6fd0ceecf31ca Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 24 Mar 2025 13:31:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=BE=E5=AE=9A=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8E=E7=B3=BB=E7=BB=9F=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androiddemo/build.gradle | 2 +- androiddemo/build.properties | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle index d134caa..5ccf9e0 100644 --- a/androiddemo/build.gradle +++ b/androiddemo/build.gradle @@ -29,7 +29,7 @@ android { // versionName 更新后需要手动设置 // .winboll/winbollBuildProps.properties 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "1.0" + versionName "15.0" if(true) { versionName = genVersionName("${versionName}") } diff --git a/androiddemo/build.properties b/androiddemo/build.properties index 9c7bb10..b0b41ad 100644 --- a/androiddemo/build.properties +++ b/androiddemo/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 24 05:17:16 GMT 2025 +#Mon Mar 24 05:30:56 GMT 2025 stageCount=0 libraryProject= -baseVersion=1.0 -publishVersion=1.0.0 +baseVersion=15.0 +publishVersion=15.0.0 buildCount=2 -baseBetaVersion=1.0.1 +baseBetaVersion=15.0.1 From 75c2f6304cfce0445b5265ede0854f5a691b7be8 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 24 Mar 2025 13:57:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=9F=BA=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androiddemo/build.gradle | 3 ++ androiddemo/build.properties | 4 +- androiddemo/src/main/AndroidManifest.xml | 2 +- .../{GlobalApplication.java => App.java} | 12 +++--- .../studio/androiddemo/MainActivity.java | 40 ++++++++++++------- .../src/main/res/layout/activity_main.xml | 33 ++++++++++++--- 6 files changed, 64 insertions(+), 30 deletions(-) rename androiddemo/src/main/java/cc/winboll/studio/androiddemo/{GlobalApplication.java => App.java} (97%) diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle index 5ccf9e0..ac0bdd0 100644 --- a/androiddemo/build.gradle +++ b/androiddemo/build.gradle @@ -64,4 +64,7 @@ dependencies { 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' + + api 'cc.winboll.studio:libappbase:15.0.8' + api 'cc.winboll.studio:libapputils:15.0.11' } diff --git a/androiddemo/build.properties b/androiddemo/build.properties index b0b41ad..baace7d 100644 --- a/androiddemo/build.properties +++ b/androiddemo/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 24 05:30:56 GMT 2025 +#Mon Mar 24 05:56:56 GMT 2025 stageCount=0 libraryProject= baseVersion=15.0 publishVersion=15.0.0 -buildCount=2 +buildCount=7 baseBetaVersion=15.0.1 diff --git a/androiddemo/src/main/AndroidManifest.xml b/androiddemo/src/main/AndroidManifest.xml index 43eac9a..57a1145 100644 --- a/androiddemo/src/main/AndroidManifest.xml +++ b/androiddemo/src/main/AndroidManifest.xml @@ -11,7 +11,7 @@ android:label="@string/app_name" android:theme="@style/AppTheme" android:resizeableActivity="true" - android:name=".GlobalApplication"> + android:name=".App"> + android:orientation="vertical"> - + + + + + + + + + + + From dd7600d617d04abc3b67468e427119a21c1989c3 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 24 Mar 2025 14:08:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=BA=93?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androiddemo/build.gradle | 2 +- androiddemo/build.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle index ac0bdd0..4ef2484 100644 --- a/androiddemo/build.gradle +++ b/androiddemo/build.gradle @@ -65,6 +65,6 @@ dependencies { // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7 api 'com.android.support:recyclerview-v7:28.0.0' - api 'cc.winboll.studio:libappbase:15.0.8' + api 'cc.winboll.studio:libappbase:15.0.9' api 'cc.winboll.studio:libapputils:15.0.11' } diff --git a/androiddemo/build.properties b/androiddemo/build.properties index baace7d..018d60a 100644 --- a/androiddemo/build.properties +++ b/androiddemo/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 24 05:56:56 GMT 2025 +#Mon Mar 24 06:07:49 GMT 2025 stageCount=0 libraryProject= baseVersion=15.0 publishVersion=15.0.0 -buildCount=7 +buildCount=9 baseBetaVersion=15.0.1