Merge pull request '最终版本' (#33) from a_branch into dev
commit
3b01b9df03
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,12 +1,12 @@
|
|||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="Gradle: android.arch.core:runtime:1.1.1@aar" external-system-id="GRADLE">
|
<library name="Gradle: android.arch.core:runtime:1.1.1@aar" external-system-id="GRADLE">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/e5f608aa90757d0971f669fd7153b99d/transformed/runtime-1.1.1/jars/classes.jar!/" />
|
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e5f608aa90757d0971f669fd7153b99d/transformed/runtime-1.1.1/AndroidManifest.xml" />
|
||||||
<root url="file://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/e5f608aa90757d0971f669fd7153b99d/transformed/runtime-1.1.1/AndroidManifest.xml" />
|
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e5f608aa90757d0971f669fd7153b99d/transformed/runtime-1.1.1/jars/classes.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/modules-2/files-2.1/android.arch.core/runtime/1.1.1/25df553df10af32bede9dd768a2d15299543d84/runtime-1.1.1-sources.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/runtime/1.1.1/25df553df10af32bede9dd768a2d15299543d84/runtime-1.1.1-sources.jar!/" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
@ -1,12 +1,12 @@
|
|||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" external-system-id="GRADLE">
|
<library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" external-system-id="GRADLE">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/c3e3cad76e89eb4a70294d12d60419dd/transformed/livedata-1.1.1/jars/classes.jar!/" />
|
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c3e3cad76e89eb4a70294d12d60419dd/transformed/livedata-1.1.1/AndroidManifest.xml" />
|
||||||
<root url="file://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/c3e3cad76e89eb4a70294d12d60419dd/transformed/livedata-1.1.1/AndroidManifest.xml" />
|
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c3e3cad76e89eb4a70294d12d60419dd/transformed/livedata-1.1.1/jars/classes.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/modules-2/files-2.1/android.arch.lifecycle/livedata/1.1.1/bf27acaa4953c98cd519756ed7b7caacf94407d4/livedata-1.1.1-sources.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/livedata/1.1.1/bf27acaa4953c98cd519756ed7b7caacf94407d4/livedata-1.1.1-sources.jar!/" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
@ -1,12 +1,12 @@
|
|||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" external-system-id="GRADLE">
|
<library name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" external-system-id="GRADLE">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/9e0dab91aa213f02bf6442f477693ad0/transformed/livedata-core-1.1.1/jars/classes.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9e0dab91aa213f02bf6442f477693ad0/transformed/livedata-core-1.1.1/jars/classes.jar!/" />
|
||||||
<root url="file://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/9e0dab91aa213f02bf6442f477693ad0/transformed/livedata-core-1.1.1/AndroidManifest.xml" />
|
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e0dab91aa213f02bf6442f477693ad0/transformed/livedata-core-1.1.1/AndroidManifest.xml" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/modules-2/files-2.1/android.arch.lifecycle/livedata-core/1.1.1/c38818e006ea7a408c05e3090364332d46494ef/livedata-core-1.1.1-sources.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/livedata-core/1.1.1/c38818e006ea7a408c05e3090364332d46494ef/livedata-core-1.1.1-sources.jar!/" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
@ -1,12 +1,12 @@
|
|||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" external-system-id="GRADLE">
|
<library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" external-system-id="GRADLE">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/dd80ea39f4710fb51c3a701be6319dee/transformed/runtime-1.1.1/jars/classes.jar!/" />
|
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/dd80ea39f4710fb51c3a701be6319dee/transformed/runtime-1.1.1/AndroidManifest.xml" />
|
||||||
<root url="file://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/dd80ea39f4710fb51c3a701be6319dee/transformed/runtime-1.1.1/AndroidManifest.xml" />
|
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/dd80ea39f4710fb51c3a701be6319dee/transformed/runtime-1.1.1/jars/classes.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.1.1/8e4214221b3797b863dc9998d16abb4af043e784/runtime-1.1.1-sources.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.1.1/8e4214221b3797b863dc9998d16abb4af043e784/runtime-1.1.1-sources.jar!/" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
@ -1,12 +1,12 @@
|
|||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" external-system-id="GRADLE">
|
<library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" external-system-id="GRADLE">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/ef8a43026c946cb38e6e4cf92e217d98/transformed/viewmodel-1.1.1/jars/classes.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ef8a43026c946cb38e6e4cf92e217d98/transformed/viewmodel-1.1.1/jars/classes.jar!/" />
|
||||||
<root url="file://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/ef8a43026c946cb38e6e4cf92e217d98/transformed/viewmodel-1.1.1/AndroidManifest.xml" />
|
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ef8a43026c946cb38e6e4cf92e217d98/transformed/viewmodel-1.1.1/AndroidManifest.xml" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/modules-2/files-2.1/android.arch.lifecycle/viewmodel/1.1.1/d1cc8e805317f171be63c68341f499acda7e42d6/viewmodel-1.1.1-sources.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/viewmodel/1.1.1/d1cc8e805317f171be63c68341f499acda7e42d6/viewmodel-1.1.1-sources.jar!/" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
@ -1,12 +1,12 @@
|
|||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="Gradle: com.android.databinding:viewbinding:7.2.2@aar" external-system-id="GRADLE">
|
<library name="Gradle: com.android.databinding:viewbinding:7.2.2@aar" external-system-id="GRADLE">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/7c3c35a22a19e4cf64a3746f1513f947/transformed/viewbinding-7.2.2/jars/classes.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7c3c35a22a19e4cf64a3746f1513f947/transformed/viewbinding-7.2.2/jars/classes.jar!/" />
|
||||||
<root url="file://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/7c3c35a22a19e4cf64a3746f1513f947/transformed/viewbinding-7.2.2/AndroidManifest.xml" />
|
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7c3c35a22a19e4cf64a3746f1513f947/transformed/viewbinding-7.2.2/AndroidManifest.xml" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/modules-2/files-2.1/com.android.databinding/viewbinding/7.2.2/45107b3aa49be60cc01d413bc4a3c0c6761d9e4c/viewbinding-7.2.2-sources.jar!/" />
|
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/viewbinding/7.2.2/45107b3aa49be60cc01d413bc4a3c0c6761d9e4c/viewbinding-7.2.2-sources.jar!/" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
</component>
|
</component>
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue