Compare commits

..

13 Commits

Author SHA1 Message Date
ZhanGSKen
99199d445e <apputils>APK 15.3.2 release Publish. 2025-04-28 21:34:43 +08:00
ZhanGSKen
a629941054 编译测试 2025-04-28 21:22:06 +08:00
ZhanGSKen
3a2274d7a2 Merge remote-tracking branch 'origin/appbase' into apputils 2025-04-28 21:20:38 +08:00
ZhanGSKen
b918b04068 编译检查 2025-04-27 21:07:46 +08:00
ZhanGSKen
f0326bc9a3 Merge remote-tracking branch 'origin/appbase' into apputils 2025-04-27 21:04:10 +08:00
ZhanGSKen
455e38ac0c Merge remote-tracking branch 'origin/appbase' into apputils 2025-04-27 20:52:28 +08:00
ZhanGSKen
559d41e46c <libapputils>Library Release 15.3.1 2025-04-27 13:42:58 +08:00
ZhanGSKen
ef9c0f08ae <apputils>APK 15.3.1 release Publish. 2025-04-27 13:42:46 +08:00
ZhanGSKen
18b078c644 与AppCompatActivity引用一样,类继承层数不能是两层。 2025-04-27 13:41:49 +08:00
ZhanGSKen
b68d8a58e3 <libapputils>Library Release 15.3.0 2025-04-27 11:20:08 +08:00
ZhanGSKen
9eec7060b9 <apputils>APK 15.3.0 release Publish. 2025-04-27 11:19:49 +08:00
ZhanGSKen
e572486b05 设置版本号 2025-04-27 11:17:19 +08:00
ZhanGSKen
7abe096779 移除类库依赖 2025-04-27 11:11:48 +08:00
13 changed files with 71 additions and 56 deletions

View File

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

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Mon Apr 28 16:21:02 GMT 2025
stageCount=0
#Thu Apr 03 11:14:05 HKT 2025
stageCount=7
libraryProject=libaes
baseVersion=15.5
publishVersion=15.5.0
buildCount=1
baseBetaVersion=15.5.1
baseVersion=15.2
publishVersion=15.2.6
buildCount=0
baseBetaVersion=15.2.7

View File

@@ -8,7 +8,6 @@ package cc.winboll.studio.aes;
import android.view.Gravity;
import cc.winboll.studio.libappbase.GlobalApplication;
import com.hjq.toast.ToastUtils;
import com.hjq.toast.style.WhiteToastStyle;
public class App extends GlobalApplication {
@@ -22,8 +21,8 @@ public class App extends GlobalApplication {
// 初始化 Toast 框架
ToastUtils.init(this);
// 设置 Toast 布局样式
//ToastUtils.setView(R.layout.view_toast);
ToastUtils.setStyle(new WhiteToastStyle());
ToastUtils.setView(R.layout.view_toast);
//ToastUtils.setStyle(new WhiteToastStyle());
ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
}

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}")
}

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Sat Mar 29 12:14:55 HKT 2025
stageCount=2
#Mon Apr 28 21:34:43 HKT 2025
stageCount=3
libraryProject=libapputils
baseVersion=15.2
publishVersion=15.2.1
baseVersion=15.3
publishVersion=15.3.2
buildCount=0
baseBetaVersion=15.2.2
baseBetaVersion=15.3.3

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";

View File

@@ -45,12 +45,12 @@ dependencies {
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'
api 'com.google.android.material:material:1.4.0'
//api 'androidx.viewpager:viewpager:1.0.0'
//api 'androidx.vectordrawable:vectordrawable:1.1.0'
//api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
//api 'androidx.fragment:fragment:1.1.0'
api 'cc.winboll.studio:libapputils:15.3.1'
api 'cc.winboll.studio:libappbase:15.4.8'
api 'cc.winboll.studio:libapputils:15.2.2'
api 'cc.winboll.studio:libappbase:15.2.2'
}

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Mon Apr 28 16:21:02 GMT 2025
stageCount=0
#Thu Apr 03 11:13:53 HKT 2025
stageCount=7
libraryProject=libaes
baseVersion=15.5
publishVersion=15.5.0
buildCount=1
baseBetaVersion=15.5.1
baseVersion=15.2
publishVersion=15.2.6
buildCount=0
baseBetaVersion=15.2.7

View File

@@ -5,7 +5,6 @@ package cc.winboll.studio.libaes.winboll;
* @Date 2025/03/28 17:41:55
* @Describe WinBoll 服务主机连接状态视图
*/
import cc.winboll.studio.libaes.R;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -22,6 +21,7 @@ import android.widget.TextView;
import cc.winboll.studio.libaes.winboll.WinBollClientService;
import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libapputils.R;
import cc.winboll.studio.libapputils.utils.PrefUtils;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;

View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:background="@drawable/toast_frame"
android:padding="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textStyle="bold"
android:textColor="#FFFFFFFF"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/ic_launcher"/>
<TextView
android:id="@android:id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:textColor="#FFFFFFFF"/>
</LinearLayout>
</LinearLayout>

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'

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Sat Mar 29 12:14:39 HKT 2025
stageCount=2
#Mon Apr 28 21:34:43 HKT 2025
stageCount=3
libraryProject=libapputils
baseVersion=15.2
publishVersion=15.2.1
baseVersion=15.3
publishVersion=15.3.2
buildCount=0
baseBetaVersion=15.2.2
baseBetaVersion=15.3.3

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>