应用介绍页调试

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 16:06:29 GMT 2025
+#Mon Mar 24 17:10:04 GMT 2025
 stageCount=6
 libraryProject=libaes
 baseVersion=15.0
 publishVersion=15.0.5
-buildCount=8
+buildCount=12
 baseBetaVersion=15.0.6

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

@@ -23,7 +23,7 @@ public class AboutActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about);
+        //setContentView(R.layout.activity_about);
         mContext = this;
         
         AboutView aboutView = CreateAboutView();
@@ -35,13 +35,6 @@ public class AboutActivity extends Activity {
             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);
         
     }
@@ -50,7 +43,7 @@ public class AboutActivity extends Activity {
         String szBranchName = "aes";
         APPInfo appInfo = new APPInfo();
         appInfo.setAppName("AES");
-        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
+        appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
         appInfo.setAppDescription("AES Description");
         appInfo.setAppGitName("APP");
         appInfo.setAppGitOwner("Studio");

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,7 +199,8 @@ 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;
         }
 

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 15:40:14 GMT 2025
+#Mon Mar 24 17:10:04 GMT 2025
 stageCount=6
 libraryProject=libaes
 baseVersion=15.0
 publishVersion=15.0.5
-buildCount=8
+buildCount=12
 baseBetaVersion=15.0.6

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/AboutActivity.java

@@ -1,56 +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;
-
-final public class AboutActivity extends Activity {
-
-    public static final String TAG = "AboutActivity";
-
-    public static final String EXTRA_APPINFO = "EXTRA_APPINFO";
-
-    APPInfo mAPPInfo;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(cc.winboll.studio.libaes.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(AboutActivity.this, mAPPInfo);
-        LinearLayout llMain = findViewById(cc.winboll.studio.libaes.R.id.aboutroot_ll);
-        llMain.addView(aboutView);
-
-        //ToastUtils.show(TAG);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(cc.winboll.studio.libaes.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);
-    }
-}