From 156efec976379c56de256f9a5cf36aa360d481f3 Mon Sep 17 00:00:00 2001
From: Key <mrkey.k@gmail.com>
Date: Mon, 5 Jun 2023 17:35:38 +0800
Subject: [PATCH] 修改包名，配置证书

---
 android/app/build.gradle                                                 | 36 +++++++++++++++++++++++-------------
 android/app/src/main/kotlin/com/example/wow_english/MainActivity.kt      |  6 ------
 android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt | 11 +++++++++++
 android/build.gradle                                                     |  3 ++-
 android/certificate/wow_english                                          | Bin 0 -> 2738 bytes
 android/certificate/wow_english_info.png                                 | Bin 0 -> 119330 bytes
 android/settings.gradle                                                  |  1 +
 7 files changed, 37 insertions(+), 20 deletions(-)
 delete mode 100644 android/app/src/main/kotlin/com/example/wow_english/MainActivity.kt
 create mode 100644 android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt
 create mode 100644 android/certificate/wow_english
 create mode 100644 android/certificate/wow_english_info.png

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 04b28f1..278de80 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -26,9 +26,11 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    namespace "com.example.wow_english"
-    compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    namespace "com.kouyuxingqiu.wow_english"
+    // compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 33
+    // 展示没有ndk需求
+    // ndkVersion flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -44,21 +46,30 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.wow_english"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
+        applicationId "com.kouyuxingqiu.wow_english"
+        //minSdkVersion flutter.minSdkVersion
+        //targetSdkVersion flutter.targetSdkVersion
+        minSdkVersion 23
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
+    signingConfigs {
+        release {
+            storeFile file("../certificate/wow_english")
+            storePassword "wow_english"
+            keyAlias "wow_english"
+            keyPassword "wow_english"
+        }
+    }
+
     buildTypes {
+        debug {
+            signingConfig signingConfigs.release
+        }
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
     }
 }
@@ -68,5 +79,4 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/android/app/src/main/kotlin/com/example/wow_english/MainActivity.kt b/android/app/src/main/kotlin/com/example/wow_english/MainActivity.kt
deleted file mode 100644
index b3f30ae..0000000
--- a/android/app/src/main/kotlin/com/example/wow_english/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.example.wow_english
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}
diff --git a/android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt b/android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt
new file mode 100644
index 0000000..4a5cd2d
--- /dev/null
+++ b/android/app/src/main/kotlin/com/kouyuxingqiu/wow_english/MainActivity.kt
@@ -0,0 +1,11 @@
+package com.kouyuxingqiu.wow_english
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity : FlutterActivity() {
+    // 测试有效
+    /*override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Toast.makeText(this, "onCreate", Toast.LENGTH_SHORT).show()
+    }*/
+}
diff --git a/android/build.gradle b/android/build.gradle
index f7eb7f6..70d8a25 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,11 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.8.21'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
+        // AGP版本，目前自动创建的Gradle版本是用的7.5.0
         classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
diff --git a/android/certificate/wow_english b/android/certificate/wow_english
new file mode 100644
index 0000000..bd14dc5
Binary files /dev/null and b/android/certificate/wow_english differ
diff --git a/android/certificate/wow_english_info.png b/android/certificate/wow_english_info.png
new file mode 100644
index 0000000..2e94857
Binary files /dev/null and b/android/certificate/wow_english_info.png differ
diff --git a/android/settings.gradle b/android/settings.gradle
index 44e62bc..10b1479 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,3 +1,4 @@
+rootProject.name = "WowEnglishAndroid"
 include ':app'
 
 def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
--
libgit2 0.22.2