 黎超凡
|
81defbbf16
|
代码
|
2 years ago |
|
黎超凡
|
06c9991c5a
|
代码
|
2 years ago |
|
黎超凡
|
d361ccdb00
|
代码
|
2 years ago |
|
黎超凡
|
618b74afe6
|
代码
|
2 years ago |
|
黎超凡
|
507e11b44d
|
代码
|
2 years ago |
|
黎超凡
|
ad4f76f0b5
|
代码
|
2 years ago |
|
黎超凡
|
972446da17
|
代码
|
2 years ago |
|
黎超凡
|
00303f86c1
|
代码
|
2 years ago |
|
黎超凡
|
7e4649532b
|
代码
|
2 years ago |
|
黎超凡
|
7bc74fa8ed
|
代码
|
2 years ago |
|
黎超凡
|
8c955d3167
|
代码
|
2 years ago |
|
黎超凡
|
10515884ae
|
代码
|
2 years ago |
|
黎超凡
|
021b85d96e
|
代码
|
2 years ago |
|
黎超凡
|
f06e5955a3
|
代码
|
2 years ago |
|
黎超凡
|
d7586b3a11
|
代码
|
2 years ago |
|
黎超凡
|
bef61bbae3
|
代码
|
2 years ago |
|
黎超凡
|
620578a2b4
|
代码
|
2 years ago |
|
黎超凡
|
04929b8e8d
|
代码
|
2 years ago |
|
黎超凡
|
d229b40632
|
代码
|
2 years ago |
|
黎超凡
|
97d7ac7776
|
代码
|
2 years ago |
|
黎超凡
|
747b8f98a2
|
代码
|
2 years ago |
|
黎超凡
|
0d2334a5c6
|
代码
|
2 years ago |
|
黎超凡
|
1b6a9b82fa
|
代码
|
2 years ago |
|
黎超凡
|
02f8e77a6f
|
代码
|
2 years ago |
|
黎超凡
|
8f9c338bd9
|
代码
|
2 years ago |
|
黎超凡
|
9edc43d088
|
代码
|
2 years ago |
|
黎超凡
|
1a4065bc66
|
Merge branch 'master' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into develop
# Conflicts:
# src/.dart_tool/package_config.json
|
2 years ago |
|
黎超凡
|
596e5a4145
|
代码
|
2 years ago |
|
黎超凡
|
ef66626291
|
代码
|
2 years ago |
|
黎超凡
|
82bb9ff03d
|
提交
|
2 years ago |
|
黎超凡
|
9bf82eb643
|
代码
|
2 years ago |
|
黎超凡
|
c19aec2b40
|
代码
|
2 years ago |
|
黎超凡
|
f53c837e0b
|
代码
|
2 years ago |
|
黎超凡
|
b6bc7b9a09
|
代码
|
2 years ago |
|
pjamoh6iq
|
d6e7d4d0b6
|
合并
合并
|
2 years ago |
 康江龙
