From beadecb2bbc75b8f153d366df11246719cf97b2f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 23 二月 2024 14:37:25 +0800
Subject: [PATCH] Merge branch 'dev-hxb' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev-hxb
---
app/build.gradle | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 754b6ef..016ef7e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,7 @@
plugins {
id 'com.android.application'
+ // 娣诲姞濡備笅閰嶇疆(鍗庝负鏋佸厜鎺ㄩ��)
+ id 'com.huawei.agconnect'
}
//蹇呴』閰嶇疆uni
def mfph = [
@@ -28,7 +30,7 @@
minSdk 23
targetSdk 30
versionCode 1
- versionName "1.1.3"//鐗堟湰瑙勫垯1.1鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�1鏄垜浠慨澶峛ug鐢ㄧ殑
+ versionName "1.2.1"//鐗堟湰瑙勫垯1.2鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�1鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
manifestPlaceholders = mfph
@@ -54,6 +56,8 @@
// VIVO_APPKEY : "vivo鐨凙PPKEY",
// VIVO_APPID : "vivo鐨凙PPID",
// HONOR_APPID : "Honor鐨凙PP ID",
+// MEIZU_APPKEY : "MZ-榄呮棌鐨凙PPKEY",
+// MEIZU_APPID : "110098313",
]
@@ -119,8 +123,8 @@
//浜岀淮鐮佸簱
implementation project(path: ':third-zxing')
//Link鏈湴搴�
- implementation project(path: ':HDLLinkLocalSdk')
-// implementation project(path: ':HDLLinkPMSdk')
+ implementation project(path: ':HDLLinkPMSdk')
+ implementation 'com.hdl.android.link.local.sdk:localsdk:1.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
@@ -136,7 +140,7 @@
implementation 'com.github.JessYanCoding:AndroidAutoSize:v1.2.1'
//鍥剧墖鍔犺浇搴�
- implementation 'com.github.bumptech.glide:glide:4.12.0'
+ implementation 'com.github.bumptech.glide:glide:4.13.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
@@ -170,11 +174,12 @@
implementation 'com.contrarywind:Android-PickerView:4.1.9'
-// //鑻ヤ笉闆嗘垚鍘傚晢閫氶亾锛屽彲鐩存帴璺宠繃浠ヤ笅渚濊禆
-// // 鏋佸厜鍘傚晢鎻掍欢鐗堟湰涓庢帴鍏� JPush 鐗堟湰淇濇寔涓�鑷达紝涓嬪悓
-// // 鎺ュ叆鍗庝负鍘傚晢
-// implementation 'com.huawei.hms:push:6.9.0.300'
-// implementation 'cn.jiguang.sdk.plugin:huawei:5.0.3'
+ //鑻ヤ笉闆嗘垚鍘傚晢閫氶亾锛屽彲鐩存帴璺宠繃浠ヤ笅渚濊禆
+ // 鏋佸厜鍘傚晢鎻掍欢鐗堟湰涓庢帴鍏� JPush 鐗堟湰淇濇寔涓�鑷达紝涓嬪悓
+ // 鎺ュ叆鍗庝负鍘傚晢
+ implementation 'com.huawei.hms:push:6.9.0.300'
+ implementation 'cn.jiguang.sdk.plugin:huawei:5.0.3'
+ implementation 'com.huawei.agconnect:agconnect-core:1.9.1.301'
// // 鎺ュ叆 FCM 鍘傚晢
// implementation 'com.google.firebase:firebase-messaging:23.1.2'
// implementation 'cn.jiguang.sdk.plugin:fcm:5.0.3'
--
Gitblit v1.8.0