设置版本号

更正com.android.tools.build:gradle:7.2.1'对应的Gradle版本设置
更新编译配置已对应Android10开发，API级别29。Java 使用版本为 Java 8。
2025-02-25 16:02:55 +08:00 · 2025-02-25 15:59:48 +08:00 · 2025-02-25 15:51:54 +08:00 · 2025-02-21 11:03:53 +08:00 · 2025-02-21 10:58:04 +08:00 · 2025-02-21 10:56:13 +08:00
8 changed files with 65 additions and 57 deletions
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -18,18 +18,18 @@ def genVersionName(def versionName){
 }

 android {
-    compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"

    defaultConfig {
        applicationId "cc.winboll.studio.appbase"
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion 29
        versionCode 1
        // versionName 更新后需要手动设置 
        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "1.5" 
+        versionName "2.0" 
        if(true) {
            versionName = genVersionName("${versionName}")
        }
@@ -41,11 +41,6 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }

 dependencies {
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Feb 20 11:24:23 HKT 2025
-stageCount=6
+#Tue Feb 25 08:02:20 GMT 2025
+stageCount=0
 libraryProject=libappbase
-baseVersion=1.5
-publishVersion=1.5.5
-buildCount=0
-baseBetaVersion=1.5.6
+baseVersion=2.0
+publishVersion=2.0.0
+buildCount=1
+baseBetaVersion=2.0.1
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -24,6 +24,13 @@
 			android:layout_height="wrap_content"
 			android:text="Hello, WinBoll!"/>

+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Android版本10的代号是“Q”，API级别是29。   Android 10开始谷歌不再公开使用甜品作为版本代号，但内部仍保留了大量与“Q”相关的元素。Android 10本身并没有严格对应某个特定的Java版本，但在开发Android 10应用时，通常可以使用Java 8或更高版本。
+ 
+Java 8为Android开发带来了诸如Lambda表达式、方法引用等新特性，能提高开发效率和代码可读性，与Android 10开发适配良好。Java 9及更高版本也可用于Android 10开发，能使用一些新的语言特性和API，但可能需要注意兼容性和配置问题。"/>
+
 		<LinearLayout
 			android:orientation="horizontal"
 			android:layout_width="match_parent"
@@ -61,33 +68,33 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content">

-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
+					<LinearLayout
+						android:orientation="horizontal"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content">

-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="StartTestService"
-                            android:textAllCaps="false"
-                            android:onClick="onStartTestService"/>
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="StartTestService"
+							android:textAllCaps="false"
+							android:onClick="onStartTestService"/>

-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="StopTestService"
-                            android:textAllCaps="false"
-                            android:onClick="onStopTestService"/>
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="StopTestService"
+							android:textAllCaps="false"
+							android:onClick="onStopTestService"/>

-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="StopTestServiceNoSettings"
-                            android:textAllCaps="false"
-                            android:onClick="onStopTestServiceNoSettings"/>
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="StopTestServiceNoSettings"
+							android:textAllCaps="false"
+							android:onClick="onStopTestServiceNoSettings"/>

-                    </LinearLayout>
+					</LinearLayout>

 				</HorizontalScrollView>

--- a/build.gradle
+++ b/build.gradle
@@ -69,6 +69,14 @@ allprojects {
            }
 	    }
    }
+    
+    subprojects {
+        tasks.withType(JavaCompile) {
+            options.compilerArgs << "-parameters"
+            sourceCompatibility = JavaVersion.VERSION_1_8
+            targetCompatibility = JavaVersion.VERSION_1_8
+        }
+    }
 }

 task clean(type: Delete) {
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl = https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/libappbase/build.gradle
+++ b/libappbase/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.libappbase'
-    
-    compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"

    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion 29
    }
    buildTypes {
        release {
@@ -19,10 +17,6 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }

 dependencies {
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Feb 20 11:24:23 HKT 2025
-stageCount=6
+#Tue Feb 25 08:02:20 GMT 2025
+stageCount=0
 libraryProject=libappbase
-baseVersion=1.5
-publishVersion=1.5.5
-buildCount=0
-baseBetaVersion=1.5.6
+baseVersion=2.0
+publishVersion=2.0.0
+buildCount=1
+baseBetaVersion=2.0.1
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/BaseBean.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/BaseBean.java
@@ -118,7 +118,11 @@ public abstract class BaseBean<T extends BaseBean> {

    public static <T extends BaseBean> boolean parseStringToBeanList(String szBeanList, ArrayList<T> beanList, Class<T> clazz) {
        try {
-            beanList.clear();
+            if(beanList == null) {
+                beanList = new ArrayList<T>();
+            } else {
+                beanList.clear();
+            }
            StringReader stringReader = new StringReader(szBeanList);
            JsonReader jsonReader = new JsonReader(stringReader);
            jsonReader.beginArray();
Author	SHA1	Message	Date
ZhanGSKen	9b1264234e	设置版本号	2025-02-25 16:02:55 +08:00
ZhanGSKen	d207a9ea9b	更正com.android.tools.build:gradle:7.2.1'对应的Gradle版本设置	2025-02-25 15:59:48 +08:00
ZhanGSKen	404239de23	更新编译配置已对应Android10开发，API级别29。Java 使用版本为 Java 8。	2025-02-25 15:51:54 +08:00
ZhanGSKen	e849e54960	<libappbase>Library Release 1.5.6	2025-02-21 11:03:53 +08:00
ZhanGSKen	8b2866419c	<appbase>APK 1.5.6 release Publish.	2025-02-21 10:58:04 +08:00
ZhanGSKen	22a4a71203	更新bean基础类	2025-02-21 10:56:13 +08:00
ZhanGSKen	292f7c553f	<libappbase>Library Release 1.5.5	2025-02-20 11:24:38 +08:00