From a1ac20d9cbe90b566bffe3ed39a6e07700c3248f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 19 六月 2023 10:30:06 +0800
Subject: [PATCH] Merge branch 'wjc'

---
 app/build.gradle |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 1 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2c43ce4..7ac585a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,11 @@
 plugins {
     id 'com.android.application'
 }
+//蹇呴』閰嶇疆uni
+def mfph = [
+        //瀹夸富鍖呭悕
+        "apk.applicationId": "com.hdl.photovoltaic",
+]
 
 android {
     compileSdk 32
@@ -13,6 +18,23 @@
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
+        manifestPlaceholders = mfph
+        ndk {
+            abiFilters 'x86', 'armeabi-v7a', "arm64-v8a" //涓嶆敮鎸乤rmeabi
+        }
+
+    }
+    //姝ゅ閰嶇疆蹇呴』娣诲姞 鍚﹀垯鏃犳硶姝g‘杩愯uni
+    aaptOptions {
+        additionalParameters '--auto-add-overlay'
+        //noCompress 'foo', 'bar'
+        ignoreAssetsPattern "!.svn:!.git:.*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
+    }
+    repositories {
+        flatDir {
+            dirs 'libs'
+        }
     }
 
     buildTypes {
@@ -33,14 +55,33 @@
 
 dependencies {
 
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
+
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     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: ':third-zxing')
     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 'org.greenrobot:eventbus:3.0.0'
+    implementation 'com.hdl.hdlhttp:hxhttp:1.0.4'
+
+
+    //********UniSDK蹇呴』娣诲姞鐨勪緷璧� start********
+    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation 'com.alibaba:fastjson:1.2.66'//蹇呴』闆嗘垚锛宖astjson鍔熻兘闇�瑕�
+    implementation 'com.facebook.fresco:fresco:2.5.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
+    implementation 'com.facebook.fresco:animated-gif:2.5.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
+    implementation 'com.facebook.fresco:webpsupport:2.5.0'
+    implementation 'com.facebook.fresco:animated-webp:2.5.0'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
+    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.webkit:webkit:1.3.0'//3.6.15鐗堟湰涔嬪悗 蹇呴』闆嗘垚锛岀敤鏉ユ敮鎸佹殫榛戞ā寮�
+    //********UniSDK蹇呴』娣诲姞鐨勪緷璧� end********
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0