Studio/APPBase
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/apputils' into appbase

Browse Source
This commit is contained in:
ZhanGSKen
2025-04-29 14:06:04 +08:00
parent dab1412bc4 559d41e46c
commit 63f424c149
6 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apputils/build.gradle
View File

@@ -29,7 +29,7 @@ android {
// versionName 更新后需要手动设置
// 项目模块目录的 build.gradle 文件的 stageCount=0
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
versionName "15.2"
versionName "15.3"
if(true) {
versionName = genVersionName("${versionName}")
}

8
apputils/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Sat Mar 29 12:14:55 HKT 2025
#Sun Apr 27 13:42:52 HKT 2025
stageCount=2
libraryProject=libapputils
baseVersion=15.2
publishVersion=15.2.1
baseVersion=15.3
publishVersion=15.3.1
buildCount=0
baseBetaVersion=15.2.2
baseBetaVersion=15.3.2

3
apputils/src/main/java/cc/winboll/studio/apputils/WinBollActivityBase.java
View File

@@ -8,12 +8,11 @@ package cc.winboll.studio.apputils;
import android.app.Activity;
import android.os.Bundle;
import android.os.PersistableBundle;
import android.support.v7.app.AppCompatActivity;
import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
public class WinBollActivityBase extends Activity implements IWinBollActivity {
public static final String TAG = "WinBollActivityBase";

23
libapputils/build.gradle
View File

@@ -21,28 +21,7 @@ android {
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
// Android 类库
//api 'com.android.support:appcompat-v7:28.0.0'
api('com.android.support:appcompat-v7:28.0.0'){
//exclude group: "com.android.support", module: "support-vector-drawable"
exclude group: "com.android.support:animated-vector-drawable:28.0.0"
}
// 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'
api 'cc.winboll.studio:libappbase:15.2.0'
api 'cc.winboll.studio:libappbase:15.4.8'
// 二维码类库
api 'com.google.zxing:core:3.4.1'

8
libapputils/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Sat Mar 29 12:14:39 HKT 2025
#Sun Apr 27 13:42:46 HKT 2025
stageCount=2
libraryProject=libapputils
baseVersion=15.2
publishVersion=15.2.1
baseVersion=15.3
publishVersion=15.3.1
buildCount=0
baseBetaVersion=15.2.2
baseBetaVersion=15.3.2

2
libapputils/src/main/res/values/styles.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="UtilsTheme" parent="APPBaseTheme">
<style name="UtilsTheme" parent="@android:style/Theme.Holo.Light.NoActionBar">
</style>
</resources>