From e234a15b428267997c903a4ed42536c5d9f14a1f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 10 十一月 2025 13:10:42 +0800
Subject: [PATCH] 2025.11.10 1. 新增巡查场景历史详情相关数据逻辑; 2. 新增工地施工阶段修改界面；
---
app/build.gradle | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 2fa6aa9..9d2515d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,18 +5,19 @@
apply plugin: 'kotlin-android-extensions' // apply plugin
apply plugin: 'kotlin-kapt'
apply plugin: 'com.jakewharton.butterknife'
-apply plugin: 'com.aliyun.ams.emas-services'
+//apply plugin: 'com.aliyun.ams.emas-services'
android {
compileSdkVersion 28
-// buildToolsVersion '28.0.3'
+ buildToolsVersion '28.0.3'
+// buildToolsVersion = '29.0.2'
defaultConfig {
// applicationId "cn.flightfeather.thirdapp"
minSdkVersion 19
targetSdkVersion 28
- versionCode 29
- versionName "1.1.14.13"
+ versionCode 33
+ versionName "1.1.14.17"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// renderscriptTargetApi 25
// renderscriptSupportModeEnabled true
@@ -35,6 +36,9 @@
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ buildFeatures {
+ dataBinding true
+ }
productFlavors {
}
sourceSets {
@@ -42,7 +46,6 @@
jniLibs.srcDirs = ['libs']
}
}
- buildToolsVersion = '29.0.2'
// Butterknife requires Java 8.
compileOptions {
@@ -59,6 +62,12 @@
doNotStrip "*/mips/*.so"
doNotStrip "*/mips64/*.so"
//...
+ }
+
+ lintOptions {
+ checkReleaseBuilds false
+ abortOnError false
+ disable 'TypographyFractions','TypographyQuotes'
}
}
@@ -79,7 +88,7 @@
//noinspection GradleCompatible
api 'com.android.support:appcompat-v7:28.0.0'
api 'com.android.support:design:28.0.0'
- api 'com.android.support:support-v4:28.0.0'
+// api 'com.android.support:support-v428.0.0'
api 'com.android.support:cardview-v7:28.0.0'
implementation 'org.greenrobot:greendao:3.3.0'
api 'com.squareup.retrofit2:retrofit:2.3.0'
@@ -137,7 +146,7 @@
api "org.jetbrains.anko:anko:$anko_version"
//鑵捐TBS鏂囦欢娴忚鏈嶅姟
- api 'com.tencent.tbs.tbssdk:sdk:43697'
+ implementation 'com.tencent.tbs:tbssdk:44213'
//鏂囦欢涓嬭浇
implementation "com.liulishuo.okdownload:okdownload:${file_download_version}"
@@ -148,6 +157,11 @@
//鍦嗗舰杩涘害鏉�
api "com.mikhaellopez:circularprogressbar:${progressbar_version}"
+
+ //閫夋嫨鍣ㄧ殑鍩虹绐椾綋
+ implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:1.5.6.20181018'
+ //鍗曢」/鏁板瓧銆佷簩涓夌骇鑱斿姩銆佹棩鏈�/鏃堕棿绛夋粴杞�夋嫨鍣�
+ implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:1.5.6.20181018'
}
repositories {
mavenCentral()
--
Gitblit v1.9.3