From e7e48e1a65fdaa361e14e7e77e24043a63126bd6 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 13 一月 2026 15:52:15 +0800
Subject: [PATCH] 2026年01月13日15:47:59 升级gradle版本

---
 app/build.gradle |   83 ++++++++++++++++++++++++++++++++---------
 1 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 79af1d0..b247e14 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,6 +3,7 @@
     // 娣诲姞濡備笅閰嶇疆(鍗庝负鏋佸厜鎺ㄩ��)
     id 'com.huawei.agconnect'
 }
+apply plugin: 'com.google.gms.google-services' // 鏀惧湪鏂囦欢搴曢儴
 //蹇呴』閰嶇疆uni
 def mfph = [
         //瀹夸富鍖呭悕
@@ -13,24 +14,25 @@
     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'
         }
     }
-    compileSdk 34
+    namespace 'com.hdl.photovoltaic'
+    compileSdk 35
     defaultConfig {
         applicationId "com.hdl.photovoltaic"
         minSdk 23
-        targetSdk 34
-        versionCode 4
-        versionName "1.1.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠g敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+        targetSdk 35
+        versionCode 23
+        versionName "2.0.1"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠g敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         manifestPlaceholders = mfph
@@ -62,10 +64,10 @@
         ]
 
     }
-    // 淇濊瘉鍏朵粬鐨刲ib娌℃湁琚玴reDex
-    dexOptions {
-        preDexLibraries = false
-    }
+//    // 淇濊瘉鍏朵粬鐨刲ib娌℃湁琚玴reDex
+//    dexOptions {
+//        preDexLibraries = false
+//    }
     repositories {
         flatDir {
             dirs 'libs'
@@ -84,13 +86,18 @@
 //        abortOnError false
 //    }
 
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
 
     /**
      * 鎵撳寘鑷姩鍛藉悕
      */
     android.applicationVariants.configureEach { variant ->
         variant.outputs.configureEach {
-            outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(2)}.apk"
+            outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(4)}.apk"
         }
     }
 
@@ -109,6 +116,7 @@
     buildFeatures {
         viewBinding true
         aidl true
+        buildConfig true
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -153,10 +161,11 @@
     //浜岀淮鐮佸簱
     implementation project(path: ':third-zxing')
     //Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
-    implementation 'com.hdl.android:pmsdk:1.0.11'
+    implementation 'com.hdl.android:pmsdk:1.0.22'//22
 //    implementation 'com.hdl.android:debugsdk:1.0.71'
     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'
@@ -183,13 +192,13 @@
     //********UniSDK蹇呴』娣诲姞鐨勪緷璧� start********
     implementation "androidx.recyclerview:recyclerview:1.0.0"
     implementation 'com.alibaba:fastjson:1.2.66'//蹇呴』闆嗘垚锛宖astjson鍔熻兘闇�瑕�
-    implementation 'com.facebook.fresco:fresco:2.5.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
-    implementation 'com.facebook.fresco:animated-gif:2.5.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
-    implementation 'com.facebook.fresco:webpsupport:2.5.0'
-    implementation 'com.facebook.fresco:animated-webp:2.5.0'
-    implementation 'com.github.bumptech.glide:glide:4.9.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
+    implementation 'com.facebook.fresco:fresco:3.6.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
+    implementation 'com.facebook.fresco:animated-gif:3.6.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
+    implementation 'com.facebook.fresco:webpsupport:3.6.0'
+    implementation 'com.facebook.fresco:animated-webp:3.6.0'
+    implementation 'com.github.bumptech.glide:glide:5.0.5'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
     implementation 'com.android.support:multidex:1.0.3'
-    implementation 'androidx.webkit:webkit:1.3.0'//3.6.15鐗堟湰涔嬪悗 蹇呴』闆嗘垚锛岀敤鏉ユ敮鎸佹殫榛戞ā寮�
+    implementation 'androidx.webkit:webkit:1.6.1'//3.6.15鐗堟湰涔嬪悗 蹇呴』闆嗘垚锛岀敤鏉ユ敮鎸佹殫榛戞ā寮�
     //********UniSDK蹇呴』娣诲姞鐨勪緷璧� end********
     //NanoHTTPD鎼缓鏈嶅姟鍣�
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
@@ -206,13 +215,49 @@
     //鍒嗘瀽鍜岀敤鎴锋爣绛剧瓑鍔熻兘(鍙�夛紝闆嗘垚鏋佸厜鍒嗘瀽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.6.8'// 蹇呴��
+    implementation 'com.umeng.umsdk:asms:1.8.0'// 蹇呴��
+//    implementation 'com.umeng.umsdk:apm:1.9.2' // 閿欒鍒嗘瀽锛岀洰鍓嶄笉鏀寔鈥孉ndroid 15鐨勨��16KB鍔熻兘閫傞厤瑕佹眰鈥屻�傗��
+
+    //寮曞叆FCM锛堝師鐢熻胺姝岋級
+    implementation 'com.google.firebase:firebase-messaging:23.2.1'
+
+    // 寮曞叆FCM
+    implementation 'com.google.firebase:firebase-messaging:23.0.0' // 浣跨敤鏈�鏂扮増鏈�
+    // 浣跨敤 ShortcutBadger 搴擄紝娓呴櫎瑙掓爣
+    implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
+    // 闃块噷浜戞帹閫佹牳蹇冨簱
+    implementation 'com.aliyun.ams:alicloud-android-push:3.9.3'
+
+
+    //杈呭姪閫氶亾
+    implementation 'com.aliyun.ams:alicloud-android-third-push:3.9.2'
+////鍗庝负渚濊禆
+//    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.9.2'
+////vivo渚濊禆
+//    implementation 'com.aliyun.ams:alicloud-android-third-push-vivo:3.10.1'
+////榄呮棌渚濊禆
+//    implementation 'com.aliyun.ams:alicloud-android-third-push-meizu:3.10.1'
+////璋锋瓕渚濊禆
+//    implementation 'com.aliyun.ams:alicloud-android-third-push-fcm:3.10.1'
+////鑽h��渚濊禆
+//    implementation 'com.aliyun.ams:alicloud-android-third-push-honor:3.10.1'
+
+//    // 鍙�夛細濡傛灉浣犻渶瑕佸鐞嗗悗鍙版秷鎭紝鍙兘闇�瑕佷互涓嬩緷璧�
+//    implementation 'com.google.firebase:firebase-analytics:21.0.0'
+
 //    // 鎺ュ叆 FCM 鍘傚晢
 //    implementation 'com.google.firebase:firebase-messaging:23.1.2'
 //    implementation 'cn.jiguang.sdk.plugin:fcm:5.0.3'

--
Gitblit v1.8.0