SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

PICloudClient now soft stop thread when closed

Browse Source 
last cmake changes
This commit is contained in:
Пелипенко Иван
2021-08-16 22:30:56 +03:00
parent 97b0b6fc0c
commit 44b9c37391
5 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -284,7 +284,7 @@ endif()
if(APPLE) if(APPLE)
add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE) add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
endif() endif()
if ((NOT DEFINED LIBPROJECT) AND (DEFINED ANDROID_PLATFORM)) if ((NOT DEFINED SHSTKPROJECT) AND (DEFINED ANDROID_PLATFORM))
include_directories(${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include) include_directories(${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include)
#message("${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include") #message("${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include")
#message("${ANDROID_NDK}/sysroot/usr/include") #message("${ANDROID_NDK}/sysroot/usr/include")

1
libs/cloud/picloudclient.cpp
View File

@@ -85,6 +85,7 @@ bool PICloudClient::openDevice() {
bool PICloudClient::closeDevice() { bool PICloudClient::closeDevice() {
PIThread::stop(false);
if (is_connected) { if (is_connected) {
is_connected = false; is_connected = false;
disconnected(); disconnected();

2
libs/main/system/pisysteminfo.cpp
View File

@@ -259,7 +259,7 @@ uint PISystemInfo::machineID() {
if (ret == 0) { if (ret == 0) {
CRC_32 crc = standardCRC_32(); CRC_32 crc = standardCRC_32();
ret = crc.calculate(machineKey().toByteArray()); ret = crc.calculate(machineKey().toByteArray());
piCout << "machineID \"" << machineKey() << "\" =" << PICoutManipulators::Hex << ret; //piCout << "machineID \"" << machineKey() << "\" =" << PICoutManipulators::Hex << ret;
} }
return ret; return ret;
} }

22
main.cpp
View File

@@ -2,7 +2,25 @@
int main(int argc, char * argv[]) { int main(int argc, char * argv[]) {
PICLI cli(argc, argv); PIByteArray v0 = PIByteArray::fromHex("01020304");
PIByteArray v1 = PIByteArray::fromHex("01020304");
piCout << "==" << (v0 == v1) << ", !=" << (v0 != v1) << ", <" << (v0 < v1) << ", >" << (v0 > v1);
v0 = PIByteArray::fromHex("0102030405");
v1 = PIByteArray::fromHex("01020304");
piCout << "==" << (v0 == v1) << ", !=" << (v0 != v1) << ", <" << (v0 < v1) << ", >" << (v0 > v1);
v0 = PIByteArray::fromHex("01020304");
v1 = PIByteArray::fromHex("0102030405");
piCout << "==" << (v0 == v1) << ", !=" << (v0 != v1) << ", <" << (v0 < v1) << ", >" << (v0 > v1);
v0 = PIByteArray::fromHex("01020404");
v1 = PIByteArray::fromHex("01020304");
piCout << "==" << (v0 == v1) << ", !=" << (v0 != v1) << ", <" << (v0 < v1) << ", >" << (v0 > v1);
v0 = PIByteArray::fromHex("0102040405");
v1 = PIByteArray::fromHex("01020304");
piCout << "==" << (v0 == v1) << ", !=" << (v0 != v1) << ", <" << (v0 < v1) << ", >" << (v0 > v1);
v0 = PIByteArray::fromHex("01020404");
v1 = PIByteArray::fromHex("0102030405");
piCout << "==" << (v0 == v1) << ", !=" << (v0 != v1) << ", <" << (v0 < v1) << ", >" << (v0 > v1);
/*PICLI cli(argc, argv);
PITimer tm; PITimer tm;
cli.addArgument("connect", true); cli.addArgument("connect", true);
cli.addArgument("name", true); cli.addArgument("name", true);
@@ -59,6 +77,6 @@ int main(int argc, char * argv[]) {
PIKbdListener ls; PIKbdListener ls;
ls.enableExitCapture(PIKbdListener::F10); ls.enableExitCapture(PIKbdListener::F10);
ls.start(); ls.start();
WAIT_FOR_EXIT WAIT_FOR_EXIT*/
return 0; return 0;
} }

1
utils/cloud_dispatcher/CMakeLists.txt
View File

@@ -22,5 +22,6 @@ if (NOT DEFINED ANDROID_PLATFORM)
DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR}
DESTINATION ${ROOT_DIR}/release DESTINATION ${ROOT_DIR}/release
DEB_ADD_SERVICE DEB_ADD_SERVICE
ADD_MANIFEST
) )
endif() endif()