Kaynağa Gözat

Merge branch 'dev' of mayun.itc.cmbchina.cn:QD_RemoteBankArea/LR04.02_RVCTerminalPlus into dev

80296915 4 yıl önce
ebeveyn
işleme
9c13fc328a

+ 1 - 0
Module/CMakeLists.txt

@@ -218,6 +218,7 @@ add_subdirectory(mod_sipphone)
 set(RVC_CONAN_DEP_LIBS ${RVC_CONAN_DEP_LIBS} ${MODULE_CONAN_DEP_LIBS} PARENT_SCOPE)
 
 if(TEST_CHROMIMU_DIR)
+    MESSAGE( STATUS "TEST_CHROMIMU_DIR = ${TEST_CHROMIMU_DIR}")
     set (CEF_BIN_DIR ${TEST_CHROMIMU_DIR} PARENT_SCOPE)
 endif()
 

+ 2 - 3
Module/mod_chromium/CMakeLists.txt

@@ -60,8 +60,7 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 #附加包含的目录
 
 
-set (TEST_CHROMIMU_DIR ${CONAN_CEFCLIENT_ROOT}/bin PARENT_SCOPE)
-
+set(TEST_CHROMIMU_DIR ${CONAN_CEFCLIENT_MUTABLE_ROOT}/bin PARENT_SCOPE)
 
 
 MESSAGE( STATUS "BOOST_ROOT = ${CONAN_BOOST_ROOT}")
@@ -123,7 +122,7 @@ target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_BOOST} ${CONAN_L
 set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_ALL_LIBS} ${CONAN_PKG_LIBS_OPENSSL} )
 
 
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${Boost_LIBRARIES} libpublicFun ${LIBPROFILER_LIBRARY})  
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${Boost_LIBRARIES} libpublicFun ${LIBPROFILER_LIBRARY} )  
 
 deploy_module(${MODULE_PREFIX} ${MODULE_NAME})
 

+ 1 - 1
addin/cmake/DependencyConanFiles.cmake

