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 | 113 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 80 insertions(+), 33 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index fdba244..9d2515d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,32 +1,43 @@
-apply plugin: 'com.android.application'
+//apply plugin: 'com.android.application'
+apply plugin: 'com.android.library'
apply plugin: 'org.greenrobot.greendao'
apply plugin: 'kotlin-android'
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
-// buildToolsVersion '28.0.3'
+ buildToolsVersion '28.0.3'
+// buildToolsVersion = '29.0.2'
defaultConfig {
- applicationId "cn.flightfeather.thirdapp"
+// applicationId "cn.flightfeather.thirdapp"
minSdkVersion 19
targetSdkVersion 28
- versionCode 24
- versionName "1.1.14.07"
+ versionCode 33
+ versionName "1.1.14.17"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
- renderscriptTargetApi 25
- renderscriptSupportModeEnabled true
- multiDexEnabled true
+// renderscriptTargetApi 25
+// renderscriptSupportModeEnabled true
+// multiDexEnabled true
+
+ ndk {
+ //x5 鍏煎64浣嶆墜鏈�
+ abiFilters 'armeabi', 'armeabi-v7a', 'x86', 'mips'
+ }
}
buildTypes {
release {
minifyEnabled true
- shrinkResources true
- multiDexEnabled true
+// shrinkResources true
+// multiDexEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
+ }
+ buildFeatures {
+ dataBinding true
}
productFlavors {
}
@@ -35,45 +46,60 @@
jniLibs.srcDirs = ['libs']
}
}
- buildToolsVersion = '29.0.2'
// Butterknife requires Java 8.
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
+
+ packagingOptions {
+ doNotStrip "*/armeabi/*.so"
+ doNotStrip "*/armeabi-v7a/*.so"
+ doNotStrip "*/arm64-v8a/*.so"
+ doNotStrip "*/x86/*.so"
+ doNotStrip "*/x86_64/*.so"
+ doNotStrip "*/mips/*.so"
+ doNotStrip "*/mips64/*.so"
+ //...
+ }
+
+ lintOptions {
+ checkReleaseBuilds false
+ abortOnError false
+ disable 'TypographyFractions','TypographyQuotes'
+ }
}
greendao {
- schemaVersion 12
+ schemaVersion 14
daoPackage 'com.ping.greendao.gen'
targetGenDir 'src/main/java'
}
dependencies {
- implementation fileTree(include: ['*.jar'], dir: 'libs')
+ api fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
// implementation files('libs/AMap3DMap_5.6.0_AMapSearch_5.5.0_AMapLocation_3.7.0_20171218.jar')
// add library
-// implementation project(':calendarview')
- implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+ api 'com.android.support.constraint:constraint-layout:2.0.1'
//noinspection GradleCompatible
- implementation 'com.android.support:appcompat-v7:28.0.0'
- implementation 'com.android.support:design:28.0.0'
- implementation 'com.android.support:support-v4:28.0.0'
- implementation 'com.android.support:cardview-v7:28.0.0'
- implementation 'org.greenrobot:greendao:3.2.2'
- implementation 'com.squareup.retrofit2:retrofit:2.3.0'
- implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
- implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+ api 'com.android.support:appcompat-v7:28.0.0'
+ api 'com.android.support:design: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'
+ api 'com.squareup.retrofit2:converter-gson:2.3.0'
+ api 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
implementation 'de.hdodenhof:circleimageview:2.2.0'
implementation 'cn.carbswang.android:NumberPickerView:1.1.1'
implementation 'com.bm.photoview:library:1.4.1'
implementation 'com.orhanobut:dialogplus:1.11@aar'
- testImplementation 'junit:junit:4.12'
- implementation 'com.android.support:recyclerview-v7:28.0.0'
+ testApi 'junit:junit:4.13.2'
+ api 'com.android.support:recyclerview-v7:28.0.0'
implementation 'com.jakewharton:butterknife:9.0.0'
kapt 'com.jakewharton:butterknife-compiler:9.0.0'
@@ -82,15 +108,18 @@
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.2'
api 'com.github.cazaea:sweet-alert-dialog:1.0.0'
implementation 'com.github.razerdp:BasePopup:2.1.8'
- implementation 'io.reactivex.rxjava2:rxjava:2.2.6'
- implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+ api 'io.reactivex.rxjava2:rxjava:2.2.6'
+ api 'io.reactivex.rxjava2:rxandroid:2.1.1'
implementation 'com.haibin:calendarview:3.5.8'
//楂樺痉鍦板浘sdk
- implementation 'com.amap.api:3dmap:6.8.0'
- implementation 'com.amap.api:location:4.6.0'
- implementation 'com.amap.api:search:6.5.0.1'
+ api 'com.amap.api:3dmap:6.8.0'
+ api 'com.amap.api:location:4.6.0'
+ api 'com.amap.api:search:6.5.0.1'
+ //recyclerViewAdapter
+ implementation "com.github.CymChad:BaseRecyclerViewAdapterHelper:${adaper_version}"
+
//lifecycle
implementation "android.arch.lifecycle:extensions:${lifecycle_version}"
@@ -99,7 +128,7 @@
implementation project(path: ':multi-image-selector')
//eventbus
- implementation "org.greenrobot:eventbus:${event_bus}"
+ api "org.greenrobot:eventbus:${event_bus}"
//imagePicker
implementation "com.lcw.library:imagepicker:${image_picker_version}"
@@ -113,8 +142,26 @@
implementation "com.github.chrisbanes:PhotoView:2.1.4"
//kotlin plugin
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation "org.jetbrains.anko:anko:$anko_version"
+ api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+ api "org.jetbrains.anko:anko:$anko_version"
+
+ //鑵捐TBS鏂囦欢娴忚鏈嶅姟
+ implementation 'com.tencent.tbs:tbssdk:44213'
+
+ //鏂囦欢涓嬭浇
+ 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}"
+
+ //鍦嗗舰杩涘害鏉�
+ 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