From 542a1aebe872632e69b4a42ff629d13bb4e8d6d0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 七月 2025 09:31:14 +0800
Subject: [PATCH] Merge branch '1.3.1'
---
app/build.gradle | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index c427dd7..fec5047 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,24 +13,24 @@
signingConfigs {
debug {
storeFile file('../keystore/Untitled')
- keyAlias 'photovotaic'
+ keyAlias 'hdlphotovotaic'
storePassword '85521566'
keyPassword '85521566'
}
release {
storeFile file('../keystore/Untitled')
- keyAlias 'photovotaic'
+ keyAlias 'hdlphotovotaic'
storePassword '85521566'
keyPassword '85521566'
}
}
- compileSdkVersion 34
+ compileSdk 34
defaultConfig {
applicationId "com.hdl.photovoltaic"
- minSdkVersion 23
- targetSdkVersion 34
- versionCode 2
- versionName "1.5.1"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+ minSdk 23
+ targetSdk 34
+ versionCode 16
+ versionName "1.3.2"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
manifestPlaceholders = mfph
@@ -90,7 +90,7 @@
*/
android.applicationVariants.configureEach { variant ->
variant.outputs.configureEach {
- outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(2)}.apk"
+ outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(4)}.apk"
}
}
@@ -153,15 +153,17 @@
//浜岀淮鐮佸簱
implementation project(path: ':third-zxing')
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
- implementation 'com.hdl.android:pmsdk:1.0.9'
+ implementation 'com.hdl.android:pmsdk:1.0.11'
// implementation 'com.hdl.android:debugsdk:1.0.71'
- implementation project(path:':sdk')
+ implementation project(path: ':sdk')
+ implementation 'androidx.activity:activity:1.2.3'
+ implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
// implementation 'org.greenrobot:eventbus:3.0.0'
- implementation 'com.hdl.hdlhttp:hxhttp:1.0.4'
+ implementation 'com.hdl.hdlhttp:hxhttp:1.0.4'//1.0.4
//okhttp 鎵撳嵃
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
@@ -205,13 +207,18 @@
//鍒嗘瀽鍜岀敤鎴锋爣绛剧瓑鍔熻兘(鍙�夛紝闆嗘垚鏋佸厜鍒嗘瀽SDK鍚庯紝鍗冲彲鏀寔琛屼负瑙﹀彂鎺ㄩ�佹秷鎭�佹帹閫佽浆鍖栫巼缁熻锛岀敤鎴疯涓哄垎)
implementation 'cn.jiguang.sdk:joperate:2.0.2'
-
//鑻ヤ笉闆嗘垚鍘傚晢閫氶亾锛屽彲鐩存帴璺宠繃浠ヤ笅渚濊禆
// 鏋佸厜鍘傚晢鎻掍欢鐗堟湰涓庢帴鍏� JPush 鐗堟湰淇濇寔涓�鑷达紝涓嬪悓
// 鎺ュ叆鍗庝负鍘傚晢
implementation 'com.huawei.hms:push:6.9.0.300'
implementation 'cn.jiguang.sdk.plugin:huawei:5.0.3'
implementation 'com.huawei.agconnect:agconnect-core:1.9.1.301'
+
+ //鍙嬬洘
+ implementation 'com.umeng.umsdk:common:9.5.6'// 蹇呴��
+ implementation 'com.umeng.umsdk:asms:1.6.3'// 蹇呴��
+ implementation 'com.umeng.umsdk:apm:1.7.0' // 閿欒鍒嗘瀽
+
// // 鎺ュ叆 FCM 鍘傚晢
// implementation 'com.google.firebase:firebase-messaging:23.1.2'
// implementation 'cn.jiguang.sdk.plugin:fcm:5.0.3'
--
Gitblit v1.8.0