From 979d9cff22806f213b420452ab4a68fcbaf021b6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 31 五月 2021 17:43:49 +0800
Subject: [PATCH] 1. 修复多项可能引起空指针崩溃的bug； 2. 新建子任务时默认执行人员从全体人员改为当前用户； 3. 新建子任务时默认执行时间强制固定为总任务对应的时段内，确保子任务执行时间不会超出总任务范围。
---
app/build.gradle | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index ef003ed..fc391d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,7 @@
apply plugin: 'kotlin-android-extensions' // apply plugin
apply plugin: 'kotlin-kapt'
apply plugin: 'com.jakewharton.butterknife'
+apply plugin: 'com.aliyun.ams.emas-services'
android {
compileSdkVersion 28
@@ -13,12 +14,17 @@
applicationId "cn.flightfeather.thirdapp"
minSdkVersion 19
targetSdkVersion 28
- versionCode 20
- versionName "1.1.14.02"
+ versionCode 27
+ versionName "1.1.14.10"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
renderscriptTargetApi 25
renderscriptSupportModeEnabled true
multiDexEnabled true
+
+ ndk {
+ //x5 鍏煎64浣嶆墜鏈�
+ abiFilters 'armeabi', 'armeabi-v7a', 'x86', 'mips'
+ }
}
buildTypes {
release {
@@ -45,7 +51,7 @@
}
greendao {
- schemaVersion 11
+ schemaVersion 13
daoPackage 'com.ping.greendao.gen'
targetGenDir 'src/main/java'
}
@@ -91,6 +97,9 @@
implementation 'com.amap.api:location:4.6.0'
implementation 'com.amap.api:search:6.5.0.1'
+ //recyclerViewAdapter
+ implementation "com.github.CymChad:BaseRecyclerViewAdapterHelper:${adaper_version}"
+
//lifecycle
implementation "android.arch.lifecycle:extensions:${lifecycle_version}"
@@ -115,6 +124,19 @@
//kotlin plugin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.anko:anko:$anko_version"
+
+ //鑵捐TBS鏂囦欢娴忚鏈嶅姟
+ api 'com.tencent.tbs.tbssdk:sdk:43697'
+
+ //鏂囦欢涓嬭浇
+ implementation "com.liulishuo.okdownload:okdownload:${file_download_version}"
+ implementation "com.liulishuo.okdownload:sqlite:${file_download_version}"
+ implementation "com.liulishuo.okdownload:okhttp:${file_download_version}"
+ implementation "com.liulishuo.okdownload:ktx:${file_download_version}"
+ implementation "com.liulishuo.okdownload:filedownloader:${file_download_version}"
+
+ //鍦嗗舰杩涘害鏉�
+ implementation "com.mikhaellopez:circularprogressbar:${progressbar_version}"
}
repositories {
mavenCentral()
--
Gitblit v1.9.3