build

.gitignore

@@ -41,3 +41,4 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+/android/build/

android/app/build.gradle

@@ -5,6 +5,10 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
 }
 
+def keystorePropertiesFile = rootProject.file("key.properties")
+def keystoreProperties = new Properties()
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
 android {
     namespace = "com.czg.cashier_reserve"
     compileSdk = flutter.compileSdkVersion
@@ -21,21 +25,39 @@ android {
     }
 
     defaultConfig {
-        applicationId = "com.czg.cashier_reserve"
+        applicationId = "com.czg.cashierReserve"
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
-        versionCode = flutter.versionCode
-        versionName = flutter.versionName
+        versionCode = 1
+        versionName = "1.0.0"
         minSdkVersion 26
         targetSdkVersion 33
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+        debug {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+
     buildTypes {
         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
         }
+        debug {
+            signingConfig signingConfigs.release
+        }
     }
 }
 
@@ -43,6 +65,12 @@ flutter {
     source = "../.."
 }
 
+configurations.all {
+    resolutionStrategy {
+        force 'androidx.core:core-ktx:1.6.0'
+    }
+}
+
 dependencies {
     implementation(name:'callmodule-release',ext:'aar')
     implementation('com.android.support:appcompat-v7:28.0.0')

android/app/proguard-rules.pro

@@ -19,3 +19,4 @@
 -dontwarn org.linphone.core.VideoActivationPolicy
 -dontwarn org.linphone.core.tools.Log
 -dontwarn org.linphone.core.tools.receiver.BluetoothReceiver
+-dontwarn com.kaer.subutil.R$string

android/app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     <uses-permission android:name="android.permission.READ_CALL_LOG" />
 
     <application
-        android:label="cashier_reserve"
+        android:label="银收客订餐"
         android:name=".CzgApplication"
         android:icon="@mipmap/ic_launcher">
         <activity

android/build.gradle

@@ -11,28 +11,46 @@ allprojects {
 
 subprojects {
     afterEvaluate { project ->
-        if (project.plugins.hasPlugin('com.android.library') || project.plugins.hasPlugin('com.android.application')) {
-            println "project: ${project.name} Namespace get: ${project.android.namespace}"
-            def packageName = project.android.namespace ?: project.android.defaultConfig.applicationId ?: project.android.sourceSets.main.manifest.srcFile.text.find(/package="([^"]*)"/) ?: project.group
-//            project.android.namespace = packageName
-//            println "Namespace set to: ${packageName} for project: ${project.name}"
-
-            // 如果包名不包含 "com.baidu"，则设置命名空间
-            if (packageName.contains('com.baidu')) {
-                println "Skipping namespace setting for project ${project.name} as the package name contains 'com.baidu' or 'isar_flutter_libs'"
-            } else {
-                project.android.namespace = packageName
-                println "Namespace set to: ${packageName} for project: ${project.name}"
+//        if (project.plugins.hasPlugin('com.android.library') || project.plugins.hasPlugin('com.android.application')) {
+//            println "project: ${project.name} Namespace get: ${project.android.namespace}"
+//            def packageName = project.android.namespace ?: project.android.defaultConfig.applicationId ?: project.android.sourceSets.main.manifest.srcFile.text.find(/package="([^"]*)"/) ?: project.group
+////            project.android.namespace = packageName
+////            println "Namespace set to: ${packageName} for project: ${project.name}"
+//
+//            // 如果包名不包含 "com.baidu"，则设置命名空间
+//            if (packageName.contains('com.baidu')) {
+//                println "Skipping namespace setting for project ${project.name} as the package name contains 'com.baidu' or 'isar_flutter_libs'"
+//            } else {
+//                project.android.namespace = packageName
+//                println "Namespace set to: ${packageName} for project: ${project.name}"
+//            }
+//        }
+        if (project.plugins.hasPlugin("com.android.application") ||
+                project.plugins.hasPlugin("com.android.library")) {
+            project.android {
+                compileSdkVersion 34
+                buildToolsVersion "34.0.0"
+            }
+        }
+        if (project.hasProperty("android")) {
+            project.android {
+                if (namespace == null) {
+                    namespace project.group
+                }
             }
         }
     }
+
+    // ============
+    project.buildDir = "${rootProject.buildDir}/${project.name}"
+//    project.evaluationDependsOn(":app")
 }
 
 rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
+//}
+//subprojects {
     project.evaluationDependsOn(":app")
 }