From b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期三, 28 二月 2024 17:26:58 +0800
Subject: [PATCH] 1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段
---
app/build.gradle | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 4ddb9db..a6cf7dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,26 +8,29 @@
applicationId "com.application.zhangshi_app_android"
minSdk 24
targetSdk 33
- versionCode 1
- versionName "1.0"
-
+ versionCode 8
+ versionName "1.0.7"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ ndk {
+ //APP鐨刡uild.gradle璁剧疆鏀寔鐨凷O搴撴灦鏋�
+ abiFilters 'armeabi', 'armeabi-v7a', 'x86' , 'arm64-v8a', 'x86_64'
+ }
}
-// signingConfigs {
-// release {
-// storeFile file('xxx.keystore')
-// storePassword '123456'
-// keyAlias 'alias'
-// keyPassword '123456'
-// }
-// }
+ signingConfigs {
+ release {
+ storeFile file(KEY_PATH)
+ storePassword KEY_PASS
+ keyAlias ALIAS_NAME
+ keyPassword ALIAS_PASS
+ }
+ }
buildTypes {
release {
debuggable true
minifyEnabled true //鍚敤Proguard
shrinkResources true //鏄惁娓呯悊鏃犵敤璧勬簮,渚濊禆浜巑inifyEnabled
zipAlignEnabled true //鏄惁鍚敤zipAlign鍘嬬缉
-// signingConfig signingConfigs.release
+ signingConfig signingConfigs.release
// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
@@ -36,11 +39,21 @@
minifyEnabled false //涓嶅惎鐢≒roguard
shrinkResources false //鏄惁娓呯悊鏃犵敤璧勬簮,渚濊禆浜巑inifyEnabled
zipAlignEnabled false //鏄惁鍚敤zipAlign鍘嬬缉
-// signingConfig signingConfigs.release
+ signingConfig signingConfigs.release
}
}
+
+
buildFeatures{
dataBinding = true
+ viewBinding true
+ }
+ android.applicationVariants.all { variant ->
+ variant.outputs.all {
+ def createTime = new Date().format("YYYYMMdd", TimeZone.getTimeZone("GMT+08:00"))
+ def fileName = "Bendudu${createTime}.apk"
+ outputFileName = fileName
+ }
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -52,10 +65,15 @@
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+ implementation 'androidx.annotation:annotation:1.3.0'
+ implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
+ implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
+ implementation 'com.google.android.material:material:1.8.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation project(path: ':app_base')
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1