Studio/APPBase
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化调试框架

Browse Source
This commit is contained in:
ZhanGSKen
2025-03-25 20:59:55 +08:00
parent 9706a39f41
commit f3ef7226d8
14 changed files with 264 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appbase/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Mon Mar 24 21:28:41 GMT 2025 #Tue Mar 25 12:59:12 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=12 buildCount=41
baseBetaVersion=15.0.11 baseBetaVersion=15.0.11

8
appbase/src/main/AndroidManifest.xml
View File

@@ -13,7 +13,6 @@
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="singleInstance"
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>
@@ -106,10 +105,9 @@
android:name="android.max_aspect" android:name="android.max_aspect"
android:value="4.0"/> android:value="4.0"/>
<activity android:name=".activities.NewActivity" <activity android:name=".activities.NewActivity"/>
android:label="NewActivity"
android:launchMode="singleInstance" <activity android:name=".activities.New2Activity"/>
android:exported="true"/>
</application> </application>

53
appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
View File

@@ -19,12 +19,15 @@ 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.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 {
public static final String TAG = "MainActivity"; public static final String TAG = "MainActivity";
@Override @Override
public Activity getActivity() { public Activity getActivity() {
return this; return this;
@@ -36,7 +39,7 @@ public class MainActivity extends Activity implements IWinBollActivity {
} }
Toolbar mToolbar; Toolbar mToolbar;
LogView mLogView; //LogView mLogView;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -49,14 +52,32 @@ public class MainActivity extends Activity implements IWinBollActivity {
CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1); CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
cbIsDebugMode.setChecked(GlobalApplication.isDebuging()); cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
mLogView = findViewById(R.id.activitymainLogView1); //mLogView = findViewById(R.id.activitymainLogView1);
if (GlobalApplication.isDebuging()) { // if (GlobalApplication.isDebuging()) {
mLogView.start(); // mLogView.start();
ToastUtils.show("LogView start."); // ToastUtils.show("LogView start.");
} // }
} }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.toolbar_main, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
onLogActivity();
return true;
}
// 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
return super.onOptionsItemSelected(item);
}
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
@@ -67,9 +88,9 @@ public class MainActivity extends Activity implements IWinBollActivity {
@Override @Override
protected void onResume() { protected void onResume() {
LogUtils.d(TAG, "onResume"); //LogUtils.d(TAG, "onResume");
super.onResume(); super.onResume();
mLogView.start(); //mLogView.start();
} }
public void onSwitchDebugMode(View view) { public void onSwitchDebugMode(View view) {
@@ -155,8 +176,20 @@ public class MainActivity extends Activity implements IWinBollActivity {
Intent intent = new Intent(this, TestDemoBindService.class); Intent intent = new Intent(this, TestDemoBindService.class);
stopService(intent); stopService(intent);
} }
public void onTestOpenNewActivity(View view) { public void onTestOpenNewActivity(View view) {
WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class); WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
} }
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);
}
} }

58
appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java Normal file
View File

@@ -0,0 +1,58 @@
package cc.winboll.studio.appbase.activities;
/**
* @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/25 11:46:40
* @Describe 测试窗口2
*/
import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import cc.winboll.studio.appbase.R;
import cc.winboll.studio.libappbase.LogView;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
public class New2Activity extends Activity implements IWinBollActivity {
public static final String TAG = "New2Activity";
//LogView mLogView;
@Override
public Activity getActivity() {
return this;
}
@Override
public String getTag() {
return TAG;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_new2);
// mLogView = findViewById(R.id.logview);
// mLogView.start();
}
@Override
protected void onResume() {
super.onResume();
//mLogView.start();
}
public void onCloseThisActivity(View view) {
WinBollActivityManager.getInstance(this).finish(this);
}
public void onCloseAllActivity(View view) {
WinBollActivityManager.getInstance(this).finishAll();
}
public void onNewActivity(View view) {
WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
}
}

31
appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
View File

@@ -1,20 +1,23 @@
package cc.winboll.studio.appbase.activities; package cc.winboll.studio.appbase.activities;
import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import cc.winboll.studio.appbase.R;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
/** /**
* @Author ZhanGSKen@AliYun.Com * @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/25 05:04:22 * @Date 2025/03/25 05:04:22
*/ */
import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import cc.winboll.studio.appbase.R;
import cc.winboll.studio.libappbase.LogView;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
public class NewActivity extends Activity implements IWinBollActivity { public class NewActivity extends Activity implements IWinBollActivity {
public static final String TAG = "NewActivity"; public static final String TAG = "NewActivity";
//LogView mLogView;
@Override @Override
public Activity getActivity() { public Activity getActivity() {
return this; return this;
@@ -29,13 +32,25 @@ public class NewActivity extends Activity implements IWinBollActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_new); setContentView(R.layout.activity_new);
// mLogView = findViewById(R.id.logview);
// mLogView.start();
}
@Override
protected void onResume() {
super.onResume();
//mLogView.start();
} }
public void onCloseThisActivity(View view) { public void onCloseThisActivity(View view) {
WinBollActivityManager.getInstance(this).finish(this); WinBollActivityManager.getInstance(this).finish(this);
} }
public void onCloseAllActivity(View view) { public void onCloseAllActivity(View view) {
WinBollActivityManager.getInstance(this).finishAll(); WinBollActivityManager.getInstance(this).finishAll();
} }
public void onNew2Activity(View view) {
WinBollActivityManager.getInstance(this).startWinBollActivity(this, New2Activity.class);
}
} }

