From 48c855f178121dbee34719372682b1978ea6da1c Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Thu, 28 Nov 2024 14:57:39 +0800 Subject: [PATCH] build --- .gitignore | 1 + android/app/build.gradle | 34 +++++++++++++++-- android/app/proguard-rules.pro | 3 +- android/app/src/main/AndroidManifest.xml | 2 +- android/build.gradle | 46 ++++++++++++++++------- android/key.jks | Bin 0 -> 2724 bytes 6 files changed, 67 insertions(+), 19 deletions(-) create mode 100644 android/key.jks diff --git a/.gitignore b/.gitignore index 29a3a50..9d2a5f0 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release +/android/build/ diff --git a/android/app/build.gradle b/android/app/build.gradle index f53969b..cef6b80 100644 --- a/android/app/build.gradle +++ b/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') diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index df42668..b40c911 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -18,4 +18,5 @@ -dontwarn org.linphone.core.Reason -dontwarn org.linphone.core.VideoActivationPolicy -dontwarn org.linphone.core.tools.Log --dontwarn org.linphone.core.tools.receiver.BluetoothReceiver \ No newline at end of file +-dontwarn org.linphone.core.tools.receiver.BluetoothReceiver +-dontwarn com.kaer.subutil.R$string \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f7d33aa..8b5fbe9 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ - 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") } diff --git a/android/key.jks b/android/key.jks new file mode 100644 index 0000000000000000000000000000000000000000..e59f617e3bf28a55c697a423ceca064a708f27e4 GIT binary patch literal 2724 zcma);X*d)N_r_<&j6owi*_Xm(8Drm<>{&txWoHrwMYiliW0$o_&&U`&X{?28*-3VZ zLd1|=+1D^{|Lgx=J=go`eLtM*T<3S6`+U5wgT&AgKtL)ahR%qZRt#&1J){RhfdmYl zDi}kj_#4Y2F%Z&!NRYq47zpk+&iY+Xs4x861)~Fk2pEXgZ>Wa6`^N#HN7^Bk{uyCN zaWE@o%(3al5U>B8wnj{d4}+1QgLJA;oCLw1?U-|g~NtQWOTt4}^lJsG!uvf0v*@c{+#vL)%jOxFaG%TkNA99AD z@I@q;KKIO~`r5bxvx+BQ#eZ;CFdnH^;4Mklk$<>vHqqKa&&gizY2%b`r$;MbHxt$v z5wwM-qe$w6bl9olIa3y7`L9f5ZRg$FtrND}()T}_$96w60 zdr&l@q5Cb3WE=L^kz}}kwXob{ZvPn*5(hxJ=V_%Hx?;R_W%)DFCsnK0J&wBhq#stt zJpIf%lRt&fq(Y0>I%tuasVi#|lmVCfdCM<~a%IK$Q`^eM;k^3DpLS0=v&U}DPuQm9 zEAzyofv9mwQCC!*_V>Aov5JbIm0WwMZ)}G3gII8Yeb)fQ_rl+TI_@LXQ!g41;tf{( ziDLpv6j~NpeQfzml0HLF;XnW_ZcZv|^9pZ>r2}4~GKSf#zWip1Y}DSTyo3E95~a*D zV&*V_SQ0W~WVyUic?Hb!2%OWHV9PNGhod(uhOi#QnM#6dGvbUqd%Wcyz^i;8imt$7c&CCPb zt{#iI5Oq$&4!M^UlYFbKh_IzpgGy&>ozS3+P2E>5se;WTjmhhy;)N=d_L~!Gp?<5n zL#l`KA*Ph8TnO4ISt0K5SxKqvr-6#PeElV$}oTY37R1f&&ZWfT?V6_t_F$}&g{ zIOfk1l$wA6`~OD1ARyp(^Y}*r{~Bsc&m?j4Jf<2*2V^O^WcU5v`lP>oQd=jLyG>rL2H$Gb;EeRkpS_QG zJK-OCgssZu@|H=AMwvLwivW=0x2M3PXYI;Ve$aE^U_HP|)ulMw9vyDDIakQ5Iu$p} zWa*%4zG2^VyC9u+^Y4E7iMWtgV@faHLf99y9LDKFcIC5(L!lJEh8!rUscKZ-ourNT zJFeR4f18m#OdRjs@wnXR9_`&U3l#=xG!yIDa9EJm$bA3Fq-w?K&RJuL@zc}%-P1$5e zZ`)CndB#D{iKP{dTe?|VZNf2ww#vi5lYFxZA*%u)$|r2y_IylvfN!vQ)D(N(sAboU z+NnDwp9tY$5e5~aO0Fu2ZSjeDy%mO88Y)c7!DRk7tTX|kR%oZW7i(npt|7YiJaaBf zF+AOjqUGZu+|M&EHW6-%!FfaIti|G)I>8>~K+@x?NwtR5JOYoZS758^ETQJ)Lf?fr zi)@%^VPK7BuMRu-Zc)grOJF%DmXc!iGe>?lIx@EL{tEW!t{A}ESx9^%UQ~d|zV02f zPE@G$u~b78C64A)=xXgHRP8d|KM7$?)?ft z_Jabc>v51@fga$m@!c%H5@FCDn)<$W0bR(*_T06D79#al0Mc#f>-ys6`V=|LB8gSf zPTTMvYA%k~c+v|0#&zHCtx`fL|GP%~(CC)&*xBd4=3a*mZOx_yA%S$n50@JR8}*WH zXusIn;cG>iCL-Riw^b=CN8H2baBq%4X#G(k1e1ti7qwn3iv8rffEHOq)-=TK!x)K! zuN&0Hy1sATmQdK!UVda{+7glXcnY14RpR=k~iXv;f!ayLRGCxP57BE_~QUwoz2(yg>w z{zv>q=67^r(yIq9L+@^1t8}NQXHTaU=AvG5`OFn4@PCo> EFHgDdO#lD@ literal 0 HcmV?d00001