diff --git a/androiddemo/app_update_description.txt b/androiddemo/app_update_description.txt
new file mode 100644
index 0000000..e69de29
diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle
index a59598c..8357611 100644
--- a/androiddemo/build.gradle
+++ b/androiddemo/build.gradle
@@ -1,25 +1,74 @@
apply plugin: 'com.android.application'
+apply from: '../.winboll/winboll_app_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+def genVersionName(def versionName){
+ // 检查编译标志位配置
+ assert (winbollBuildProps['stageCount'] != null)
+ assert (winbollBuildProps['baseVersion'] != null)
+ // 保存基础版本号
+ winbollBuildProps.setProperty("baseVersion", "${versionName}");
+ //保存编译标志配置
+ FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
+ winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
+ fos.close();
+
+ // 返回编译版本号
+ return "${versionName}." + winbollBuildProps['stageCount']
+}
android {
- compileSdkVersion 33
- buildToolsVersion "33.0.0"
+ productFlavors {
+ beta {
+ }
+ stage {
+ }
+ }
+
+ compileSdkVersion 30
+ buildToolsVersion "30.0.3"
defaultConfig {
applicationId "cc.winboll.studio.androiddemo"
- minSdkVersion 19
- targetSdkVersion 26
+ minSdkVersion 26
+ targetSdkVersion 29
versionCode 1
+ // versionName 更新后需要手动设置
+ // .winboll/winbollBuildProps.properties 文件的 stageCount=0
+ // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
versionName "1.0"
+ if(true) {
+ versionName = genVersionName("${versionName}")
+ }
}
buildTypes {
release {
minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
dependencies {
- implementation fileTree(dir: "libs", include: ["*.jar"])
+ api fileTree(dir: 'libs', include: ['*.jar'])
+
+ // 吐司类库
+ implementation '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'
+ // https://mvnrepository.com/artifact/com.android.support/support-compat
+ implementation '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'
+ // https://mvnrepository.com/artifact/com.android.support/support-core-utils
+ implementation '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'
+ // https://mvnrepository.com/artifact/com.android.support/support-fragment
+ implementation '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'
}
diff --git a/androiddemo/build.properties b/androiddemo/build.properties
new file mode 100644
index 0000000..4d98e2f
--- /dev/null
+++ b/androiddemo/build.properties
@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Tue Mar 11 18:02:14 GMT 2025
+stageCount=0
+libraryProject=
+baseVersion=1.0
+publishVersion=1.0.0
+buildCount=1
+baseBetaVersion=1.0.1
diff --git a/androiddemo/src/beta/AndroidManifest.xml b/androiddemo/src/beta/AndroidManifest.xml
new file mode 100644
index 0000000..ee78d9f
--- /dev/null
+++ b/androiddemo/src/beta/AndroidManifest.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/androiddemo/src/beta/res/values/strings.xml b/androiddemo/src/beta/res/values/strings.xml
new file mode 100644
index 0000000..e0c92e9
--- /dev/null
+++ b/androiddemo/src/beta/res/values/strings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ Android Demo +
+
+
diff --git a/androiddemo/src/main/AndroidManifest.xml b/androiddemo/src/main/AndroidManifest.xml
index 77073c0..43eac9a 100644
--- a/androiddemo/src/main/AndroidManifest.xml
+++ b/androiddemo/src/main/AndroidManifest.xml
@@ -1,9 +1,12 @@
-
\ No newline at end of file
+
diff --git a/androiddemo/src/main/res/layout/activity_main.xml b/androiddemo/src/main/res/layout/activity_main.xml
index 8ca9527..f8b9a89 100644
--- a/androiddemo/src/main/res/layout/activity_main.xml
+++ b/androiddemo/src/main/res/layout/activity_main.xml
@@ -1,7 +1,16 @@
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
diff --git a/androiddemo/src/main/res/values/strings.xml b/androiddemo/src/main/res/values/strings.xml
index 6953a75..21acbbd 100644
--- a/androiddemo/src/main/res/values/strings.xml
+++ b/androiddemo/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-
-
- AndroidDemo
-
+
+
+ Android Demo
+
diff --git a/androiddemo/src/stage/AndroidManifest.xml b/androiddemo/src/stage/AndroidManifest.xml
new file mode 100644
index 0000000..ee78d9f
--- /dev/null
+++ b/androiddemo/src/stage/AndroidManifest.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/androiddemo/src/stage/res/values/strings.xml b/androiddemo/src/stage/res/values/strings.xml
new file mode 100644
index 0000000..ace0c41
--- /dev/null
+++ b/androiddemo/src/stage/res/values/strings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+