From a1c880c476327032fe174af8c80d6f78a590dae9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 07 二月 2025 16:35:22 +0800
Subject: [PATCH] Merge branch '1.5.1' into dev
---
app/build.gradle | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index b25c9fe..d1417a0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,8 +29,8 @@
applicationId "com.hdl.photovoltaic"
minSdkVersion 23
targetSdkVersion 34
- versionCode 2
- versionName "1.5.1"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+ versionCode 4
+ versionName "1.0.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(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
@@ -153,8 +154,8 @@
implementation project(path: ':third-zxing')
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
implementation 'com.hdl.android:pmsdk:1.0.9'
- implementation 'com.hdl.android:debugsdk:1.0.71'
-// implementation project(path:':sdk')
+// implementation 'com.hdl.android:debugsdk:1.0.71'
+ implementation project(path: ':sdk')
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
--
Gitblit v1.8.0