From 3bd6e9023e011336da840e11a9d48bb31c7a0261 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 07 Nov 2018 09:31:59 +0800
Subject: [PATCH] [*]将电磁版本的唤醒心跳改成两秒，唤醒之后回到30一次心跳 [*]整体版本页面显示的绝对安全换成了安全 [*]自定义语音修改和优化，添加了无声的选择
---
app/build.gradle | 63 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 1aacbde..6afc232 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,36 +2,51 @@
android {
compileSdkVersion 25
- buildToolsVersion "25.0.2"
+ buildToolsVersion '26.0.2'
defaultConfig {
applicationId "com.moral.yunfushao"
- minSdkVersion 18
- targetSdkVersion 22
- versionCode 1
- versionName "1.0"
+ minSdkVersion 21
+ targetSdkVersion 25
+ versionCode 2
+ versionName "1.0.2_sp10"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ signingConfig signingConfigs.debug
}
+
signingConfigs {
- // your debug keystore
- debug {
+ key {
keyAlias 'moral'
keyPassword 'moral123456'
- storeFile file("C:\\Users\\haijiang\\Desktop\\key\\key.jks")
+ storeFile file('../pregnancy_guard_android/key.jks')
storePassword 'moral123456'
}
}
-
sourceSets {
main {
jniLibs.srcDirs = ['libs']
+ }
+ }
+ //���������������
+ //3.0������
+ android.applicationVariants.all { variant ->
+ variant.outputs.all {
+ if (buildType.name == "debug")
+ outputFileName = "Dev_yfs_v.${variant.versionName}.apk"
+ else outputFileName = "yfs_v.${variant.versionName}.apk"
}
}
buildTypes {
release {
minifyEnabled false
+ zipAlignEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ manifestPlaceholders = [app_name: "@string/app_name"]//������������
+ }
+ debug {
+ minifyEnabled false
+ manifestPlaceholders = [app_name: "@string/app_name_text"]
}
}
}
@@ -41,22 +56,22 @@
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support:appcompat-v7:25.3.1'
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- compile 'com.android.support:cardview-v7:25.3.1'
- testCompile 'junit:junit:4.12'
- compile project(':andbrickslib')
- compile project(':FastBleLib')
+ implementation 'com.android.support:appcompat-v7:25.3.1'
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ implementation 'com.android.support:cardview-v7:25.3.1'
+ testImplementation 'junit:junit:4.12'
+ implementation project(':andbrickslib')
+ implementation project(':FastBleLib')
//������������
- compile 'in.srain.cube:ultra-ptr:1.0.11'
+ implementation 'in.srain.cube:ultra-ptr:1.0.11'
//������������
- compile 'com.github.bumptech.glide:glide:3.7.0'
+ implementation 'com.github.bumptech.glide:glide:3.7.0'
//������������
- compile 'com.lzy.net:okgo:2.1.4'
- compile files('libs/BaiduLBS_Android.jar')
- compile 'pub.devrel:easypermissions:0.4.0'
- compile 'com.daimajia.numberprogressbar:library:1.4@aar'
- compile 'org.greenrobot:eventbus:3.0.0'
- compile 'com.github.lecho:hellocharts-library:1.5.8@aar'
- compile 'com.contrarywind:Android-PickerView:3.1.2'
+ implementation 'com.lzy.net:okgo:2.1.4'
+ implementation files('libs/BaiduLBS_Android.jar')
+ implementation 'pub.devrel:easypermissions:0.4.0'
+ implementation 'com.daimajia.numberprogressbar:library:1.4@aar'
+ implementation 'org.greenrobot:eventbus:3.0.0'
+ implementation 'com.github.lecho:hellocharts-library:1.5.8@aar'
+ implementation 'com.contrarywind:Android-PickerView:3.1.2'
}
--
Gitblit v1.8.0