From 0287b5d20f7d57f5352248175733b99d5a99959b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 28 八月 2025 17:42:27 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev

---
 app/build.gradle |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 94f678b..378881d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,8 +29,8 @@
         applicationId "com.hdl.photovoltaic"
         minSdk 23
         targetSdk 34
-        versionCode 4
-        versionName "1.2.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠g敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+        versionCode 17
+        versionName "1.4.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠g敤鐨�,鏈�鍚庝竴浣�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"
         }
     }
 
@@ -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