From f151e203da870dbe281defcb1daf84a1a38ecac1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 29 十二月 2025 09:59:57 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/build.gradle | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 98eade4..55ca496 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,8 +30,8 @@
applicationId "com.hdl.photovoltaic"
minSdk 23
targetSdk 35
- versionCode 20
- versionName "2.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+ versionCode 23
+ versionName "2.0.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
manifestPlaceholders = mfph
@@ -91,7 +91,7 @@
*/
android.applicationVariants.configureEach { variant ->
variant.outputs.configureEach {
- outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(2)}.apk"
+ outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(4)}.apk"
}
}
@@ -215,10 +215,10 @@
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' // 閿欒鍒嗘瀽
+ // //鍙嬬洘
+ // 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.2.1'
@@ -237,8 +237,8 @@
// implementation 'com.aliyun.ams:alicloud-android-third-push-huawei:3.10.1'
//灏忕背鍥藉唴閫氶亾渚濊禆
implementation 'com.aliyun.ams:alicloud-android-third-push-xiaomi:3.9.2'
-////OPPO渚濊禆
-// implementation 'com.aliyun.ams:alicloud-android-third-push-oppo:3.10.1'
+//OPPO渚濊禆
+ implementation 'com.aliyun.ams:alicloud-android-third-push-oppo:3.9.2'
////vivo渚濊禆
// implementation 'com.aliyun.ams:alicloud-android-third-push-vivo:3.10.1'
////榄呮棌渚濊禆
--
Gitblit v1.8.0