|
45a79265ad
|
Merge branch 'develop' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into KangJiangLong_Branch
# Conflicts:
# src/.dart_tool/package_config.json
# src/.dart_tool/package_config_subset
# src/.idea/libraries/Dart_Packages.xml
# src/.idea/libraries/Dart_SDK.xml
# src/build/app/intermediates/assets/debug/flutter_assets/kernel_blob.bin
# src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/kernel_blob.bin.jar
# src/build/app/intermediates/flutter/debug/flutter_assets/kernel_blob.bin
# src/build/app/intermediates/flutter/debug/flutter_build.d
# src/build/app/intermediates/flutter/debug/libs.jar
# src/build/app/intermediates/incremental/debug-mergeJavaRes/merge-state
# src/build/app/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
# src/build/app/intermediates/incremental/debug/mergeDebugResources/merger.xml
# src/build/app/intermediates/incremental/mergeDebugAssets/merger.xml
# src/build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/build/app/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
# src/build/app/intermediates/source_set_path_map/debug/file-map.txt
# src/build/app/kotlin/compileDebugKotlin/cacheable/last-build.bin
# src/build/app/kotlin/compileDebugKotlin/local-state/build-history.bin
# src/build/app/outputs/apk/debug/app-debug.apk
# src/build/app/outputs/flutter-apk/app-debug.apk
# src/build/app/outputs/flutter-apk/app-debug.apk.sha1
# src/build/app/outputs/logs/manifest-merger-debug-report.txt
# src/build/fa1f46848d15fd18dc4e2938a3aa6cef.cache.dill.track.dill
# src/lib/travelguideapp/ui/pages/MuseumInfoPage.dart
# src/pubspec.yaml
|
2 years ago |
|
黎超凡
|
ad4150daaf
|
1
|
2 years ago |
|
黎超凡
|
314c3e0042
|
1
|
2 years ago |
|
黎超凡
|
a086c34bf8
|
develop
|
2 years ago |
|
康江龙
|
1acff0412e
|
Merge branch 'develop' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into KangJiangLong_Branch
# Conflicts:
# src/.dart_tool/flutter_build/99d422f60ec3de076ff7e456d1ef6bf5/.filecache
# src/.dart_tool/flutter_build/99d422f60ec3de076ff7e456d1ef6bf5/app.dill
# src/.dart_tool/flutter_build/99d422f60ec3de076ff7e456d1ef6bf5/debug_android_application.stamp
# src/.dart_tool/flutter_build/99d422f60ec3de076ff7e456d1ef6bf5/flutter_assets.d
# src/.dart_tool/flutter_build/99d422f60ec3de076ff7e456d1ef6bf5/gen_dart_plugin_registrant.stamp
# src/.dart_tool/flutter_build/99d422f60ec3de076ff7e456d1ef6bf5/kernel_snapshot.d
# src/.dart_tool/flutter_build/99d422f60ec3de076ff7e456d1ef6bf5/kernel_snapshot.stamp
# src/.dart_tool/package_config.json
# src/.dart_tool/package_config_subset
# src/.idea/libraries/Dart_Packages.xml
# src/.idea/libraries/Dart_SDK.xml
# src/build/app/intermediates/assets/debug/flutter_assets/kernel_blob.bin
# src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/kernel_blob.bin.jar
# src/build/app/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
# src/build/app/intermediates/dex_archive_input_jar_hashes/debug/out
# src/build/app/intermediates/flutter/debug/flutter_assets/kernel_blob.bin
# src/build/app/intermediates/flutter/debug/flutter_build.d
# src/build/app/intermediates/flutter/debug/libs.jar
# src/build/app/intermediates/incremental/debug-mergeJavaRes/merge-state
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/1+k56PqPL+yZXyNpf3MLyGoZHag=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/1D9rtkv9IQI6ikzv2ZwzBWjgHZw=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/1F+n0k6DZ4JptcAx1XScP658CrI=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/1ohE4sB6Dwzmw+57nNm9pqj55yY=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/3YngtZOBDU2aW7cip9L5d1yjfE4=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/4kGSiE8wN2FLMYQ9kSnKhFWg1wc=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/50pLDY+LmgLN8FOEY6Zh0nYQrCc=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/89SeLvgB6zv9PXd3EyHdTCMHmnk=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/8QdTi_LNuCx9_miuFMuUQS329Ho=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/99j2vPHwExqBK9cV3LrlcqrZChg=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/9LHtsa78abE1KtrUVH56ORMKSNU=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/9iusDWdhgMzjDhKlg_vBw3DfurY=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/9w1U0pl6y3jlslqw_9B_egasalc=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/APV1oVU1Qmx1+xO8WcEca1bDHpo=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/AVmIKdHQ+3yb9rvGy9uMqkLXCN8=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/CChI0RWJH+ylPAqraRFPgelFOio=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/DX7l3gS4NM0E0tllBYF3jl4m2Zg=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/E7SW9VPf_UML56jM3_Yw5iRqut0=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Et2FTjxJ6dTekT5lyvqwv8Q20m4=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/FDXmCNvjU1WbLv21hw6fC123ypk=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/FR59i4tLNxtfsXchz5ha2zwcCqg=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/GQeVIHgjq7uqIpYoDgS2mVde0DE=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/HZRwHvaPAFpGaPJxFo3JrGxVhJc=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/K8KAjX05LgpANx03BT9j0NJEuZs=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/KAdoV_imWRf4DYnNlzHlhaATidg=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/LQpSUy9ET6zGhgu82OxxjOzxB+4=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/LpgFH5P7F5hsrB4KWxd2zp5IilA=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/LrIdAwKNNY4BNk0S7WA4tnV7UdM=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/M33rpO38ZKjOf94fjZ39L6j0PJY=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/N2s8SJdmcmTMtWBC7ICjHQzll6w=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/NdXboO1Do+3vxwZsM4I58iCczbE=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/NsAb+bddDgR4hotL9TWEzUJRezM=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/PvI8PYLx1G2x2qXI4LmD11oAQQo=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/RJHbWJDCSdoYfJn1MBKzWEHHjSk=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/RMFlAPuaHMqkY576r3UvrgxG7BI=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/RgNC7PdWW3mXStjoc61g4bDjprU=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/RmUk3OTIDHiloSG6QlA9lb0GYUI=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/So4fzxS+KKwQj2oxV25qMmY1tiw=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/UysC6fQK04HVgXOy8Qaks1TDSU8=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/V9b_Om1ptfpJr9xJyP5GfCAzLWo=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/VBiHSEx25Ju+wiTjTFPIJBiSPGM=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/VdE6IIN9Axj3TvwKA72fGzRG85Y=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/VisLhmA_VisBIFERX9ZaiQ1PJhg=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/WWHR_bY05hvAM3AWYtbMqZqD1rc=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Wo4lBQTB4E1CY0968BjZM2QrGFg=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/XRmo3o36gdt6Yg8OyFEzd9FNI2g=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xg_lu9CKdw2qNCIe0dJmHLQIbU4=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xjp62i4a9IKlLbBTwvHqPPYn9Sc=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Y6VRDpQgmRJvdCQtutTvZjNWGoA=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZM0wDz9U6fiFq5PQmoWeR_ZkXQ0=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZpkDOS0d8oOWzs7vtcfgeWMPgco=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/_e5POg7bMrqboLyNL48fwouKdkA=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/afEwPEGZzgB3nGDoGf6C63mUrBA=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/ap5gcfgX4TfHlDho2zubKvAPC3k=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/avioooMiU2PCP6ZlsOcws+LDKds=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/awbZFJsHE+7EME9bKTXZBtcl53A=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/b5Xf486Qj63IdAxOpLAbr38B_Rg=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/bO1MzPDTBUqFMmKDE0DgdmyBFC8=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/bswIdob_5t3zwZSYY3ooXliJbFA=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/btQSO+cjSE4IR8kQ5sooupncHbo=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/d8n_CzSkh6R9gaJY_RJPx9MDhOg=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/dNDmEFdDQPlZtURgxAO44x6t2r0=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/dgpo4ieOOV474ZW9eYqx06JyEJo=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/eB1bVS6pJ24YZ11_zUHiNwfDedU=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/eLHxGftB4vMbnplZ4rZbZcae2oA=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/eS_Pdl0fKRw6JpraA2OV7Qp+WaI=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/fyGrtsW8xZ3HYAEedmBf4LpKSQI=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/gbmLKhBWBvG84LJJ+8DtmGi70qw=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/hEJxvtpItZL2c4J4bBVjjADgd8Y=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/hLkBDpRM8D_LMhVBr9RxT5sDDHI=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/hmGUEPJJNTNLNsEGdUMNuqXXQLU=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/hu9xiLz0CDdo_ORLL9wZepNZY0U=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/i9JaTA4As7rNOuXoFojkcz+W2D4=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/iBA_oEfNAJUppX7LkUixx_RrUdU=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/iUVGBbdfjhQopRgfdnT5A2QTnl0=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/jndTM_yFVgRgFzUGPtGG5zCgBso=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/lX+jtoBaw8K43IQHjEJ18X2hvhE=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/leSPJxn1OjIaBM2F5AJySsu_jSc=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/m0VXB6ZPwOrS9XARhKpdjWCD8cU=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/mBQoV_JZWp5WUM4Sq9NBQm+VwHA=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/nJgwSo_M_DOIcJAnYkpGCs0wJmU=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/nQf5R_+ymVAGsNufxvsGdUhIR7A=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/nzUlLVYtzX2OElPJ4sM2qhKzW4g=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/ozCMBMB1okeaYbxhITcz9vY05vY=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/pNf+abA0ppzVGVt+5QgDGtCYWys=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/poDiMnNwV1SrenrWnc41PPDz8iU=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/pvcrzMbuPSgdf6FSX_TUqAoV86k=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/qM2edB8etWN2FHgcQxW5k5ifOrA=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/qukBQUa63iW9ux76_pB1ltq9H8Y=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/raIMpdhAOuEsj9RfL8rv5irthws=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/sVKzuyK32Emv7SUxX3+KiN7FQGs=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/wJBkdPd7MB8UlpyGU_piIOIIyEA=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/wXP+AAh5exPs4fwXVhFzmqpQQaU=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/we4+w2VPXe4+UgQk42yMiJIfozc=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/xRSMmiHkgU_U74hw8hgvmrJqFy8=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/xfYT860cjKi_XOPpiKxDpm5IMzg=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/xhV0bOYCl6zh7qK34HPqz7AEVvA=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/xppmk0Kw_BdVlm8JDLrjTcXRlzs=
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/zflDT7PXjd9iyTO8EGeysxDQsQ4=
# src/build/app/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
# src/build/app/intermediates/incremental/debug/mergeDebugResources/merger.xml
# src/build/app/intermediates/incremental/mergeDebugAssets/merger.xml
# src/build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/build/app/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
# src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
# src/build/app/intermediates/project_dex_archive/debug/out/fd5f28bbb2814597ada3448ec80ce6248fe0317ebf66c649cc19e41ac83c140c_0.jar
# src/build/app/intermediates/source_set_path_map/debug/file-map.txt
# src/build/app/kotlin/compileDebugKotlin/cacheable/last-build.bin
# src/build/app/kotlin/compileDebugKotlin/local-state/build-history.bin
# src/build/app/outputs/apk/debug/app-debug.apk
# src/build/app/outputs/flutter-apk/app-debug.apk
# src/build/app/outputs/flutter-apk/app-debug.apk.sha1
# src/build/app/outputs/logs/manifest-merger-debug-report.txt
# src/build/ec22a813054638c3e7d2f0a209f18233/gen_dart_plugin_registrant.stamp
# src/build/fa1f46848d15fd18dc4e2938a3aa6cef.cache.dill.track.dill
# src/lib/travelguideapp/ui/pages/MuseumInfoPage.dart
# src/lib/travelguideapp/ui/pages/ServiceEditPage.dart
# src/pubspec.yaml
|
2 years ago |
|
康江龙
|
1469632aa4
|
1
|
2 years ago |
|
pjamoh6iq
|
14d63d40b3
|
合并
合并
|
2 years ago |
 嘉辉 JIA HUI
