From e54c6323719239d381311f8de7e9e9b0ce404b74 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 14 四月 2025 16:55:08 +0800
Subject: [PATCH] 2025年04月14日16:55:06

---
 app/build.gradle |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4c24bb6..1c24c2a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,24 +13,24 @@
     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'
         }
     }
-    compileSdkVersion 34
+    compileSdk 34
     defaultConfig {
         applicationId "com.hdl.photovoltaic"
-        minSdkVersion 23
-        targetSdkVersion 34
-        versionCode 2
-        versionName "1.5.1"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠g敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+        minSdk 23
+        targetSdk 34
+        versionCode 10
+        versionName "1.1.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(2)}.apk"
+            outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(4)}.apk"
         }
     }
 
@@ -108,6 +108,7 @@
 
     buildFeatures {
         viewBinding true
+        aidl true
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -152,15 +153,16 @@
     //浜岀淮鐮佸簱
     implementation project(path: ':third-zxing')
     //Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
-    implementation 'com.hdl.android:pmsdk:1.0.9'
-    implementation 'com.hdl.android:debugsdk:1.0.65'
-//    implementation project(path:':sdk')
+    implementation 'com.hdl.android:pmsdk:1.0.11'
+//    implementation 'com.hdl.android:debugsdk:1.0.71'
+    implementation project(path: ':sdk')
+    implementation 'androidx.activity:activity:1.2.3'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 //    implementation 'org.greenrobot:eventbus:3.0.0'
-    implementation 'com.hdl.hdlhttp:hxhttp:1.0.4'
+    implementation 'com.hdl.hdlhttp:hxhttp:1.0.4'//1.0.4
     //okhttp 鎵撳嵃
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
 

--
Gitblit v1.8.0