From 3e44bb0c634a072b35ef39ba2982cdb2cb490cfb Mon Sep 17 00:00:00 2001
From: Fanhuitong <981964879@qq.com>
Date: Fri, 28 Apr 2023 10:53:18 +0800
Subject: [PATCH] =?UTF-8?q?version:1.3.6=20fix:=20update:Android=2013?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 39 +++++++++++++------
 .../uiui/zyos/activity/main/MainActivity.java | 21 +++++++++-
 app/src/main/res/values/strings.xml           |  3 +-
 3 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5ec04f9..c2a9357 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
 
-        versionCode 27
-        versionName "1.3.5"
+        versionCode 28
+        versionName "1.3.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -50,7 +50,7 @@ android {
     }
 
     signingConfigs {
-        mtk12 {
+        tuixin {
             storeFile file("keystore/tuixin.jks")
             storePassword "123456"
             keyAlias "universal"
@@ -69,29 +69,45 @@ android {
     }
 
     buildTypes {
+//        iPlay50SEDebug.initWith(debug)
+//        iPlay50SEDebug {
+//            versionNameSuffix "-debug"
+//            debuggable true
+//            signingConfig signingConfigs.iPlay50SE
+//        }
+//
+//        iPlay50SERelease.initWith(release)
+//        iPlay50SERelease {
+//            signingConfig signingConfigs.iPlay50SE
+//        }
+
         iPlay50SEDebug.initWith(debug)
         iPlay50SEDebug {
             versionNameSuffix "-debug"
             debuggable true
-            signingConfig signingConfigs.iPlay50SE
+            signingConfig signingConfigs.tuixin
+            resValue "string", "app_name", "智慧课堂"
         }
 
         iPlay50SERelease.initWith(release)
         iPlay50SERelease {
-            signingConfig signingConfigs.iPlay50SE
+            signingConfig signingConfigs.tuixin
+            resValue "string", "app_name", "智慧课堂"
         }
 
         debug {
+            resValue "string", "app_name", "教育中心"
             // 显示Log
             versionNameSuffix "-debug"
             minifyEnabled false
             //Zipalign优化
             zipAlignEnabled true
-            signingConfig signingConfigs.mtk12
+            signingConfig signingConfigs.tuixin
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
                     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
                     }
                 }
@@ -99,8 +115,7 @@ android {
         }
 
         release {
-            // 不显示Log
-            buildConfigField "boolean", "LOG_DEBUG", "false"
+            resValue "string", "app_name", "教育中心"
             //混淆
             minifyEnabled false
             //Zipalign优化
@@ -108,15 +123,15 @@ android {
             //前一部分代表系统默认的android程序的混淆文件，该文件已经包含了基本的混淆声明，后一个文件是自己的定义混淆文件
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             //签名
-            signingConfig signingConfigs.mtk12
+            signingConfig signingConfigs.tuixin
 //            将release版本的包名重命名，加上版本及日期
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
                     def outputFile = ""
                     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)
-
                     }
                 }
             }
diff --git a/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java b/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java
index a0c2ef8..765f9a1 100644
--- a/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java
+++ b/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java
@@ -110,10 +110,29 @@ public class MainActivity extends BaseActivity implements MainContact.MainView,
         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
     public void initView() {
         Log.e(TAG, "initView: ");
-
+        if (Build.VERSION.SDK_INT >= 33) {
+            hideSystemUI();
+        }
         ButterKnife.bind(this);
 //        toggleNotificationListenerService(this);
         mPresenter = new MainAPresenter(this);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6fbdced..e5caf8d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <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_title">服务协议和隐私政策</string>