From 49c135d23c6038a8c456cf1fcf450e5fb649047a Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 25 十一月 2022 17:44:06 +0800
Subject: [PATCH] 合并代码
---
AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml b/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
index be0a4c6..5e49184 100644
--- a/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
+++ b/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="LCAndroidSDKDemo" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+ <component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="LCAndroidSDKDemo" externalSystemModuleVersion="unspecified" linkedProjectId=":app" linkedProjectPath="$MODULE_DIR$/../../../app" rootProjectPath="$MODULE_DIR$/../../.." />
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
@@ -22,7 +23,6 @@
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
- <option name="PROJECT_TYPE" value="1" />
</configuration>
</facet>
</component>
@@ -46,13 +46,13 @@
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
@@ -68,9 +68,9 @@
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.0" level="project" />
- <orderEntry type="library" name="Gradle: ./../../../.gradle/caches/transforms-1/files-1.1/PullToRefreshListView-release.aar/1232b6310601f161610e5eb82d661087" level="project" />
- <orderEntry type="library" name="Gradle: ./../../../.gradle/caches/transforms-1/files-1.1/DHMobileToolset-1.1.1.aar/f7d8eb2f1804db3345ec5a537e5ec0db" level="project" />
- <orderEntry type="library" name="Gradle: ./../../../.gradle/caches/transforms-1/files-1.1/DHScanner-1.0.7.aar/0ecd90b9bed2580cb7702e452029b5fe" level="project" />
+ <orderEntry type="library" name="Gradle: ./DeviceAddModule/libs/PullToRefreshListView-release.aar" level="project" />
+ <orderEntry type="library" name="Gradle: ./DeviceAddModule/libs/DHMobileToolset-1.1.1.aar" level="project" />
+ <orderEntry type="library" name="Gradle: ./DeviceAddModule/libs/DHScanner-1.0.7.aar" level="project" />
<orderEntry type="library" name="Gradle: com.alibaba:arouter-api:1.4.1@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-v4:28.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:design:28.0.0@aar" level="project" />
--
Gitblit v1.8.0