Merge branch 'master' of http://10.20.2.7:8080/r/~enchantedwyf/vbvs_app

# Conflicts: # assets/file.json # pubspec.lock
2025-07-07 14:10:55 +08:00
parent b59fd0a2f6 850d7eba5a
commit 62879acb05
17 changed files with 208 additions and 122 deletions
--- a/android/app/.cxx/Debug/5xts1q2e/arm64-v8a/configure_fingerprint.bin
+++ b/android/app/.cxx/Debug/5xts1q2e/arm64-v8a/configure_fingerprint.bin
@@ -2,27 +2,27 @@ C/C++ Structured LogO
 M
 KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18> <20><>Ю<EFBFBD>2l
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ͽ<EFBFBD><EFBFBD><EFBFBD>2<18> <20><>Ю<EFBFBD>2l
 j
-hE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\additional_project_files.txt	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2 ͹ל<CDB9>2i
+hE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\additional_project_files.txt	ͽ<EFBFBD><EFBFBD><EFBFBD>2 ͹ל<CDB9>2i
 g
-eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\android_gradle_build.json	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18> ѹל<D1B9>2n
+eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\android_gradle_build.json	ͽ<EFBFBD><EFBFBD><EFBFBD>2<18> ѹל<D1B9>2n
 l
-jE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\android_gradle_build_mini.json	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18> չל<D5B9>2[
+jE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\android_gradle_build_mini.json	ͽ<EFBFBD><EFBFBD><EFBFBD>2<18> չל<D5B9>2[
 Y
-WE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\build.ninja	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18><> Ÿל<C5B8>2_
+WE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\build.ninja	ͽ<EFBFBD><EFBFBD><EFBFBD>2<18><> Ÿל<C5B8>2_
 ]
-[E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\build.ninja.txt	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2d
+[E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\build.ninja.txt	ͽ<EFBFBD><EFBFBD><EFBFBD>2d
 b
-`E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\build_file_index.txt	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2
+`E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\build_file_index.txt	ͽ<EFBFBD><EFBFBD><EFBFBD>2
 K ׹ל<D7B9>2e
-c
+c
 aE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\compile_commands.json	ͽ<><CDBD><EFBFBD>2	i
-g
+g
 eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\compile_commands.json.bin	ͽ<><CDBD><EFBFBD>2
 o
-m
+m
 kE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\metadata_generation_command.txt	ͽ<><CDBD><EFBFBD>2<18> ֹל<D6B9>2b
-`
+`
 ^E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\prefab_config.json	ͽ<><CDBD><EFBFBD>2
-( ֹל<D6B9>2g
+( ֹל<D6B9>2g
--- a/android/app/.cxx/Debug/5xts1q2e/armeabi-v7a/configure_fingerprint.bin
+++ b/android/app/.cxx/Debug/5xts1q2e/armeabi-v7a/configure_fingerprint.bin
@@ -2,27 +2,27 @@ C/C++ Structured LogO
 M
 KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18> <20><>Ю<EFBFBD>2n
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ؽ<EFBFBD><EFBFBD><EFBFBD>2<18> <20><>Ю<EFBFBD>2n
 l
-jE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\additional_project_files.txt	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2 <20><>ל<EFBFBD>2k
+jE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\additional_project_files.txt	ؽ<EFBFBD><EFBFBD><EFBFBD>2 <20><>ל<EFBFBD>2k
 i
-gE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\android_gradle_build.json	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18> <20><>ל<EFBFBD>2p
+gE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\android_gradle_build.json	ؽ<EFBFBD><EFBFBD><EFBFBD>2<18> <20><>ל<EFBFBD>2p
 n
-lE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\android_gradle_build_mini.json	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18> <20><>ל<EFBFBD>2]
+lE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\android_gradle_build_mini.json	ؽ<EFBFBD><EFBFBD><EFBFBD>2<18> <20><>ל<EFBFBD>2]
 [
-YE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\build.ninja	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18><> <20><>ל<EFBFBD>2a
+YE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\build.ninja	ؽ<EFBFBD><EFBFBD><EFBFBD>2<18><> <20><>ל<EFBFBD>2a
 _
-]E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\build.ninja.txt	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2f
+]E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\build.ninja.txt	ؽ<EFBFBD><EFBFBD><EFBFBD>2f
 d
-bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\build_file_index.txt	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2
+bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\build_file_index.txt	ؽ<EFBFBD><EFBFBD><EFBFBD>2
 K <20><>ל<EFBFBD>2g
-e
+e
 cE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\compile_commands.json	ؽ<><D8BD><EFBFBD>2	k
-i
+i
 gE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\compile_commands.json.bin	ؽ<><D8BD><EFBFBD>2
 q
-o
+o
 mE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\metadata_generation_command.txt	ؽ<><D8BD><EFBFBD>2<18> <20><>ל<EFBFBD>2d
-b
+b
 `E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\prefab_config.json	ؽ<><D8BD><EFBFBD>2
-( <20><>ל<EFBFBD>2i
+( <20><>ל<EFBFBD>2i
--- a/android/app/.cxx/Debug/5xts1q2e/x86/configure_fingerprint.bin
+++ b/android/app/.cxx/Debug/5xts1q2e/x86/configure_fingerprint.bin
@@ -2,27 +2,27 @@ C/C++ Structured LogO
 M
 KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18> <20><>Ю<EFBFBD>2f
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ὠ<EFBFBD><EFBFBD>2<18> <20><>Ю<EFBFBD>2f
 d
-bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\additional_project_files.txt	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2 <20><>ל<EFBFBD>2c
+bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\additional_project_files.txt	ὠ<EFBFBD><EFBFBD>2 <20><>ל<EFBFBD>2c
 a
-_E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\android_gradle_build.json	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18> <20><>ל<EFBFBD>2h
+_E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\android_gradle_build.json	ὠ<EFBFBD><EFBFBD>2<18> <20><>ל<EFBFBD>2h
 f
-dE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\android_gradle_build_mini.json	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18> <20><>ל<EFBFBD>2U
+dE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\android_gradle_build_mini.json	ὠ<EFBFBD><EFBFBD>2<18> <20><>ל<EFBFBD>2U
 S
-QE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\build.ninja	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18><> <20><>ל<EFBFBD>2Y
+QE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\build.ninja	ὠ<EFBFBD><EFBFBD>2<18><> <20><>ל<EFBFBD>2Y
 W
-UE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\build.ninja.txt	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2^
+UE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\build.ninja.txt	ὠ<EFBFBD><EFBFBD>2^
 \
-ZE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\build_file_index.txt	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2
+ZE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\build_file_index.txt	ὠ<EFBFBD><EFBFBD>2
 K <20><>ל<EFBFBD>2_
-]
+]
 [E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\compile_commands.json	ὠ<><E1BDA0>2	c
-a
+a
 _E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\compile_commands.json.bin	ὠ<><E1BDA0>2
 i
-g
+g
 eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\metadata_generation_command.txt	ὠ<><E1BDA0>2<18> <20><>ל<EFBFBD>2\
-Z
+Z
 XE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\prefab_config.json	ὠ<><E1BDA0>2
-( <20><>ל<EFBFBD>2a
+( <20><>ל<EFBFBD>2a
--- a/android/app/.cxx/Debug/5xts1q2e/x86_64/configure_fingerprint.bin
+++ b/android/app/.cxx/Debug/5xts1q2e/x86_64/configure_fingerprint.bin
@@ -2,27 +2,27 @@ C/C++ Structured LogO
 M
 KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18> <20><>Ю<EFBFBD>2i
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	뽠<EFBFBD><EFBFBD>2<18> <20><>Ю<EFBFBD>2i
 g
-eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\additional_project_files.txt	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2 <20><>ל<EFBFBD>2f
+eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\additional_project_files.txt	뽠<EFBFBD><EFBFBD>2 <20><>ל<EFBFBD>2f
 d
-bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\android_gradle_build.json	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18> <20><>ל<EFBFBD>2k
+bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\android_gradle_build.json	뽠<EFBFBD><EFBFBD>2<18> <20><>ל<EFBFBD>2k
 i
-gE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\android_gradle_build_mini.json	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18> <20><>ל<EFBFBD>2X
+gE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\android_gradle_build_mini.json	뽠<EFBFBD><EFBFBD>2<18> <20><>ל<EFBFBD>2X
 V
-TE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\build.ninja	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<18><> <20><>ל<EFBFBD>2\
+TE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\build.ninja	뽠<EFBFBD><EFBFBD>2<18><> <20><>ל<EFBFBD>2\
 Z
-XE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\build.ninja.txt	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2a
+XE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\build.ninja.txt	뽠<EFBFBD><EFBFBD>2a
 _
-]E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\build_file_index.txt	<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2
+]E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\build_file_index.txt	뽠<EFBFBD><EFBFBD>2
 K <20><>ל<EFBFBD>2b
-`
+`
 ^E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\compile_commands.json	뽠<><EBBDA0>2	f
-d
+d
 bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\compile_commands.json.bin	뽠<><EBBDA0>2
 l
-j
+j
 hE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\metadata_generation_command.txt	뽠<><EBBDA0>2<18> <20><>ל<EFBFBD>2_
-]
+]
 [E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\prefab_config.json	뽠<><EBBDA0>2
-( <20><>ל<EFBFBD>2d
+( <20><>ל<EFBFBD>2d
--- a/android/app/.cxx/RelWithDebInfo/3n4i5831/arm64-v8a/configure_fingerprint.bin
+++ b/android/app/.cxx/RelWithDebInfo/3n4i5831/arm64-v8a/configure_fingerprint.bin
@@ -2,27 +2,27 @@ C/C++ Structured LogO
 M
 KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<08><><EFBFBD><EFBFBD><EFBFBD>2<18> <20><>Ю<EFBFBD>2u
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<08><>բ<EFBFBD>2<18> <20><>Ю<EFBFBD>2u
 s
-qE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\additional_project_files.txt	<08><><EFBFBD><EFBFBD><EFBFBD>2 <20><><EFBFBD><EFBFBD><EFBFBD>2r
+qE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\additional_project_files.txt	<08><>բ<EFBFBD>2 <20><><EFBFBD><EFBFBD><EFBFBD>2r
 p
-nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\android_gradle_build.json	<08><><EFBFBD><EFBFBD><EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2w
+nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\android_gradle_build.json	<08><>բ<EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2w
 u
-sE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\android_gradle_build_mini.json	<08><><EFBFBD><EFBFBD><EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2d
+sE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\android_gradle_build_mini.json	<08><>բ<EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2d
 b
-`E:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\build.ninja	<08><><EFBFBD><EFBFBD><EFBFBD>2<18><> <20><><EFBFBD><EFBFBD><EFBFBD>2h
+`E:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\build.ninja	<08><>բ<EFBFBD>2<18><> <20><><EFBFBD><EFBFBD><EFBFBD>2h
 f
-dE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\build.ninja.txt	<08><><EFBFBD><EFBFBD><EFBFBD>2m
+dE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\build.ninja.txt	<08><>բ<EFBFBD>2m
 k
-iE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\build_file_index.txt	<08><><EFBFBD><EFBFBD><EFBFBD>2
+iE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\build_file_index.txt	<08><>բ<EFBFBD>2
 K <20><><EFBFBD><EFBFBD><EFBFBD>2n
-l
+l
 jE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\compile_commands.json	<08><>բ<EFBFBD>2	r
-p
+p
 nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\compile_commands.json.bin	<08><>բ<EFBFBD>2
 x
-v
+v
 tE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\metadata_generation_command.txt	<08><>բ<EFBFBD>2<18>	 <20><><EFBFBD><EFBFBD><EFBFBD>2k
-i
+i
 gE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\prefab_config.json	<08><>բ<EFBFBD>2
-( <20><><EFBFBD><EFBFBD><EFBFBD>2p
+( <20><><EFBFBD><EFBFBD><EFBFBD>2p
--- a/android/app/.cxx/RelWithDebInfo/3n4i5831/armeabi-v7a/configure_fingerprint.bin
+++ b/android/app/.cxx/RelWithDebInfo/3n4i5831/armeabi-v7a/configure_fingerprint.bin
@@ -2,27 +2,27 @@ C/C++ Structured LogO
 M
 KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<08><><EFBFBD><EFBFBD><EFBFBD>2<18> <20><>Ю<EFBFBD>2w
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<08><>բ<EFBFBD>2<18> <20><>Ю<EFBFBD>2w
 u
-sE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\additional_project_files.txt	<08><><EFBFBD><EFBFBD><EFBFBD>2 <20><><EFBFBD><EFBFBD><EFBFBD>2t
+sE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\additional_project_files.txt	<08><>բ<EFBFBD>2 <20><><EFBFBD><EFBFBD><EFBFBD>2t
 r
-pE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\android_gradle_build.json	<08><><EFBFBD><EFBFBD><EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2y
+pE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\android_gradle_build.json	<08><>բ<EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2y
 w
-uE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\android_gradle_build_mini.json	<08><><EFBFBD><EFBFBD><EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2f
+uE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\android_gradle_build_mini.json	<08><>բ<EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2f
 d
-bE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\build.ninja	<08><><EFBFBD><EFBFBD><EFBFBD>2<18><> <20><><EFBFBD><EFBFBD><EFBFBD>2j
+bE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\build.ninja	<08><>բ<EFBFBD>2<18><> <20><><EFBFBD><EFBFBD><EFBFBD>2j
 h
-fE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\build.ninja.txt	<08><><EFBFBD><EFBFBD><EFBFBD>2o
+fE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\build.ninja.txt	<08><>բ<EFBFBD>2o
 m
-kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\build_file_index.txt	<08><><EFBFBD><EFBFBD><EFBFBD>2
+kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\build_file_index.txt	<08><>բ<EFBFBD>2
 K <20><><EFBFBD><EFBFBD><EFBFBD>2p
-n
+n
 lE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\compile_commands.json	<08><>բ<EFBFBD>2	t
-r
+r
 pE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\compile_commands.json.bin	<08><>բ<EFBFBD>2
 z
-x
+x
 vE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\metadata_generation_command.txt	<08><>բ<EFBFBD>2<18>	 <20><><EFBFBD><EFBFBD><EFBFBD>2m
-k
+k
 iE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\prefab_config.json	<08><>բ<EFBFBD>2
-( <20><><EFBFBD><EFBFBD><EFBFBD>2r
+( <20><><EFBFBD><EFBFBD><EFBFBD>2r
--- a/android/app/.cxx/RelWithDebInfo/3n4i5831/x86/configure_fingerprint.bin
+++ b/android/app/.cxx/RelWithDebInfo/3n4i5831/x86/configure_fingerprint.bin
@@ -2,27 +2,27 @@ C/C++ Structured LogO
 M
 KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	֍<EFBFBD><EFBFBD><EFBFBD>2<18> <20><>Ю<EFBFBD>2o
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<08><>բ<EFBFBD>2<18> <20><>Ю<EFBFBD>2o
 m
-kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\additional_project_files.txt	֍<EFBFBD><EFBFBD><EFBFBD>2 <20><><EFBFBD><EFBFBD><EFBFBD>2l
+kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\additional_project_files.txt	<08><>բ<EFBFBD>2 <20><><EFBFBD><EFBFBD><EFBFBD>2l
 j
-hE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\android_gradle_build.json	֍<EFBFBD><EFBFBD><EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2q
+hE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\android_gradle_build.json	<08><>բ<EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2q
 o
-mE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\android_gradle_build_mini.json	֍<EFBFBD><EFBFBD><EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2^
+mE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\android_gradle_build_mini.json	<08><>բ<EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2^
 \
-ZE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\build.ninja	֍<EFBFBD><EFBFBD><EFBFBD>2<18><> <20><><EFBFBD><EFBFBD><EFBFBD>2b
+ZE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\build.ninja	<08><>բ<EFBFBD>2<18><> <20><><EFBFBD><EFBFBD><EFBFBD>2b
 `
-^E:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\build.ninja.txt	֍<EFBFBD><EFBFBD><EFBFBD>2g
+^E:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\build.ninja.txt	<08><>բ<EFBFBD>2g
 e
-cE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\build_file_index.txt	׍<EFBFBD><EFBFBD><EFBFBD>2
+cE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\build_file_index.txt	<08><>բ<EFBFBD>2
 K <20><><EFBFBD><EFBFBD><EFBFBD>2h
-f
+f
 dE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\compile_commands.json	<08><>բ<EFBFBD>2	l
-j
+j
 hE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\compile_commands.json.bin	<08><>բ<EFBFBD>2
 r
-p
+p
 nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\metadata_generation_command.txt	<08><>բ<EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2e
-c
+c
 aE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\prefab_config.json	<08><>բ<EFBFBD>2
-( <20><><EFBFBD><EFBFBD><EFBFBD>2j
+( <20><><EFBFBD><EFBFBD><EFBFBD>2j
--- a/android/app/.cxx/RelWithDebInfo/3n4i5831/x86_64/configure_fingerprint.bin
+++ b/android/app/.cxx/RelWithDebInfo/3n4i5831/x86_64/configure_fingerprint.bin
@@ -2,27 +2,27 @@ C/C++ Structured LogO
 M
 KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<EFBFBD><EFBFBD>2<18> <20><>Ю<EFBFBD>2r
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<08><EFBFBD>բ<EFBFBD>2<18> <20><>Ю<EFBFBD>2r
 p
-nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\additional_project_files.txt	<EFBFBD><EFBFBD>2 <20><><EFBFBD><EFBFBD><EFBFBD>2o
+nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\additional_project_files.txt	<08><EFBFBD>բ<EFBFBD>2 <20><><EFBFBD><EFBFBD><EFBFBD>2o
 m
-kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\android_gradle_build.json	<EFBFBD><EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2t
+kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\android_gradle_build.json	<08><EFBFBD>բ<EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2t
 r
-pE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\android_gradle_build_mini.json	<EFBFBD><EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2a
+pE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\android_gradle_build_mini.json	<08><EFBFBD>բ<EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2a
 _
-]E:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\build.ninja	<EFBFBD><EFBFBD>2<18><> <20><><EFBFBD><EFBFBD><EFBFBD>2e
+]E:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\build.ninja	<08><EFBFBD>բ<EFBFBD>2<18><> <20><><EFBFBD><EFBFBD><EFBFBD>2e
 c
-aE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\build.ninja.txt	<EFBFBD><EFBFBD>2j
+aE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\build.ninja.txt	<08><EFBFBD>բ<EFBFBD>2j
 h
-fE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\build_file_index.txt	<EFBFBD><EFBFBD>2
+fE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\build_file_index.txt	<08><EFBFBD>բ<EFBFBD>2
 K <20><><EFBFBD><EFBFBD><EFBFBD>2k
-i
+i
 gE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\compile_commands.json	<08><>բ<EFBFBD>2	o
-m
+m
 kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\compile_commands.json.bin	<08><>բ<EFBFBD>2
 u
-s
+s
 qE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\metadata_generation_command.txt	<08><>բ<EFBFBD>2<18> <20><><EFBFBD><EFBFBD><EFBFBD>2h
-f
+f
 dE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\prefab_config.json	<08><>բ<EFBFBD>2
-( <20><><EFBFBD><EFBFBD><EFBFBD>2m
+( <20><><EFBFBD><EFBFBD><EFBFBD>2m
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -0,0 +1,44 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "com.taihe.vbvs_app"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "com.taihe.vbvs_app"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.getByName("debug")
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}
--- a/android/app/src/main/kotlin/com/taihe/vbvs_app/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/taihe/vbvs_app/MainActivity.kt
@@ -0,0 +1,5 @@
+package com.taihe.vbvs_app
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity : FlutterActivity()
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -0,0 +1,21 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}
--- a/android/local.properties
+++ b/android/local.properties
@@ -1,11 +1,7 @@
-<<<<<<< HEAD
 sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk
 flutter.sdk=C:\\dev\\flutter
 =======
-sdk.dir=C:\\Users\\wyf\\AppData\\Local\\Android\\sdk
-flutter.sdk=D:\\flutter_res\\flutter
->>>>>>> 13eb25e1c30dcd81c87aa85bcb5306ca0931ed21
-flutter.buildMode=debug
+flutter.buildMode=release
 flutter.versionName=1.0.0
 flutter.versionCode=1
 flutter.minSdkVersion=21
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -0,0 +1,25 @@
+pluginManagement {
+    val flutterSdkPath = run {
+        val properties = java.util.Properties()
+        file("local.properties").inputStream().use { properties.load(it) }
+        val flutterSdkPath = properties.getProperty("flutter.sdk")
+        require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+        flutterSdkPath
+    }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.7.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.8.22" apply false
+}
+
+include(":app")