<aes>APK 15.2.5 release Publish.

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 31 02:04:47 HKT 2025
+#Wed Apr 02 20:08:50 HKT 2025
-stageCount=4
+stageCount=6
 libraryProject=libaes
 baseVersion=15.2
-publishVersion=15.2.3
+publishVersion=15.2.5
 buildCount=0
-baseBetaVersion=15.2.4
+baseBetaVersion=15.2.6

aes/src/main/java/cc/winboll/studio/aes/App.java

@@ -5,19 +5,26 @@ package cc.winboll.studio.aes;
  * @Date 2024/06/13 19:03:58
  * @Describe AES应用类
  */
+import android.view.Gravity;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import com.hjq.toast.ToastUtils;
 
 
 public class App extends GlobalApplication {
-    
+
     public static final String TAG = "App";
 
     @Override
     public void onCreate() {
         super.onCreate();
+
+        // 初始化 Toast 框架
         ToastUtils.init(this);
-        //ToastUtils.show("App onCreate");
+        // 设置 Toast 布局样式
+        ToastUtils.setView(R.layout.view_toast);
+        //ToastUtils.setStyle(new WhiteToastStyle());
+        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+
     }
-    
+
 }

aes/src/main/java/cc/winboll/studio/aes/WinBollActivity.java

@@ -6,6 +6,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import android.view.MenuItem;
 
 /**
  * @Author ZhanGSKen@AliYun.Com
@@ -47,4 +48,13 @@ public class WinBollActivity extends AppCompatActivity implements IWinBollActivi
         //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
         setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if(item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }

libaes/build.gradle

@@ -51,6 +51,6 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
     
-    api 'cc.winboll.studio:libappbase:15.2.0'
+    api 'cc.winboll.studio:libapputils:15.2.1'
-    api 'cc.winboll.studio:libapputils:15.2.0'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 31 02:04:35 HKT 2025
+#Wed Apr 02 20:08:50 HKT 2025
-stageCount=4
+stageCount=6
 libraryProject=libaes
 baseVersion=15.2
-publishVersion=15.2.3
+publishVersion=15.2.5
 buildCount=0
-baseBetaVersion=15.2.4
+baseBetaVersion=15.2.6

libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java

@@ -118,7 +118,7 @@ public class AboutView extends LinearLayout {
         } else {
             mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder();
         }
-        
+
 
         if (GlobalApplication.isDebuging()) {
             LayoutInflater inflater = LayoutInflater.from(mContext);
@@ -150,7 +150,7 @@ public class AboutView extends LinearLayout {
 
         // 初始化标题栏
         //setSubtitle(getContext().getString(R.string.text_about));
-        
+
 //        LinearLayout llMain = findViewById(R.id.viewaboutLinearLayout1);
 //        llMain.addView(createAboutPage());
 
@@ -282,6 +282,7 @@ public class AboutView extends LinearLayout {
             //intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             GlobalApplication.setIsDebuging(true);
+            GlobalApplication.saveDebugStatus();
 
             GlobalApplication.getWinBollActivityManager().finishAll();
             context.startActivity(intent);
@@ -293,6 +294,7 @@ public class AboutView extends LinearLayout {
         if (intent != null) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             GlobalApplication.setIsDebuging(false);
+            GlobalApplication.saveDebugStatus();
 
             GlobalApplication.getWinBollActivityManager().finishAll();
             context.startActivity(intent);
@@ -322,14 +324,17 @@ public class AboutView extends LinearLayout {
                             PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString());
                             PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
                         } else {
-                            credential = Credentials.basic("WinBoll", "WinBollPowerByZhanGSKen");
+                            String username = "WinBoll";
+                            String password = "WinBollPowerByZhanGSKen";
+                            credential = Credentials.basic(username, password);
                         }
-                        OkHttpClient client = new OkHttpClient();
+                        
                         Request request = new Request.Builder()
                             .url(szUrl)
                             .header("Accept", "text/plain") // 设置正确的Content-Type头
                             .header("Authorization", credential)
                             .build();
+                        OkHttpClient client = new OkHttpClient();
                         Call call = client.newCall(request);
                         call.enqueue(new Callback() {
                                 @Override

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java

@@ -252,6 +252,7 @@ public class WinBollServiceStatusView extends LinearLayout {
             username = "WinBoll";
             password = "WinBollPowerByZhanGSKen";
         }
+        
         LogUtils.d(TAG, String.format("Connection Start. targetUrl %s", targetUrl));
         WinBollServerConnectionThread thread = new WinBollServerConnectionThread(
             targetUrl,

libaes/src/main/res/drawable/toast_frame.xml

@@ -1,62 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?> 
+<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > 
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    <!-- 边框阴影部分 --> 
+    android:shape="rectangle">
-    <!-- 相对边框的Offset设置(android:left, top, right, bottom) --> 
+    <solid android:color="#BF4C4C4C" />
-    <item 
+    <!-- 定义成圆角的 -->
-        android:left="0dp" 
+    <corners android:radius="15dp" />
-        android:top="0dp" 
+</shape>
-        android:right="0dp" 
-        android:bottom="0dp"> 
-        <shape android:shape="rectangle" > 
-            <gradient 
-                android:angle="270" 
-                android:startColor="@color/colorToastShadow"
-                android:centerColor="@color/colorToastShadow"
-                android:endColor="@color/colorToastShadow"/> 
-            <corners 
-                android:bottomLeftRadius="10dip" 
-                android:bottomRightRadius="10dip" 
-                android:topLeftRadius="10dip" 
-                android:topRightRadius="10dip" /> 
-        </shape> 
-    </item>
-    <!-- 边框部分 -->
-    <item 
-        android:left="0dp" 
-        android:top="0dp" 
-        android:right="1dp" 
-        android:bottom="2dp"> 
-        <shape android:shape="rectangle" > 
-            <gradient 
-                android:angle="270" 
-                android:startColor="@color/colorToastFrame"
-                android:centerColor="@color/colorToastFrame"
-                android:endColor="@color/colorToastFrame"/> 
-            <corners 
-                android:bottomLeftRadius="10dip" 
-                android:bottomRightRadius="10dip" 
-                android:topLeftRadius="10dip" 
-                android:topRightRadius="10dip" /> 
-        </shape> 
-    </item>
-    <!-- 背景主体部分 -->
-    <item
-        android:left="2dp" 
-        android:top="2dp" 
-        android:right="3dp" 
-        android:bottom="3dp"> 
-        <shape android:shape="rectangle" > 
-            <gradient
-                android:type="linear"
-                android:angle="90"
-                android:startColor="@color/colorToastBackgroung"
-                android:centerColor="@color/colorToastBackgroung"
-                android:endColor="@color/colorToastBackgroung"/> 
-            <corners 
-                android:bottomLeftRadius="10dip" 
-                android:bottomRightRadius="10dip" 
-                android:topLeftRadius="10dip" 
-                android:topRightRadius="10dip" /> 
-        </shape> 
-    </item> 
-</layer-list>

libaes/src/main/res/layout/view_toast.xml

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