合并 AES 项目

aes/build.gradle

@@ -38,6 +38,11 @@ android {
             versionName = genVersionName("${versionName}")
         }
     }
+
+    packagingOptions {
+        exclude 'META-INF/NOTICE.md'
+        exclude 'META-INF/LICENSE.md'
+    }
 	
 }
 

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Jul 11 20:07:14 HKT 2026
+#Fri Jul 17 10:37:08 HKT 2026
 stageCount=19
 libraryProject=libaes
 baseVersion=15.20
 publishVersion=15.20.18
-buildCount=0
+buildCount=9
 baseBetaVersion=15.20.19

aes/src/main/AndroidManifest.xml

@@ -40,6 +40,8 @@
 
         <activity android:name=".AboutActivity"/>
 
+        <activity android:name=".SMTPSettingsActivity" android:exported="true"/>
+
     </application>
 
 </manifest>

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

@@ -183,6 +183,8 @@ public class MainActivity extends DrawerFragmentActivity {
         } else if (nItemId ==  R.id.item_settings) {
             Intent intent = new Intent(this, SettingsActivity.class);
             startActivity(intent);
+        } else if (nItemId == R.id.item_smtp_settings) {
+            WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, SMTPSettingsActivity.class);
         } else if (nItemId ==  R.id.item_about) {
 //            Intent intent = new Intent(this, AboutActivity.class);
 //            startActivity(intent);

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

@@ -0,0 +1,51 @@
+package cc.winboll.studio.aes;
+
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/07/16
+ * @Describe SMTP邮件设置窗口，使用SMTPConfigView控件进行配置操作
+ */
+public class SMTPSettingsActivity extends BaseWinBoLLActivity {
+
+    public static final String TAG = "SMTPSettingsActivity";
+
+    private Toolbar mToolbar;
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_smtp_settings);
+
+        initToolbar();
+    }
+
+    private void initToolbar() {
+        LogUtils.d(TAG, "initToolbar() 开始初始化");
+        mToolbar = findViewById(R.id.toolbar);
+        if (mToolbar == null) {
+            LogUtils.e(TAG, "initToolbar() | Toolbar未找到");
+            return;
+        }
+        setSupportActionBar(mToolbar);
+        mToolbar.setSubtitle(getTag());
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    LogUtils.d(TAG, "导航栏 点击返回按钮");
+                    finish();
+                }
+            });
+        LogUtils.d(TAG, "initToolbar() 配置完成");
+    }
+}

aes/src/main/res/layout/activity_smtp_settings.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_container_border">
+
+    <cc.winboll.studio.libaes.views.ASupportToolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/toolbar"/>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <cc.winboll.studio.libaes.views.SMTPConfigView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    </ScrollView>
+
+</LinearLayout>

aes/src/main/res/menu/toolbar_main.xml

@@ -35,6 +35,9 @@
     <item
         android:id="@+id/item_settings"
         android:title="Settings"/>
+    <item
+        android:id="@+id/item_smtp_settings"
+        android:title="SMTP设置"/>
 	<item
         android:id="@+id/item_about"
         android:title="About"/>