<appbase>APK 15.1.1 release Publish.

修复编译警告问题
设置窗口任务栏显示信息
2025-03-28 14:53:11 +08:00 · 2025-03-28 14:25:26 +08:00 · 2025-03-28 13:57:26 +08:00 · 2025-03-28 13:45:45 +08:00 · 2025-03-28 13:27:03 +08:00 · 2025-03-28 13:18:55 +08:00
17 changed files with 221 additions and 201 deletions
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 10:59:31 GMT 2025
-stageCount=1
+#Fri Mar 28 14:53:11 HKT 2025
+stageCount=2
 libraryProject=libappbase
 baseVersion=15.1
-publishVersion=15.1.0
-buildCount=130
-baseBetaVersion=15.1.1
+publishVersion=15.1.1
+buildCount=0
+baseBetaVersion=15.1.2
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -32,12 +32,15 @@

        </activity>

-        <activity android:name=".activities.NewActivity"
+        <activity
+            android:name=".activities.NewActivity"
+            android:label="NewActivity"
            android:exported="true"
            android:resizeableActivity="true"
            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>

        <activity android:name=".activities.New2Activity"
+            android:label="New2Activity"
            android:exported="true"
            android:resizeableActivity="true"
            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -1,12 +1,10 @@
 package cc.winboll.studio.appbase;

 import android.app.Activity;
-import android.app.ActivityOptions;
 import android.content.ComponentName;
 import android.content.Intent;
-import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -16,17 +14,17 @@ import cc.winboll.studio.appbase.activities.NewActivity;
 import cc.winboll.studio.appbase.services.MainService;
 import cc.winboll.studio.appbase.services.TestDemoBindService;
 import cc.winboll.studio.appbase.services.TestDemoService;
+import cc.winboll.studio.libappbase.CrashHandler;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.GlobalCrashActivity;
 import cc.winboll.studio.libappbase.LogUtils;
 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.support.v7.widget.Toolbar;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityBase;

-public class MainActivity extends AppCompatActivity implements IWinBollActivity {
+public class MainActivity extends WinBollActivityBase implements IWinBollActivity {

    public static final String TAG = "MainActivity";

@@ -72,7 +70,7 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            WinBollActivityManager.getInstance(this).startLogActivity(this);
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
            return true;
        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
            moveTaskToBack(true);
@@ -95,6 +93,12 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
        boolean isDebuging = ((CheckBox)view).isChecked();
        GlobalApplication.setIsDebuging(isDebuging);
    }
+   
+    public void onPreviewGlobalCrashActivity(View view) {
+        Intent intent = new Intent(this, GlobalCrashActivity.class);
+        intent.putExtra(CrashHandler.EXTRA_CRASH_INFO, "Demo log...");
+        startActivity(intent);
+    }

    public void onStartCenter(View view) {
        MainService.startMainService(this);
@@ -176,7 +180,7 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
    }

    public void onTestOpenNewActivity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
+        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, NewActivity.class);
    }

    
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
@@ -7,16 +7,16 @@ package cc.winboll.studio.appbase.activities;
 */
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityBase;

-public class New2Activity extends AppCompatActivity implements IWinBollActivity {
+public class New2Activity extends WinBollActivityBase implements IWinBollActivity {

    public static final String TAG = "New2Activity";

@@ -52,15 +52,15 @@ public class New2Activity extends AppCompatActivity implements IWinBollActivity
    }

    public void onCloseThisActivity(View view) {
-        WinBollActivityManager.getInstance(this).finish(this);
+        GlobalApplication.getWinBollActivityManager().finish(this);
    }

    public void onCloseAllActivity(View view) {
-        WinBollActivityManager.getInstance(this).finishAll();
+        GlobalApplication.getWinBollActivityManager().finishAll();
    }

    public void onNewActivity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
+        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, NewActivity.class);
    }
    

@@ -74,7 +74,7 @@ public class New2Activity extends AppCompatActivity implements IWinBollActivity
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            WinBollActivityManager.getInstance(this).startLogActivity(this);
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
            return true;
        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
            moveTaskToBack(true);
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
@@ -6,16 +6,16 @@ package cc.winboll.studio.appbase.activities;
 */
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityBase;

