diff --git a/appbase/build.gradle b/appbase/build.gradle index 5a0d1d3..694a91a 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -47,4 +47,21 @@ android { dependencies { api project(':libappbase') api fileTree(dir: 'libs', include: ['*.jar']) + + // Android 类库 + api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity + // 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/appbase/build.properties b/appbase/build.properties index d0d0416..50787f7 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 06:37:55 GMT 2025 +#Wed Mar 26 07:32:40 GMT 2025 stageCount=11 libraryProject=libappbase baseVersion=15.0 publishVersion=15.0.10 -buildCount=89 +buildCount=97 baseBetaVersion=15.0.11 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 e685848..cf0133e 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -6,11 +6,11 @@ import android.content.ComponentName; import android.content.Intent; import android.graphics.Rect; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; 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; @@ -24,8 +24,9 @@ import cc.winboll.studio.libappbase.widgets.StatusWidget; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.LogActivity; import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; +import android.support.v7.widget.Toolbar; -public class MainActivity extends Activity implements IWinBollActivity { +public class MainActivity extends AppCompatActivity implements IWinBollActivity { public static final String TAG = "MainActivity"; @@ -49,7 +50,7 @@ public class MainActivity extends Activity implements IWinBollActivity { setContentView(R.layout.activity_main); mToolbar = findViewById(R.id.toolbar); - setActionBar(mToolbar); + setSupportActionBar(mToolbar); CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1); cbIsDebugMode.setChecked(GlobalApplication.isDebuging()); @@ -176,6 +177,8 @@ public class MainActivity extends Activity implements IWinBollActivity { } public void onLogActivity() { + + Intent intent = new Intent(MainActivity.this, LogActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT); // Define the bounds. diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml index 81cf153..b86b6d4 100644 --- a/appbase/src/main/res/layout/activity_main.xml +++ b/appbase/src/main/res/layout/activity_main.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/libappbase/build.gradle b/libappbase/build.gradle index 571b164..8b65344 100644 --- a/libappbase/build.gradle +++ b/libappbase/build.gradle @@ -22,11 +22,21 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - // AndroidX 类库 - api 'androidx.appcompat:appcompat:1.0.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' + + // Android 类库 + api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity + // 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 d0d0416..50787f7 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 06:37:55 GMT 2025 +#Wed Mar 26 07:32:40 GMT 2025 stageCount=11 libraryProject=libappbase baseVersion=15.0 publishVersion=15.0.10 -buildCount=89 +buildCount=97 baseBetaVersion=15.0.11 diff --git a/libappbase/src/main/res/values/styles.xml b/libappbase/src/main/res/values/styles.xml index da69f41..13f26cd 100644 --- a/libappbase/src/main/res/values/styles.xml +++ b/libappbase/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ -