From fe9e585973d4976dd8bdb6061cfff25c21d3b757 Mon Sep 17 00:00:00 2001 From: luocai Date: Tue, 9 Jul 2024 10:41:51 +0800 Subject: [PATCH] add script. --- .clang-format | 2 +- Readme.md | 11 +++++++++++ resources/build.sh | 45 ++++++++++++++++++++++++--------------------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/.clang-format b/.clang-format index aa2f616..fc80049 100644 --- a/.clang-format +++ b/.clang-format @@ -4,7 +4,7 @@ ObjCBlockIndentWidth: 4 IndentWidth: 4 TabWidth: 4 AccessModifierOffset: -4 -ColumnLimit: 130 +ColumnLimit: 140 #模板声明后换行 AlwaysBreakTemplateDeclarations: true diff --git a/Readme.md b/Readme.md index c86737b..35b4dd6 100644 --- a/Readme.md +++ b/Readme.md @@ -117,6 +117,7 @@ void statusbarUi::updatePlatformConnectionStatus(const int status) - 可视对讲（阳江博物馆项目）：https://172.16.100.22/ - 账号：admin - 密码：Reconova_123456 +- FacePass测试地址：http://172.16.7.36/ ## 人脸识别函数调用 @@ -390,6 +391,16 @@ classDiagram +``` +recoUiRecognize::event() 点击拨号按钮 +recoUiRecognizeTypeBase::event() 点击拨号按钮 +recoUiCallDial(拨号页面) 是 recoUi 的成员 +recoUiRecognize和 recoUiRecognizeTypeBase(recoUiRecognizeTypeColor、recoUiRecognizeTypeAd) 也是 recoUi 的成员 +``` + + + + diff --git a/resources/build.sh b/resources/build.sh index 8cc1fe8..ebf35fc 100755 --- a/resources/build.sh +++ b/resources/build.sh @@ -38,15 +38,15 @@ function cmake_scan() { $toolchain_file } -function qtmoc(){ - /opt/Qt/5.9.4/gcc_64/bin/moc src/qt/mainUi/mainUi.h -o src/qt/mainUi/moc_mainUi.cpp - /opt/Qt/5.9.4/gcc_64/bin/moc src/qt/utility/UiTools.h -o src/qt/utility/moc_UiTools.cpp - /opt/Qt/5.9.4/gcc_64/bin/moc src/qt/videoChatUi/CallWaittingPage.h -o src/qt/videoChatUi/moc_CallWaittingPage.cpp - /opt/Qt/5.9.4/gcc_64/bin/moc src/qt/videoChatUi/DialPadPage.h -o src/qt/videoChatUi/moc_DialPadPage.cpp - /opt/Qt/5.9.4/gcc_64/bin/moc src/qt/videoChatUi/VideoChatPage.h -o src/qt/videoChatUi/moc_VideoChatPage.cpp - /opt/Qt/5.9.4/gcc_64/bin/moc src/qt/recoUi/recoUi.h -o src/qt/recoUi/moc_recoUi.cpp - /opt/Qt/5.9.4/gcc_64/bin/moc src/qt/recoUi/recoUiRecognize.h -o src/qt/recoUi/moc_recoUiRecognize.cpp - /opt/Qt/5.9.4/gcc_64/bin/moc src/qt/utility/DndModeCountDownItem.h -o src/qt/utility/moc_DndModeCountDownItem.cpp +function qtmoc() { + MOC_EXE="docker run --rm -v $(pwd):$(pwd) -w $(pwd) frp-by1.wwvvww.cn:45288/ubuntu_dev:16.04 moc" + $MOC_EXE src/qt/mainUi/mainUi.h -o src/qt/mainUi/moc_mainUi.cpp + $MOC_EXE src/qt/utility/UiTools.h -o src/qt/utility/moc_UiTools.cpp + $MOC_EXE src/qt/recoUi/recoUi.h -o src/qt/recoUi/moc_recoUi.cpp + $MOC_EXE src/qt/recoUi/recoUiRecognize.h -o src/qt/recoUi/moc_recoUiRecognize.cpp + $MOC_EXE src/qt/recoUi/recoUiRecognizeTypeBase.h -o src/qt/recoUi/moc_recoUiRecognizeTypeBase.cpp + $MOC_EXE src/qt/recoUi/recoUiCallConsole.h -o src/qt/recoUi/moc_recoUiCallConsole.cpp + $MOC_EXE src/qt/utility/DndModeCountDownItem.h -o src/qt/utility/moc_DndModeCountDownItem.cpp } function build() { @@ -86,8 +86,8 @@ function deploy() { scp -i ~/Projects/ssh_host_rsa_key_ok ${build_path}/src/gate_face/GateFace root@${TARGET_IP}:${TARGET_PATH} # scp -i ~/Projects/ssh_host_rsa_key_ok ${build_path}/ThirdParty/librwSrvProtocol.so root@${TARGET_IP}:/system/lib/ - scp -i resources/ssh_host_rsa_key_ok ${build_path}/Tools/Record/Record root@${TARGET_IP}:/sdcard/ - scp -i resources/ssh_host_rsa_key_ok ${build_path}/Tools/Record/rkmedia_audio_test root@${TARGET_IP}:/sdcard/ + scp -i resources/ssh_host_rsa_key_ok ${build_path}/Tools/Record/Record root@${TARGET_IP}:/sdcard/ + scp -i resources/ssh_host_rsa_key_ok ${build_path}/Tools/Record/rkmedia_audio_test root@${TARGET_IP}:/sdcard/ scp -i resources/ssh_host_rsa_key_ok ./3rdparty/arm-linux-gnueabihf/mpp/rk-libs/libeasymedia.so.1.0.1 root@${TARGET_IP}:/system/lib/ ssh -i resources/ssh_host_rsa_key_ok root@${TARGET_IP} "sync" @@ -131,7 +131,7 @@ function copy_ssh() { ssh -i ~/Projects/ssh_host_rsa_key_ok root@${TARGET_IP} "sync" } -function deploy_old(){ +function build_old() { if [ -n "$1" ]; then TARGET_IP=$1 fi @@ -155,9 +155,18 @@ function deploy_old(){ if [ $? -ne 0 ]; then exit 1 fi + deploy_old $TARGET_IP + # deploy_old "172.16.103.98" + # deploy_old "172.16.103.117" +} + +function deploy_old() { + if [ -n "$1" ]; then + TARGET_IP=$1 + fi echo "deply to $TARGET_IP, path $TARGET_PATH" ssh -i ~/Projects/ssh_host_rsa_key_ok root@${TARGET_IP} "mount -o remount rw /; mount -o remount rw /system/" - + if [ $build_hisi = true ]; then ssh -i ~/Projects/ssh_host_rsa_key_ok root@${TARGET_IP} "killall start-app.sh; killall GateFace; sleep 1" ssh -i ~/Projects/ssh_host_rsa_key_ok root@${TARGET_IP} "killall start-app.sh; killall GateFace" @@ -165,16 +174,10 @@ function deploy_old(){ else ssh -i ~/Projects/ssh_host_rsa_key_ok root@${TARGET_IP} "killall start-app.sh; killall GateFace; killall netconfig" fi - # scp -i ~/Projects/ssh_host_rsa_key_ok ./3rdparty/arm-linux-gnueabihf/mpp/rk-libs/libeasymedia.so.1.0.1 root@${TARGET_IP}:/usr/lib/ - # scp -i ~/Projects/ssh_host_rsa_key_ok ./3rdparty/arm-linux-gnueabihf/rkap_3a/lib/libRKAP_3A.so root@${TARGET_IP}:/system/lib/ - # scp -i ~/Projects/ssh_host_rsa_key_ok ./3rdparty/arm-linux-gnueabihf/rkap_3a/lib/libRKAP_Common.so root@${TARGET_IP}:/system/lib/ - # scp -i ~/Projects/ssh_host_rsa_key_ok ./3rdparty/arm-linux-gnueabihf/rkap_3a/lib/libRKAP_ANR.so root@${TARGET_IP}:/system/lib/ - - # scp -r -i ~/Projects/ssh_host_rsa_key_ok src/web/php/*.php root@${TARGET_IP}:/system/www/web/ + scp -r -i ~/Projects/ssh_host_rsa_key_ok src/web/php/*.php root@${TARGET_IP}:/system/www/web/ scp -i ~/Projects/ssh_host_rsa_key_ok ./build/GateFace root@${TARGET_IP}:$TARGET_PATH # scp -i ~/Projects/ssh_host_rsa_key_ok ./build/netconfig root@${TARGET_IP}:$TARGET_PATH # scp -i ~/Projects/ssh_host_rsa_key_ok ./src/netlink/libRwNetlink.so root@${TARGET_IP}:/system/lib/ - if [ $build_hisi = true ]; then scp -i ~/Projects/ssh_host_rsa_key_ok ./3rdparty/arm-himix200-linux/rwStageProtocol/lib/librwSrvProtocol.so root@${TARGET_IP}:/system/lib/ @@ -212,7 +215,7 @@ function main() { clean ;; old) - deploy_old $@ + build_old $@ ;; ssh) copy_ssh $@