diff --git a/appbase/build.properties b/appbase/build.properties
index e7f532c..afd36e8 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 13:15:24 HKT 2025
+#Tue Apr 29 05:36:55 GMT 2025
stageCount=5
libraryProject=libappbase
baseVersion=15.7
publishVersion=15.7.4
-buildCount=0
+buildCount=2
baseBetaVersion=15.7.5
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 c99a20d..1534dfa 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -4,11 +4,11 @@ import android.app.Activity;
import android.content.ComponentName;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.CheckBox;
+import android.widget.Toolbar;
import cc.winboll.studio.appbase.R;
import cc.winboll.studio.appbase.activities.NewActivity;
import cc.winboll.studio.appbase.services.MainService;
@@ -22,7 +22,6 @@ 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.dialogs.YesNoAlertDialog;
public class MainActivity extends WinBollActivityBase implements IWinBollActivity {
@@ -48,7 +47,7 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
setContentView(R.layout.activity_main);
mToolbar = findViewById(R.id.toolbar);
- setSupportActionBar(mToolbar);
+ setActionBar(mToolbar);
CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java b/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java
index 54765d8..ba56fb3 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java
@@ -8,7 +8,6 @@ package cc.winboll.studio.appbase;
import android.app.Activity;
import android.os.Bundle;
import android.os.PersistableBundle;
-import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import cc.winboll.studio.appbase.App;
import cc.winboll.studio.appbase.R;
@@ -17,7 +16,7 @@ import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
+public class WinBollActivityBase extends Activity implements IWinBollActivity {
public static final String TAG = "WinBollActivityBase";
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
index 37f4422..5ba8702 100644
--- 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,10 +7,10 @@ package cc.winboll.studio.appbase.activities;
*/
import android.app.Activity;
import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import android.widget.Toolbar;
import cc.winboll.studio.appbase.R;
import cc.winboll.studio.appbase.WinBollActivityBase;
import cc.winboll.studio.libappbase.GlobalApplication;
@@ -41,7 +41,7 @@ public class New2Activity extends WinBollActivityBase implements IWinBollActivit
// mLogView = findViewById(R.id.logview);
// mLogView.start();
mToolbar = findViewById(R.id.toolbar);
- setSupportActionBar(mToolbar);
+ setActionBar(mToolbar);
}
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
index 907c3ad..58c3cb0 100644
--- 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,10 +6,10 @@ package cc.winboll.studio.appbase.activities;
*/
import android.app.Activity;
import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import android.widget.Toolbar;
import cc.winboll.studio.appbase.R;
import cc.winboll.studio.appbase.WinBollActivityBase;
import cc.winboll.studio.libappbase.GlobalApplication;
@@ -39,7 +39,7 @@ public class NewActivity extends WinBollActivityBase implements IWinBollActivity
// mLogView = findViewById(R.id.logview);
// mLogView.start();
mToolbar = findViewById(R.id.toolbar);
- setSupportActionBar(mToolbar);
+ setActionBar(mToolbar);
}
diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml
index 193d0cc..17813d2 100644
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
diff --git a/appbase/src/main/res/layout/activity_new.xml b/appbase/src/main/res/layout/activity_new.xml
index 0917de8..b3dd223 100644
--- a/appbase/src/main/res/layout/activity_new.xml
+++ b/appbase/src/main/res/layout/activity_new.xml
@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
diff --git a/appbase/src/main/res/layout/activity_new2.xml b/appbase/src/main/res/layout/activity_new2.xml
index 38b5906..697e613 100644
--- a/appbase/src/main/res/layout/activity_new2.xml
+++ b/appbase/src/main/res/layout/activity_new2.xml
@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
diff --git a/libappbase/build.gradle b/libappbase/build.gradle
index 62dc4d5..39bd64b 100644
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -22,25 +22,4 @@ android {
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
-
- // Android 类库
- //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"
- exclude group: "com.android.support:animated-vector-drawable:28.0.0"
- }
- // 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
- api 'com.android.support:support-v4:28.0.0'
- // https://mvnrepository.com/artifact/com.android.support/support-media-compat
- api 'com.android.support:support-media-compat:28.0.0'
- // https://mvnrepository.com/artifact/com.android.support/support-core-utils
- api 'com.android.support:support-core-utils:28.0.0'
- // https://mvnrepository.com/artifact/com.android.support/support-core-ui
- api 'com.android.support:support-core-ui:28.0.0'
- // https://mvnrepository.com/artifact/com.android.support/support-fragment
- api 'com.android.support:support-fragment:28.0.0'
- // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
- api 'com.android.support:recyclerview-v7:28.0.0'
}
diff --git a/libappbase/build.properties b/libappbase/build.properties
index c956443..afd36e8 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 13:14:59 HKT 2025
+#Tue Apr 29 05:36:55 GMT 2025
stageCount=5
libraryProject=libappbase
baseVersion=15.7
publishVersion=15.7.4
-buildCount=0
+buildCount=2
baseBetaVersion=15.7.5
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
index dbf8c8a..0509ac9 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
@@ -4,20 +4,19 @@ 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.net.Uri;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.Toast;
import cc.winboll.studio.libappbase.R;
-public final class GlobalCrashActivity extends AppCompatActivity implements MenuItem.OnMenuItemClickListener {
+public final class GlobalCrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
private static final int MENUITEM_COPY = 0;
private static final int MENUITEM_RESTART = 1;
@@ -39,10 +38,10 @@ public final class GlobalCrashActivity extends AppCompatActivity implements Menu
setContentView(R.layout.activity_globalcrash);
mGlobalCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1);
mGlobalCrashReportView.setReport(mLog);
- setSupportActionBar(mGlobalCrashReportView.getToolbar());
+ setActionBar(mGlobalCrashReportView.getToolbar());
- getSupportActionBar().setTitle(CrashHandler.TITTLE);
- getSupportActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
+ getActionBar().setTitle(CrashHandler.TITTLE);
+ getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
}
@Override
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
index 533e5da..5ae634f 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
@@ -8,7 +8,6 @@ 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,6 +15,7 @@ import android.view.Menu;
import android.view.MenuItem;
import android.widget.LinearLayout;
import android.widget.TextView;
+import android.widget.Toolbar;
import cc.winboll.studio.libappbase.R;
public class GlobalCrashReportView extends LinearLayout {
diff --git a/libappbase/src/main/res/layout/view_globalcrashreport.xml b/libappbase/src/main/res/layout/view_globalcrashreport.xml
index cda2c96..65c05a7 100644
--- a/libappbase/src/main/res/layout/view_globalcrashreport.xml
+++ b/libappbase/src/main/res/layout/view_globalcrashreport.xml
@@ -7,7 +7,7 @@
android:layout_height="match_parent"
android:id="@+id/viewglobalcrashreportLinearLayout1">
-
diff --git a/libappbase/src/main/res/menu/toolbar_appbase.xml b/libappbase/src/main/res/menu/toolbar_appbase.xml
index b6236e8..90e72ef 100644
--- a/libappbase/src/main/res/menu/toolbar_appbase.xml
+++ b/libappbase/src/main/res/menu/toolbar_appbase.xml
@@ -1,25 +1,20 @@
-