diff --git a/mymessagemanager/build.gradle b/mymessagemanager/build.gradle index 92dc90b..f7029bf 100644 --- a/mymessagemanager/build.gradle +++ b/mymessagemanager/build.gradle @@ -80,8 +80,8 @@ dependencies { api 'com.google.android.material:material:1.0.0' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libaes:15.12.12' - api 'cc.winboll.studio:libappbase:15.14.2' + api 'cc.winboll.studio:libaes:15.15.9' + api 'cc.winboll.studio:libappbase:15.15.21' // WinBoLL备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:AES:aes-v15.12.9' diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java index 27a9c2d..ce093ca 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java @@ -1,92 +1,52 @@ package cc.winboll.studio.mymessagemanager.activitys; -/** - * @Author ZhanGSKen - * @Date 2024/07/14 13:20:33 - * @Describe 应用介绍窗口 - */ -import android.app.Activity; -import android.content.Context; import android.os.Bundle; -import android.view.ViewGroup; -import android.widget.LinearLayout; +import android.view.View; +import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; import cc.winboll.studio.libaes.models.APPInfo; -import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libaes.views.AboutView; -import cc.winboll.studio.mymessagemanager.App; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.R; -public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity { +public class AboutActivity extends AppCompatActivity { public static final String TAG = "AboutActivity"; - Context mContext; - Toolbar mToolbar; - - @Override - public Activity getActivity() { - return this; - } - - @Override - public String getTag() { - return TAG; - } - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mContext = this; setContentView(R.layout.activity_about); - mToolbar = findViewById(R.id.toolbar); - setSupportActionBar(mToolbar); - mToolbar.setSubtitle(TAG); + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); + toolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); - 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); - - LinearLayout layout = findViewById(R.id.aboutviewroot_ll); - // 创建布局参数(宽度和高度) - ViewGroup.LayoutParams params = new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT - ); - layout.addView(aboutView, params); - - WinBoLLActivityManager.getInstance().add(this); + AboutView aboutView = findViewById(R.id.aboutview); + aboutView.setAPPInfo(genDefaultAppInfo()); } - @Override - protected void onDestroy() { - super.onDestroy(); - WinBoLLActivityManager.getInstance().registeRemove(this); - } - - public AboutView CreateAboutView() { - String szBranchName = "mymessagemanager"; + private APPInfo genDefaultAppInfo() { + LogUtils.d(TAG, "genDefaultAppInfo() 调用"); + String branchName = "mymessagemanager"; APPInfo appInfo = new APPInfo(); - appInfo.setAppName(getString(R.string.app_name)); - appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll); + appInfo.setAppName("MyMessageManager"); + appInfo.setAppIcon(R.drawable.ic_winboll); appInfo.setAppDescription(getString(R.string.app_description)); - appInfo.setAppGitName("APPBase"); + appInfo.setAppGitName("WinBoLL"); appInfo.setAppGitOwner("Studio"); - appInfo.setAppGitAPPBranch(szBranchName); - appInfo.setAppGitAPPSubProjectFolder(szBranchName); - appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=5&extra=page%3D1"); + appInfo.setAppGitAPPBranch(branchName); + appInfo.setAppGitAPPSubProjectFolder(branchName); + appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=MyMessageManager"); appInfo.setAppAPKName("MyMessageManager"); appInfo.setAppAPKFolderName("MyMessageManager"); - return new AboutView(mContext, appInfo); + LogUtils.d(TAG, "genDefaultAppInfo: 应用信息已生成"); + return appInfo; } } diff --git a/mymessagemanager/src/main/res/layout/activity_about.xml b/mymessagemanager/src/main/res/layout/activity_about.xml index fbe7ef7..2638726 100644 --- a/mymessagemanager/src/main/res/layout/activity_about.xml +++ b/mymessagemanager/src/main/res/layout/activity_about.xml @@ -1,21 +1,25 @@ - + - + - + - + + + + +