From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/build.gradle | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 53caeb2..18b52a4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,13 +13,13 @@
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'
}
@@ -29,8 +29,8 @@
applicationId "com.hdl.photovoltaic"
minSdk 23
targetSdk 34
- versionCode 4
- versionName "1.1.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+ versionCode 12
+ versionName "1.2.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(2)}.apk"
+ outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(4)}.apk"
}
}
@@ -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