diff --git a/powerbell/build.gradle b/powerbell/build.gradle index 7897886..8f47058 100644 --- a/powerbell/build.gradle +++ b/powerbell/build.gradle @@ -23,13 +23,13 @@ android { defaultConfig { applicationId "cc.winboll.studio.powerbell" - minSdkVersion 26 + minSdkVersion 24 targetSdkVersion 29 versionCode 6 // versionName 更新后需要手动设置 // .winboll/winbollBuildProps.properties 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "15.0" + versionName "15.2" if(true) { versionName = genVersionName("${versionName}") } @@ -46,6 +46,8 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) + // 吐司提示库 + api 'com.github.getActivity:ToastUtils:10.5' // 应用介绍页类库 api 'io.github.medyo:android-about-page:2.0.0' // SSH @@ -57,6 +59,7 @@ dependencies { api 'com.journeyapps:zxing-android-embedded:3.6.0' // 网络连接类库 api 'com.squareup.okhttp3:okhttp:4.4.1' + // AndroidX 类库 api 'androidx.appcompat:appcompat:1.1.0' api 'com.google.android.material:material:1.4.0' @@ -65,13 +68,12 @@ dependencies { //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' //api 'androidx.fragment:fragment:1.1.0' - api 'cc.winboll.studio:libappbase:15.0.9' - api 'cc.winboll.studio:libapputils:15.0.15' - api 'cc.winboll.studio:libaes:15.0.7' + api 'cc.winboll.studio:libaes:15.2.3' + api 'cc.winboll.studio:libapputils:15.2.1' + api 'cc.winboll.studio:libappbase:15.2.2' /*api 'cc.winboll.studio:winboll-shared:1.8.0' 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' diff --git a/powerbell/build.properties b/powerbell/build.properties index c6ec8a5..04abdd1 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 25 02:43:07 HKT 2025 -stageCount=4 +#Mon Mar 31 06:52:50 GMT 2025 +stageCount=0 libraryProject= -baseVersion=15.0 -publishVersion=15.0.3 -buildCount=0 -baseBetaVersion=15.0.4 +baseVersion=15.2 +publishVersion=15.2.0 +buildCount=1 +baseBetaVersion=15.2.1 diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/App.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/App.java index a41290c..cebba11 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/App.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/App.java @@ -1,12 +1,12 @@ package cc.winboll.studio.powerbell; import android.content.Context; +import android.view.Gravity; import cc.winboll.studio.libappbase.GlobalApplication; -import cc.winboll.studio.libappbase.utils.ToastUtils; import cc.winboll.studio.powerbell.receivers.GlobalApplicationReceiver; import cc.winboll.studio.powerbell.utils.AppCacheUtils; import cc.winboll.studio.powerbell.utils.AppConfigUtils; -import cc.winboll.studio.libapputils.bean.DebugBean; +import com.hjq.toast.ToastUtils; public class App extends GlobalApplication { @@ -20,22 +20,13 @@ public class App extends GlobalApplication { @Override public void onCreate() { super.onCreate(); - // 设置应用调试标志 - DebugBean debugBean = DebugBean.loadBean(this, DebugBean.class); - if (debugBean == null) { - //ToastUtils.show("debugBean == null"); - setIsDebuging(this, false); - } else { - //ToastUtils.show("saveDebugStatus(" + String.valueOf(debugBean.isDebuging()) + ")"); - setIsDebuging(this, debugBean.isDebuging()); - } // 初始化 Toast 框架 - //ToastUtils.init(this); + ToastUtils.init(this); // 设置 Toast 布局样式 //ToastUtils.setView(R.layout.toast_custom_view); //ToastUtils.setStyle(new WhiteToastStyle()); - //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200); + ToastUtils.setGravity(Gravity.BOTTOM, 0, 200); // 设置数据配置存储工具 _mAppConfigUtils = getAppConfigUtils(this); diff --git a/powerbell/src/main/res/values/styles.xml b/powerbell/src/main/res/values/styles.xml index 9683860..6509201 100644 --- a/powerbell/src/main/res/values/styles.xml +++ b/powerbell/src/main/res/values/styles.xml @@ -1,9 +1,9 @@ - -