更换为maven库引用方式的类库依赖。
This commit is contained in:
parent
6190d728db
commit
458fa40c40
6
.gitmodules
vendored
6
.gitmodules
vendored
@ -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
|
|
@ -47,25 +47,4 @@ android {
|
|||||||
dependencies {
|
dependencies {
|
||||||
api project(':libappbase')
|
api project(':libappbase')
|
||||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
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'
|
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#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
|
stageCount=6
|
||||||
libraryProject=libappbase
|
libraryProject=libappbase
|
||||||
baseVersion=15.2
|
baseVersion=15.2
|
||||||
publishVersion=15.2.5
|
publishVersion=15.2.5
|
||||||
buildCount=10
|
buildCount=16
|
||||||
baseBetaVersion=15.2.6
|
baseBetaVersion=15.2.6
|
||||||
|
@ -22,9 +22,8 @@ import cc.winboll.studio.libappbase.sos.SOS;
|
|||||||
import cc.winboll.studio.libappbase.utils.ToastUtils;
|
import cc.winboll.studio.libappbase.utils.ToastUtils;
|
||||||
import cc.winboll.studio.libappbase.widgets.StatusWidget;
|
import cc.winboll.studio.libappbase.widgets.StatusWidget;
|
||||||
import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
|
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";
|
public static final String TAG = "MainActivity";
|
||||||
|
|
||||||
|
@ -10,6 +10,7 @@ import android.os.Bundle;
|
|||||||
import android.os.PersistableBundle;
|
import android.os.PersistableBundle;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
import android.widget.Toast;
|
||||||
import cc.winboll.studio.appbase.App;
|
import cc.winboll.studio.appbase.App;
|
||||||
import cc.winboll.studio.appbase.R;
|
import cc.winboll.studio.appbase.R;
|
||||||
import cc.winboll.studio.libappbase.GlobalApplication;
|
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.IWinBollActivity;
|
||||||
import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
|
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";
|
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) {
|
if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
|
||||||
GlobalApplication.getWinBollActivityManager().startLogActivity(this);
|
GlobalApplication.getWinBollActivityManager().startLogActivity(this);
|
||||||
return true;
|
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) {
|
} else if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
|
||||||
//moveTaskToBack(true);
|
//moveTaskToBack(true);
|
||||||
exit();
|
exit();
|
@ -12,11 +12,11 @@ import android.view.Menu;
|
|||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import cc.winboll.studio.appbase.R;
|
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.GlobalApplication;
|
||||||
import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
|
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";
|
public static final String TAG = "New2Activity";
|
||||||
|
|
||||||
|
@ -11,11 +11,11 @@ import android.view.Menu;
|
|||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import cc.winboll.studio.appbase.R;
|
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.GlobalApplication;
|
||||||
import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
|
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";
|
public static final String TAG = "NewActivity";
|
||||||
|
|
||||||
|
@ -23,4 +23,24 @@ android {
|
|||||||
dependencies {
|
dependencies {
|
||||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
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'
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#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
|
stageCount=6
|
||||||
libraryProject=libappbase
|
libraryProject=libappbase
|
||||||
baseVersion=15.2
|
baseVersion=15.2
|
||||||
publishVersion=15.2.5
|
publishVersion=15.2.5
|
||||||
buildCount=10
|
buildCount=16
|
||||||
baseBetaVersion=15.2.6
|
baseBetaVersion=15.2.6
|
||||||
|
@ -1 +0,0 @@
|
|||||||
Subproject commit 645058e1e350a80eb4bfe33bd252f58f4dbe09c9
|
|
@ -1 +0,0 @@
|
|||||||
Subproject commit d94d70050f92a24b407f35cbd93a8e9ed8b007d8
|
|
Loading…
x
Reference in New Issue
Block a user