version:1.3.6

fix:
update:Android 13全屏
This commit is contained in:
2023-04-28 10:53:18 +08:00
parent 3346ffca88
commit 3e44bb0c63
3 changed files with 49 additions and 14 deletions

View File

@@ -17,8 +17,8 @@ android {
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 29 targetSdkVersion 29
versionCode 27 versionCode 28
versionName "1.3.5" versionName "1.3.6"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -50,7 +50,7 @@ android {
} }
signingConfigs { signingConfigs {
mtk12 { tuixin {
storeFile file("keystore/tuixin.jks") storeFile file("keystore/tuixin.jks")
storePassword "123456" storePassword "123456"
keyAlias "universal" keyAlias "universal"
@@ -69,29 +69,45 @@ android {
} }
buildTypes { buildTypes {
// iPlay50SEDebug.initWith(debug)
// iPlay50SEDebug {
// versionNameSuffix "-debug"
// debuggable true
// signingConfig signingConfigs.iPlay50SE
// }
//
// iPlay50SERelease.initWith(release)
// iPlay50SERelease {
// signingConfig signingConfigs.iPlay50SE
// }
iPlay50SEDebug.initWith(debug) iPlay50SEDebug.initWith(debug)
iPlay50SEDebug { iPlay50SEDebug {
versionNameSuffix "-debug" versionNameSuffix "-debug"
debuggable true debuggable true
signingConfig signingConfigs.iPlay50SE signingConfig signingConfigs.tuixin
resValue "string", "app_name", "智慧课堂"
} }
iPlay50SERelease.initWith(release) iPlay50SERelease.initWith(release)
iPlay50SERelease { iPlay50SERelease {
signingConfig signingConfigs.iPlay50SE signingConfig signingConfigs.tuixin
resValue "string", "app_name", "智慧课堂"
} }
debug { debug {
resValue "string", "app_name", "教育中心"
// 显示Log // 显示Log
versionNameSuffix "-debug" versionNameSuffix "-debug"
minifyEnabled false minifyEnabled false
//Zipalign优化 //Zipalign优化
zipAlignEnabled true zipAlignEnabled true
signingConfig signingConfigs.mtk12 signingConfig signingConfigs.tuixin
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.outputs.each { output -> variant.outputs.each { output ->
if (outputFile != null) { if (outputFile != null) {
def fileName = "${appName()}-V${defaultConfig.versionName}-${releaseTime()}.apk" def app_name = getResValues().get("app_name").value
def fileName = "${appName()}-${app_name}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk"
output.outputFileName = fileName output.outputFileName = fileName
} }
} }
@@ -99,8 +115,7 @@ android {
} }
release { release {
// 不显示Log resValue "string", "app_name", "教育中心"
buildConfigField "boolean", "LOG_DEBUG", "false"
//混淆 //混淆
minifyEnabled false minifyEnabled false
//Zipalign优化 //Zipalign优化
@@ -108,15 +123,15 @@ android {
//前一部分代表系统默认的android程序的混淆文件该文件已经包含了基本的混淆声明后一个文件是自己的定义混淆文件 //前一部分代表系统默认的android程序的混淆文件该文件已经包含了基本的混淆声明后一个文件是自己的定义混淆文件
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
//签名 //签名
signingConfig signingConfigs.mtk12 signingConfig signingConfigs.tuixin
// 将release版本的包名重命名加上版本及日期 // 将release版本的包名重命名加上版本及日期
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.outputs.each { output -> variant.outputs.each { output ->
def outputFile = "" def outputFile = ""
if (outputFile != null) { if (outputFile != null) {
def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk" def app_name = getResValues().get("app_name").value
def fileName = "${appName()}-${app_name}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk"
output.outputFileName = new File(outputFile, fileName) output.outputFileName = new File(outputFile, fileName)
} }
} }
} }

View File

@@ -110,10 +110,29 @@ public class MainActivity extends BaseActivity implements MainContact.MainView,
return R.layout.activity_main; return R.layout.activity_main;
} }
private void hideSystemUI() {
// Enables regular immersive mode.
// For "lean back" mode, remove SYSTEM_UI_FLAG_IMMERSIVE.
// Or for "sticky immersive," replace it with SYSTEM_UI_FLAG_IMMERSIVE_STICKY
View decorView = getWindow().getDecorView();
decorView.setSystemUiVisibility(
View.SYSTEM_UI_FLAG_IMMERSIVE
// Set the content to appear under the system bars so that the
// content doesn't resize when the system bars hide and show.
| View.SYSTEM_UI_FLAG_LAYOUT_STABLE
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
// | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
// Hide the nav bar and status bar
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_FULLSCREEN);
}
@Override @Override
public void initView() { public void initView() {
Log.e(TAG, "initView: "); Log.e(TAG, "initView: ");
if (Build.VERSION.SDK_INT >= 33) {
hideSystemUI();
}
ButterKnife.bind(this); ButterKnife.bind(this);
// toggleNotificationListenerService(this); // toggleNotificationListenerService(this);
mPresenter = new MainAPresenter(this); mPresenter = new MainAPresenter(this);

View File

@@ -1,5 +1,6 @@
<resources> <resources>
<string name="app_name">智慧课堂</string> <!-- <string name="app_name">教育中心</string>-->
<!-- <string name="app_name">智慧课堂</string>-->
<string name="privacy_agreement"><u>隐私协议</u></string> <string name="privacy_agreement"><u>隐私协议</u></string>
<string name="privacy_agreement_title">服务协议和隐私政策</string> <string name="privacy_agreement_title">服务协议和隐私政策</string>