From 5b06b2b9917fbe0c35d21d1b2b54a7de1ec3da29 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:06:44 +0800
Subject: [PATCH] Merge branch '1.4.4'
---
app/build.gradle | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 94f678b..537a2d6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,13 +24,13 @@
keyPassword '85521566'
}
}
- compileSdk 34
+ compileSdk 35
defaultConfig {
applicationId "com.hdl.photovoltaic"
minSdk 23
- targetSdk 34
- versionCode 4
- versionName "1.2.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+ targetSdk 35
+ versionCode 19
+ versionName "1.4.0"//鐗堟湰瑙勫垯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(1)}.apk"
+ outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(2)}.apk"
}
}
@@ -153,7 +153,7 @@
//浜岀淮鐮佸簱
implementation project(path: ':third-zxing')
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
- implementation 'com.hdl.android:pmsdk:1.0.11'
+ implementation 'com.hdl.android:pmsdk:1.0.18'
// implementation 'com.hdl.android:debugsdk:1.0.71'
implementation project(path: ':sdk')
implementation 'androidx.activity:activity:1.2.3'
@@ -214,6 +214,11 @@
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