From 458fa40c400b83c2e88817d5c460649e211c55f0 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 27 Apr 2025 08:05:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=B8=BAmaven=E5=BA=93?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F=E7=9A=84=E7=B1=BB=E5=BA=93?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 6 ------ appbase/build.gradle | 21 ------------------- appbase/build.properties | 4 ++-- .../winboll/studio/appbase/MainActivity.java | 3 +-- ...ActivityBase.java => WinBoLLActivity.java} | 10 ++++++--- .../appbase/activities/New2Activity.java | 4 ++-- .../appbase/activities/NewActivity.java | 4 ++-- libappbase/build.gradle | 20 ++++++++++++++++++ libappbase/build.properties | 4 ++-- libjc/jcc/libs | 1 - winboll-x | 1 - 11 files changed, 36 insertions(+), 42 deletions(-) rename appbase/src/main/java/cc/winboll/studio/appbase/{WinBollActivityBase.java => WinBoLLActivity.java} (85%) delete mode 160000 libjc/jcc/libs delete mode 160000 winboll-x diff --git a/.gitmodules b/.gitmodules index 6828285..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +0,0 @@ -[submodule "winboll-x"] - path = winboll-x - url = https://gitea.winboll.cc/Studio/WinBollX.git -[submodule "libjc/jcc/libs"] - path = libjc/jcc/libs - url = https://gitea.winboll.cc/Studio/APP_libjc_jcc_libs.git diff --git a/appbase/build.gradle b/appbase/build.gradle index 94efd36..727c7be 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -47,25 +47,4 @@ android { dependencies { api project(':libappbase') api fileTree(dir: 'libs', include: ['*.jar']) - - // Android 类库 - //api 'com.android.support:appcompat-v7:28.0.0' - implementation('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 - implementation 'com.android.support:support-v4:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-media-compat - implementation 'com.android.support:support-media-compat:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-core-utils - implementation 'com.android.support:support-core-utils:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-core-ui - implementation 'com.android.support:support-core-ui:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-fragment - implementation 'com.android.support:support-fragment:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7 - implementation 'com.android.support:recyclerview-v7:28.0.0' } diff --git a/appbase/build.properties b/appbase/build.properties index 5374279..43f1987 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Apr 26 18:00:33 GMT 2025 +#Sun Apr 27 00:03:39 GMT 2025 stageCount=6 libraryProject=libappbase baseVersion=15.2 publishVersion=15.2.5 -buildCount=10 +buildCount=16 baseBetaVersion=15.2.6 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..e0e3776 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -22,9 +22,8 @@ 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 { +public class MainActivity extends WinBoLLActivity implements IWinBollActivity { public static final String TAG = "MainActivity"; diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java b/appbase/src/main/java/cc/winboll/studio/appbase/WinBoLLActivity.java similarity index 85% rename from appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java rename to appbase/src/main/java/cc/winboll/studio/appbase/WinBoLLActivity.java index 54765d8..8e31bc2 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/WinBoLLActivity.java @@ -10,6 +10,7 @@ import android.os.Bundle; import android.os.PersistableBundle; import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; +import android.widget.Toast; import cc.winboll.studio.appbase.App; import cc.winboll.studio.appbase.R; import cc.winboll.studio.libappbase.GlobalApplication; @@ -17,7 +18,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 WinBoLLActivity extends AppCompatActivity implements IWinBollActivity { public static final String TAG = "WinBollActivityBase"; @@ -45,14 +46,17 @@ public class WinBollActivityBase extends AppCompatActivity implements IWinBollAc public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) { super.onPostCreate(savedInstanceState, persistentState); } - + @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { GlobalApplication.getWinBollActivityManager().startLogActivity(this); return true; - } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) { + } else if (item.getItemId() == cc.winboll.studio.libappbase.R.id.item_about) { + Toast.makeText(getApplication(), "item_about", Toast.LENGTH_SHORT).show(); + return true; + } else if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) { //moveTaskToBack(true); exit(); } 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..e888412 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 @@ -12,11 +12,11 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import cc.winboll.studio.appbase.R; -import cc.winboll.studio.appbase.WinBollActivityBase; +import cc.winboll.studio.appbase.WinBoLLActivity; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; -public class New2Activity extends WinBollActivityBase implements IWinBollActivity { +public class New2Activity extends WinBoLLActivity implements IWinBollActivity { public static final String TAG = "New2Activity"; 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..0867496 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 @@ -11,11 +11,11 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import cc.winboll.studio.appbase.R; -import cc.winboll.studio.appbase.WinBollActivityBase; +import cc.winboll.studio.appbase.WinBoLLActivity; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; -public class NewActivity extends WinBollActivityBase implements IWinBollActivity { +public class NewActivity extends WinBoLLActivity implements IWinBollActivity { public static final String TAG = "NewActivity"; diff --git a/libappbase/build.gradle b/libappbase/build.gradle index b5abec6..2071132 100644 --- a/libappbase/build.gradle +++ b/libappbase/build.gradle @@ -23,4 +23,24 @@ 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 5374279..43f1987 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Apr 26 18:00:33 GMT 2025 +#Sun Apr 27 00:03:39 GMT 2025 stageCount=6 libraryProject=libappbase baseVersion=15.2 publishVersion=15.2.5 -buildCount=10 +buildCount=16 baseBetaVersion=15.2.6 diff --git a/libjc/jcc/libs b/libjc/jcc/libs deleted file mode 160000 index 645058e..0000000 --- a/libjc/jcc/libs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 645058e1e350a80eb4bfe33bd252f58f4dbe09c9 diff --git a/winboll-x b/winboll-x deleted file mode 160000 index d94d700..0000000 --- a/winboll-x +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d94d70050f92a24b407f35cbd93a8e9ed8b007d8