diff --git a/appbase/build.properties b/appbase/build.properties index bbc8b51..c2ac156 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 25 12:59:12 GMT 2025 +#Tue Mar 25 17:54:33 GMT 2025 stageCount=11 libraryProject=libappbase baseVersion=15.0 publishVersion=15.0.10 -buildCount=41 +buildCount=76 baseBetaVersion=15.0.11 diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml index 2e4b180..9f60792 100644 --- a/appbase/src/main/AndroidManifest.xml +++ b/appbase/src/main/AndroidManifest.xml @@ -13,8 +13,13 @@ + diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java index e15b13d..8624557 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -4,6 +4,8 @@ import android.app.Activity; import android.content.ComponentName; import android.content.Intent; import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.widget.CheckBox; import android.widget.Toolbar; @@ -14,15 +16,12 @@ import cc.winboll.studio.appbase.services.TestDemoBindService; import cc.winboll.studio.appbase.services.TestDemoService; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libappbase.LogView; import cc.winboll.studio.libappbase.sos.SOS; import cc.winboll.studio.libappbase.utils.ToastUtils; import cc.winboll.studio.libappbase.widgets.StatusWidget; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.LogActivity; import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; -import android.view.Menu; -import android.view.MenuItem; public class MainActivity extends Activity implements IWinBollActivity { @@ -68,15 +67,15 @@ public class MainActivity extends Activity implements IWinBollActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { - if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { + if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { onLogActivity(); return true; } // 在switch语句中处理每个ID,并在处理完后返回true,未处理的情况返回false。 return super.onOptionsItemSelected(item); } - - + + @Override protected void onDestroy() { @@ -86,13 +85,6 @@ public class MainActivity extends Activity implements IWinBollActivity { sendBroadcast(intentAPPWidget); } - @Override - protected void onResume() { - //LogUtils.d(TAG, "onResume"); - super.onResume(); - //mLogView.start(); - } - public void onSwitchDebugMode(View view) { boolean isDebuging = ((CheckBox)view).isChecked(); GlobalApplication.setIsDebuging(isDebuging); @@ -183,13 +175,7 @@ public class MainActivity extends Activity implements IWinBollActivity { public void onLogActivity() { Intent intent = new Intent(MainActivity.this, LogActivity.class); - //打开多任务窗口 flags -// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); -// intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); -// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT); -// startActivity(intent); WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class); - } } diff --git a/libappbase/build.properties b/libappbase/build.properties index bbc8b51..c2ac156 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 25 12:59:12 GMT 2025 +#Tue Mar 25 17:54:33 GMT 2025 stageCount=11 libraryProject=libappbase baseVersion=15.0 publishVersion=15.0.10 -buildCount=41 +buildCount=76 baseBetaVersion=15.0.11 diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml index d5ffb3a..b189cd6 100644 --- a/libappbase/src/main/AndroidManifest.xml +++ b/libappbase/src/main/AndroidManifest.xml @@ -24,7 +24,13 @@ + android:resizeableActivity="true" + android:launchMode="singleInstance" + android:taskAffinity="cc.winboll.studio.libappbase.task.log" + android:configChanges="screenSize|screenLayout|orientation" + android:exported="true"> + +