Skip to content

Commit

Permalink
Bump submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
@yzx9
yzx9 committed Jul 28, 2024
1 parent 085ddd3 commit 7b09874
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
[submodule "CAR-Mobile"]
path = CAR-Mobile
url = https://github.com/Hi5App/C3.git
branch = "new_zll"
[submodule "CAR-Server"]
path = CAR-Server
url = https://github.com/Hi5App/BrainTellServer.git
Expand Down
2 changes: 1 addition & 1 deletion CAR-Mobile
Submodule CAR-Mobile updated 69 files
+1 −1 MyApplicationVolume/app/build.gradle
+4 −3 MyApplicationVolume/app/src/main/AndroidManifest.xml
+ − MyApplicationVolume/app/src/main/ic_car_launcher_circle-playstore.png
+ − MyApplicationVolume/app/src/main/ic_iamge_downsample_off-playstore.png
+25 −22 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/SplashScreenActivity.java
+34 −58 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/collaboration/MsgSender.java
+1 −0 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/collaboration/connector/BasicConnector.java
+26 −0 ...plicationVolume/app/src/main/java/com/penglab/hi5/core/collaboration/connector/ExecutorServiceProvider.java
+10 −2 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/collaboration/service/BasicService.java
+2 −1 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/collaboration/service/CollaborationService.java
+10 −27 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/net/HttpUtilsCollaborate.java
+1 −1 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/net/HttpUtilsUser.java
+3 −1 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/ui/BoutonDetection/BoutonDetectionActivity.java
+1 −0 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/ui/ImageClassify/ImageClassifyViewModel.java
+137 −184 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/ui/collaboration/CollaborationActivity.java
+25 −55 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/ui/collaboration/CollaborationViewModel.java
+82 −76 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/ui/login/LoginActivity.java
+2 −1 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/ui/marker/MarkerFactoryActivity.java
+19 −11 MyApplicationVolume/app/src/main/java/com/penglab/hi5/core/ui/splash/SplashScreenActivity.java
+64 −100 MyApplicationVolume/app/src/main/java/com/penglab/hi5/data/CollorationDataSource.java
+1 −1 MyApplicationVolume/app/src/main/java/com/penglab/hi5/data/UserDataSource.java
+1 −13 MyApplicationVolume/app/src/main/java/com/penglab/hi5/data/model/img/CollaborateNeuronInfo.java
+ − MyApplicationVolume/app/src/main/res/drawable/newlogo.png
+3 −3 MyApplicationVolume/app/src/main/res/drawable/splash_screen_background.xml
+329 −191 MyApplicationVolume/app/src/main/res/layout/activity_login.xml
+16 −3 MyApplicationVolume/app/src/main/res/layout/activity_splash_screen.xml
+5 −0 MyApplicationVolume/app/src/main/res/mipmap-anydpi-v26/ic_car_launcher_circle.xml
+5 −0 MyApplicationVolume/app/src/main/res/mipmap-anydpi-v26/ic_car_launcher_circle_round.xml
+5 −0 MyApplicationVolume/app/src/main/res/mipmap-anydpi-v26/ic_car_launcher_square.xml
+5 −0 MyApplicationVolume/app/src/main/res/mipmap-anydpi-v26/ic_iamge_downsample_off_round.xml
+ − MyApplicationVolume/app/src/main/res/mipmap-hdpi/bg_car_logo.png
+ − MyApplicationVolume/app/src/main/res/mipmap-hdpi/bg_login_car.png
+ − MyApplicationVolume/app/src/main/res/mipmap-hdpi/ic_car_launcher_circle.png
+ − MyApplicationVolume/app/src/main/res/mipmap-hdpi/ic_car_launcher_circle_foreground.png
+ − MyApplicationVolume/app/src/main/res/mipmap-hdpi/ic_car_launcher_circle_round.png
+ − MyApplicationVolume/app/src/main/res/mipmap-hdpi/ic_car_launcher_square.png
+ − MyApplicationVolume/app/src/main/res/mipmap-hdpi/ic_iamge_downsample_off_foreground.png
+ − MyApplicationVolume/app/src/main/res/mipmap-hdpi/ic_iamge_downsample_off_round.png
+ − MyApplicationVolume/app/src/main/res/mipmap-hdpi/ic_login_3party_csdn.png
+ − MyApplicationVolume/app/src/main/res/mipmap-hdpi/ic_login_3party_qq.png
+ − MyApplicationVolume/app/src/main/res/mipmap-hdpi/ic_login_3party_wechat.png
+ − MyApplicationVolume/app/src/main/res/mipmap-hdpi/ic_login_3party_weibo.png
+ − MyApplicationVolume/app/src/main/res/mipmap-mdpi/ic_car_launcher_circle.png
+ − MyApplicationVolume/app/src/main/res/mipmap-mdpi/ic_car_launcher_circle_foreground.png
+ − MyApplicationVolume/app/src/main/res/mipmap-mdpi/ic_car_launcher_circle_round.png
+ − MyApplicationVolume/app/src/main/res/mipmap-mdpi/ic_car_launcher_square.png
+ − MyApplicationVolume/app/src/main/res/mipmap-mdpi/ic_iamge_downsample_off_foreground.png
+ − MyApplicationVolume/app/src/main/res/mipmap-mdpi/ic_iamge_downsample_off_round.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xhdpi/ic_car_launcher_circle.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xhdpi/ic_car_launcher_circle_foreground.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xhdpi/ic_car_launcher_circle_round.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xhdpi/ic_car_launcher_square.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xhdpi/ic_iamge_downsample_off_foreground.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xhdpi/ic_iamge_downsample_off_round.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xxhdpi/ic_car_launcher_circle.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xxhdpi/ic_car_launcher_circle_foreground.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xxhdpi/ic_car_launcher_circle_round.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xxhdpi/ic_car_launcher_square.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xxhdpi/ic_iamge_downsample_off_foreground.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xxhdpi/ic_iamge_downsample_off_round.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xxxhdpi/ic_car_launcher_circle.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xxxhdpi/ic_car_launcher_circle_foreground.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xxxhdpi/ic_car_launcher_circle_round.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xxxhdpi/ic_car_launcher_square.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xxxhdpi/ic_iamge_downsample_off_foreground.png
+ − MyApplicationVolume/app/src/main/res/mipmap-xxxhdpi/ic_iamge_downsample_off_round.png
+4 −0 MyApplicationVolume/app/src/main/res/values/ic_car_launcher_circle_background.xml
+1 −1 MyApplicationVolume/app/src/main/res/values/ic_iamge_downsample_off_background.xml
+1 −0 MyApplicationVolume/app/src/main/res/values/strings.xml
2 changes: 1 addition & 1 deletion CAR-Server
Submodule CAR-Server updated 115 files
2 changes: 1 addition & 1 deletion CAR-WS-VR
Submodule CAR-WS-VR updated 38 files
+3 −2 v3d_main/3drenderer/v3dr_glwidget.cpp
+1 −0 v3d_main/3drenderer/v3dr_glwidget.h
+14 −1 v3d_main/3drenderer/v3dr_mainwindow.cpp
+2 −2 v3d_main/3drenderer/v3dr_mainwindow.h
+40 −72 v3d_main/3drenderer/v3dr_surfaceDialog.cpp
+6 −13 v3d_main/3drenderer/v3dr_surfaceDialog.h
+ − v3d_main/build-vaa3d_msvc-unknown-Release/.qtc_clangd/.cache/clangd/index/CPlugin.cpp.28A29962252D667C.idx
+ − v3d_main/build-vaa3d_msvc-unknown-Release/.qtc_clangd/.cache/clangd/index/PMain.cpp.13BA3573DFA043C4.idx
+ − v3d_main/build-vaa3d_msvc-unknown-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.D2A733A48B5805FA.idx
+ − ...ain/build-vaa3d_msvc-unknown-Release/.qtc_clangd/.cache/clangd/index/v3d_application.h.306B3F1C8919055C.idx
+1 −1 v3d_main/build-vaa3d_msvc-unknown-Release/.qtc_clangd/compile_commands.json
+0 −2 v3d_main/build-vaa3d_msvc-unknown-Release/release/autosave/annotations_stamp_2024_04_24_16_23.ano
+0 −2 v3d_main/build-vaa3d_msvc-unknown-Release/release/autosave/annotations_stamp_2024_04_24_16_23.ano.apo
+0 −38 v3d_main/build-vaa3d_msvc-unknown-Release/release/autosave/annotations_stamp_2024_04_24_16_23.ano.eswc
+0 −2 v3d_main/build-vaa3d_msvc-unknown-Release/release/autosave/annotations_stamp_2024_04_24_16_38.ano
+0 −2 v3d_main/build-vaa3d_msvc-unknown-Release/release/autosave/annotations_stamp_2024_04_24_16_38.ano.apo
+0 −68 v3d_main/build-vaa3d_msvc-unknown-Release/release/autosave/annotations_stamp_2024_04_24_16_38.ano.eswc
+22,635 −0 v3d_main/build-vaa3d_msvc-unknown-Release/release/customMessageLog.txt
+1 −1 ...n/build-vaa3d_msvc-unknown-Release/release/loaddata/00122_P003_T01-S001_S(M)TG_R0613_WY-20220513_RJ.ano.apo
+269 −5,141 .../build-vaa3d_msvc-unknown-Release/release/loaddata/00122_P003_T01-S001_S(M)TG_R0613_WY-20220513_RJ.ano.eswc
+ − v3d_main/build-vaa3d_msvc-unknown-Release/release/vaa3d_msvc.exe
+1 −3 v3d_main/mozak/m_terafly/src/presentation/m_PMain.cpp
+1 −1 v3d_main/mozak/m_terafly/src/presentation/m_PMain.h
+1 −0 v3d_main/terafly/src/control/CImport.cpp
+2 −1 v3d_main/terafly/src/control/CImport.h
+8 −1 v3d_main/terafly/src/control/CPlugin.cpp
+1 −0 v3d_main/terafly/src/control/CPlugin.h
+68 −24 v3d_main/terafly/src/presentation/PMain.cpp
+8 −2 v3d_main/terafly/src/presentation/PMain.h
+193 −88 v3d_main/terafly/src/presentation/loadmanagewidget.cpp
+10 −4 v3d_main/terafly/src/presentation/loadmanagewidget.h
+2 −2 v3d_main/v3d/customdebug.h
+7 −1 v3d_main/v3d/mainwindow.cpp
+2 −2 v3d_main/v3d/v3d_application.h
+2 −2 v3d_main/v3d/v3d_core.cpp
+1 −1 v3d_main/v3d/xformwidget.h
+37 −14 v3d_main/vrrenderer/V3dR_Communicator.cpp
+3 −3 v3d_main/vrrenderer/V3dR_Communicator.h

0 comments on commit 7b09874

Please sign in to comment.