diff --git a/app/build.gradle b/app/build.gradle index b07c0f4..c92c417 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,13 +9,13 @@ android { keyPassword 'zcs220807' } } - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { applicationId "com.zcshou.gogogo" minSdkVersion 27 - targetSdkVersion 29 - versionCode 177 - versionName '1.7.7' // 语义化版本 https://semver.org/lang/zh-CN/ + targetSdkVersion 30 + versionCode 178 + versionName '1.7.8' // 语义化版本 https://semver.org/lang/zh-CN/ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } ndkVersion '23.0.7599858' diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 4810878..1d226ee 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/src/main/java/com/zcshou/gogogo/HistoryActivity.java b/app/src/main/java/com/zcshou/gogogo/HistoryActivity.java index bdb976e..b581642 100644 --- a/app/src/main/java/com/zcshou/gogogo/HistoryActivity.java +++ b/app/src/main/java/com/zcshou/gogogo/HistoryActivity.java @@ -48,11 +48,14 @@ public class HistoryActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + // 临时处理,因为没有找到其他方法处理 填充 StatusBar + getWindow().setStatusBarColor(getResources().getColor(R.color.colorPrimary, this.getTheme())); + setContentView(R.layout.activity_history); ActionBar actionBar = getSupportActionBar(); if(actionBar != null) { - actionBar.setHomeButtonEnabled(true); actionBar.setDisplayHomeAsUpEnabled(true); } diff --git a/app/src/main/java/com/zcshou/gogogo/SettingsActivity.java b/app/src/main/java/com/zcshou/gogogo/SettingsActivity.java index 0385e76..9901e84 100644 --- a/app/src/main/java/com/zcshou/gogogo/SettingsActivity.java +++ b/app/src/main/java/com/zcshou/gogogo/SettingsActivity.java @@ -10,6 +10,10 @@ public class SettingsActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + // 临时处理,因为没有找到其他方法处理 填充 StatusBar + getWindow().setStatusBarColor(getResources().getColor(R.color.colorPrimary, this.getTheme())); + setContentView(R.layout.activity_settings); if (savedInstanceState == null) { @@ -22,7 +26,6 @@ public class SettingsActivity extends BaseActivity { /* 获取默认的顶部的标题栏(安卓称为 ActionBar)*/ ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { - actionBar.setDisplayShowHomeEnabled(true); actionBar.setDisplayHomeAsUpEnabled(true); } } diff --git a/app/src/main/java/com/zcshou/gogogo/WelcomeActivity.java b/app/src/main/java/com/zcshou/gogogo/WelcomeActivity.java index d77fd46..7b7c081 100644 --- a/app/src/main/java/com/zcshou/gogogo/WelcomeActivity.java +++ b/app/src/main/java/com/zcshou/gogogo/WelcomeActivity.java @@ -5,14 +5,11 @@ import android.app.AlertDialog; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.graphics.Color; import android.os.Bundle; import android.text.SpannableStringBuilder; import android.text.method.LinkMovementMethod; import android.view.Gravity; -import android.view.View; import android.view.Window; -import android.view.WindowManager; import android.widget.Button; import android.widget.CheckBox; import android.widget.TextView; @@ -44,12 +41,6 @@ public class WelcomeActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Window window = getWindow(); - window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - | View.SYSTEM_UI_FLAG_LAYOUT_STABLE); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(Color.TRANSPARENT); - // 从登录界面进入主页,按home键回桌面再进入app,重新弹出登录界面的问题 if (!isTaskRoot()) { finish(); diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7720864..425d86f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -6,6 +6,7 @@ @color/colorPrimary @color/colorAccent @style/AppTheme.Button + @android:color/transparent