-public class NewActivity extends AppCompatActivity implements IWinBollActivity {
+public class NewActivity extends WinBollActivityBase implements IWinBollActivity {

    public static final String TAG = "NewActivity";

@@ -50,15 +50,15 @@ public class NewActivity extends AppCompatActivity implements IWinBollActivity {
    }

    public void onCloseThisActivity(View view) {
-        WinBollActivityManager.getInstance(this).finish(this);
+        GlobalApplication.getWinBollActivityManager().finish(this);
    }

    public void onCloseAllActivity(View view) {
-        WinBollActivityManager.getInstance(this).finishAll();
+        GlobalApplication.getWinBollActivityManager().finishAll();
    }

    public void onNew2Activity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, New2Activity.class);
+        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, New2Activity.class);
    }
    

@@ -72,7 +72,7 @@ public class NewActivity extends AppCompatActivity implements IWinBollActivity {
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            WinBollActivityManager.getInstance(this).startLogActivity(this);
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
            return true;
        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
            moveTaskToBack(true);
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -39,28 +39,41 @@
 					android:layout_height="wrap_content"
 					android:text="Android版本10的代号是“Q”，API级别是29。   Android 10开始谷歌不再公开使用甜品作为版本代号，但内部仍保留了大量与“Q”相关的元素。Android 10本身并没有严格对应某个特定的Java版本，但在开发Android 10应用时，通常可以使用Java 8或更高版本。   Java 8为Android开发带来了诸如Lambda表达式、方法引用等新特性，能提高开发效率和代码可读性，与Android 10开发适配良好。Java 9及更高版本也可用于Android 10开发，能使用一些新的语言特性和API，但可能需要注意兼容性和配置问题。"/>

-				<LinearLayout
-					android:orientation="horizontal"
+				<HorizontalScrollView
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:gravity="right|center_vertical">
+					android:layout_height="wrap_content">

-					<CheckBox
-						android:layout_width="wrap_content"
+					<LinearLayout
+						android:orientation="horizontal"
 						android:layout_height="wrap_content"
-						android:text="Debug Mode"
-						android:layout_weight="1.0"
-						android:onClick="onSwitchDebugMode"
-						android:id="@+id/activitymainCheckBox1"/>
+						android:gravity="right|center_vertical"
+						android:layout_width="wrap_content">

-					<Button
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:text="Test Application CrashReport"
-						android:textAllCaps="false"
-						android:onClick="onTestApplicationCrashReport"/>
+						<CheckBox
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="Debug Mode"
+							android:layout_weight="1.0"
+							android:onClick="onSwitchDebugMode"
+							android:id="@+id/activitymainCheckBox1"/>

-				</LinearLayout>
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="Test Application CrashReport"
+							android:textAllCaps="false"
+							android:onClick="onTestApplicationCrashReport"/>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="PreviewGlobalCrashActivity"
+							android:textAllCaps="false"
+							android:onClick="onPreviewGlobalCrashActivity"/>
+
+					</LinearLayout>
+
+				</HorizontalScrollView>

 				<ScrollView
 					android:layout_width="match_parent"
@@ -72,26 +85,27 @@
 						android:layout_height="wrap_content"
 						android:gravity="right">

-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content">
+						<LinearLayout
+							android:orientation="horizontal"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content">

-                            <Button
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="StartCenter"
-                                android:textAllCaps="false"
-                                android:onClick="onStartCenter"/>
+							<Button
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:text="StartCenter"
+								android:textAllCaps="false"
+								android:onClick="onStartCenter"/>
+
+							<Button
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:text="StopCenter"
+								android:textAllCaps="false"
+								android:onClick="onStopCenter"/>
+
+						</LinearLayout>

-                            <Button
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="StopCenter"
-                                android:textAllCaps="false"
-                                android:onClick="onStopCenter"/>
-                        </LinearLayout>
-                        
 						<HorizontalScrollView
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content">
@@ -160,7 +174,6 @@

 						</HorizontalScrollView>

-
 						<Button
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -181,14 +194,14 @@
 							android:text="TestDemoServiceSOS"
 							android:textAllCaps="false"
 							android:onClick="onTestDemoServiceSOS"/>
-                        
-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="TestOpenNewActivity"
-                            android:textAllCaps="false"
-                            android:onClick="onTestOpenNewActivity"/>
-                        
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="TestOpenNewActivity"
+							android:textAllCaps="false"
+							android:onClick="onTestOpenNewActivity"/>
+
 					</LinearLayout>

 				</ScrollView>
@@ -198,6 +211,6 @@
 		</LinearLayout>

 	</ScrollView>
-    
+
 </LinearLayout>

--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -24,7 +24,10 @@ dependencies {
    api fileTree(dir: 'libs', include: ['*.jar'])
    
    // Android 类库
-    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
+    //api 'com.android.support:appcompat-v7:28.0.0'
+    api('com.android.support:appcompat-v7:28.0.0'){
+        exclude group: "com.android.support", module: "support-vector-drawable"
+    }
    // https://mvnrepository.com/artifact/com.android.support/support-compat
    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
    // https://mvnrepository.com/artifact/com.android.support/support-v4
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 10:59:31 GMT 2025
-stageCount=1
+#Fri Mar 28 14:53:11 HKT 2025
+stageCount=2
 libraryProject=libappbase
 baseVersion=15.1
-publishVersion=15.1.0
-buildCount=130
-baseBetaVersion=15.1.1
+publishVersion=15.1.1
+buildCount=0
+baseBetaVersion=15.1.2
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -9,12 +9,16 @@
    <!-- 发送持久广播 -->
    <uses-permission android:name="android.permission.BROADCAST_STICKY"/>

+    <!-- 对正在运行的应用重新排序 -->
+    <uses-permission android:name="android.permission.REORDER_TASKS"/>
+
    <application>

        <activity
            android:name=".CrashHandler$CrashActivity"
            android:label="CrashActivity"
-            android:launchMode="standard"/>
+            android:launchMode="singleInstance"
+            android:process=":CrashActivity"/>

        <activity
            android:name=".GlobalCrashActivity"
@@ -23,7 +27,8 @@
            android:process=":GlobalCrashActivity"/>

        <activity
-            android:name="cc.winboll.studio.libappbase.winboll.LogActivity"
+            android:name=".winboll.LogActivity"
+            android:label="LogActivity"
            android:resizeableActivity="true"
            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
            android:exported="true"
@@ -42,7 +47,8 @@
            android:name=".services.TestService"
            android:exported="true"/>

-        <receiver android:name=".receiver.MyBroadcastReceiver"
+        <receiver
+            android:name=".receiver.MyBroadcastReceiver"
            android:exported="true">

            <intent-filter>
@@ -85,7 +91,8 @@

        <service android:name="cc.winboll.studio.libappbase.sos.SOSCenter"/>

-        <receiver android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"
+        <receiver
+            android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"
            android:exported="true">

            <intent-filter>
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
@@ -339,6 +339,7 @@ public final class CrashHandler {
                    int padding = dp2px(16);
                    message.setPadding(padding, padding, padding, padding);
                    message.setText(mLog);
+                    message.setTextColor(Color.BLACK);
                    message.setTextIsSelectable(true);
                }
                hw.addView(message);
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
@@ -19,11 +19,6 @@ public class GlobalApplication extends Application {

    public static final String TAG = "GlobalApplication";

-    final static String PREFS = GlobalApplication.class.getName() + "PREFS";
-    final static String PREFS_ISDEBUGING = "PREFS_ISDEBUGING";
-
-    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
-
    volatile static GlobalApplication _GlobalApplication;
    // 是否处于调试状态
    volatile static boolean isDebuging = false;
@@ -33,14 +28,6 @@ public class GlobalApplication extends Application {
        if (_GlobalApplication != null) {
            GlobalApplication.isDebuging = isDebuging;
            APPBaseModel.saveBeanToFile(getAPPBaseModelFilePath(), new APPBaseModel(isDebuging));
-            // 获取SharedPreferences实例
-//        SharedPreferences sharedPreferences = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
-//        // 获取编辑器
-//        SharedPreferences.Editor editor = sharedPreferences.edit();
-//        // 保存数据
-//        editor.putBoolean(PREFS_ISDEBUGING, GlobalApplication.isDebuging);
-//        // 提交更改
-//        editor.apply();
        }
    }

@@ -56,57 +43,38 @@ public class GlobalApplication extends Application {
        return isDebuging;
    }

-    @Override
-    public Context getApplicationContext() {
-        return super.getApplicationContext();
-    }
-
-    public Application getApplication() {
-        return this;
+    public static WinBollActivityManager getWinBollActivityManager() {
+        return WinBollActivityManager.getInstance(_GlobalApplication);
    }

    @Override
    public void onCreate() {
        super.onCreate();
+        // 保存初始实例
+        _GlobalApplication = this;
+        
+        setIsDebuging(true);
+        // 添加日志模块
+        LogUtils.init(this);
+        //LogUtils.setLogLevel(LogUtils.LOG_LEVEL.Debug);
+        //LogUtils.setTAGListEnable(GlobalApplication.TAG, true);
+        //LogUtils.setALlTAGListEnable(true);
+        //LogUtils.d(TAG, "LogUtils init");
+        // 设置应用异常处理窗口
+        CrashHandler.init(this);
+        // 初始化 Toast 框架
+        ToastUtils.init(this);

-        // _GlobalApplication 取值调试部分
-        //
-        boolean is_GlobalApplicationNull = false;
-        if (_GlobalApplication == null) {
-            is_GlobalApplicationNull = true;
-            _GlobalApplication = this;
-        } else {
-            is_GlobalApplicationNull = false;
-            _GlobalApplication = this;
-        }
-
-        // 设置应用调试标志
+        // 应用保存的调试标志
        APPBaseModel appBaseModel = APPBaseModel.loadBeanFromFile(getAPPBaseModelFilePath(), APPBaseModel.class);
        if (appBaseModel == null) {
            setIsDebuging(false);
        } else {
            setIsDebuging(appBaseModel.isDebuging());
        }
-
-        LogUtils.init(this);
-        //LogUtils.setLogLevel(LogUtils.LOG_LEVEL.Debug);
-        //LogUtils.setTAGListEnable(GlobalApplication.TAG, true);
-        //LogUtils.setALlTAGListEnable(true);
-        //LogUtils.d(TAG, "LogUtils init");
-
-        // 设置应用异常处理窗口
-        CrashHandler.init(this);
-
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
-
-        // _GlobalApplication 取值调试部分
-        //
-        LogUtils.d(TAG, String.format("is_GlobalApplicationNull is %s", is_GlobalApplicationNull));
-
-        WinBollActivityManager.getInstance(_GlobalApplication);
-        WinBollActivityManager.getInstance(_GlobalApplication).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
-        // 注册回调
+        
+        getWinBollActivityManager().setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
+        // 注册窗口回调监听
        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
    }
@@ -115,7 +83,6 @@ public class GlobalApplication extends Application {
    @Override
    public void onTerminate() {
        super.onTerminate();
-        _GlobalApplication = null;
        // 注销回调（非必须，但建议释放资源）
        unregisterActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
    }
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
@@ -4,26 +4,20 @@ package cc.winboll.studio.libappbase;
 * @Author ZhanGSKen@AliYun.Com
 * @Date 2025/02/11 00:14:05
 */
-import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.SpannableString;
-import android.text.style.ForegroundColorSpan;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 import cc.winboll.studio.libappbase.R;

-public final class GlobalCrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
+public final class GlobalCrashActivity extends AppCompatActivity implements MenuItem.OnMenuItemClickListener {

    private static final int MENUITEM_COPY = 0;
    private static final int MENUITEM_RESTART = 1;
@@ -45,10 +39,10 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
        setContentView(R.layout.activity_globalcrash);
        mGlobalCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1);
        mGlobalCrashReportView.setReport(mLog);
-        setActionBar(mGlobalCrashReportView.getToolbar());
+        setSupportActionBar(mGlobalCrashReportView.getToolbar());
        
-        getActionBar().setTitle(CrashHandler.TITTLE);
-        getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
+        getSupportActionBar().setTitle(CrashHandler.TITTLE);
+        getSupportActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
    }

    @Override
@@ -98,20 +92,4 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
        mGlobalCrashReportView.updateMenuStyle();
        return true;
    }
-
-    void joinQQGroup(String key) {
-        // 创建Intent
-        Intent intent = new Intent();
-        // 设置动作
-        intent.setAction("android.intent.action.VIEW");
-        // 设置数据为网址的URI
-        Uri content_url = Uri.parse("https://www.winboll.cc");
-        intent.setData(content_url);
-        // 添加标志
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        // 设置类名和活动名
-        intent.setClassName("com.android.browser", "com.android.browser.BrowserActivity");
-        // 启动Activity
-        startActivity(intent);
-    }
 }
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
@@ -8,6 +8,7 @@ package cc.winboll.studio.libappbase;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.support.v7.widget.Toolbar;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.util.AttributeSet;
@@ -16,7 +17,6 @@ import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import cc.winboll.studio.libappbase.R;
-import android.widget.Toolbar;

 public class GlobalCrashReportView extends LinearLayout {

--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java
@@ -8,24 +8,17 @@ import android.app.Activity;
 import android.app.Application;
 import android.content.Intent;
 import android.os.Bundle;
-import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity; 
+import cc.winboll.studio.libappbase.utils.ToastUtils; 

 public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { 

    public static final String TAG = "MyActivityLifecycleCallbacks";
-    
-    
+
    public String mInfo = "";

    public MyActivityLifecycleCallbacks() {
-        
-    }
-    
-    WinBollActivityManager getWinBollActivityManager() {
-        return WinBollActivityManager.getInstance(GlobalApplication.getInstance());
+
    }

    void createActivityeInfo(Activity activity) {
@@ -64,7 +57,6 @@ public class MyActivityLifecycleCallbacks implements Application.ActivityLifecyc
        //System.out.println(activity.getLocalClassName() + " was created"); 
        LogUtils.d(TAG, activity.getLocalClassName() + " was created");
        createActivityeInfo(activity);
-        getWinBollActivityManager().add((IWinBollActivity)activity);
    } 

    @Override 
@@ -102,6 +94,5 @@ public class MyActivityLifecycleCallbacks implements Application.ActivityLifecyc
    public void onActivityDestroyed(Activity activity) { 
        //System.out.println(activity.getLocalClassName() + " was destroyed");
        LogUtils.d(TAG, activity.getLocalClassName() + " was destroyed");
-        getWinBollActivityManager().registeRemove((IWinBollActivity)activity);
    } 
 }
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java
@@ -0,0 +1,53 @@
+package cc.winboll.studio.libappbase.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 13:35:28
+ * @Describe WinBoll应用窗口基类
+ */
+import android.app.Activity;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.R;
+
+public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
+
+    public static final String TAG = "WinBollActivityBase";
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    WinBollActivityManager getWinBollActivityManager() {
+        return WinBollActivityManager.getInstance(GlobalApplication.getInstance());
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWinBollActivityManager().add(this);
+    }
+
+    @Override
+    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
+        super.onPostCreate(savedInstanceState, persistentState);
+    }
+
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        getWinBollActivityManager().registeRemove(this);
+    }
+}
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
@@ -12,6 +12,7 @@ import android.app.ActivityManager;
 import android.app.TaskStackBuilder;
 import android.content.Context;
 import android.content.Intent;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.util.HashMap;