|
8496eeb78c
|
Merge branch 'develop' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into HanJiaHui_Branch
# Conflicts:
# src/.dart_tool/package_config.json
# src/.dart_tool/package_config_subset
# src/.flutter-plugins
# src/.flutter-plugins-dependencies
# src/build/app/intermediates/assets/debug/flutter_assets/kernel_blob.bin
# src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/kernel_blob.bin.jar
# src/build/app/intermediates/dex_archive_input_jar_hashes/debug/out
# src/build/app/intermediates/flutter/debug/flutter_assets/kernel_blob.bin
# src/build/app/intermediates/flutter/debug/flutter_build.d
# src/build/app/intermediates/flutter/debug/libs.jar
# src/build/app/intermediates/incremental/debug-mergeJavaRes/merge-state
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/zflDT7PXjd9iyTO8EGeysxDQsQ4=
# src/build/app/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
# src/build/app/intermediates/incremental/debug/mergeDebugResources/merger.xml
# src/build/app/intermediates/incremental/mergeDebugAssets/merger.xml
# src/build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/build/app/intermediates/source_set_path_map/debug/file-map.txt
# src/build/app/kotlin/compileDebugKotlin/cacheable/last-build.bin
# src/build/app/kotlin/compileDebugKotlin/local-state/build-history.bin
# src/build/app/outputs/apk/debug/app-debug.apk
# src/build/app/outputs/flutter-apk/app-debug.apk
# src/build/app/outputs/flutter-apk/app-debug.apk.sha1
# src/build/app/outputs/logs/manifest-merger-debug-report.txt
# src/build/fa1f46848d15fd18dc4e2938a3aa6cef.cache.dill.track.dill
# src/build/sqflite/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
# src/build/sqflite/intermediates/incremental/debug/packageDebugResources/merger.xml
# src/build/sqflite/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
# src/build/sqflite/intermediates/incremental/mergeDebugShaders/merger.xml
# src/build/sqflite/intermediates/incremental/packageDebugAssets/merger.xml
# src/build/sqflite/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
# src/build/sqflite/outputs/logs/manifest-merger-debug-report.txt
# src/lib/travelguideapp/ui/pages/MuseumInfoPage.dart
|
2 years ago |
|
黎超凡
|
b3e9191f62
|
代码
|
2 years ago |
|
嘉辉 JIA HUI
|
4b1abf514c
|
1
|
2 years ago |
|
黎超凡
|
ea9ccb3688
|
代码
|
2 years ago |
|
黎超凡
|
7e679626b8
|
代码
|
2 years ago |
|
黎超凡
|
1ffbd2bac1
|
代码
|
2 years ago |
|
黎超凡
|
c940b005c4
|
代码
|
2 years ago |
|
康江龙
|
fc465f6cf3
|
1
|
2 years ago |
