Merge pull request '合并' (#10) from linlingfei_branch into tianchuan_branch

Browse Source

tianchuan_branch

p3ahs4flo 3 years ago

parent 0c92f88a39 eabd907ba5

commit 34787cb9e8

558 changed files with 9234 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

BIN

src/__MACOSX/._weapon

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._.DS_Store

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._.gitignore

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._.gradle

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._.idea

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._HelpDoc.md

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._app

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._build.gradle

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._gradle

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._gradle.properties

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._gradlew

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._gradlew.bat

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._local.properties

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/._settings.gradle

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/._7.0.2

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/._buildOutputCleanup

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/._checksums

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/._vcs-1

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/._dependencies-accessors

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/._executionHistory

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/._fileChanges

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/._fileHashes

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/._gc.properties

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/._javaCompile

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/._vcsMetadata-1

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/dependencies-accessors/._dependencies-accessors.lock

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/dependencies-accessors/._gc.properties

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/executionHistory/._executionHistory.bin

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/executionHistory/._executionHistory.lock

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/fileChanges/._last-build.bin

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/fileHashes/._fileHashes.bin

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/fileHashes/._fileHashes.lock

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/fileHashes/._resourceHashesCache.bin

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/javaCompile/._classAnalysis.bin

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/javaCompile/._jarAnalysis.bin

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/javaCompile/._javaCompile.lock

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/7.0.2/javaCompile/._taskHistory.bin

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/buildOutputCleanup/._buildOutputCleanup.lock

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/buildOutputCleanup/._cache.properties

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/buildOutputCleanup/._outputFiles.bin

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/checksums/._checksums.lock

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/checksums/._md5-checksums.bin

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/checksums/._sha1-checksums.bin

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.gradle/vcs-1/._gc.properties

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/._.gitignore

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/._compiler.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/._gradle.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/._libraries

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/._misc.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/._modules

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/._modules.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/._workspace.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_activity_activity_1_3_1_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_annotation_annotation_1_2_0.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_annotation_annotation_experimental_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_appcompat_appcompat_1_3_1_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_appcompat_appcompat_resources_1_3_1_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_arch_core_core_common_2_1_0.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_arch_core_core_runtime_2_1_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_cardview_cardview_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_collection_collection_1_1_0.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_constraintlayout_constraintlayout_2_1_4_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_core_core_1_5_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_customview_customview_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_dynamicanimation_dynamicanimation_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_exifinterface_exifinterface_1_3_3_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_fragment_fragment_1_3_6_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_lifecycle_lifecycle_common_2_3_1.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_lifecycle_lifecycle_livedata_core_2_3_1_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_lifecycle_lifecycle_runtime_2_3_1_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_lifecycle_lifecycle_viewmodel_2_3_1_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_lifecycle_lifecycle_viewmodel_savedstate_2_3_1_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_loader_loader_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_media_media_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_print_print_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_recyclerview_recyclerview_1_2_1_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_savedstate_savedstate_1_1_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_test_core_1_3_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_test_espresso_espresso_core_3_3_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_test_espresso_espresso_idling_resource_3_3_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_test_ext_junit_1_1_2_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_test_monitor_1_3_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_test_runner_1_3_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_transition_transition_1_2_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml

View File

Binary file not shown.

BIN

src/__MACOSX/weapon/.idea/libraries/._Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml

View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More

Write Preview

Loading…

Cancel

Save