更换为maven库引用方式的类库依赖。

2025-04-27 08:05:00 +08:00
parent 6190d728db
commit 458fa40c40
11 changed files with 36 additions and 42 deletions
--- 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
--- 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'
 }
--- 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
--- 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";

--- a/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.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";

@@ -52,6 +53,9 @@ public class WinBollActivityBase extends AppCompatActivity implements IWinBollAc
        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
            return true;
+        } 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();
--- 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";

--- 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";

--- 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'
 }
--- 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
--- a/libjc/jcc/libs
+++ b/libjc/jcc/libs
--- a/1
+++ b/1