设置版本号

aes/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.2" 
+        versionName "15.5" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 11:14:05 HKT 2025
+#Mon Apr 28 16:21:02 GMT 2025
-stageCount=7
+stageCount=0
 libraryProject=libaes
-baseVersion=15.2
+baseVersion=15.5
-publishVersion=15.2.6
+publishVersion=15.5.0
-buildCount=0
+buildCount=1
-baseBetaVersion=15.2.7
+baseBetaVersion=15.5.1

aes/src/main/java/cc/winboll/studio/aes/App.java

@@ -8,6 +8,7 @@ package cc.winboll.studio.aes;
 import android.view.Gravity;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import com.hjq.toast.ToastUtils;
+import com.hjq.toast.style.WhiteToastStyle;
 
 
 public class App extends GlobalApplication {
@@ -21,8 +22,8 @@ public class App extends GlobalApplication {
         // 初始化 Toast 框架
         ToastUtils.init(this);
         // 设置 Toast 布局样式
-        ToastUtils.setView(R.layout.view_toast);
+        //ToastUtils.setView(R.layout.view_toast);
-        //ToastUtils.setStyle(new WhiteToastStyle());
+        ToastUtils.setStyle(new WhiteToastStyle());
         ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
 
     }

appbase/build.gradle

@@ -25,7 +25,7 @@ android {
     defaultConfig {
         applicationId "cc.winboll.studio.appbase"
         minSdkVersion 24
-        targetSdkVersion 30
+        targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 13:40:44 HKT 2025
+#Mon Apr 28 21:17:52 HKT 2025
-stageCount=6
+stageCount=4
 libraryProject=libappbase
 baseVersion=15.7
-publishVersion=15.7.5
+publishVersion=15.7.3
 buildCount=0
-baseBetaVersion=15.7.6
+baseBetaVersion=15.7.4

appbase/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
 
     <application
         android:name=".App"
-        android:icon="@drawable/ic_miapp"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/MyAPPBaseTheme"
         android:resizeableActivity="true"

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,6 +22,7 @@ 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 {
 
@@ -47,7 +48,7 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
         setContentView(R.layout.activity_main);
 
         mToolbar = findViewById(R.id.toolbar);
-        setActionBar(mToolbar);
+        setSupportActionBar(mToolbar);
 
         CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
         cbIsDebugMode.setChecked(GlobalApplication.isDebuging());

appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java

@@ -8,6 +8,7 @@ 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;
@@ -16,7 +17,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 Activity implements IWinBollActivity {
+public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
 
     public static final String TAG = "WinBollActivityBase";
 

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);
-        setActionBar(mToolbar);
+        setSupportActionBar(mToolbar);
         
     }
 

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);
-        setActionBar(mToolbar);
+        setSupportActionBar(mToolbar);
         
     }
 

appbase/src/main/res/layout/activity_main.xml

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

appbase/src/main/res/layout/activity_new.xml

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

appbase/src/main/res/layout/activity_new2.xml

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

apputils/build.gradle

@@ -24,12 +24,12 @@ android {
     defaultConfig {
         applicationId "cc.winboll.studio.apputils"
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.3" 
+        versionName "15.2" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 14:07:52 HKT 2025
+#Sat Mar 29 12:14:55 HKT 2025
-stageCount=4
+stageCount=2
 libraryProject=libapputils
-baseVersion=15.3
+baseVersion=15.2
-publishVersion=15.3.3
+publishVersion=15.2.1
 buildCount=0
-baseBetaVersion=15.3.4
+baseBetaVersion=15.2.2

apputils/src/main/java/cc/winboll/studio/apputils/WinBollActivityBase.java

@@ -8,11 +8,12 @@ package cc.winboll.studio.apputils;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.PersistableBundle;
+import android.support.v7.app.AppCompatActivity;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 
-public class WinBollActivityBase extends Activity implements IWinBollActivity {
+public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
 
     public static final String TAG = "WinBollActivityBase";
 

libaes/build.gradle

@@ -45,12 +45,12 @@ dependencies {
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     // AndroidX 类库
     api 'androidx.appcompat:appcompat:1.1.0'
-    api 'com.google.android.material:material:1.4.0'
+    //api 'com.google.android.material:material:1.4.0'
     //api 'androidx.viewpager:viewpager:1.0.0'
     //api 'androidx.vectordrawable:vectordrawable:1.1.0'
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
     
-    api 'cc.winboll.studio:libapputils:15.2.2'
+    api 'cc.winboll.studio:libapputils:15.3.1'
-    api 'cc.winboll.studio:libappbase:15.2.2'
+    api 'cc.winboll.studio:libappbase:15.4.8'
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 11:13:53 HKT 2025
+#Mon Apr 28 16:21:02 GMT 2025
-stageCount=7
+stageCount=0
 libraryProject=libaes
-baseVersion=15.2
+baseVersion=15.5
-publishVersion=15.2.6
+publishVersion=15.5.0
-buildCount=0
+buildCount=1
-baseBetaVersion=15.2.7
+baseBetaVersion=15.5.1

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java

@@ -5,6 +5,7 @@ package cc.winboll.studio.libaes.winboll;
  * @Date 2025/03/28 17:41:55
  * @Describe WinBoll 服务主机连接状态视图
  */
+import cc.winboll.studio.libaes.R;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -21,7 +22,6 @@ import android.widget.TextView;
 import cc.winboll.studio.libaes.winboll.WinBollClientService;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libapputils.R;
 import cc.winboll.studio.libapputils.utils.PrefUtils;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;

libaes/src/main/res/layout/view_toast.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
-    android:background="@drawable/toast_frame"
-    android:padding="10dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:textStyle="bold"
-        android:textColor="#FFFFFFFF"/>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:src="@drawable/ic_launcher"/>
-
-        <TextView
-            android:id="@android:id/message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:textColor="#FFFFFFFF"/>
-
-    </LinearLayout>
-
-</LinearLayout>
-

libappbase/build.gradle

@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 30
+        targetSdkVersion 29
     }
     buildTypes {
         release {
@@ -22,4 +22,25 @@ 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'
 }

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 13:40:21 HKT 2025
+#Mon Apr 28 21:17:52 HKT 2025
-stageCount=6
+stageCount=4
 libraryProject=libappbase
 baseVersion=15.7
-publishVersion=15.7.5
+publishVersion=15.7.3
 buildCount=0
-baseBetaVersion=15.7.6
+baseBetaVersion=15.7.4

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java

@@ -4,19 +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.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 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;
@@ -38,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);
+        getSupportActionBar().setTitle(CrashHandler.TITTLE);
-        getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
+        getSupportActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
     }
 
     @Override

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;
@@ -15,7 +16,6 @@ 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 {

libappbase/src/main/res/layout/view_globalcrashreport.xml

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

libappbase/src/main/res/menu/toolbar_appbase.xml

@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/item_minimal"
         android:title="MINIMAL"
-        android:icon="@drawable/ic_winboll_point"/>
+        android:icon="@drawable/ic_winboll_point"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/item_about"
         android:title="ABOUT"
-        android:icon="@drawable/ic_winboll_logo"/>
+        android:icon="@drawable/ic_winboll_logo"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/item_help"
         android:title="HELP"
-        android:icon="@drawable/ic_winboll_help"/>
+        android:icon="@drawable/ic_winboll_help"
+        app:showAsAction="always"/>
 
     <item
         android:id="@+id/item_log"
         android:title="LOG"
-        android:icon="@drawable/ic_winboll_log"/>
+        android:icon="@drawable/ic_winboll_log"
+        app:showAsAction="always"/>
 </menu>

libappbase/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
+    <style name="APPBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item>
     </style>
 

libapputils/build.gradle

@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 30
+        targetSdkVersion 29
     }
     buildTypes {
         release {
@@ -21,7 +21,28 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libappbase:15.7.5'
+    // 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'
+
+    api 'cc.winboll.studio:libappbase:15.2.0'
     
     // 二维码类库
     api 'com.google.zxing:core:3.4.1'

libapputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 14:07:52 HKT 2025
+#Sat Mar 29 12:14:39 HKT 2025
-stageCount=4
+stageCount=2
 libraryProject=libapputils
-baseVersion=15.3
+baseVersion=15.2
-publishVersion=15.3.3
+publishVersion=15.2.1
 buildCount=0
-baseBetaVersion=15.3.4
+baseBetaVersion=15.2.2

libapputils/src/main/res/values-v21/styles.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
+    <style name="AppTheme" parent="@android:style/Theme.Material.Light">
 	</style>
-</resources>
+</resources>

libapputils/src/main/res/values/styles.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="UtilsTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
+    <style name="UtilsTheme" parent="APPBaseTheme">
     </style>
 </resources>