From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/build.gradle | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index d1417a0..79af1d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,13 +24,13 @@
keyPassword '85521566'
}
}
- compileSdkVersion 34
+ compileSdk 34
defaultConfig {
applicationId "com.hdl.photovoltaic"
- minSdkVersion 23
- targetSdkVersion 34
+ minSdk 23
+ targetSdk 34
versionCode 4
- versionName "1.0.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+ versionName "1.1.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(4)}.apk"
+ outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(2)}.apk"
}
}
@@ -153,15 +153,16 @@
//浜岀淮鐮佸簱
implementation project(path: ':third-zxing')
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
- implementation 'com.hdl.android:pmsdk:1.0.9'
+ 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