From a32b10cdecc066bd372ebe7de7163e483579d682 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@188.COM>
Date: Sun, 27 Apr 2025 13:48:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 aes/build.properties                          |  4 +-
 .../main/java/cc/winboll/studio/aes/App.java  |  5 ++-
 libaes/build.gradle                           |  6 +--
 libaes/build.properties                       |  4 +-
 .../winboll/WinBollServiceStatusView.java     |  2 +-
 libaes/src/main/res/layout/view_toast.xml     | 38 -------------------
 6 files changed, 11 insertions(+), 48 deletions(-)
 delete mode 100644 libaes/src/main/res/layout/view_toast.xml

diff --git a/aes/build.properties b/aes/build.properties
index 6c6ad79..01fc6c9 100644
--- a/aes/build.properties
+++ b/aes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 11:14:05 HKT 2025
+#Sun Apr 27 05:47:09 GMT 2025
 stageCount=7
 libraryProject=libaes
 baseVersion=15.2
 publishVersion=15.2.6
-buildCount=0
+buildCount=1
 baseBetaVersion=15.2.7
diff --git a/aes/src/main/java/cc/winboll/studio/aes/App.java b/aes/src/main/java/cc/winboll/studio/aes/App.java
index 2dc8e06..b656adb 100644
--- a/aes/src/main/java/cc/winboll/studio/aes/App.java
+++ b/aes/src/main/java/cc/winboll/studio/aes/App.java
@@ -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);
 
     }
diff --git a/libaes/build.gradle b/libaes/build.gradle
index 6056965..1b30b3c 100644
--- a/libaes/build.gradle
+++ b/libaes/build.gradle
@@ -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'
 }
diff --git a/libaes/build.properties b/libaes/build.properties
index 740a6cf..01fc6c9 100644
--- a/libaes/build.properties
+++ b/libaes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 11:13:53 HKT 2025
+#Sun Apr 27 05:47:09 GMT 2025
 stageCount=7
 libraryProject=libaes
 baseVersion=15.2
 publishVersion=15.2.6
-buildCount=0
+buildCount=1
 baseBetaVersion=15.2.7
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java
index 694779b..630a3a7 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java
@@ -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;
diff --git a/libaes/src/main/res/layout/view_toast.xml b/libaes/src/main/res/layout/view_toast.xml
deleted file mode 100644
index c4a65fc..0000000
--- a/libaes/src/main/res/layout/view_toast.xml
+++ /dev/null
@@ -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>
-