diff --git a/aes/build.properties b/aes/build.properties index f572667..840f905 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 24 12:49:28 GMT 2025 +#Mon Mar 24 16:06:29 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=15.0 publishVersion=15.0.5 -buildCount=7 +buildCount=8 baseBetaVersion=15.0.6 diff --git a/aes/src/main/AndroidManifest.xml b/aes/src/main/AndroidManifest.xml index bd314e6..2f397f0 100644 --- a/aes/src/main/AndroidManifest.xml +++ b/aes/src/main/AndroidManifest.xml @@ -30,6 +30,8 @@ android:name="android.max_aspect" android:value="4.0"/> + + - + \ No newline at end of file diff --git a/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java b/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java new file mode 100644 index 0000000..bd535d8 --- /dev/null +++ b/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java @@ -0,0 +1,64 @@ +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 + ); + +// Button button = new Button(this); +// button.setText("动态添加的按钮"); +// button.setLayoutParams(params); + // 将按钮添加到 Activity 的根布局中 + //addContentView(button, params); + + addContentView(aboutView, params); + + } + + public AboutView CreateAboutView() { + String szBranchName = "aes"; + APPInfo appInfo = new APPInfo(); + 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"); + return new AboutView(mContext, appInfo); + } +} diff --git a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java index 589fc37..55f064f 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java @@ -209,21 +209,5 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBollActi 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"); - } + } diff --git a/aes/src/main/res/layout/activity_about.xml b/aes/src/main/res/layout/activity_about.xml new file mode 100644 index 0000000..6684a21 --- /dev/null +++ b/aes/src/main/res/layout/activity_about.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/libaes/build.properties b/libaes/build.properties index f572667..27b6550 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 24 12:49:28 GMT 2025 +#Mon Mar 24 15:40:14 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=15.0 publishVersion=15.0.5 -buildCount=7 +buildCount=8 baseBetaVersion=15.0.6 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java index f27c556..66a53e6 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java +++ b/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";