@@ -22,7 +22,7 @@ set(CONAN_ALLPLATFORM_LIB_NAMES
 	#mod_CustMngrAuth mod_uplog
 	jsoncpp/1.9.0@LR04.02_ThirdParty/stable # !!!!support build missing!!!!
 	#mod_chromium
-	cefclient/12.0@LR04.02_ThirdParty/testing   
+	cefclient_mutable/1.0@LR04.02_ThirdParty/testing   
 	#mod_chromium mod_RomoteController mod_rpc
 	boost/1.69.0@LR04.02_ThirdParty/testing
 	#liblog4vendor

+ 137 - 0
addin/din/unix/rvcinstall.sh

@@ -0,0 +1,137 @@
+#!/bin/bash
+MY_PATH="`dirname \"$0\"`"              # relative
+# echo "1"$MY_PATH
+MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
+
+
+echo "[RVCTermianal] === Install Start === "
+echo "result=-1&msg=install begin" > `pwd`/install.log
+rvc_install_path_root="/opt"
+rvc_install_path_rvc_dir=${rvc_install_path_root}/rvc
+rvc_install_path_Run_dir=${rvc_install_path_root}/Run
+rvc_install_path_hardware_dir=${rvc_install_path_Run_dir}/hardwarecfg
+rvc_install_path_versions_dir=${rvc_install_path_Run_dir}/version
+
+
+#detect the usr input the vendor or not
+has_vendor=0
+tolower_vendor=''
+upper_vendor=''
+if [ $# -eq 1 ];then
+    has_vendor=1
+    echo has arguments: $*
+	tolower_vendor=$(echo $1 | awk '{ print tolower($0) }' )
+    upper_vendor=$(echo $1 | awk '{ print toupper($0) }' )
+else
+    echo no any arguments.
+fi
+
+# to detect zipped pkg is exist or not
+pkgs=$(sudo find ${MY_PATH} -type f -name *.tar.gz | head -n 1)
+if [ "#${pkgs}" = "#" ]
+then
+    echo Fail to find tar install package !!
+    exit 1
+else
+    echo ${pkgs}
+fi
+
+cur_pkg=${pkgs}
+slen=${#cur_pkg}
+cur_pkg_len=$((${slen}-6))
+cur_pkg_exists_dir=$(echo $cur_pkg | awk '{ print substr($0,0,length($0)-6) }') #.tar.gz
+echo ${cur_pkg_exists_dir}
+
+# remove the unzipped files if exists
+if [ -d $cur_pkg_exists_dir ]; then
+    echo "to remove unzipped exists directory"
+    sudo rm -rf ${cur_pkg_exists_dir}
+fi
+
+# unzip the zipped pkg.
+echo to unzip $cur_pkg ...
+tar -xzvf $cur_pkg
+echo unzip $cur_pkg done!
+
+# fetch the version full path at pkg
+version_dir=$(find ${cur_pkg_exists_dir}/Run/version/ -maxdepth 1 -regex ".*[0-9\.]$" -type d)
+echo version dir: $version_dir
+slen=${#cur_pkg_exists_dir}
+rel_version_dir=${version_dir:$slen+1}
+echo ${rel_version_dir}
+
+#if [ $has_vendor -eq 1 ];then
+#    bak=${cur_pkg}_bak
+#    sudo rm -rf ${bak}
+#    sudo mkdir -p ${bak}
+#    sudo cp -R 'find ${version_dir} -type d -path ${version_dir}/dep -prune -o -print | sed 1d' ${bak}
+#fi
+
+
+# to copy thirdparty libraries
+
+# deal with libcef.so
+if [ ! -f "$version_dir/bin/Chromium/libcef.so" -a ! -f "/usr/lib/libcef.so"  ];then
+    echo cannot found libcef.so !!!
+    exit 1
+else if [ ! -f "/usr/lib/libcef.so" ];then
+    echo to mv libcef.so...
+    sudo mv $version_dir/bin/Chromium/libcef.so /usr/lib/
+    echo mv libcef.so done!
+else if [ -f "$version_dir/bin/Chromium/libcef.so" ]; then
+    sudo rm $version_dir/bin/Chromium/libcef.so
+fi
+fi
+fi
+sudo chmod 644 /usr/lib/libcef.so
+
+#delete /opt/rvc
+# sudo rm -rf ${rvc_install_path_rvc_dir}
+
+if [ ! -f $rvc_install_path_hardware_dir/root.ini ]; then
+    #delete /opt/Run
+    sudo rm -rf ${rvc_install_path_Run_dir}
+else
+    echo has root.ini at hardware folder!! do not remove Run base dir.
+fi
+
+
+#copy the Run pkg to run path
+echo to copy Run package...
+sudo cp -rvf $cur_pkg_exists_dir/Run ${rvc_install_path_root}
+echo copy Run package completely!
+
+#copy the res pkg to rvc path
+echo to copy rvc Audio files...
+if [ ! -d $rvc_install_path_rvc_dir ]; then
+    sudo mkdir -p ${rvc_install_path_rvc_dir}
+fi
+sudo cp -rvf $cur_pkg_exists_dir/Data/Audio ${rvc_install_path_rvc_dir}/addata
+echo copy rvc Audio files completely!
+
+echo change the run scripts priviledge...
+echo ${rvc_install_path_rvc_dir}
+echo ${rvc_install_path_root}/${rel_version_dir}
+sudo chmod 766 -R ${rvc_install_path_rvc_dir}
+sudo chmod 666 -R ${rvc_install_path_hardware_dir}
+sudo chmod 777 -R ${rvc_install_path_root}/${rel_version_dir}
+sudo chmod 777 ${rvc_install_path_versions_dir}/spexplorer.sh
+sudo chmod 777 ${rvc_install_path_versions_dir}/sudo_spexplorer.sh
+echo change the run scripts priviledge done!
+
+if [ $has_vendor -eq 1 ];then
+    root_file=$rvc_install_path_hardware_dir/root.ini
+    root_vendor_file=$rvc_install_path_hardware_dir/root.ini.$tolower_vendor
+    if [ -f $root_vendor_file ] #  ! -f $root_file -a 
+    then
+        echo copy root.ini
+        sudo cp $root_vendor_file $root_file
+    fi
+fi
+
+echo "result=0&msg=install ok" > `pwd`/install.log
+chmod 777 `pwd`/install.log
+
+echo "[RVCTermianal] all install work done completely!!!"
+
+exit 0

+ 4 - 2
addin/res/ManagerDesktop/css/ininPsd.css

@@ -24,7 +24,7 @@ a,ins,s,u,del{text-decoration:none}
 p,small{word-wrap: break-word; word-break: break-all;}
 sup,sub{vertical-align:baseline}
 html {height: 100%;width:100%;-webkit-tap-highlight-color: transparent;touch-action: pan-x pan-y;}
-body {font-family:'HYQiHei 55S',sans-serif;color:#000;line-height: 1;-webkit-text-size-adjust: none;-webkit-font-smoothing:antialiased;}
+body {font-family:'HYQiHei 55S',sans-serif;color:#000;-webkit-text-size-adjust: none;-webkit-font-smoothing:antialiased;}
 hr {height: .02rem;margin: .1rem 0;border: medium none;border-top: .02rem solid #cacaca;}
 a {color: #25a4bb;text-decoration: none;}
 .clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}
@@ -295,9 +295,11 @@ nav ul li:nth-child(5)::before{
 	margin-bottom: 20px;
 }
 
+
+
 #SuspensionTxt{
 	max-height: 200px;
-	overflow-y: scroll;
+	overflow-y: auto;
 	overflow-x: hidden;
 	margin-bottom: 15px;
 }