<aes>APK 15.0.6 release Publish.

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 20:00:06 HKT 2025
-stageCount=6
+#Tue Mar 25 01:14:22 HKT 2025
+stageCount=7
 libraryProject=libaes
 baseVersion=15.0
-publishVersion=15.0.5
+publishVersion=15.0.6
 buildCount=0
-baseBetaVersion=15.0.6
+baseBetaVersion=15.0.7

aes/src/main/AndroidManifest.xml

@@ -30,6 +30,8 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
+        <activity android:name=".AboutActivity"/>
+
     </application>
 
-</manifest>
+</manifest>

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

@@ -0,0 +1,57 @@
+package cc.winboll.studio.aes;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import cc.winboll.studio.libaes.winboll.APPInfo;
+import cc.winboll.studio.libaes.winboll.AboutView;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/24 23:52:29
+ * @Describe AES应用介绍窗口
+ */
+public class AboutActivity extends Activity {
+
+    Context mContext;
+    
+    public static final String TAG = "AboutActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //setContentView(R.layout.activity_about);
+        mContext = this;
+        
+        AboutView aboutView = CreateAboutView();
+        // 在 Activity 的 onCreate 或其他生命周期方法中调用
+        LinearLayout layout = new LinearLayout(this);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        // 创建布局参数（宽度和高度）
+        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        );
+        addContentView(aboutView, params);
+        
+    }
+
+    public AboutView CreateAboutView() {
+        String szBranchName = "aes";
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppName("AES");
+        appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
+        appInfo.setAppDescription("AES Description");
+        appInfo.setAppGitName("APP");
+        appInfo.setAppGitOwner("Studio");
+        appInfo.setAppGitAPPBranch(szBranchName);
+        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=AES");
+        appInfo.setAppAPKName("AES");
+        appInfo.setAppAPKFolderName("AES");
+        return new AboutView(mContext, appInfo);
+    }
+}

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

@@ -25,11 +25,8 @@ import cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity;
 import cc.winboll.studio.libaes.unittests.TestAToolbarActivity;
 import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity;
 import cc.winboll.studio.libaes.unittests.TestViewPageFragment;
-import cc.winboll.studio.libaes.winboll.APPInfo;
-import cc.winboll.studio.libaes.winboll.AboutActivityFactory;
 import cc.winboll.studio.libaes.winboll.IWinBollActivity;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
 import com.a4455jkjh.colorpicker.ColorPickerDialog;
 import java.util.ArrayList;
 
@@ -202,28 +199,13 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBollActi
             startActivity(intent);
         } 
         else if (nItemId ==  R.id.item_about) {
-            onAbout();
+            Intent intent = new Intent(this, AboutActivity.class);
+            startActivity(intent);
             return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
     
-    public void onAbout() {
-        String szBranchName = "aes";
-
-        APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo();
-        appInfo.setAppName("AES");
-        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
-        appInfo.setAppDescription("AES Description");
-        appInfo.setAppGitName("APP");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(szBranchName);
-        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=AES");
-        appInfo.setAppAPKName("AES");
-        appInfo.setAppAPKFolderName("AES");
-        AboutActivityFactory.showAboutActivity(this, appInfo);
-        //ToastUtils.show("onAbout");
-    }
+    
 }

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    
+</LinearLayout>

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 20:00:06 HKT 2025
-stageCount=6
+#Tue Mar 25 01:14:22 HKT 2025
+stageCount=7
 libraryProject=libaes
 baseVersion=15.0
-publishVersion=15.0.5
+publishVersion=15.0.6
 buildCount=0
-baseBetaVersion=15.0.6
+baseBetaVersion=15.0.7

libaes/src/main/AndroidManifest.xml

@@ -13,8 +13,6 @@
 
         <activity android:name="cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity"/>
 
-        <activity android:name="cc.winboll.studio.libaes.winboll.AboutActivity"/>
-
     </application>
 
 </manifest>

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

