diff --git a/.metadata b/.metadata
index c2aa44b..878648b 100644
--- a/.metadata
+++ b/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "603104015dd692ea3403755b55d07813d5cf8965"
+  revision: "ea121f8859e4b13e47a8f845e4586164519588bc"
   channel: "stable"
 
 project_type: app
@@ -13,26 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
-      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      create_revision: ea121f8859e4b13e47a8f845e4586164519588bc
+      base_revision: ea121f8859e4b13e47a8f845e4586164519588bc
     - platform: android
-      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
-      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
-    - platform: ios
-      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
-      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
-    - platform: linux
-      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
-      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
-    - platform: macos
-      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
-      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
-    - platform: web
-      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
-      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
-    - platform: windows
-      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
-      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      create_revision: ea121f8859e4b13e47a8f845e4586164519588bc
+      base_revision: ea121f8859e4b13e47a8f845e4586164519588bc
 
   # User provided section
 
diff --git a/android/app/.cxx/Debug/5xts1q2e/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/Debug/5xts1q2e/arm64-v8a/configure_fingerprint.bin
index 67087a4..45f0583 100644
--- 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	����2

� ���2l
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ͽ���2

� ���2l
 j
-hE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\additional_project_files.txt	����2
 ͹ל�2i
+hE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\additional_project_files.txt	ͽ���2
 ͹ל�2i
 g
-eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\android_gradle_build.json	����2
� ѹל�2n
+eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\android_gradle_build.json	ͽ���2
� ѹל�2n
 l