7
appbase/src/main/res/layout/activity_main.xml
View File

@@ -198,11 +198,6 @@
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
<cc.winboll.studio.libappbase.LogView
android:layout_height="300dp"
android:layout_width="match_parent"
android:id="@+id/activitymainLogView1"/>
</LinearLayout> </LinearLayout>

9
appbase/src/main/res/layout/activity_new.xml
View File

@@ -29,6 +29,15 @@
android:text="CloseAllActivity" android:text="CloseAllActivity"
android:textAllCaps="false" android:textAllCaps="false"
android:onClick="onCloseAllActivity"/> android:onClick="onCloseAllActivity"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="New2Activity"
android:textAllCaps="false"
android:onClick="onNew2Activity"/>
</LinearLayout> </LinearLayout>

50
appbase/src/main/res/layout/activity_new2.xml Normal file
View File

@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/toolbar"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="New2Activity"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="CloseThisActivity"
android:textAllCaps="false"
android:onClick="onCloseThisActivity"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="CloseAllActivity"
android:textAllCaps="false"
android:onClick="onCloseAllActivity"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="CloseAllActivity"
android:textAllCaps="false"
android:onClick="onCloseAllActivity"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="NewActivity"
android:textAllCaps="false"
android:onClick="onNewActivity"/>
</LinearLayout>

9
appbase/src/main/res/menu/toolbar_main.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/item_log"
android:title="Log"/>
</menu>

4
libappbase/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Mon Mar 24 21:28:41 GMT 2025 #Tue Mar 25 12:59:12 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=12 buildCount=41
baseBetaVersion=15.0.11 baseBetaVersion=15.0.11

9
libappbase/src/main/AndroidManifest.xml
View File

@@ -21,8 +21,11 @@
android:label="GlobalCrashActivity" android:label="GlobalCrashActivity"
android:launchMode="standard"/> android:launchMode="standard"/>
<activity android:name=".LogActivity"/> <activity
android:theme="@android:style/Theme.Holo.Light.NoActionBar"
android:name="cc.winboll.studio.libappbase.winboll.LogActivity"
android:exported="true"/>
<service <service
android:name=".SimpleOperateSignalCenterService" android:name=".SimpleOperateSignalCenterService"
android:exported="true"> android:exported="true">
@@ -87,4 +90,4 @@
</application> </application>
</manifest> </manifest>

10
libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
View File

@@ -87,11 +87,11 @@ public class GlobalApplication extends Application {
// 初始化 Toast 框架 // 初始化 Toast 框架
ToastUtils.init(this); ToastUtils.init(this);
mWinBollActivityManager = WinBollActivityManager.getInstance(this); // mWinBollActivityManager = WinBollActivityManager.getInstance(this);
mWinBollActivityManager.setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service); // mWinBollActivityManager.setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
// 注册回调 // // 注册回调
mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(mWinBollActivityManager); // mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(mWinBollActivityManager);
registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks); // registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
} }

44
libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java Normal file
View File

@@ -0,0 +1,44 @@
package cc.winboll.studio.libappbase.winboll;
/**
* @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/25 20:34:47
* @Describe 应用日志窗口
*/
import android.app.Activity;
import android.os.Bundle;
import cc.winboll.studio.libappbase.LogView;
import cc.winboll.studio.libappbase.R;
public class LogActivity extends Activity implements IWinBollActivity {
public static final String TAG = "LogActivity";
LogView mLogView;
@Override
public Activity getActivity() {
return this;
}
@Override
public String getTag() {
return TAG;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_log);
//ToastUtils.show("LogActivity onCreate");
mLogView = findViewById(R.id.logview);
mLogView.start();
}
@Override
protected void onResume() {
super.onResume();
mLogView.start();
}
}

20
libappbase/src/main/res/layout/activity_log.xml
View File

@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent">
android:layout_height="match_parent">
<cc.winboll.studio.libappbase.LogView <cc.winboll.studio.libappbase.LogView
android:orientation="horizontal" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="0dp" android:id="@+id/logview"/>
android:layout_weight="1.0"
android:id="@+id/logview"/>
</LinearLayout> </LinearLayout>