@@ -47,13 +47,14 @@ public class APPInfo implements Serializable {
     }
 
     public APPInfo() {
-        this.appName = "WinBoll-APP";
+        String szBranchName = "app";
+        this.appName = "APP";
         this.appIcon = R.drawable.ic_launcher;
-        this.appDescription = "WinBoll APP";
+        this.appDescription = "APP Description";
         this.appGitName = "APP";
         this.appGitOwner = "Studio";
-        this.appGitAPPBranch = "app";
-        this.appGitAPPSubProjectFolder = "app";
+        this.appGitAPPBranch = szBranchName;
+        this.appGitAPPSubProjectFolder = szBranchName;
         this.appHomePage = "https://www.winboll.cc/studio/details.php?app=APP";
         this.appAPKName = "APP";
         this.appAPKFolderName = "APP";

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

@@ -1,62 +0,0 @@
-package cc.winboll.studio.libaes.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/24 16:39:29
- * @Describe WinBoll Android 应用介绍窗口
- */
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.LinearLayout;
-import cc.winboll.studio.libaes.R;
-
-final public class AboutActivity extends Activity {
-
-    public static final String TAG = "AboutActivity";
-
-    public static final String EXTRA_APPINFO = "EXTRA_APPINFO";
-
-    APPInfo mAPPInfo;
-
-    @Override
-    public Context getApplicationContext() {
-        return this;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about);
-        Intent intent = getIntent();
-        if (intent != null) {
-            mAPPInfo = (APPInfo)intent.getSerializableExtra(EXTRA_APPINFO);
-        }
-        if (mAPPInfo == null) {
-            mAPPInfo = new APPInfo();
-        }
-
-        AboutView aboutView = new AboutView(this, mAPPInfo);
-        LinearLayout llMain = findViewById(R.id.aboutroot_ll);
-        llMain.addView(aboutView);
-
-        //ToastUtils.show(TAG);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.toolbar_winboll_shared_about, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-//        if (item.getItemId() == R.id.item_help) {
-//            WinBollActivityManager.getInstance(this).startWinBollActivity(this, AssetsHtmlActivity.class);
-//        }
-        return super.onOptionsItemSelected(item);
-    }
-}

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

@@ -1,55 +0,0 @@
-package cc.winboll.studio.libaes.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/06 08:45:23
- * @Describe 关于活动窗口的介绍窗口工厂
- */
-
-import android.content.Context;
-import android.content.Intent;
-import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libaes.winboll.AboutActivityFactory;
-
-public class AboutActivityFactory {
-
-    public static final String TAG = "AboutActivityFactory";
-
-    public static APPInfo buildDefaultAPPInfo() {
-        String szBranchName = "";
-
-        APPInfo appInfo = new APPInfo();
-        appInfo.setAppName("APP");
-        appInfo.setAppIcon(R.drawable.ic_winboll);
-        appInfo.setAppDescription("APP Description");
-        appInfo.setAppGitName("APP");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(szBranchName);
-        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP");
-        appInfo.setAppAPKName("APP");
-        appInfo.setAppAPKFolderName("APP");
-        return appInfo;
-    }
-
-    public static void showAboutActivity(Context context, APPInfo appInfo) {
-        /*String szPN = ((IWinBollActivity)context).getActivityPackageName();
-         //String szPN = context.getPackageName();
-         String szBranchName = "";
-         if (szPN != null) {
-         //String szPN = "cc.winboll.studio.apputils.beta";
-         String regex = "cc\\.winboll\\.studio\\.([^.]+)\\.*";
-         Pattern pattern = Pattern.compile(regex);
-         Matcher matcher = pattern.matcher(szPN);
-         if (matcher.find()) {
-         szBranchName = matcher.group(1);
-         }
-         }*/
-        //ToastUtils.show(szPN);
-
-        Intent intent = new Intent(context, AboutActivity.class);
-        intent.putExtra(AboutActivity.EXTRA_APPINFO, (appInfo == null) ? AboutActivityFactory.buildDefaultAPPInfo():appInfo);
-        context.startActivity(intent);
-        //WinBollActivityManager.getInstance(context).startWinBollActivity(context, intent, AboutActivity.class);
-    }
-}

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

@@ -120,6 +120,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);