From 542a1aebe872632e69b4a42ff629d13bb4e8d6d0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 七月 2025 09:31:14 +0800
Subject: [PATCH] Merge branch '1.3.1'
---
app/build.gradle | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 56f9234..fec5047 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,24 +13,24 @@
signingConfigs {
debug {
storeFile file('../keystore/Untitled')
- keyAlias 'photovotaic'
+ keyAlias 'hdlphotovotaic'
storePassword '85521566'
keyPassword '85521566'
}
release {
storeFile file('../keystore/Untitled')
- keyAlias 'photovotaic'
+ keyAlias 'hdlphotovotaic'
storePassword '85521566'
keyPassword '85521566'
}
}
- compileSdk 30
+ compileSdk 34
defaultConfig {
applicationId "com.hdl.photovoltaic"
minSdk 23
- targetSdk 30
- versionCode 1
- versionName "1.3.3"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+ targetSdk 34
+ versionCode 16
+ versionName "1.3.2"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
manifestPlaceholders = mfph
@@ -77,12 +77,20 @@
//noCompress 'foo', 'bar'
ignoreAssetsPattern "!.svn:!.git:.*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
}
+// lintOptions {
+// checkReleaseBuilds false
+// // Or, if you prefer, you can continue to check for errors in release builds,
+// // but continue the build even when errors are found:
+// abortOnError false
+// }
+
+
/**
* 鎵撳寘鑷姩鍛藉悕
*/
android.applicationVariants.configureEach { variant ->
variant.outputs.configureEach {
- outputFileName = "photovoltaic_${name}_v${versionName}_${generateTime()}.apk"
+ outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(4)}.apk"
}
}
@@ -100,6 +108,7 @@
buildFeatures {
viewBinding true
+ aidl true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -109,6 +118,20 @@
//鏋勫缓鏃堕棿
static def generateTime() {
return new Date().format("yyyyMMddHHmm")
+}
+
+//鐜鐗堟湰鍙凤細姝ょ増鏈彿鐢ㄤ簬鏍囨敞褰撳墠鐗堟湰鐨勮蒋浠跺浜庡摢涓紑鍙戦樁娈碉紝褰撹蒋浠惰繘鍏ュ埌鍙︿竴涓樁娈垫椂闇�瑕佷慨鏀规鐗堟湰鍙枫��
+static String getEnvironmentVersion(int environmentVersionValue) {
+ if (environmentVersionValue == 1) {
+ return "dev"//寮�鍙戦樁娈电増鏈��(涓�鑸笉鍚戝閮ㄥ彂甯冿紝bug浼氭瘮杈冨锛屽姛鑳戒篃涓嶅叏锛屼竴鑸彧鏈夊紑鍙戜汉鍛樹娇鐢ㄣ��)
+ } else if (environmentVersionValue == 2) {
+ return "test"//娴嬭瘯闃舵鐗堟湰銆�(杩欎釜闃舵鐗堟湰浼氶厤鍚堟祴璇曚汉鍛樹慨澶峛ug锛岀洿鍒版弧瓒冲彂甯冩潯浠躲��)
+ } else if (environmentVersionValue == 3) {
+ return "beta"//鍏祴闃舵鐗堟湰銆�(鍏紑娴嬭瘯鐗堟湰锛屼竴鑸槸鍐呮祴閫氳繃鐨勶紝涓昏浼氭湁"绮変笣鐢ㄦ埛"浣跨敤浣撻獙銆�)
+ } else if (environmentVersionValue == 4) {
+ return "release"
+//鍙戝竷闃舵鐗堟湰銆�(璇ョ増鏈剰鍛�"鏈�缁堢増鏈�"锛屽湪鍓嶉潰鐗堟湰鐨勪竴绯诲垪娴嬭瘯鐗堜箣鍚庯紝缁堝綊浼氭湁涓�涓寮忕増鏈紝鏄渶缁堜氦浠樼敤鎴蜂娇鐢ㄧ殑涓�涓増鏈�傝鐗堟湰鏈夋椂涔熺О涓烘爣鍑嗙増銆備竴鑸儏鍐典笅锛孯elease涓嶄細浠ュ崟璇嶅舰寮忓嚭鐜板湪杞欢灏侀潰涓娿��)
+ }
}
dependencies {
@@ -130,14 +153,17 @@
//浜岀淮鐮佸簱
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:pmsdk:1.0.11'
+// implementation 'com.hdl.android:debugsdk:1.0.71'
+ implementation project(path: ':sdk')
+ implementation 'androidx.activity:activity:1.2.3'
+ implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
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'
@@ -151,7 +177,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'
@@ -181,14 +207,18 @@
//鍒嗘瀽鍜岀敤鎴锋爣绛剧瓑鍔熻兘(鍙�夛紝闆嗘垚鏋佸厜鍒嗘瀽SDK鍚庯紝鍗冲彲鏀寔琛屼负瑙﹀彂鎺ㄩ�佹秷鎭�佹帹閫佽浆鍖栫巼缁熻锛岀敤鎴疯涓哄垎)
implementation 'cn.jiguang.sdk:joperate:2.0.2'
-
-
//鑻ヤ笉闆嗘垚鍘傚晢閫氶亾锛屽彲鐩存帴璺宠繃浠ヤ笅渚濊禆
// 鏋佸厜鍘傚晢鎻掍欢鐗堟湰涓庢帴鍏� 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'
+
+ //鍙嬬洘
+ implementation 'com.umeng.umsdk:common:9.5.6'// 蹇呴��
+ implementation 'com.umeng.umsdk:asms:1.6.3'// 蹇呴��
+ implementation 'com.umeng.umsdk:apm:1.7.0' // 閿欒鍒嗘瀽
+
// // 鎺ュ叆 FCM 鍘傚晢
// implementation 'com.google.firebase:firebase-messaging:23.1.2'
// implementation 'cn.jiguang.sdk.plugin:fcm:5.0.3'
@@ -217,6 +247,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