Compare commits

..

20 Commits

Author SHA1 Message Date
ZhanGSKen
2005ba6aee 设置版本号 2025-04-29 00:21:37 +08:00
ZhanGSKen
6adc96449b <aes>Start New Stage Version. 2025-04-29 00:19:26 +08:00
ZhanGSKen
4d8675f1f7 编译测试 2025-04-29 00:10:58 +08:00
ZhanGSKen
2467f3b5a8 Merge remote-tracking branch 'origin/appbase' into aes 2025-04-29 00:08:31 +08:00
ZhanGSKen
b8834627ae 编译测试 2025-04-27 21:10:23 +08:00
ZhanGSKen
164c00ee0d Merge remote-tracking branch 'origin/appbase' into aes 2025-04-27 21:03:34 +08:00
ZhanGSKen
b34d777c9f 合并appbase 2025-04-27 20:55:34 +08:00
ZhanGSKen
2ce07bbcf3 <libaes>Library Release 15.4.1 2025-04-27 17:40:14 +08:00
ZhanGSKen
7932e25def <aes>APK 15.4.1 release Publish. 2025-04-27 17:39:51 +08:00
ZhanGSKen
191de5c511 <aes>APK 15.4.0 release Publish. 2025-04-27 17:39:39 +08:00
ZhanGSKen
d520c9ae06 <aes>Start New Stage Version. 2025-04-27 17:36:17 +08:00
ZhanGSKen
933abbc261 <aes>Start New Stage Version. 2025-04-27 17:36:08 +08:00
ZhanGSKen
14a161ab3f 更新版本号 2025-04-27 17:35:16 +08:00
ZhanGSKen
248b8084dc Merge branch 'aes' of https://zhangsken.winboll.cc/ZhanGSKen/APPBase.git into aes 2025-04-27 17:31:08 +08:00
ZhanGSKen
006cefea2a <aes>Start New Stage Version. 2025-04-27 17:30:08 +08:00
ZhanGSKen
ad1b6ca3e9 编译测试 2025-04-27 17:26:24 +08:00
ZhanGSKen
37c93658b3 <aes>Start New Stage Version. 2025-04-27 14:03:25 +08:00
ZhanGSKen
65aae2146e 更新版本号 2025-04-27 14:03:03 +08:00
ZhanGSKen
58eba26eb5 <aes>Start New Stage Version. 2025-04-27 14:00:56 +08:00
ZhanGSKen
a32b10cdec 更新类库 2025-04-27 13:48:45 +08:00
13 changed files with 56 additions and 71 deletions

View File

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

View File

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

View File

@@ -8,6 +8,7 @@ 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 {
@@ -21,8 +22,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.3"
versionName "15.2"
if(true) {
versionName = genVersionName("${versionName}")
}

View File

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

View File

@@ -8,11 +8,12 @@ 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 Activity implements IWinBollActivity {
public class WinBollActivityBase extends AppCompatActivity 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.2.2'
api 'cc.winboll.studio:libappbase:15.2.2'
api 'cc.winboll.studio:libapputils:15.3.1'
api 'cc.winboll.studio:libappbase:15.4.8'
}

View File

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

View File

@@ -5,6 +5,7 @@ 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;
@@ -21,7 +22,6 @@ 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

@@ -1,38 +0,0 @@
<?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,7 +21,28 @@ android {
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
api 'cc.winboll.studio:libappbase:15.4.8'
// 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 'com.google.zxing:core:3.4.1'

View File

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

View File

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