From 2c62031554742600f735baf74ea6a5776a1093a9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 22 五月 2024 11:47:40 +0800
Subject: [PATCH] Merge branch 'feature/hxb' into develop_new
---
app/build.gradle | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index cd070c5..df36e5a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,9 +28,9 @@
defaultConfig {
applicationId "com.hdl.photovoltaic"
minSdk 23
- targetSdk 30
+ targetSdk 28
versionCode 1
- versionName "1.4.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+ versionName "1.3.3"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
manifestPlaceholders = mfph
@@ -121,17 +121,14 @@
implementation 'androidx.navigation:navigation-fragment:2.3.5'
implementation 'androidx.navigation:navigation-ui:2.3.5'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
- //鏃堕棿搴�
- implementation project(path: ':pickerview')
- //鍥捐〃搴�
- implementation project(path: ':aa_chart_core')
+
//鍥藉鍒楄〃鍜屾墜鏈哄尯鍙峰簱
implementation project(path: ':countrypicker')
//浜岀淮鐮佸簱
implementation project(path: ':third-zxing')
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
implementation 'com.hdl.android:pmsdk:1.0.2'
- implementation 'com.hdl.android:debugsdk:1.0.22'
+ implementation 'com.hdl.android:debugsdk:1.0.23'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
@@ -143,9 +140,8 @@
//Eventbus浜嬩欢鍙戝竷涓庢帴鏀�
implementation 'org.greenrobot:eventbus:3.3.1'
- //灞忓箷閫傞厤搴�
+ //灞忓箷閫傞厤
implementation 'com.github.JessYanCoding:AndroidAutoSize:v1.2.1'
-
//鍥剧墖鍔犺浇搴�
implementation 'com.github.bumptech.glide:glide:4.13.0'
@@ -181,6 +177,13 @@
//鍒嗘瀽鍜岀敤鎴锋爣绛剧瓑鍔熻兘(鍙�夛紝闆嗘垚鏋佸厜鍒嗘瀽SDK鍚庯紝鍗冲彲鏀寔琛屼负瑙﹀彂鎺ㄩ�佹秷鎭�佹帹閫佽浆鍖栫巼缁熻锛岀敤鎴疯涓哄垎)
implementation 'cn.jiguang.sdk:joperate:2.0.2'
+ //PickerView
+ implementation 'com.contrarywind:Android-PickerView:4.1.9'
+
+
+
+
+
//鑻ヤ笉闆嗘垚鍘傚晢閫氶亾锛屽彲鐩存帴璺宠繃浠ヤ笅渚濊禆
// 鏋佸厜鍘傚晢鎻掍欢鐗堟湰涓庢帴鍏� JPush 鐗堟湰淇濇寔涓�鑷达紝涓嬪悓
--
Gitblit v1.8.0