Merge remote-tracking branch 'origin/appbase' into apputils

This commit is contained in:
ZhanGSKen 2025-03-28 15:51:48 +08:00
commit 888e2c7a4d
7 changed files with 18 additions and 19 deletions

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Fri Mar 28 14:53:30 HKT 2025 #Fri Mar 28 15:50:23 HKT 2025
stageCount=2 stageCount=3
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.1 baseVersion=15.1
publishVersion=15.1.1 publishVersion=15.1.2
buildCount=0 buildCount=0
baseBetaVersion=15.1.2 baseBetaVersion=15.1.3

View File

@ -22,7 +22,6 @@ 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.winboll.WinBollActivityBase;
public class MainActivity extends WinBollActivityBase implements IWinBollActivity { public class MainActivity extends WinBollActivityBase implements IWinBollActivity {

View File

@ -1,18 +1,17 @@
package cc.winboll.studio.libappbase.winboll; package cc.winboll.studio.appbase;
/** /**
* @Author ZhanGSKen@AliYun.Com * @Author ZhanGSKen@AliYun.Com
* @Date 2025/03/28 13:35:28 * @Date 2025/03/28 15:34:16
* @Describe WinBoll应用窗口基类 * @Describe 应用活动窗口基类
*/ */
import android.app.Activity; import android.app.Activity;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.R; 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 AppCompatActivity implements IWinBollActivity {

View File

@ -12,9 +12,9 @@ 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.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityBase;
public class New2Activity extends WinBollActivityBase implements IWinBollActivity { public class New2Activity extends WinBollActivityBase implements IWinBollActivity {

View File

@ -11,9 +11,9 @@ 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.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
import cc.winboll.studio.libappbase.winboll.WinBollActivityBase;
public class NewActivity extends WinBollActivityBase implements IWinBollActivity { public class NewActivity extends WinBollActivityBase implements IWinBollActivity {

View File

@ -26,10 +26,11 @@ dependencies {
// Android // Android
//api 'com.android.support:appcompat-v7:28.0.0' //api 'com.android.support:appcompat-v7:28.0.0'
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", module: "support-vector-drawable"
exclude group: "com.android.support:animated-vector-drawable:28.0.0"
} }
// https://mvnrepository.com/artifact/com.android.support/support-compat // https://mvnrepository.com/artifact/com.android.support/support-compat
api 'com.android.support:support-compat:28.0.0' // //api 'com.android.support:support-compat:28.0.0' //
// https://mvnrepository.com/artifact/com.android.support/support-v4 // https://mvnrepository.com/artifact/com.android.support/support-v4
api 'com.android.support:support-v4:28.0.0' api 'com.android.support:support-v4:28.0.0'
// https://mvnrepository.com/artifact/com.android.support/support-media-compat // https://mvnrepository.com/artifact/com.android.support/support-media-compat

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Fri Mar 28 14:53:11 HKT 2025 #Fri Mar 28 15:50:14 HKT 2025
stageCount=2 stageCount=3
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.1 baseVersion=15.1
publishVersion=15.1.1 publishVersion=15.1.2
buildCount=0 buildCount=0
baseBetaVersion=15.1.2 baseBetaVersion=15.1.3