@@ -29,27 +30,25 @@ public class WinBollActivityManager {
        };

    // 应用类型标志
-    volatile static WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
+    static volatile WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;

-    Context mContext;
-    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
-    static volatile WinBollActivityManager _mWinBollActivityManager;
+    GlobalApplication mGlobalApplication;
+    static volatile WinBollActivityManager _Instance;
    static volatile Map<String, IWinBollActivity> _mapIWinBollList;
-    static volatile IWinBollActivity firstIWinBollActivity;
+    volatile IWinBollActivity mFirstIWinBollActivity;

-    public WinBollActivityManager(Context context) {
-        mContext = context;
-        LogUtils.d(TAG, "WinBollActivityManager()");
+    WinBollActivityManager(GlobalApplication application) {
+        mGlobalApplication = application;
        _mapIWinBollList = new HashMap<String, IWinBollActivity>();
    }

-    public static synchronized WinBollActivityManager getInstance(Context context) {
+    public static synchronized WinBollActivityManager getInstance(GlobalApplication application) {
        LogUtils.d(TAG, "getInstance");
-        if (_mWinBollActivityManager == null) {
-            LogUtils.d(TAG, "_mWinBollActivityManager == null");
-            _mWinBollActivityManager = new WinBollActivityManager(context);
+        if (_Instance == null) {
+            LogUtils.d(TAG, "_Instance == null");
+            _Instance = new WinBollActivityManager(application);
        }
-        return _mWinBollActivityManager;
+        return _Instance;
    }

    //
@@ -73,11 +72,12 @@ public class WinBollActivityManager {
        String tag = ((IWinBollActivity)iWinBoll).getTag();
        LogUtils.d(TAG, String.format("add(T iWinBoll) tag is %s", tag));
        if (isActive(tag)) {
-            LogUtils.d(TAG, String.format("add(...) %s is active.", iWinBoll.getTag()));
+            LogUtils.d(TAG, String.format("isActive(tag) is true, tag : %s.", tag));
        } else {
            // 设置起始活动窗口，以便最后退出时提问
-            if (firstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
-                firstIWinBollActivity = iWinBoll;
+            if (mFirstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
+                LogUtils.d(TAG, "Set firstIWinBollActivity, iWinBoll.getTag() is %s" + iWinBoll.getTag());
+                mFirstIWinBollActivity = iWinBoll;
            }

            // 添加到活动窗口列表
@@ -168,7 +168,7 @@ public class WinBollActivityManager {
    }

    public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) {
-        return firstIWinBollActivity != null && firstIWinBollActivity == iWinBollActivity;
+        return mFirstIWinBollActivity != null && mFirstIWinBollActivity == iWinBollActivity;
    }

    //
@@ -220,10 +220,10 @@ public class WinBollActivityManager {
    //
    public <T extends IWinBollActivity> void resumeActivity(Context context, T iWinBoll) {
        LogUtils.d(TAG, "resumeActivity(Context context, T iWinBoll)");
-        ActivityManager am = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
+        ActivityManager am = (ActivityManager) mGlobalApplication.getSystemService(Context.ACTIVITY_SERVICE);
        //返回启动它的根任务（home 或者 MainActivity）
-        Intent intent = new Intent(mContext, iWinBoll.getClass());
-        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mContext);
+        Intent intent = new Intent(mGlobalApplication, iWinBoll.getClass());
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mGlobalApplication);
        stackBuilder.addNextIntentWithParentStack(intent);
        stackBuilder.startActivities();
        //moveTaskToFront(YourTaskId, 0);
@@ -287,7 +287,7 @@ public class WinBollActivityManager {
                IWinBollActivity preIWinBoll = getPreIWinBoll(iWinBoll);
                iWinBoll.getActivity().finish();
                if (preIWinBoll != null) {
-                    resumeActivity(mContext, preIWinBoll);
+                    resumeActivity(mGlobalApplication, preIWinBoll);
                }
            }

--- a/libappbase/src/main/res/layout/view_globalcrashreport.xml
+++ b/libappbase/src/main/res/layout/view_globalcrashreport.xml
@@ -7,9 +7,9 @@
 	android:layout_height="match_parent"
 	android:id="@+id/viewglobalcrashreportLinearLayout1">

-	<android.widget.Toolbar
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+    <android.support.v7.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
 		android:id="@+id/viewglobalcrashreportToolbar1"/>

 	<ScrollView
Author	SHA1	Message	Date
ZhanGSKen	ae680b5b48	<appbase>APK 15.1.1 release Publish.	2025-03-28 14:53:11 +08:00
ZhanGSKen	80767ca5b5	修复编译警告问题	2025-03-28 14:25:26 +08:00
ZhanGSKen	be5ed936df	设置窗口任务栏显示信息	2025-03-28 13:57:26 +08:00
ZhanGSKen	b3075f778d	修复窗口切换问题	2025-03-28 13:45:45 +08:00
ZhanGSKen	ce05d69132	修复Support风格的应用崩溃报告窗口	2025-03-28 13:27:03 +08:00
ZhanGSKen	6a9434b194	取消窗口管理模块，修复应用崩溃调试模块。	2025-03-28 13:18:55 +08:00
ZhanGSKen	6ca7b210a6	简化配置	2025-03-28 12:17:48 +08:00