From 21e38bfe17d3077d7ab0e05ee065f59547536692 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 03 十二月 2024 10:33:19 +0800
Subject: [PATCH] 1.添加当前巡检状态的功能。 2.修复工单界面刷新已完成列表导致未完成列表数据被清除的bug
---
app/build.gradle | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 107 insertions(+), 6 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 450820a..023987e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,17 +3,51 @@
}
android {
+ signingConfigs {
+ debug {
+ storeFile file('../dycz.jks')
+ storePassword 'dycz@2023'
+ keyAlias 'dayu'
+ keyPassword 'dycz@2023'
+ }
+ }
namespace 'com.dayu.pipirrapp'
compileSdk 33
defaultConfig {
applicationId "com.dayu.pipirrapp"
minSdk 24
- targetSdk 33
+ targetSdk 31
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+ signingConfig signingConfigs.debug
+
+ manifestPlaceholders = [
+ JPUSH_PKGNAME : applicationId,
+ //JPush 涓婃敞鍐岀殑鍖呭悕瀵瑰簲鐨� Appkey.
+ JPUSH_APPKEY : "375adbd599ceb9977566b929",
+ //鏆傛椂濉啓榛樿鍊煎嵆鍙�.
+ JPUSH_CHANNEL : "developer-default",
+
+ //鑻ヤ笉闆嗘垚鍘傚晢閫氶亾锛屽彲鐩存帴璺宠繃浠ヤ笅閰嶇疆
+ MEIZU_APPKEY : "MZ-榄呮棌鐨凙PPKEY",
+ MEIZU_APPID : "MZ-榄呮棌鐨凙PPID",
+ XIAOMI_APPID : "MI-灏忕背鐨凙PPID",
+ XIAOMI_APPKEY : "MI-灏忕背鐨凙PPKEY",
+ OPPO_APPKEY : "OP-oppo鐨凙PPKEY",
+ OPPO_APPID : "OP-oppo鐨凙PPID",
+ OPPO_APPSECRET: "OP-oppo鐨凙PPSECRET",
+ VIVO_APPKEY : "vivo鐨凙PPKEY",
+ VIVO_APPID : "vivo鐨凙PPID",
+ HONOR_APPID : "Honor鐨凙PP ID",
+ ]
+ ndk {
+ // 璁剧疆鏀寔鐨凷O搴撴灦鏋勶紙寮�鍙戣�呭彲浠ユ牴鎹渶瑕侊紝閫夋嫨涓�涓垨澶氫釜骞冲彴鐨剆o锛�
+ abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+ }
}
buildTypes {
@@ -33,6 +67,18 @@
viewBinding {
enabled = true;
}
+ packagingOptions {
+ exclude 'META-INF/DEPENDENCIES'
+ // 濡傛灉浣犺繕閬囧埌鍏朵粬閲嶅鐨凪ETA-INF鏂囦欢锛屼篃鍙互娣诲姞绫讳技鐨勬帓闄よ鍒�
+ exclude 'META-INF/LICENSE'
+ exclude 'META-INF/LICENSE.txt'
+ exclude 'META-INF/NOTICE'
+ exclude 'META-INF/NOTICE.txt'
+ // RocketMQ鐗规湁鐨勬帓闄ら」锛堝鏋滈渶瑕侊級
+ exclude 'META-INF/INDEX.LIST'
+ exclude 'META-INF/spring.factories'
+ exclude 'META-INF/spring.handlers'
+ }
}
@@ -50,11 +96,7 @@
// implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10"
//鏉冮檺
- implementation('com.guolindev.permissionx:permissionx:1.7.1') {
- exclude group: 'androidx.core';
- exclude group: 'androidx.appcompat';
- exclude group: 'androidx.annotation';
- }
+ implementation 'com.github.getActivity:XXPermissions:18.5'
//鍒楄〃
implementation 'io.github.scwang90:refresh-layout-kernel:2.0.5'
implementation 'io.github.scwang90:refresh-header-classics:2.0.5'
@@ -79,5 +121,64 @@
//loding
implementation 'com.pnikosis:materialish-progress:1.7'
+ //瀹氫綅
+ implementation 'com.baidu.lbsyun:BaiduMapSDK_Location:9.3.7'
+
+// //鎺ㄩ�佺浉鍏�
+// // 姝ゅ浠Push 5.0.0 鐗堟湰涓轰緥锛�5.0.0 鐗堟湰寮�濮嬪彲浠ヨ嚜鍔ㄦ媺鍙� JCore 鍖咃紝鏃犻渶鍙﹀閰嶇疆
+// implementation 'cn.jiguang.sdk:jpush:5.2.2'
+// //鑻ヤ笉闆嗘垚鍘傚晢閫氶亾锛屽彲鐩存帴璺宠繃浠ヤ笅渚濊禆
+// // 鏋佸厜鍘傚晢鎻掍欢鐗堟湰涓庢帴鍏� JPush 鐗堟湰淇濇寔涓�鑷达紝涓嬪悓
+// // 鎺ュ叆鍗庝负鍘傚晢
+// implementation 'com.huawei.hms:push:6.5.0.300'
+// implementation 'cn.jiguang.sdk.plugin:huawei:5.2.2'
+// // 鎺ュ叆 FCM 鍘傚晢
+// implementation 'com.google.firebase:firebase-messaging:23.0.5'
+// implementation 'cn.jiguang.sdk.plugin:fcm:5.2.2'
+// // 鎺ュ叆榄呮棌鍘傚晢
+// implementation 'cn.jiguang.sdk.plugin:meizu:5.2.2'
+// // 鎺ュ叆 VIVO 鍘傚晢
+// implementation 'cn.jiguang.sdk.plugin:vivo:5.2.2'
+// // 鎺ュ叆灏忕背鍘傚晢
+// implementation 'cn.jiguang.sdk.plugin:xiaomi:5.2.2'
+// // 鎺ュ叆 OPPO 鍘傚晢
+// implementation 'cn.jiguang.sdk.plugin:oppo:5.2.2'
+// // JPush Android SDK v4.6.0 寮�濮嬶紝闇�瑕佸崟鐙紩鍏� oppo 鍘傚晢 aar 锛岃涓嬭浇瀹樼綉 SDK 鍖呭苟鎶� jpush-android-xxx-release/third-push/oppo/libs 涓嬬殑 aar 鏂囦欢鍗曠嫭鎷疯礉涓�浠藉埌搴旂敤 module/libs 涓�
+// implementation(name: 'com.heytap.msp-push-3.1.0', ext: 'aar')
+// //浠ヤ笅涓� OPPO 3.1.0 aar闇�瑕佷緷璧�
+// implementation 'com.google.code.gson:gson:2.6.2'
+// implementation 'commons-codec:commons-codec:1.6'
+// implementation 'androidx.annotation:annotation:1.1.0'
+// // 鎺ュ叆鑽ｈ��鍘傚晢
+// implementation 'cn.jiguang.sdk.plugin:honor:5.2.2'
+
+// apply plugin: 'com.google.gms.google-services'
+// apply plugin: 'com.huawei.agconnect'
+
+
+ //鍦嗗舰澶村儚
+ implementation 'de.hdodenhof:circleimageview:3.1.0'
+
+ //骞挎挱閫氫俊
+ implementation 'io.github.jeremyliao:live-event-bus-x:1.8.0'
+
+ //闃块噷鐨凴ocketMQ
+// implementation 'org.apache.rocketmq:rocketmq-client:4.9.4'
+
+ implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
+
+ //room鏁版嵁搴�
+ implementation "androidx.room:room-runtime:2.3.0"
+ implementation "androidx.room:room-ktx:2.3.0"
+ runtimeOnly("androidx.room:room-common:2.3.0")
+ annotationProcessor "androidx.room:room-compiler:2.3.0"
+ implementation "androidx.room:room-rxjava3:2.3.0"
+
+ //鍥剧墖
+ implementation 'com.github.bumptech.glide:glide:4.11.0'
+ // PictureSelector 鍩虹 (蹇呴』鍥剧墖閫夋嫨)
+ implementation 'io.github.lucksiege:pictureselector:v3.11.2'
+ // 鍥剧墖鍘嬬缉 (鎸夐渶寮曞叆)
+ implementation 'io.github.lucksiege:compress:v3.11.2'
}
\ No newline at end of file
--
Gitblit v1.8.0