From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/build.gradle | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 3d62235..d1417a0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,8 +29,8 @@
applicationId "com.hdl.photovoltaic"
minSdkVersion 23
targetSdkVersion 34
- versionCode 1
- versionName "1.4.3"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+ versionCode 4
+ versionName "1.0.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
manifestPlaceholders = mfph
@@ -108,6 +108,7 @@
buildFeatures {
viewBinding true
+ aidl true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -153,7 +154,8 @@
implementation project(path: ':third-zxing')
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
implementation 'com.hdl.android:pmsdk:1.0.9'
- implementation 'com.hdl.android:debugsdk:1.0.54'
+// 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'
@@ -173,7 +175,7 @@
implementation 'com.github.bumptech.glide:glide:4.13.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
- //娣诲姞StatusBarUtil鐨勪緷璧�
+ //娣诲姞StatusBarUtil鐨勪緷璧� 鐘舵�佹爮閫傞厤
implementation 'com.jaeger.statusbarutil:library:1.5.1'
@@ -238,6 +240,6 @@
// 濡傛灉閫夋嫨鐨勫巶鍟嗛�氶亾鍖呭惈浜� Huawei 鍘傚晢閫氶亾鍜� FCM 鍘傚晢閫氶亾锛屽垯闇�瑕侀澶栨墽琛屼互涓嬫搷浣滐紝鑻ユ湭閫夋嫨鍙拷鐣ユ湰姝ラ銆�
// FCM锛氬湪 Firebase 涓婂垱寤哄拰 JPush 涓婂悓鍖呭悕鐨勫緟鍙戝竷搴旂敤锛屽垱寤哄畬鎴愬悗涓嬭浇璇ュ簲鐢ㄧ殑 google-services.json 閰嶇疆鏂囦欢骞舵坊鍔犲埌搴旂敤鐨� module 鐩綍涓嬨��
// Huawei锛氬湪 Huawei 涓婂垱寤哄拰 JPush 涓婂悓鍖呭悕鐨勫緟鍙戝竷搴旂敤锛屽垱寤哄畬鎴愬悗涓嬭浇璇ュ簲鐢ㄧ殑 agconnect-services.json 閰嶇疆鏂囦欢骞舵坊鍔犲埌搴旂敤鐨� module 鐩綍涓嬨��
-
+ //鍙互浣跨敤CardView缁勪欢鏉ヤ负瑙嗗浘璁剧疆闃村奖鏁堟灉
}
\ No newline at end of file
--
Gitblit v1.8.0