Bläddra i källkod

要提交的变更:
修改: lib/libgsd_modules.so
修改: modules/Expel/src/Expel.cpp
修改: tools/Deploy.sh

修复http控制驱鸟设备时无数据的bug

Your Name 2 år sedan
förälder
incheckning
a4d76c70e4
3 ändrade filer med 14 tillägg och 6 borttagningar
  1. BIN
      lib/libgsd_modules.so
  2. 1 1
      modules/Expel/src/Expel.cpp
  3. 13 5
      tools/Deploy.sh

BIN
lib/libgsd_modules.so


+ 1 - 1
modules/Expel/src/Expel.cpp

@@ -367,8 +367,8 @@ namespace gsd
             }
             httplib::Client cli(serviceIP, config::getPtr()->ExpelPort);
             std::string json;
+            json = (char*)data;
             if(json != ""){
-                json = (char*)data;
                 DebugL << "Http control data:" << json << endl;
             }
             if(deviceControl->getTypeId() == DeviceType::DevicePlayerV3){

+ 13 - 5
tools/Deploy.sh

@@ -1,10 +1,18 @@
 #!/bin/bash
+###
+ # @Author: Your Name lishengyin@sz-sunwin.com
+ # @Date: 2022-09-09 17:09:07
+ # @LastEditors: lishengyin
+ # @LastEditTime: 2022-09-15 09:19:27
+ # @FilePath: /gsd/tools/Deploy.sh
+ # @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+### 
 
 cp ../build/source/gsd ~/Desktop/Deploy/new/GSD/source/gsd/bin/
 cp ../lib/* ~/Desktop/Deploy/new/GSD/source/gsd/lib/
 
-sudo cp ~/Desktop/develop/GSD/GSD_CNStream/gsdv3.0/CNStream/lib/* /home/sunwin/Desktop/Deploy/new/GSD/source/CNStream/lib
-sudo cp ~/Desktop/develop/GSD/GSD_CNStream/gsdv3.0/CNStream/easydk/lib/* /home/sunwin/Desktop/Deploy/new/GSD/source/CNStream/lib
-sudo cp ~/Desktop/develop/GSD/GSD_CNStream/gsdv3.0/CNStream/3rdparty/live555/lib/* /home/sunwin/Desktop/Deploy/new/GSD/source/CNStream/lib
-sudo cp ~/Desktop/develop/GSD/GSD_CNStream/gsdv3.0/CNStream/3rdparty/libyuv/lib/*  /home/sunwin/Desktop/Deploy/new/GSD/source/CNStream/lib
-sudo cp ~/Desktop/develop/GSD/GSD_CNStream/gsdv3.0/CNStream/source/bin/main  /home/sunwin/Desktop/Deploy/new/GSD/source/CNStream/bin
+# sudo cp ~/Desktop/develop/GSD/GSD_CNStream/CNStream/lib/* /home/sunwin/Desktop/Deploy/new/GSD/source/CNStream/lib
+# sudo cp ~/Desktop/develop/GSD/GSD_CNStream/CNStream/easydk/lib/* /home/sunwin/Desktop/Deploy/new/GSD/source/CNStream/lib
+# sudo cp ~/Desktop/develop/GSD/GSD_CNStream/CNStream/3rdparty/live555/lib/* /home/sunwin/Desktop/Deploy/new/GSD/source/CNStream/lib
+# sudo cp ~/Desktop/develop/GSD/GSD_CNStream/CNStream/3rdparty/libyuv/lib/*  /home/sunwin/Desktop/Deploy/new/GSD/source/CNStream/lib
+# sudo cp ~/Desktop/develop/GSD/GSD_CNStream/CNStream/source/bin/main  /home/sunwin/Desktop/Deploy/new/GSD/source/CNStream/bin