日志分屏方案设定完成

This commit is contained in:
ZhanGSKen 2025-03-26 02:02:49 +08:00
parent f3ef7226d8
commit e89873046b
6 changed files with 25 additions and 24 deletions

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #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 stageCount=11
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.0 baseVersion=15.0
publishVersion=15.0.10 publishVersion=15.0.10
buildCount=41 buildCount=76
baseBetaVersion=15.0.11 baseBetaVersion=15.0.11

View File

@ -13,8 +13,13 @@
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:resizeableActivity="true"
android:launchMode="singleInstance"
android:taskAffinity="cc.winboll.studio.appbase.task.main"
android:configChanges="screenSize|screenLayout|orientation"
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>

View File

@ -4,6 +4,8 @@ import android.app.Activity;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.Toolbar; 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.appbase.services.TestDemoService;
import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libappbase.LogView;
import cc.winboll.studio.libappbase.sos.SOS; import cc.winboll.studio.libappbase.sos.SOS;
import cc.winboll.studio.libappbase.utils.ToastUtils; import cc.winboll.studio.libappbase.utils.ToastUtils;
import cc.winboll.studio.libappbase.widgets.StatusWidget; import cc.winboll.studio.libappbase.widgets.StatusWidget;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.LogActivity; import cc.winboll.studio.libappbase.winboll.LogActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
import android.view.Menu;
import android.view.MenuItem;
public class MainActivity extends Activity implements IWinBollActivity { public class MainActivity extends Activity implements IWinBollActivity {
@ -68,7 +67,7 @@ public class MainActivity extends Activity implements IWinBollActivity {
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { 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(); onLogActivity();
return true; return true;
} }
@ -86,13 +85,6 @@ public class MainActivity extends Activity implements IWinBollActivity {
sendBroadcast(intentAPPWidget); sendBroadcast(intentAPPWidget);
} }
@Override
protected void onResume() {
//LogUtils.d(TAG, "onResume");
super.onResume();
//mLogView.start();
}
public void onSwitchDebugMode(View view) { public void onSwitchDebugMode(View view) {
boolean isDebuging = ((CheckBox)view).isChecked(); boolean isDebuging = ((CheckBox)view).isChecked();
GlobalApplication.setIsDebuging(isDebuging); GlobalApplication.setIsDebuging(isDebuging);
@ -183,13 +175,7 @@ public class MainActivity extends Activity implements IWinBollActivity {
public void onLogActivity() { public void onLogActivity() {
Intent intent = new Intent(MainActivity.this, LogActivity.class); 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); intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
// startActivity(intent);
WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class); WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class);
} }
} }

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #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 stageCount=11
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.0 baseVersion=15.0
publishVersion=15.0.10 publishVersion=15.0.10
buildCount=41 buildCount=76
baseBetaVersion=15.0.11 baseBetaVersion=15.0.11

View File

@ -24,7 +24,13 @@
<activity <activity
android:theme="@android:style/Theme.Holo.Light.NoActionBar" android:theme="@android:style/Theme.Holo.Light.NoActionBar"
android:name="cc.winboll.studio.libappbase.winboll.LogActivity" android:name="cc.winboll.studio.libappbase.winboll.LogActivity"
android:exported="true"/> android:resizeableActivity="true"
android:launchMode="singleInstance"
android:taskAffinity="cc.winboll.studio.libappbase.task.log"
android:configChanges="screenSize|screenLayout|orientation"
android:exported="true">
</activity>
<service <service
android:name=".SimpleOperateSignalCenterService" android:name=".SimpleOperateSignalCenterService"

View File

@ -6,9 +6,12 @@ package cc.winboll.studio.libappbase.winboll;
* @Describe 应用日志窗口 * @Describe 应用日志窗口
*/ */
import android.app.Activity; import android.app.Activity;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.WindowManager;
import cc.winboll.studio.libappbase.LogView; import cc.winboll.studio.libappbase.LogView;
import cc.winboll.studio.libappbase.R; import cc.winboll.studio.libappbase.R;
import cc.winboll.studio.libappbase.utils.ToastUtils;
public class LogActivity extends Activity implements IWinBollActivity { public class LogActivity extends Activity implements IWinBollActivity {
@ -41,4 +44,5 @@ public class LogActivity extends Activity implements IWinBollActivity {
super.onResume(); super.onResume();
mLogView.start(); mLogView.start();
} }
} }