From bd80ca98ffb4f483ca2eba47051281fa69e790ac Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 14 八月 2023 10:24:25 +0800
Subject: [PATCH] 代码同步
---
.idea/modules/app/PhotovoltaicDebug.app.iml | 92 +--------------------------------------------
1 files changed, 3 insertions(+), 89 deletions(-)
diff --git a/.idea/modules/app/PhotovoltaicDebug.app.iml b/.idea/modules/app/PhotovoltaicDebug.app.iml
index bf0f54b..794d5f7 100644
--- a/.idea/modules/app/PhotovoltaicDebug.app.iml
+++ b/.idea/modules/app/PhotovoltaicDebug.app.iml
@@ -1,11 +1,11 @@
<?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="PhotovoltaicDebug" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
- <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
- <option name="LAST_KNOWN_AGP_VERSION" value="7.1.3" />
+ <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="4.1.2" />
+ <option name="LAST_KNOWN_AGP_VERSION" value="4.1.2" />
</configuration>
</facet>
<facet type="android" name="Android">
@@ -24,91 +24,5 @@
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
- <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
- <exclude-output />
- <content url="file://$MODULE_DIR$/../../../app">
- <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/../../../app/.gradle" />
- <excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
- </content>
- <orderEntry type="jdk" jdkName="Android API 32 Platform" jdkType="Android SDK" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.13.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" 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: 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: androidx.test.ext:junit:1.1.3@aar" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-core:3.4.0@aar" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.4.0@aar" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.4.0@aar" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.services:storage:1.4.0@aar" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.4.0@aar" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
- <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.4.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
- <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.3.1" level="project" />
- <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
- <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" />
- <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:2.0.4" level="project" />
- <orderEntry type="library" name="Gradle: org.greenrobot:eventbus:3.0.0" level="project" />
- <orderEntry type="library" name="Gradle: androidx.databinding:viewbinding:7.1.3@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.navigation:navigation-ui:2.3.5@aar" level="project" />
- <orderEntry type="library" name="Gradle: com.google.android.material:material:1.4.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:2.0.4@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.3.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.navigation:navigation-fragment:2.3.5@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.4@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.navigation:navigation-runtime:2.3.5@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.activity:activity:1.2.3@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.3.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.1.1@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.dynamicanimation:dynamicanimation:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.transition:transition:1.3.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.customview:customview:1.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.core:core:1.5.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.3.1@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.3.1@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.navigation:navigation-common:2.3.5@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
</component>
</module>
\ No newline at end of file
--
Gitblit v1.8.0