forked from pjamoh6iq/travelguideProject
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.yamlKangJiangLong_Branch
commit
1acff0412e
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":[]}
|
||||
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
["E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]
|
||||
["E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/1F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/2F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/3F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/4F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/5F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection0.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection3.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection4.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +1,5 @@
|
||||
D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z: D:\\travelguideProject\\src\\pubspec.yaml D:\\travelguideProject\\src\\assets\\Collection_Preview.jpg D:\\travelguideProject\\src\\assets\\Museum_Preview.jpg D:\\travelguideProject\\src\\assets\\service1.png D:\\travelguideProject\\src\\assets\\service2.png C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\assets\\CupertinoIcons.ttf D:\\flutter\\flutter\\bin\\cache\\artifacts\\material_fonts\\MaterialIcons-Regular.otf D:\\flutter\\flutter\\packages\\flutter\\lib\\src\\material\\shaders\\ink_sparkle.frag C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\async-2.11.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\boolean_selector-2.1.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\characters-1.3.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\clock-1.1.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\collection-1.17.2\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\fake_async-1.3.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\flutter_lints-2.0.3\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\lints-2.1.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\matcher-0.12.16\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\material_color_utilities-0.5.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\meta-1.9.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path-1.8.3\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\source_span-1.10.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stack_trace-1.11.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stream_channel-2.1.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\string_scanner-1.2.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\term_glyph-1.2.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\test_api-0.6.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\vector_math-2.1.4\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\web-0.1.4-beta\\LICENSE D:\\flutter\\flutter\\bin\\cache\\pkg\\sky_engine\\LICENSE D:\\flutter\\flutter\\packages\\flutter\\LICENSE D:\\travelguideProject\\src\\DOES_NOT_EXIST_RERUN_FOR_WILDCARD421784613
|
||||
<<<<<<< HEAD
|
||||
D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z: D:\\travelguideProject\\src\\pubspec.yaml D:\\travelguideProject\\src\\assets\\Collection_Preview.jpg D:\\travelguideProject\\src\\assets\\Museum_Preview.jpg D:\\travelguideProject\\src\\assets\\service1.png D:\\travelguideProject\\src\\assets\\service2.png C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\assets\\CupertinoIcons.ttf D:\\flutter\\flutter\\bin\\cache\\artifacts\\material_fonts\\MaterialIcons-Regular.otf D:\\flutter\\flutter\\packages\\flutter\\lib\\src\\material\\shaders\\ink_sparkle.frag C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\async-2.11.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\boolean_selector-2.1.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\characters-1.3.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\clock-1.1.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\collection-1.17.2\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\fake_async-1.3.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\flutter_lints-2.0.3\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\lints-2.1.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\matcher-0.12.16\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\material_color_utilities-0.5.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\meta-1.9.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path-1.8.3\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\source_span-1.10.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stack_trace-1.11.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stream_channel-2.1.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\string_scanner-1.2.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\term_glyph-1.2.1\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\test_api-0.6.0\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\vector_math-2.1.4\\LICENSE C:\\Users\\康江龙\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\web-0.1.4-beta\\LICENSE D:\\flutter\\flutter\\bin\\cache\\pkg\\sky_engine\\LICENSE D:\\flutter\\flutter\\packages\\flutter\\LICENSE D:\\travelguideProject\\src\\DOES_NOT_EXIST_RERUN_FOR_WILDCARD421784613
|
||||
=======
|
||||
D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z: D:\\travelguideProject\\src\\pubspec.yaml D:\\travelguideProject\\src\\assets\\Collection_Preview.jpg D:\\travelguideProject\\src\\assets\\Museum_Preview.jpg D:\\travelguideProject\\src\\assets\\service1.png D:\\travelguideProject\\src\\assets\\service2.png C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\assets\\CupertinoIcons.ttf D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\cache\\artifacts\\material_fonts\\MaterialIcons-Regular.otf D:\\flutter_windows_3.13.3-stable\\flutter\\packages\\flutter\\lib\\src\\material\\shaders\\ink_sparkle.frag C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\async-2.11.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\boolean_selector-2.1.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\characters-1.3.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\clock-1.1.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\collection-1.17.2\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\fake_async-1.3.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\flutter_lints-2.0.3\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\lints-2.1.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\matcher-0.12.16\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\material_color_utilities-0.5.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\meta-1.9.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path-1.8.3\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\source_span-1.10.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite_common-2.5.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stack_trace-1.11.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stream_channel-2.1.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\string_scanner-1.2.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\synchronized-3.1.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\term_glyph-1.2.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\test_api-0.6.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\vector_math-2.1.4\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\web-0.1.4-beta\\LICENSE D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\cache\\pkg\\sky_engine\\LICENSE D:\\flutter_windows_3.13.3-stable\\flutter\\packages\\flutter\\LICENSE D:\\travelguideProject\\src\\DOES_NOT_EXIST_RERUN_FOR_WILDCARD179728225
|
||||
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
|
||||
|
||||
@ -1 +1,5 @@
|
||||
{"inputs":["D:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":[]}
|
||||
<<<<<<< HEAD
|
||||
{"inputs":["D:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":[]}
|
||||
=======
|
||||
{"inputs":["D:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["D:\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}
|
||||
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -0,0 +1 @@
|
||||
D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/0.png D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z: D:\\travelguideProject\\travelguideProject\\src\\pubspec.yaml D:\\travelguideProject\\travelguideProject\\src\\assets\\0.png D:\\travelguideProject\\travelguideProject\\src\\assets\\Collection_Preview.jpg D:\\travelguideProject\\travelguideProject\\src\\assets\\Museum_Preview.jpg D:\\travelguideProject\\travelguideProject\\src\\assets\\service1.png D:\\travelguideProject\\travelguideProject\\src\\assets\\service2.png C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\assets\\CupertinoIcons.ttf D:\\flutter\\flutter\\flutter\\bin\\cache\\artifacts\\material_fonts\\MaterialIcons-Regular.otf D:\\flutter\\flutter\\flutter\\packages\\flutter\\lib\\src\\material\\shaders\\ink_sparkle.frag C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\async-2.11.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\boolean_selector-2.1.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\characters-1.3.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\clock-1.1.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\collection-1.17.2\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\fake_async-1.3.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\flutter_lints-2.0.3\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\lints-2.1.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\matcher-0.12.16\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\material_color_utilities-0.5.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\meta-1.9.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path-1.8.3\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\source_span-1.10.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite_common-2.5.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stack_trace-1.11.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stream_channel-2.1.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\string_scanner-1.2.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\synchronized-3.1.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\term_glyph-1.2.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\test_api-0.6.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\vector_math-2.1.4\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\web-0.1.4-beta\\LICENSE D:\\flutter\\flutter\\flutter\\bin\\cache\\pkg\\sky_engine\\LICENSE D:\\flutter\\flutter\\flutter\\packages\\flutter\\LICENSE D:\\travelguideProject\\travelguideProject\\src\\DOES_NOT_EXIST_RERUN_FOR_WILDCARD664661712
|
||||
@ -0,0 +1 @@
|
||||
{"inputs":["D:\\travelguideProject\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["D:\\travelguideProject\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}
|
||||
@ -0,0 +1 @@
|
||||
{"inputs":[],"outputs":[]}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1 @@
|
||||
["D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/0.png","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]
|
||||
@ -0,0 +1,52 @@
|
||||
//
|
||||
// Generated file. Do not edit.
|
||||
// This file is generated from template in file `flutter_tools/lib/src/flutter_plugins.dart`.
|
||||
//
|
||||
|
||||
// @dart = 3.1
|
||||
|
||||
import 'dart:io'; // flutter_ignore: dart_io_import.
|
||||
import 'package:sqflite/sqflite.dart';
|
||||
import 'package:sqflite/sqflite.dart';
|
||||
import 'package:sqflite/sqflite.dart';
|
||||
|
||||
@pragma('vm:entry-point')
|
||||
class _PluginRegistrant {
|
||||
|
||||
@pragma('vm:entry-point')
|
||||
static void register() {
|
||||
if (Platform.isAndroid) {
|
||||
try {
|
||||
SqflitePlugin.registerWith();
|
||||
} catch (err) {
|
||||
print(
|
||||
'`sqflite` threw an error: $err. '
|
||||
'The app may not function as expected until you remove this plugin from pubspec.yaml'
|
||||
);
|
||||
}
|
||||
|
||||
} else if (Platform.isIOS) {
|
||||
try {
|
||||
SqflitePlugin.registerWith();
|
||||
} catch (err) {
|
||||
print(
|
||||
'`sqflite` threw an error: $err. '
|
||||
'The app may not function as expected until you remove this plugin from pubspec.yaml'
|
||||
);
|
||||
}
|
||||
|
||||
} else if (Platform.isLinux) {
|
||||
} else if (Platform.isMacOS) {
|
||||
try {
|
||||
SqflitePlugin.registerWith();
|
||||
} catch (err) {
|
||||
print(
|
||||
'`sqflite` threw an error: $err. '
|
||||
'The app may not function as expected until you remove this plugin from pubspec.yaml'
|
||||
);
|
||||
}
|
||||
|
||||
} else if (Platform.isWindows) {
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,6 @@
|
||||
# This is a generated file; do not edit or check into version control.
|
||||
<<<<<<< HEAD
|
||||
sqflite=C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\
|
||||
=======
|
||||
sqflite=C:\\Users\\17651\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\
|
||||
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
|
||||
@ -0,0 +1,5 @@
|
||||
<<<<<<< HEAD
|
||||
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-17 23:37:06.534861","version":"3.13.3"}
|
||||
=======
|
||||
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-17 22:31:12.840798","version":"3.13.3"}
|
||||
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
|
||||
@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="dataSourceStorageLocal" created-in="IU-211.7628.21">
|
||||
<data-source name="travelguide.sqlite" uuid="5004e01d-17e4-4e45-bbdf-a455ba9544e6">
|
||||
<database-info product="SQLite" version="3.43.0" jdbc-version="4.2" driver-name="SQLite JDBC" driver-version="3.43.0.0" dbms="SQLITE" exact-version="3.43.0" exact-driver-version="3.43">
|
||||
<identifier-quote-string>"</identifier-quote-string>
|
||||
</database-info>
|
||||
<case-sensitivity plain-identifiers="mixed" quoted-identifiers="mixed" />
|
||||
<secret-storage>master_key</secret-storage>
|
||||
<auth-provider>no-auth</auth-provider>
|
||||
<schema-mapping>
|
||||
<introspection-scope>
|
||||
<node kind="schema" qname="main" />
|
||||
</introspection-scope>
|
||||
</schema-mapping>
|
||||
</data-source>
|
||||
</component>
|
||||
</project>
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,8 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Flutter Plugins" type="FlutterPluginsLibraryType">
|
||||
<CLASSES />
|
||||
<CLASSES>
|
||||
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
|
||||
@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<excludeFolder url="file://$MODULE_DIR$/src/.pub" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/src/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/src/.dart_tool" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Dart SDK" level="project" />
|
||||
<orderEntry type="library" name="Dart Packages" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 184 KiB |
|
After Width: | Height: | Size: 174 KiB |
|
After Width: | Height: | Size: 207 KiB |
|
After Width: | Height: | Size: 184 KiB |
|
After Width: | Height: | Size: 218 KiB |
|
After Width: | Height: | Size: 152 KiB |
|
After Width: | Height: | Size: 61 KiB |
|
After Width: | Height: | Size: 93 KiB |
|
After Width: | Height: | Size: 35 KiB |
|
After Width: | Height: | Size: 24 KiB |
@ -1 +1 @@
|
||||
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":[]}
|
||||
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}
|
||||
@ -0,0 +1 @@
|
||||
{"inputs":[],"outputs":[]}
|
||||
@ -0,0 +1 @@
|
||||
{"inputs":["D:\\travelguideProject\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["D:\\travelguideProject\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}
|
||||
@ -0,0 +1 @@
|
||||
{"inputs":[],"outputs":[]}
|
||||
@ -1 +1 @@
|
||||
{"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
|
||||
{"assets/1F.png":["assets/1F.png"],"assets/2F.png":["assets/2F.png"],"assets/3F.png":["assets/3F.png"],"assets/4F.png":["assets/4F.png"],"assets/5F.png":["assets/5F.png"],"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/collection0.png":["assets/collection0.png"],"assets/collection1.png":["assets/collection1.png"],"assets/collection2.png":["assets/collection2.png"],"assets/collection3.png":["assets/collection3.png"],"assets/collection4.png":["assets/collection4.png"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 184 KiB |
|
After Width: | Height: | Size: 174 KiB |
|
After Width: | Height: | Size: 207 KiB |
|
After Width: | Height: | Size: 184 KiB |
|
After Width: | Height: | Size: 218 KiB |
|
After Width: | Height: | Size: 152 KiB |
|
After Width: | Height: | Size: 61 KiB |
|
After Width: | Height: | Size: 93 KiB |
|
After Width: | Height: | Size: 35 KiB |
|
After Width: | Height: | Size: 24 KiB |
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.
@ -1 +1 @@
|
||||
{"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
|
||||
{"assets/1F.png":["assets/1F.png"],"assets/2F.png":["assets/2F.png"],"assets/3F.png":["assets/3F.png"],"assets/4F.png":["assets/4F.png"],"assets/5F.png":["assets/5F.png"],"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/collection0.png":["assets/collection0.png"],"assets/collection1.png":["assets/collection1.png"],"assets/collection2.png":["assets/collection2.png"],"assets/collection3.png":["assets/collection3.png"],"assets/collection4.png":["assets/collection4.png"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 184 KiB |
|
After Width: | Height: | Size: 174 KiB |
|
After Width: | Height: | Size: 207 KiB |
|
After Width: | Height: | Size: 184 KiB |
|
After Width: | Height: | Size: 218 KiB |
|
After Width: | Height: | Size: 152 KiB |
|
After Width: | Height: | Size: 61 KiB |
|
After Width: | Height: | Size: 93 KiB |
|
After Width: | Height: | Size: 35 KiB |
|
After Width: | Height: | Size: 24 KiB |
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.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue