# Conflicts:
#	assets/file.json
#	pubspec.lock
This commit is contained in:
wyf
2025-07-07 14:10:55 +08:00
17 changed files with 208 additions and 122 deletions

View File

@@ -4,7 +4,7 @@
# This file should be version controlled and should not be manually edited. # This file should be version controlled and should not be manually edited.
version: version:
revision: "603104015dd692ea3403755b55d07813d5cf8965" revision: "ea121f8859e4b13e47a8f845e4586164519588bc"
channel: "stable" channel: "stable"
project_type: app project_type: app
@@ -13,26 +13,11 @@ project_type: app
migration: migration:
platforms: platforms:
- platform: root - platform: root
create_revision: 603104015dd692ea3403755b55d07813d5cf8965 create_revision: ea121f8859e4b13e47a8f845e4586164519588bc
base_revision: 603104015dd692ea3403755b55d07813d5cf8965 base_revision: ea121f8859e4b13e47a8f845e4586164519588bc
- platform: android - platform: android
create_revision: 603104015dd692ea3403755b55d07813d5cf8965 create_revision: ea121f8859e4b13e47a8f845e4586164519588bc
base_revision: 603104015dd692ea3403755b55d07813d5cf8965 base_revision: ea121f8859e4b13e47a8f845e4586164519588bc
- 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
# User provided section # User provided section

View File

@@ -2,27 +2,27 @@ C/C++ Structured LogO
M M
KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
A 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 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 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 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 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 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 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 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 eE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\compile_commands.json.bin  ͽ<><CDBD><EFBFBD>2
o 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 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 ^E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\arm64-v8a\prefab_config.json  ͽ<><CDBD><EFBFBD>2
 ( ֹל<D6B9>2g  ( ֹל<D6B9>2g

View File

@@ -2,27 +2,27 @@ C/C++ Structured LogO
M M
KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
A 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 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 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 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 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 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 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 gE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\armeabi-v7a\compile_commands.json.bin  ؽ<><D8BD><EFBFBD>2
q 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 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 `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

View File

@@ -2,27 +2,27 @@ C/C++ Structured LogO
M M
KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
A 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 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 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 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 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 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_ K <20><>ל<EFBFBD>2_
] ]
[E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\compile_commands.json  <><E1BDA0>2 c [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 _E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\compile_commands.json.bin  <><E1BDA0>2
i 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\ 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 XE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86\prefab_config.json  <><E1BDA0>2
 ( <20><>ל<EFBFBD>2a  ( <20><>ל<EFBFBD>2a

View File

@@ -2,27 +2,27 @@ C/C++ Structured LogO
M M
KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
A 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 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 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 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 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 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 K <20><>ל<EFBFBD>2b
` `
^E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\compile_commands.json  <><EBBDA0>2 f ^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 bE:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\compile_commands.json.bin  <><EBBDA0>2
l 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_ 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 [E:\software\flutter\main\vbvs_app\android\app\.cxx\Debug\5xts1q2e\x86_64\prefab_config.json  <><EBBDA0>2
 ( <20><>ל<EFBFBD>2d  ( <20><>ל<EFBFBD>2d

View File

@@ -2,27 +2,27 @@ C/C++ Structured LogO
M M
KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
A 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 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 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 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 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 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 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 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 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 nE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\arm64-v8a\compile_commands.json.bin  <08><>բ<EFBFBD>2
x 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 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 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

View File

@@ -2,27 +2,27 @@ C/C++ Structured LogO
M M
KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
A 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 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 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 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 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 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 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 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 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 pE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\armeabi-v7a\compile_commands.json.bin  <08><>բ<EFBFBD>2
z 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 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 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

View File

@@ -2,27 +2,27 @@ C/C++ Structured LogO
M M
KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
A 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 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 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 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 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 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 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 hE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86\compile_commands.json.bin  <08><>բ<EFBFBD>2
r 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 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 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

View File

@@ -2,27 +2,27 @@ C/C++ Structured LogO
M M
KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC KC:\dev\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
A 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 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 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 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 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 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 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 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 kE:\software\flutter\main\vbvs_app\android\app\.cxx\RelWithDebInfo\3n4i5831\x86_64\compile_commands.json.bin  <08><>բ<EFBFBD>2
u 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 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 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

View File

@@ -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 = "../.."
}

View File

@@ -0,0 +1,5 @@
package com.taihe.vbvs_app
import io.flutter.embedding.android.FlutterActivity
class MainActivity : FlutterActivity()

21
android/build.gradle.kts Normal file
View File

@@ -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)
}

View File

@@ -1,11 +1,7 @@
<<<<<<< HEAD
sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk
flutter.sdk=C:\\dev\\flutter flutter.sdk=C:\\dev\\flutter
======= =======
sdk.dir=C:\\Users\\wyf\\AppData\\Local\\Android\\sdk flutter.buildMode=release
flutter.sdk=D:\\flutter_res\\flutter
>>>>>>> 13eb25e1c30dcd81c87aa85bcb5306ca0931ed21
flutter.buildMode=debug
flutter.versionName=1.0.0 flutter.versionName=1.0.0
flutter.versionCode=1 flutter.versionCode=1
flutter.minSdkVersion=21 flutter.minSdkVersion=21

View File

@@ -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")

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -32,10 +32,17 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
WebviewTestController() : super(WebviewTestModel()) { WebviewTestController() : super(WebviewTestModel()) {
web = WebviewHelper( web = WebviewHelper(
jsbridge: buildsdk( jsbridge: buildsdk(
<<<<<<< HEAD
// father: this,
// clientId: '494641114',
// dbgserverUrl: 'ws://192.168.1.2:9001',
),
=======
father: this, father: this,
clientId: '494641114', clientId: '494641114',
// dbgserverUrl: 'ws://192.168.1.2:9001', // dbgserverUrl: 'ws://192.168.1.2:9001',
), ),
>>>>>>> 58b2bebe936bdd7239529662ef20b531f2143de4
settings: buildsettings(), settings: buildsettings(),
params: PlatformHeadlessInAppWebViewCreationParams( params: PlatformHeadlessInAppWebViewCreationParams(
initialUrlRequest: URLRequest( initialUrlRequest: URLRequest(

View File

@@ -58,7 +58,6 @@ dependencies:
weather: ^3.1.1 weather: ^3.1.1
lpinyin: ^2.0.3 lpinyin: ^2.0.3
geocoding: ^4.0.0 geocoding: ^4.0.0
# fl_chart: ^1.0.0
video_player: ^2.9.5 video_player: ^2.9.5
chewie: ^1.10.0 chewie: ^1.10.0
map_launcher: ^3.5.0 map_launcher: ^3.5.0