diff --git a/aes/build.properties b/aes/build.properties index b3af3e0..f572667 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 24 20:01:20 HKT 2025 +#Mon Mar 24 12:49:28 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=15.0 publishVersion=15.0.5 -buildCount=0 +buildCount=7 baseBetaVersion=15.0.6 diff --git a/libaes/build.properties b/libaes/build.properties index 05e99b9..f572667 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 24 20:00:06 HKT 2025 +#Mon Mar 24 12:49:28 GMT 2025 stageCount=6 libraryProject=libaes baseVersion=15.0 publishVersion=15.0.5 -buildCount=0 +buildCount=7 baseBetaVersion=15.0.6 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutActivity.java index c245544..fc91953 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutActivity.java @@ -12,7 +12,6 @@ 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 { @@ -22,15 +21,10 @@ final public class AboutActivity extends Activity { APPInfo mAPPInfo; - @Override - public Context getApplicationContext() { - return this; - } - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_about); + setContentView(cc.winboll.studio.libaes.R.layout.activity_about); Intent intent = getIntent(); if (intent != null) { mAPPInfo = (APPInfo)intent.getSerializableExtra(EXTRA_APPINFO); @@ -39,8 +33,8 @@ final public class AboutActivity extends Activity { mAPPInfo = new APPInfo(); } - AboutView aboutView = new AboutView(this, mAPPInfo); - LinearLayout llMain = findViewById(R.id.aboutroot_ll); + AboutView aboutView = new AboutView(AboutActivity.this, mAPPInfo); + LinearLayout llMain = findViewById(cc.winboll.studio.libaes.R.id.aboutroot_ll); llMain.addView(aboutView); //ToastUtils.show(TAG); @@ -48,7 +42,7 @@ final public class AboutActivity extends Activity { @Override public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.toolbar_winboll_shared_about, menu); + getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_winboll_shared_about, menu); return super.onCreateOptionsMenu(menu); } diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java index 77e47f1..228ff11 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java +++ b/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);