-jE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\android_gradle_build_mini.json	����2
� չל�2[
+jE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\android_gradle_build_mini.json	ͽ���2
� չל�2[
 Y
-WE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\build.ninja	����2
��
 Ÿל�2_
+WE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\build.ninja	ͽ���2
��
 Ÿל�2_
 ]
-[E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\build.ninja.txt	����2d
+[E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\build.ninja.txt	ͽ���2d
 b
-`E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\build_file_index.txt	����2

K ׹ל�2e
+`E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\build_file_index.txt	ͽ���2

K ׹ל�2e
 c
-aE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\compile_commands.json	����2	i
+aE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\compile_commands.json	ͽ���2	i
 g
-eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\compile_commands.json.bin	����2
+eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\compile_commands.json.bin	ͽ���2
 o
 m
-kE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\metadata_generation_command.txt	����2
� ֹל�2b
+kE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\metadata_generation_command.txt	ͽ���2
� ֹל�2b
 `
-^E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\prefab_config.json	����2

( ֹל�2g
+^E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\prefab_config.json	ͽ���2

( ֹל�2g
 e
-cE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\symbol_folder_index.txt	����2


Z ׹ל�2
\ No newline at end of file
+cE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\symbol_folder_index.txt	ͽ���2


Z ׹ל�2
\ No newline at end of file
diff --git a/android/app/.cxx/Debug/5xts1q2e/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/Debug/5xts1q2e/armeabi-v7a/configure_fingerprint.bin
index c25c5f4..4e3ca24 100644
--- 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	����2

� ���2n
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ؽ���2

� ���2n
 l
-jE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\additional_project_files.txt	����2
 ��ל�2k
+jE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\additional_project_files.txt	ؽ���2
 ��ל�2k
 i
-gE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\android_gradle_build.json	����2
� ��ל�2p
+gE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\android_gradle_build.json	ؽ���2
� ��ל�2p
 n
-lE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\android_gradle_build_mini.json	����2
� ��ל�2]
+lE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\android_gradle_build_mini.json	ؽ���2
� ��ל�2]
 [
-YE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\build.ninja	����2
��
 ��ל�2a
+YE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\build.ninja	ؽ���2
��
 ��ל�2a
 _
-]E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\build.ninja.txt	����2f
+]E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\build.ninja.txt	ؽ���2f
 d
-bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\build_file_index.txt	����2

K ��ל�2g
+bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\build_file_index.txt	ؽ���2

K ��ל�2g
 e
-cE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\compile_commands.json	����2	k
+cE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\compile_commands.json	ؽ���2	k
 i
-gE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\compile_commands.json.bin	����2
+gE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\compile_commands.json.bin	ؽ���2
 q
 o
-mE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\metadata_generation_command.txt	����2
� ��ל�2d
+mE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\metadata_generation_command.txt	ؽ���2
� ��ל�2d
 b
-`E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\prefab_config.json	����2

( ��ל�2i
+`E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\prefab_config.json	ؽ���2

( ��ל�2i
 g
-eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\symbol_folder_index.txt	����2


\ ��ל�2
\ No newline at end of file
+eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\symbol_folder_index.txt	ؽ���2


\ ��ל�2
\ No newline at end of file
diff --git a/android/app/.cxx/Debug/5xts1q2e/x86/configure_fingerprint.bin b/android/app/.cxx/Debug/5xts1q2e/x86/configure_fingerprint.bin
index 926a4a9..a734ec5 100644
--- 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	����2

� ���2f
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ὠ��2

� ���2f
 d
-bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\additional_project_files.txt	����2
 ��ל�2c
+bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\additional_project_files.txt	ὠ��2
 ��ל�2c
 a
-_E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\android_gradle_build.json	����2
� ��ל�2h
+_E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\android_gradle_build.json	ὠ��2
� ��ל�2h
 f
-dE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\android_gradle_build_mini.json	����2
� ��ל�2U
+dE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\android_gradle_build_mini.json	ὠ��2
� ��ל�2U
 S
-QE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\build.ninja	����2
��
 ��ל�2Y
+QE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\build.ninja	ὠ��2
��
 ��ל�2Y
 W
-UE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\build.ninja.txt	����2^
+UE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\build.ninja.txt	ὠ��2^
 \
-ZE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\build_file_index.txt	����2

K ��ל�2_
+ZE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\build_file_index.txt	ὠ��2

K ��ל�2_
 ]
-[E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\compile_commands.json	����2	c
+[E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\compile_commands.json	ὠ��2	c
 a
-_E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\compile_commands.json.bin	����2
+_E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\compile_commands.json.bin	ὠ��2
 i
 g
-eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\metadata_generation_command.txt	����2
� ��ל�2\
+eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\metadata_generation_command.txt	ὠ��2
� ��ל�2\
 Z
-XE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\prefab_config.json	����2

( ��ל�2a
+XE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\prefab_config.json	ὠ��2

( ��ל�2a
 _
-]E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\symbol_folder_index.txt	����2


T ��ל�2
\ No newline at end of file
+]E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\symbol_folder_index.txt	ὠ��2


T ��ל�2
\ No newline at end of file
diff --git a/android/app/.cxx/Debug/5xts1q2e/x86_64/configure_fingerprint.bin b/android/app/.cxx/Debug/5xts1q2e/x86_64/configure_fingerprint.bin
index 5ace49c..5a76432 100644
--- 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	����2

� ���2i
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	뽠��2

� ���2i
 g
-eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\additional_project_files.txt	����2
 ��ל�2f
+eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\additional_project_files.txt	뽠��2
 ��ל�2f
 d
-bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\android_gradle_build.json	����2
� ��ל�2k
+bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\android_gradle_build.json	뽠��2
� ��ל�2k
 i
-gE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\android_gradle_build_mini.json	����2
� ��ל�2X
+gE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\android_gradle_build_mini.json	뽠��2
� ��ל�2X
 V
-TE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\build.ninja	����2
��
 ��ל�2\
+TE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\build.ninja	뽠��2
��
 ��ל�2\
 Z
-XE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\build.ninja.txt	����2a
+XE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\build.ninja.txt	뽠��2a
 _
-]E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\build_file_index.txt	����2

K ��ל�2b
+]E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\build_file_index.txt	뽠��2

K ��ל�2b
 `
-^E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\compile_commands.json	����2	f
+^E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\compile_commands.json	뽠��2	f
 d
-bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\compile_commands.json.bin	����2
+bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\compile_commands.json.bin	뽠��2
 l
 j
-hE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\metadata_generation_command.txt	����2
� ��ל�2_
+hE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\metadata_generation_command.txt	뽠��2
� ��ל�2_
 ]
-[E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\prefab_config.json	����2

( ��ל�2d
+[E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\prefab_config.json	뽠��2

( ��ל�2d
 b
-`E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\symbol_folder_index.txt	����2


W ��ל�2
\ No newline at end of file
+`E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\symbol_folder_index.txt	뽠��2


W ��ל�2
\ No newline at end of file
diff --git a/android/app/.cxx/RelWithDebInfo/3n4i5831/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/3n4i5831/arm64-v8a/configure_fingerprint.bin
index b09da14..6498d69 100644
--- 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	�����2

� ���2u
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	��բ�2

� ���2u
 s
-qE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\additional_project_files.txt	�����2
 �����2r
+qE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\additional_project_files.txt	��բ�2
 �����2r
 p
-nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\android_gradle_build.json	�����2
� �����2w
+nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\android_gradle_build.json	��բ�2
� �����2w
 u
-sE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\android_gradle_build_mini.json	�����2
� �����2d
+sE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\android_gradle_build_mini.json	��բ�2
� �����2d
 b
-`E:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\build.ninja	�����2
��
 �����2h
+`E:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\build.ninja	��բ�2
��
 �����2h
 f
-dE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\build.ninja.txt	�����2m
+dE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\build.ninja.txt	��բ�2m
 k
-iE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\build_file_index.txt	�����2

K �����2n
+iE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\build_file_index.txt	��բ�2

K �����2n
 l
-jE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\compile_commands.json	�����2	r
+jE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\compile_commands.json	��բ�2	r
 p
-nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\compile_commands.json.bin	�����2
+nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\compile_commands.json.bin	��բ�2
 x
 v
-tE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\metadata_generation_command.txt	�����2
�	 �����2k
+tE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\metadata_generation_command.txt	��բ�2
�	 �����2k
 i
-gE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\prefab_config.json	�����2

( �����2p
+gE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\prefab_config.json	��բ�2

( �����2p
 n
-lE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\symbol_folder_index.txt	�����2


c �����2
\ No newline at end of file
+lE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\symbol_folder_index.txt	��բ�2


c �����2
\ No newline at end of file
diff --git a/android/app/.cxx/RelWithDebInfo/3n4i5831/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/3n4i5831/armeabi-v7a/configure_fingerprint.bin
index fd721d9..5b22b27 100644
--- 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	�����2

� ���2w
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	��բ�2

� ���2w
 u
-sE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\additional_project_files.txt	�����2
 �����2t
+sE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\additional_project_files.txt	��բ�2
 �����2t
 r
-pE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\android_gradle_build.json	�����2
� �����2y
+pE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\android_gradle_build.json	��բ�2
� �����2y
 w
-uE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\android_gradle_build_mini.json	�����2
� �����2f
+uE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\android_gradle_build_mini.json	��բ�2
� �����2f
 d
-bE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\build.ninja	�����2
��
 �����2j
+bE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\build.ninja	��բ�2
��
 �����2j
 h
-fE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\build.ninja.txt	�����2o
+fE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\build.ninja.txt	��բ�2o
 m
-kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\build_file_index.txt	�����2

K �����2p
+kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\build_file_index.txt	��բ�2

K �����2p
 n
-lE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\compile_commands.json	�����2	t
+lE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\compile_commands.json	��բ�2	t
 r
-pE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\compile_commands.json.bin	�����2
+pE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\compile_commands.json.bin	��բ�2
 z
 x
-vE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\metadata_generation_command.txt	�����2
�	 �����2m
+vE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\metadata_generation_command.txt	��բ�2
�	 �����2m
 k
-iE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\prefab_config.json	�����2

( �����2r
+iE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\prefab_config.json	��բ�2

( �����2r
 p
-nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\symbol_folder_index.txt	�����2


e �����2
\ No newline at end of file
+nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\symbol_folder_index.txt	��բ�2


e �����2
\ No newline at end of file
diff --git a/android/app/.cxx/RelWithDebInfo/3n4i5831/x86/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/3n4i5831/x86/configure_fingerprint.bin
index f979cce..4bc59ee 100644
--- 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	֍���2

� ���2o
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	��բ�2

� ���2o
 m
-kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\additional_project_files.txt	֍���2
 �����2l
+kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\additional_project_files.txt	��բ�2
 �����2l
 j
-hE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\android_gradle_build.json	֍���2
� �����2q
+hE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\android_gradle_build.json	��բ�2
� �����2q
 o
-mE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\android_gradle_build_mini.json	֍���2
� �����2^
+mE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\android_gradle_build_mini.json	��բ�2
� �����2^
 \
-ZE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\build.ninja	֍���2
��
 �����2b
+ZE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\build.ninja	��բ�2
��
 �����2b
 `
-^E:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\build.ninja.txt	֍���2g
+^E:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\build.ninja.txt	��բ�2g
 e
-cE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\build_file_index.txt	׍���2

K �����2h
+cE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\build_file_index.txt	��բ�2

K �����2h
 f
-dE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\compile_commands.json	׍���2	l
+dE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\compile_commands.json	��բ�2	l
 j
-hE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\compile_commands.json.bin	׍���2
+hE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\compile_commands.json.bin	��բ�2
 r
 p
-nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\metadata_generation_command.txt	׍���2
� �����2e
+nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\metadata_generation_command.txt	��բ�2
� �����2e
 c
-aE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\prefab_config.json	׍���2

( �����2j
+aE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\prefab_config.json	��բ�2

( �����2j
 h
-fE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\symbol_folder_index.txt	׍���2


] �����2
\ No newline at end of file
+fE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\symbol_folder_index.txt	��բ�2


] �����2
\ No newline at end of file
diff --git a/android/app/.cxx/RelWithDebInfo/3n4i5831/x86_64/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/3n4i5831/x86_64/configure_fingerprint.bin
index 0af5b0f..45c20bb 100644
--- 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	��2

� ���2r
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	��բ�2

� ���2r
 p
-nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\additional_project_files.txt	��2
 �����2o
+nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\additional_project_files.txt	��բ�2
 �����2o
 m
-kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\android_gradle_build.json	��2
� �����2t
+kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\android_gradle_build.json	��բ�2
� �����2t
 r
-pE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\android_gradle_build_mini.json	��2
� �����2a
+pE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\android_gradle_build_mini.json	��բ�2
� �����2a
 _
-]E:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\build.ninja	��2
��
 �����2e
+]E:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\build.ninja	��բ�2
��
 �����2e
 c
-aE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\build.ninja.txt	��2j
+aE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\build.ninja.txt	��բ�2j
 h
-fE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\build_file_index.txt	��2

K �����2k
+fE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\build_file_index.txt	��բ�2

K �����2k
 i
-gE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\compile_commands.json	��2	o
+gE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\compile_commands.json	��բ�2	o
 m
-kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\compile_commands.json.bin	��2
+kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\compile_commands.json.bin	��բ�2
 u
 s
-qE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\metadata_generation_command.txt	��2
� �����2h
+qE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\metadata_generation_command.txt	��բ�2
� �����2h
 f
-dE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\prefab_config.json	��2

( �����2m
+dE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\prefab_config.json	��բ�2

( �����2m
 k
-iE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\symbol_folder_index.txt	��2


` �����2
\ No newline at end of file
+iE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\symbol_folder_index.txt	��բ�2


` �����2
\ No newline at end of file
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
new file mode 100644
index 0000000..12e1dc6
--- /dev/null
+++ 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 = "../.."
+}
diff --git a/android/app/src/main/kotlin/com/taihe/vbvs_app/MainActivity.kt b/android/app/src/main/kotlin/com/taihe/vbvs_app/MainActivity.kt
new file mode 100644
index 0000000..8fac830
--- /dev/null
+++ 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()
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
new file mode 100644
index 0000000..89176ef
--- /dev/null
+++ 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)
+}
diff --git a/android/local.properties b/android/local.properties
index e85ddb3..4b98d2e 100644
--- 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
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
new file mode 100644
index 0000000..a439442
--- /dev/null
+++ 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")
diff --git a/assets/img/icon/xiaoyi.svg b/assets/img/icon/xiaoyi.svg
index b4c5fba..6a5c24b 100644
--- a/assets/img/icon/xiaoyi.svg
+++ b/assets/img/icon/xiaoyi.svg
@@ -1 +1,5 @@
+<<<<<<< HEAD
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="60" height="60.000244140625" viewBox="0 0 60 60.000244140625"><defs><radialGradient cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" id="master_svg0_0_27437" gradientTransform="translate(22.769785523414612 21.4565509557724) rotate(0) scale(34.40628468990326 34.40628468990326)"><stop offset="31.564244627952576%" stop-color="#004430" stop-opacity="1"/><stop offset="46.56067490577698%" stop-color="#00402D" stop-opacity="1"/><stop offset="61.42193078994751%" stop-color="#003424" stop-opacity="1"/><stop offset="76.23741030693054%" stop-color="#002016" stop-opacity="1"/><stop offset="90.94374179840088%" stop-color="#000403" stop-opacity="1"/><stop offset="93.01676154136658%" stop-color="#000000" stop-opacity="1"/></radialGradient><linearGradient x1="0.000009244539796782192" y1="0.49999353289604187" x2="1.0000025033950806" y2="0.49999353289604187" id="master_svg1_0_27439"><stop offset="0%" stop-color="#45D989" stop-opacity="1"/><stop offset="96.92737460136414%" stop-color="#00C1AA" stop-opacity="1"/></linearGradient></defs><g><g><rect x="0" y="0" width="60" height="60" rx="29.999969482421875" fill="url(#master_svg0_0_27437)" fill-opacity="1"/></g><g><path d="M41.61617066345215,13.10839842010498C34.88427066345215,8.48046842010498,24.81297066345215,10.844482420104981,18.18994066345215,18.61156842010498C17.86914066345215,18.98852842010498,17.55420066345215,19.37548842010498,17.21289066345215,19.82543842010498C17.21289066345215,19.82543842010498,17.137210663452148,19.925538420104978,17.137210663452148,19.925538420104978C16.99707066345215,20.11254842010498,16.860840663452148,20.305418420104978,16.727050663452147,20.49657842010498C16.727050663452147,20.49657842010498,16.553220663452148,20.74145842010498,16.553220663452148,20.74145842010498C13.474120663452148,25.21658842010498,11.954101663452148,30.37938842010498,12.270019763452149,35.27958842010498C12.593261663452148,40.26248842010498,14.769040663452149,44.38058842010498,18.399900663452147,46.87668842010498C18.399900663452147,46.87668842010498,18.483890663452147,46.93038842010498,18.483890663452147,46.93038842010498C20.14307066345215,48.13448842010498,22.075190663452148,48.86648842010498,24.19917066345215,49.10328842010498C24.89207066345215,49.20138842010498,25.59617066345215,49.25068842010498,26.309070663452147,49.25068842010498C27.43697066345215,49.25068842010498,28.584970663452147,49.12768842010498,29.74117066345215,48.88358842010498C33.20897066345215,48.15258842010498,36.585970663452144,46.38058842010498,39.50687066345215,43.75858842010498C40.98487066345215,42.43138842010498,42.314970663452144,40.91238842010498,43.461870663452146,39.24438842010498C49.864270663452146,29.93558842010498,49.03517066345215,18.21044842010498,41.61617066345215,13.10839842010498C41.61617066345215,13.10839842010498,41.61617066345215,13.10839842010498,41.61617066345215,13.10839842010498ZM39.55807066345215,25.56538842010498C37.163070663452146,31.69558842010498,27.01317066345215,34.643588420104976,23.635270663452147,35.467488420104985C22.842270663452148,33.93848842010498,22.459970663452147,32.14748842010498,22.49217066345215,30.25948842010498C24.41407066345215,29.99948842010498,32.86817066345215,28.53958842010498,33.54297066345215,22.90548842010498C33.68507066345215,21.71658842010498,33.41597066345215,20.70043842010498,32.76517066345215,19.966548420104978C32.12597066345215,19.24657842010498,31.15287066345215,18.85155842010498,30.02487066345215,18.85155842010498C29.210970663452148,18.85155842010498,28.24417066345215,19.08959842010498,27.25777066345215,19.58959842010498C25.297870663452148,20.56249842010498,23.92727066345215,22.48758842010498,23.92727066345215,22.48758842010498C23.88917066345215,22.540488420104978,23.84917066345215,22.59158842010498,23.81197066345215,22.645488420104982C20.789060663452148,26.98438842010498,20.22314066345215,32.09958842010498,21.94482066345215,35.83058842010498C22.60307066345215,37.25758842010498,23.584970663452147,38.487588420104984,24.909170663452148,39.38648842010498C24.932170663452148,39.402588420104976,24.95707066345215,39.415288420104986,24.980970663452148,39.43138842010498C26.01417066345215,40.17158842010498,27.232870663452147,40.63258842010498,28.598170663452148,40.78348842010498C29.57907066345215,40.919688420104976,30.59617066345215,40.894288420104985,31.620070663452147,40.73268842010498C31.799770663452147,40.704388420104976,31.980970663452148,40.680388420104975,32.16207066345215,40.642288420104975C33.468270663452145,40.37038842010498,34.77397066345215,39.859588420104984,36.02397066345215,39.14138842010498C36.89597066345215,38.63938842010498,37.74117066345215,38.03958842010498,38.53617066345215,37.33548842010498C38.69827066345215,37.191388420104985,38.84517066345215,37.02048842010498,39.00197066345215,36.86938842010498C39.04587066345215,36.83548842010498,39.08887066345215,36.807388420104985,39.13187066345215,36.77348842010498C39.13187066345215,36.77348842010498,39.10987066345215,37.34058842010498,39.10987066345215,37.34058842010498C39.10987066345215,37.34058842010498,38.88717066345215,43.06758842010498,38.88717066345215,43.06758842010498C36.05717066345215,45.60868842010498,32.79887066345215,47.29028842010498,29.549770663452147,47.97628842010498C27.783170663452147,48.34838842010498,26.01997066345215,48.42258842010498,24.32817066345215,48.18528842010498C22.32817066345215,47.96168842010498,20.541990663452147,47.27758842010498,19.02881066345215,46.17948842010498C18.99414066345215,46.15548842010498,18.95801066345215,46.13548842010498,18.92285066345215,46.11158842010498C11.915039663452148,41.291288420104976,11.194820663452148,30.168488420104982,17.315920663452147,21.26538842010498C17.37207066345215,21.18648842010498,17.42920066345215,21.110588420104982,17.48486066345215,21.031488420104978C17.61523066345215,20.84638842010498,17.746090663452147,20.660398420104983,17.87988066345215,20.48046842010498C17.916020663452148,20.43139842010498,17.95410066345215,20.384518420104982,17.991210663452147,20.33544842010498C18.28320066345215,19.94848842010498,18.58594066345215,19.57641842010498,18.89600066345215,19.212398420104982C19.89893066345215,18.06860842010498,21.039060663452148,17.03442842010498,22.34327066345215,16.17358842010498C25.17387066345215,14.30443842010498,28.107870663452147,13.316408420104981,30.827170663452147,13.316408420104981C33.207970663452144,13.316408420104981,35.35497066345215,14.07543842010498,37.01517066345215,15.43139842010498C37.50587066345215,15.83251842010498,37.960970663452144,16.28149842010498,38.35887066345215,16.78442842010498C38.48587066345215,16.94555842010498,38.621070663452144,17.098388420104982,38.73827066345215,17.26952842010498C40.37987066345215,19.67358842010498,40.67917066345215,22.697488420104982,39.55807066345215,25.56538842010498C39.55807066345215,25.56538842010498,39.55807066345215,25.56538842010498,39.55807066345215,25.56538842010498Z" fill="url(#master_svg1_0_27439)" fill-opacity="1"/></g></g></svg>
+=======
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="60" height="60.000244140625" viewBox="0 0 60 60.000244140625"><defs><radialGradient cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" id="master_svg0_0_29378" gradientTransform="translate(23.68282914161682 15.754256844520569) rotate(0) scale(38.13055157661438 38.13055157661438)"><stop offset="20.670391619205475%" stop-color="#84F5FF" stop-opacity="1"/><stop offset="100%" stop-color="#001236" stop-opacity="1"/></radialGradient></defs><g><g><rect x="0" y="0" width="60" height="60" rx="29.999969482421875" fill="url(#master_svg0_0_29378)" fill-opacity="1"/></g><g><g><path d="M27.98095921875,40.376676171875005C27.98095921875,40.376676171875005,27.98095921875,45.981676171875,27.98095921875,45.981676171875C27.98095921875,45.981676171875,23.89794921875,45.981676171875,23.89794921875,45.981676171875C23.89794921875,45.981676171875,23.89794921875,40.797576171875,23.89794921875,40.797576171875C23.89794921875,40.797576171875,31.01514921875,32.665576171875,31.01514921875,32.665576171875C31.79294921875,31.887476171875,32.06294921875,31.190476171874998,32.06294921875,30.189476171875C32.06294921875,30.189476171875,32.06294921875,19.215576171875,32.06294921875,19.215576171875C32.06294921875,19.215576171875,22.61425921875,19.215576171875,22.61425921875,19.215576171875C21.06396921875,19.215576171875,19.77294921875,20.472416171875,19.77294921875,22.022456171875C19.77294921875,22.022456171875,19.77294921875,32.997576171875,19.77294921875,32.997576171875C19.77294921875,33.423576171875,20.24316421875,33.675576171875,20.60986321875,33.332476171875C20.60986321875,33.332476171875,23.89013921875,29.612576171875,23.89013921875,29.612576171875C23.89013921875,29.612576171875,23.89013921875,23.109376171875,23.89013921875,23.109376171875C23.89013921875,23.109376171875,27.97118921875,23.109376171875,27.97118921875,23.109376171875C27.97118921875,23.109376171875,27.97118921875,29.274376171874998,27.97118921875,29.274376171874998C27.97118921875,29.274376171874998,20.61523421875,37.622576171875,20.61523421875,37.622576171875C20.12890621875,38.118376171875,19.72705081875,38.977276171875005,19.78613281875,39.926476171874995C19.78613281875,39.926476171874995,19.78613281875,47.027576171875,19.78613281875,47.027576171875C19.78613281875,48.763476171875,21.34325921875,49.875776171875,22.61425921875,49.875776171875C22.61425921875,49.875776171875,29.28222921875,49.875776171875,29.28222921875,49.875776171875C30.57324921875,49.875776171875,31.97604921875,48.779576171875,32.06884921875,47.049576171875C32.06884921875,47.049576171875,32.06884921875,42.703376171875,32.06884921875,42.703376171875C32.06884921875,42.703376171875,30.773949218749998,42.703376171875,30.773949218749998,42.703376171875C28.91698921875,42.703376171875,27.98095921875,42.260476171875,27.98095921875,40.376676171875005C27.98095921875,40.376676171875005,27.98095921875,40.376676171875005,27.98095921875,40.376676171875005Z" fill="#005EAC" fill-opacity="1"/></g><g><path d="M39.339890625,25.280551171875C39.640090625,25.620651171875,40.208990625,25.567351171875,40.226090625,24.891651171875C40.226090625,24.891651171875,40.226090625,14.569581171875,40.226090625,14.569581171875C40.226090625,13.714601171875,39.584990625,11.762451171875,37.103030625,11.762451171875C37.103030625,11.762451171875,30.710940625,11.762451171875,30.710940625,11.762451171875C29.183100625,11.762451171875,27.962890625,13.178471171875,27.962890625,14.608401171875C27.962890625,14.608401171875,27.962890625,19.206541171875,27.962890625,19.206541171875C27.962890625,19.206541171875,27.962890625,21.486571171875,27.962890625,21.486571171875C27.962890625,22.488551171875002,27.989257825,23.307351171875,28.614257625,24.233351171875C28.614257625,24.233351171875,36.139160625,32.814451171875,36.139160625,32.814451171875C36.139160625,32.814451171875,36.139160625,38.758551171875,36.139160625,38.758551171875C36.139160625,38.758551171875,32.068850624999996,38.800551171875,32.068850624999996,38.800551171875C32.068850624999996,38.800551171875,32.068850624999996,35.197551171875,32.068850624999996,35.197551171875C32.094240625,34.772451171875005,31.590820625,34.479451171875,31.225100625,34.855451171875C31.225100625,34.855451171875,27.980957025,38.542751171875,27.980957025,38.542751171875C27.980957025,38.542751171875,27.980957025,42.693651171875004,27.980957025,42.693651171875004C27.980957025,42.693651171875004,32.068850624999996,42.709751171875,32.068850624999996,42.709751171875C32.068850624999996,42.709751171875,37.437010625,42.709751171875,37.437010625,42.709751171875C38.914090625,42.701451171875,40.224090625,41.372351171874996,40.227090625,39.867451171875004C40.227090625,39.867451171875004,40.227090625,31.941451171875,40.227090625,31.941451171875C40.227090625,30.901651171875,39.896990625,30.187451171875,39.214890625,29.430451171875C39.214890625,29.430451171875,32.065920625000004,21.249511171875,32.065920625000004,21.249511171875C32.065920625000004,21.249511171875,32.065920625000004,15.656491171875,32.065920625000004,15.656491171875C32.065920625000004,15.656491171875,36.143070625,15.656491171875,36.143070625,15.656491171875C36.143070625,15.656491171875,36.143070625,21.638431171875,36.143070625,21.638431171875C36.143070625,21.638431171875,39.339890625,25.280551171875,39.339890625,25.280551171875C39.339890625,25.280551171875,39.339890625,25.280551171875,39.339890625,25.280551171875Z" fill="#DB3B7B" fill-opacity="1"/></g><g><path d="M27.98095703125,40.971434396972654C27.98095703125,40.971434396972654,27.98095703125,43.06567439697265,27.98095703125,43.06567439697265C27.98095703125,43.06567439697265,32.06884703125,43.06567439697265,32.06884703125,43.06567439697265C32.06884703125,43.06567439697265,32.06884703125,37.661376396972656,32.06884703125,37.661376396972656C32.11425703125,37.10839839697265,31.49023703125,36.91455039697266,31.19628703125,37.29638639697266C31.19628703125,37.29638639697266,27.98095703125,40.971434396972654,27.98095703125,40.971434396972654C27.98095703125,40.971434396972654,27.98095703125,40.971434396972654,27.98095703125,40.971434396972654Z" fill="#005EAC" fill-opacity="1"/></g></g></g></svg>
+>>>>>>> 58b2bebe936bdd7239529662ef20b531f2143de4
diff --git a/lib/pages/mh_page/test/WebviewTestModel.dart b/lib/pages/mh_page/test/WebviewTestModel.dart
index ed72f27..c970690 100644
--- a/lib/pages/mh_page/test/WebviewTestModel.dart
+++ b/lib/pages/mh_page/test/WebviewTestModel.dart
@@ -32,10 +32,17 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
   WebviewTestController() : super(WebviewTestModel()) {
     web = WebviewHelper(
       jsbridge: buildsdk(
+<<<<<<< HEAD
+          // father: this,
+          // clientId: '494641114',
+          // dbgserverUrl: 'ws://192.168.1.2:9001',
+          ),
+=======
         father: this,
         clientId: '494641114',
         // dbgserverUrl: 'ws://192.168.1.2:9001',
       ),
+>>>>>>> 58b2bebe936bdd7239529662ef20b531f2143de4
       settings: buildsettings(),
       params: PlatformHeadlessInAppWebViewCreationParams(
         initialUrlRequest: URLRequest(
diff --git a/pubspec.yaml b/pubspec.yaml
index a5128e6..c262154 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -58,7 +58,6 @@ dependencies:
   weather: ^3.1.1
   lpinyin: ^2.0.3
   geocoding: ^4.0.0
-  # fl_chart: ^1.0.0
   video_player: ^2.9.5
   chewie: ^1.10.0
   map_launcher: ^3.5.0