Sfoglia il codice sorgente

将tcp连接逻辑提取出来

vothin 3 mesi fa
parent
commit
b6f7bdcf9e
45 ha cambiato i file con 859 aggiunte e 902 eliminazioni
  1. 79 110
      .deps.lock
  2. 1 1
      Manifest.xml
  3. BIN
      Release/libzkgui.so
  4. 31 31
      Release/makefile
  5. 16 16
      Release/src/Main.d
  6. 124 127
      Release/src/activity/DeviceUpdateActivity.d
  7. 112 115
      Release/src/activity/mainActivity.d
  8. BIN
      Release/src/activity/mainActivity.o
  9. 1 1
      Release/src/activity/subdir.mk
  10. 28 28
      Release/src/base/http_client.d
  11. 4 4
      Release/src/base/http_response.d
  12. 4 4
      Release/src/base/json_array.d
  13. 4 4
      Release/src/base/json_object.d
  14. 1 1
      Release/src/base/subdir.mk
  15. 1 1
      Release/src/core/subdir.mk
  16. 52 52
      Release/src/core/update_assistant.d
  17. 34 34
      Release/src/module/HumitureSensors.d
  18. 1 1
      Release/src/module/subdir.mk
  19. 10 10
      Release/src/net/DhcpClient.d
  20. 4 4
      Release/src/net/net.d
  21. 32 32
      Release/src/net/s433Server.d
  22. 1 1
      Release/src/net/subdir.mk
  23. 62 65
      Release/src/net/tcp_client.d
  24. BIN
      Release/src/net/tcp_client.o
  25. 32 32
      Release/src/net/tcp_model.d
  26. 18 18
      Release/src/restclient-cpp/connection.d
  27. 4 4
      Release/src/restclient-cpp/helpers.d
  28. 22 22
      Release/src/restclient-cpp/restclient.d
  29. 1 1
      Release/src/restclient-cpp/subdir.mk
  30. 60 63
      Release/src/server/http_server.d
  31. 1 1
      Release/src/server/subdir.mk
  32. 32 32
      Release/src/service/BusinessConfig.d
  33. 12 12
      Release/src/service/popup_service.d
  34. 1 1
      Release/src/service/subdir.mk
  35. 6 6
      Release/src/service/time.d
  36. BIN
      Release/src/service/time.o
  37. 4 4
      Release/src/shttpd/multipart_parser.d
  38. 1 1
      Release/src/shttpd/subdir.mk
  39. 1 1
      Release/src/subdir.mk
  40. 8 8
      Release/src/uart/ProtocolParser.d
  41. 10 10
      Release/src/uart/ProtocolSender.d
  42. 38 38
      Release/src/uart/UartContext.d
  43. 1 1
      Release/src/uart/subdir.mk
  44. 3 3
      src/logic/mainLogic.cc
  45. 2 2
      src/net/tcp_client.cpp

+ 79 - 110
.deps.lock

@@ -8,7 +8,7 @@
         "id": "public",
         "url": "https://package.flythings.cn"
       },
-      "platform": "Z20",
+      "platform": "Z21",
       "id": "easyui",
       "version": "0.0.0",
       "revision": "0.0.0"
@@ -18,7 +18,7 @@
         "id": "public",
         "url": "https://package.flythings.cn"
       },
-      "platform": "Z20",
+      "platform": "Z21",
       "id": "log",
       "version": "0.0.0",
       "revision": "0.0.0"
@@ -28,7 +28,7 @@
         "id": "public",
         "url": "https://package.flythings.cn"
       },
-      "platform": "Z20",
+      "platform": "Z21",
       "id": "zkhardware",
       "version": "0.0.0",
       "revision": "0.0.0"
@@ -38,7 +38,7 @@
         "id": "public",
         "url": "https://package.flythings.cn"
       },
-      "platform": "Z20",
+      "platform": "Z21",
       "id": "zknet",
       "version": "0.0.0",
       "revision": "0.0.0"
@@ -48,7 +48,7 @@
         "id": "public",
         "url": "https://package.flythings.cn"
       },
-      "platform": "Z20",
+      "platform": "Z21",
       "id": "voip",
       "version": "4.0.2",
       "revision": "4.0.2",
@@ -59,17 +59,17 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "base-utility",
-          "version": "^7.0.0",
-          "revision": "7.1.0",
+          "version": "^6.0.0",
+          "revision": "6.1.2",
           "dependencies": [
             {
               "repository": {
                 "id": "public",
                 "url": "https://package.flythings.cn"
               },
-              "platform": "Z20",
+              "platform": "Z21",
               "id": "ext4",
               "version": "*",
               "revision": "0.0.1"
@@ -81,7 +81,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "yuv",
           "version": "0.0.0",
           "revision": "0.0.0"
@@ -91,7 +91,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "openh264",
           "version": "0.0.0",
           "revision": "0.0.0",
@@ -102,7 +102,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "opus",
           "version": "0.0.0",
           "revision": "0.0.0",
@@ -113,7 +113,28 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
+          "id": "zkaudio",
+          "version": "^0.3.0",
+          "revision": "0.3.2"
+        },
+        {
+          "repository": {
+            "id": "public",
+            "url": "https://package.flythings.cn"
+          },
+          "platform": "Z21",
+          "id": "mi_ai",
+          "version": "0.0.0",
+          "revision": "0.0.0",
+          "includeHeader": false
+        },
+        {
+          "repository": {
+            "id": "public",
+            "url": "https://package.flythings.cn"
+          },
+          "platform": "Z21",
           "id": "ffmpeg",
           "version": "4.1.9-configure2",
           "revision": "4.1.9-configure2"
@@ -123,7 +144,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "openssl",
           "version": "1.1.1-g",
           "revision": "1.1.1-g"
@@ -133,7 +154,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "z",
           "version": "0.0.0",
           "revision": "0.0.0"
@@ -143,7 +164,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "cares",
           "version": "1.17.2",
           "revision": "1.17.2"
@@ -153,7 +174,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "mi_common",
           "version": "0.0.0",
           "revision": "0.0.0",
@@ -164,18 +185,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
-          "id": "mi_ai",
-          "version": "0.0.0",
-          "revision": "0.0.0",
-          "includeHeader": false
-        },
-        {
-          "repository": {
-            "id": "public",
-            "url": "https://package.flythings.cn"
-          },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "mi_sys",
           "version": "0.0.0",
           "revision": "0.0.0",
@@ -186,7 +196,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "mi_disp",
           "version": "0.0.0",
           "revision": "0.0.0",
@@ -197,17 +207,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
-          "id": "zkaudio",
-          "version": "^0.3.1",
-          "revision": "0.3.3"
-        },
-        {
-          "repository": {
-            "id": "public",
-            "url": "https://package.flythings.cn"
-          },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "jpeg",
           "version": "9.1.0",
           "revision": "9.1.0"
@@ -219,17 +219,17 @@
         "id": "public",
         "url": "https://package.flythings.cn"
       },
-      "platform": "Z20",
+      "platform": "Z21",
       "id": "base-utility",
       "version": "\u003e\u003d5.1.4",
-      "revision": "7.1.0",
+      "revision": "6.1.2",
       "dependencies": [
         {
           "repository": {
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "ext4",
           "version": "*",
           "revision": "0.0.1"
@@ -241,7 +241,7 @@
         "id": "public",
         "url": "https://package.flythings.cn"
       },
-      "platform": "Z20",
+      "platform": "Z21",
       "id": "base-http-client",
       "version": "0.0.0",
       "revision": "0.0.0",
@@ -251,7 +251,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "curl",
           "version": "7.65.3",
           "revision": "7.65.3"
@@ -261,7 +261,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "cares",
           "version": "1.17.2",
           "revision": "1.17.2"
@@ -271,7 +271,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "openssl",
           "version": "1.1.1-g",
           "revision": "1.1.1-g"
@@ -281,7 +281,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "z",
           "version": "0.0.0",
           "revision": "0.0.0"
@@ -293,7 +293,7 @@
         "id": "public",
         "url": "https://package.flythings.cn"
       },
-      "platform": "Z20",
+      "platform": "Z21",
       "id": "base-json",
       "version": "2.1.0-dev9",
       "revision": "2.1.0-dev9",
@@ -303,7 +303,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "rapidjson",
           "version": "1.1.0",
           "revision": "1.1.0"
@@ -315,7 +315,7 @@
         "id": "public",
         "url": "https://package.flythings.cn"
       },
-      "platform": "Z20",
+      "platform": "Z21",
       "id": "display_utility",
       "version": "0.1.1",
       "revision": "0.1.1",
@@ -325,7 +325,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "yuv",
           "version": "0.0.0",
           "revision": "0.0.0"
@@ -335,17 +335,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
-          "id": "mi_sys",
-          "version": "0.0.0",
-          "revision": "0.0.0"
-        },
-        {
-          "repository": {
-            "id": "public",
-            "url": "https://package.flythings.cn"
-          },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "mi_common",
           "version": "0.0.0",
           "revision": "0.0.0"
@@ -355,8 +345,8 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
-          "id": "mi_ai",
+          "platform": "Z21",
+          "id": "mi_sys",
           "version": "0.0.0",
           "revision": "0.0.0"
         },
@@ -365,29 +355,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
-          "id": "mi_ao",
-          "version": "0.0.0",
-          "revision": "0.0.0",
-          "includeHeader": false
-        },
-        {
-          "repository": {
-            "id": "public",
-            "url": "https://package.flythings.cn"
-          },
-          "platform": "Z20",
-          "id": "mi_aio",
-          "version": "0.0.0",
-          "revision": "0.0.0",
-          "includeHeader": false
-        },
-        {
-          "repository": {
-            "id": "public",
-            "url": "https://package.flythings.cn"
-          },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "mi_panel",
           "version": "0.0.0",
           "revision": "0.0.0"
@@ -397,20 +365,10 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "mi_disp",
           "version": "0.0.0",
           "revision": "0.0.0"
-        },
-        {
-          "repository": {
-            "id": "public",
-            "url": "https://package.flythings.cn"
-          },
-          "platform": "Z20",
-          "id": "mi_gfx",
-          "version": "0.0.0",
-          "revision": "0.0.0"
         }
       ]
     },
@@ -419,17 +377,17 @@
         "id": "public",
         "url": "https://package.flythings.cn"
       },
-      "platform": "Z20",
+      "platform": "Z21",
       "id": "audio-utility",
       "version": "\u003e\u003d3.0.10",
-      "revision": "4.0.2",
+      "revision": "3.0.10",
       "dependencies": [
         {
           "repository": {
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "mi_ao",
           "version": "0.0.0",
           "revision": "0.0.0",
@@ -440,7 +398,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "mi_aio",
           "version": "0.0.0",
           "revision": "0.0.0",
@@ -451,7 +409,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "mi_sys",
           "version": "0.0.0",
           "revision": "0.0.0",
@@ -462,7 +420,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "mi_common",
           "version": "0.0.0",
           "revision": "0.0.0",
@@ -473,7 +431,7 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "apc",
           "version": "0.0.0",
           "revision": "0.0.0",
@@ -486,13 +444,24 @@
             "id": "public",
             "url": "https://package.flythings.cn"
           },
-          "platform": "Z20",
+          "platform": "Z21",
           "id": "aec",
           "version": "0.0.0",
           "revision": "0.0.0",
           "includeHeader": false,
           "linkLibrary": false,
           "systemLibrary": false
+        },
+        {
+          "repository": {
+            "id": "public",
+            "url": "https://package.flythings.cn"
+          },
+          "platform": "Z21",
+          "id": "cam_os_wrapper",
+          "version": "0.0.0",
+          "revision": "0.0.0",
+          "includeHeader": false
         }
       ]
     },
@@ -501,7 +470,7 @@
         "id": "public",
         "url": "https://package.flythings.cn"
       },
-      "platform": "Z20",
+      "platform": "Z21",
       "id": "ffmpeg",
       "version": "4.1.9-configure2",
       "revision": "4.1.9-configure2"
@@ -511,7 +480,7 @@
         "id": "public",
         "url": "https://package.flythings.cn"
       },
-      "platform": "Z20",
+      "platform": "Z21",
       "id": "sqlite3",
       "version": "3.7.11",
       "revision": "3.7.11"

File diff suppressed because it is too large
+ 1 - 1
Manifest.xml


BIN
Release/libzkgui.so


+ 31 - 31
Release/makefile

@@ -59,6 +59,7 @@ DEPENDENCIES_LINK_FLAGS := \
 	-l:libopenh264.a \
 	-l:libopus.a \
 	-l:libzkaudio.a \
+	-l:libmi_ai.so \
 	-l:libjpeg.so \
 	-l:libbase-utility.a \
 	-l:libext4.a \
@@ -70,14 +71,13 @@ DEPENDENCIES_LINK_FLAGS := \
 	-l:libbase-json.a \
 	-l:libdisplay_utility.a \
 	-l:libyuv-arm-unknown-linux-gnueabihf.a \
-	-l:libmi_ai.so \
 	-l:libmi_panel.so \
 	-l:libmi_disp.so \
-	-l:libmi_gfx.so \
 	-l:libaudio-utility.a \
 	-l:libmi_ao.so \
 	-l:libmi_sys.so \
 	-l:libmi_common.so \
+	-l:libcam_os_wrapper.so \
 	-l:libswresample.a -l:libswscale.a -l:libavdevice.a -l:libavfilter.a -l:libavutil.a -l:libavformat.a -l:libavcodec.a \
 	-l:libsqlite3.a \
 	-pthread \
@@ -85,35 +85,35 @@ DEPENDENCIES_LINK_FLAGS := \
 	-ldl \
 	-lstdc++ \
 	-Wl,--end-group \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\voip\4.0.2\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\openh264\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\opus\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkaudio\0.3.3\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\jpeg\9.1.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\base-utility\7.1.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\ext4\0.0.1\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\base-http-client\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\cares\1.17.2\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\openssl\1.1.1-g\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\z\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\base-json\2.1.0-dev9\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\display_utility\0.1.1\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\yuv\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\mi_ai\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\mi_panel\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\mi_disp\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\mi_gfx\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\audio-utility\4.0.2\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\mi_ao\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\mi_sys\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\mi_common\0.0.0\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\ffmpeg\4.1.9-configure2\lib" \
-	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\sqlite3\3.7.11\lib"
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\voip\4.0.2\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\openh264\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\opus\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkaudio\0.3.2\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\mi_ai\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\jpeg\9.1.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\base-utility\6.1.2\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\ext4\0.0.1\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\base-http-client\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\cares\1.17.2\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\openssl\1.1.1-g\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\z\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\base-json\2.1.0-dev9\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\display_utility\0.1.1\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\yuv\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\mi_panel\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\mi_disp\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\audio-utility\3.0.10\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\mi_ao\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\mi_sys\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\mi_common\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\cam_os_wrapper\0.0.0\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\ffmpeg\4.1.9-configure2\lib" \
+	-L"D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\sqlite3\3.7.11\lib"
 
 # Add inputs and outputs from these tool invocations to the build variables 
 

+ 16 - 16
Release/src/Main.d

@@ -1,31 +1,31 @@
 src/Main.o: ../src/Main.cpp \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/entry/EasyUIContext.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/ime/IMEContext.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/entry/EasyUIContext.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/ime/IMEContext.h \
  ../src/uart/UartContext.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
  ../src/uart/CommDef.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/ConfigManager.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/ConfigManager.h
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/entry/EasyUIContext.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/entry/EasyUIContext.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/ime/IMEContext.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/ime/IMEContext.h:
 
 ../src/uart/UartContext.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
 ../src/uart/CommDef.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/ConfigManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/ConfigManager.h:

+ 124 - 127
Release/src/activity/DeviceUpdateActivity.d

@@ -1,128 +1,127 @@
 src/activity/DeviceUpdateActivity.o: \
  ../src/activity/DeviceUpdateActivity.cpp \
  ../src/activity/DeviceUpdateActivity.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/app/Activity.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/app/BaseApp.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/window/ZKMainWindow.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/window/ZKWindow.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKBase.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/entry/EasyUIContext.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/ime/IMEContext.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/app/Activity.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/app/BaseApp.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/window/ZKMainWindow.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/window/ZKWindow.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKBase.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/entry/EasyUIContext.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/ime/IMEContext.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolData.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolParser.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolData.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKDigitalClock.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKTextView.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKBase.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKButton.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKCircleBar.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKDiagram.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKListView.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKButton.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKPointer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKQRCode.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKTextView.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKSeekBar.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKEditText.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKVideoView.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/media/ZKMediaPlayer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/MessageQueue.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/window/ZKSlideWindow.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKDigitalClock.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKTextView.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKBase.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKButton.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKCircleBar.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKDiagram.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKListView.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKButton.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKPointer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKQRCode.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKTextView.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKSeekBar.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKEditText.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKVideoView.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/media/ZKMediaPlayer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/MessageQueue.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/window/ZKSlideWindow.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/logic/DeviceUpdateLogic.cc \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolSender.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/service/popup_service.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/NetManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/EthernetManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiInfo.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiCtrl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/LTE4GManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/SoftApManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/NetManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/EthernetManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiInfo.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/LTE4GManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/SoftApManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/http_client.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/http_request.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/http_response.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curlver.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/system.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/easy.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/multi.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/urlapi.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curlver.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/system.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/easy.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/multi.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/urlapi.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/strings.hpp \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/os/UpgradeMonitor.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/os/MountMonitor.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/os/UpgradeMonitor.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/os/MountMonitor.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/core/update_assistant.h
 
 ../src/activity/DeviceUpdateActivity.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/app/Activity.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/app/Activity.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/app/BaseApp.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/app/BaseApp.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/window/ZKMainWindow.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/window/ZKMainWindow.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/window/ZKWindow.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/window/ZKWindow.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKBase.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKBase.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/entry/EasyUIContext.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/entry/EasyUIContext.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/ime/IMEContext.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/ime/IMEContext.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolData.h:
 
@@ -132,51 +131,51 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolParser.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolData.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKDigitalClock.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKDigitalClock.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKTextView.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKTextView.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKBase.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKBase.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKButton.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKButton.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKCircleBar.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKCircleBar.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKDiagram.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKDiagram.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKListView.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKListView.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKButton.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKButton.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKPointer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKPointer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKQRCode.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKQRCode.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKTextView.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKTextView.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKSeekBar.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKSeekBar.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKEditText.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKEditText.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKVideoView.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKVideoView.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/media/ZKMediaPlayer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/media/ZKMediaPlayer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/MessageQueue.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/MessageQueue.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/window/ZKSlideWindow.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/window/ZKSlideWindow.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/logic/DeviceUpdateLogic.cc:
 
@@ -184,33 +183,31 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolSender.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/service/popup_service.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/NetManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/NetManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/EthernetManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/EthernetManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiInfo.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiInfo.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiCtrl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/LTE4GManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/LTE4GManager.h:
-
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/SoftApManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/SoftApManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h:
 
@@ -218,7 +215,7 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
@@ -228,24 +225,24 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/base/http_request.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/base/http_response.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curlver.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curlver.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/system.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/system.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/easy.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/easy.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/multi.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/multi.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/urlapi.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/urlapi.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/base/strings.hpp:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/os/UpgradeMonitor.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/os/UpgradeMonitor.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/os/MountMonitor.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/os/MountMonitor.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/core/update_assistant.h:

+ 112 - 115
Release/src/activity/mainActivity.d

@@ -1,78 +1,77 @@
 src/activity/mainActivity.o: ../src/activity/mainActivity.cpp \
  ../src/activity/mainActivity.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/app/Activity.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/app/BaseApp.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/window/ZKMainWindow.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/window/ZKWindow.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKBase.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/entry/EasyUIContext.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/ime/IMEContext.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/app/Activity.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/app/BaseApp.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/window/ZKMainWindow.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/window/ZKWindow.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKBase.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/entry/EasyUIContext.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/ime/IMEContext.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolData.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolParser.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolData.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKDigitalClock.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKTextView.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKBase.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKButton.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKCircleBar.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKDiagram.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKListView.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKButton.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKPointer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKQRCode.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKTextView.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKSeekBar.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKEditText.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKVideoView.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/media/ZKMediaPlayer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/MessageQueue.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKRadioGroup.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKCheckBox.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/window/ZKSlideWindow.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKDigitalClock.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKTextView.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKBase.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKButton.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKCircleBar.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKDiagram.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKListView.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKButton.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKPointer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKQRCode.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKTextView.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKSeekBar.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKEditText.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKVideoView.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/media/ZKMediaPlayer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/MessageQueue.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKRadioGroup.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKCheckBox.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/window/ZKSlideWindow.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/logic/mainLogic.cc \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolSender.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/NetManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/EthernetManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiInfo.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiCtrl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/LTE4GManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/SoftApManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/NetManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/EthernetManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiInfo.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/LTE4GManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/SoftApManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/DhcpClient.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/s433Server.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/module/HumitureSensors.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/GpioHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/GpioHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/CrcCheckUtil.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/strings.hpp \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/ByteUtil.h \
@@ -82,43 +81,43 @@ src/activity/mainActivity.o: ../src/activity/mainActivity.cpp \
 
 ../src/activity/mainActivity.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/app/Activity.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/app/Activity.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/app/BaseApp.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/app/BaseApp.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/window/ZKMainWindow.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/window/ZKMainWindow.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/window/ZKWindow.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/window/ZKWindow.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKBase.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKBase.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/entry/EasyUIContext.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/entry/EasyUIContext.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/ime/IMEContext.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/ime/IMEContext.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolData.h:
 
@@ -128,73 +127,71 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolParser.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolData.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKDigitalClock.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKDigitalClock.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKTextView.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKTextView.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKBase.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKBase.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKButton.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKButton.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKCircleBar.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKCircleBar.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKDiagram.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKDiagram.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKListView.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKListView.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKButton.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKButton.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKPointer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKPointer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKQRCode.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKQRCode.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKTextView.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKTextView.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKSeekBar.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKSeekBar.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKEditText.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKEditText.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKVideoView.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKVideoView.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/media/ZKMediaPlayer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/media/ZKMediaPlayer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/MessageQueue.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/MessageQueue.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKRadioGroup.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKRadioGroup.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/ZKCheckBox.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/ZKCheckBox.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/window/ZKSlideWindow.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/window/ZKSlideWindow.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/logic/mainLogic.cc:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolSender.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/NetManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/NetManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/EthernetManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/EthernetManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiInfo.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiInfo.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiCtrl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/LTE4GManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/LTE4GManager.h:
-
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/SoftApManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/SoftApManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/DhcpClient.h:
 
@@ -206,19 +203,19 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
@@ -226,7 +223,7 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/net/s433Server.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/module/HumitureSensors.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/GpioHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/GpioHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/CrcCheckUtil.h:
 

BIN
Release/src/activity/mainActivity.o


File diff suppressed because it is too large
+ 1 - 1
Release/src/activity/subdir.mk


+ 28 - 28
Release/src/base/http_client.d

@@ -1,20 +1,20 @@
 src/base/http_client.o: ../src/base/http_client.cpp \
  ../src/base/http_client.h ../src/base/http_request.h \
  ../src/base/http_response.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curlver.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/system.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/easy.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/multi.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/urlapi.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/ConfigManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/easy.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curlver.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/system.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/easy.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/multi.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/urlapi.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/ConfigManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/easy.h
 
 ../src/base/http_client.h:
 
@@ -22,30 +22,30 @@ src/base/http_client.o: ../src/base/http_client.cpp \
 
 ../src/base/http_response.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curlver.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curlver.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/system.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/system.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/easy.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/easy.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/multi.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/multi.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/urlapi.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/urlapi.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/ConfigManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/ConfigManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/easy.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/easy.h:

+ 4 - 4
Release/src/base/http_response.d

@@ -1,13 +1,13 @@
 src/base/http_response.o: ../src/base/http_response.cpp \
  ../src/base/http_response.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/strings.hpp \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h
 
 ../src/base/http_response.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/base/strings.hpp:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:

+ 4 - 4
Release/src/base/json_array.d

@@ -24,8 +24,8 @@ src/base/json_array.o: ../src/base/json_array.cpp \
  ../src/base/rapidjson/internal/itoa.h \
  ../src/base/rapidjson/internal/itoa.h \
  ../src/base/rapidjson/stringbuffer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h
 
 ../src/base/json_array.h:
 
@@ -91,6 +91,6 @@ src/base/json_array.o: ../src/base/json_array.cpp \
 
 ../src/base/rapidjson/stringbuffer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:

+ 4 - 4
Release/src/base/json_object.d

@@ -26,8 +26,8 @@ src/base/json_object.o: ../src/base/json_object.cpp \
  ../src/base/rapidjson/internal/itoa.h \
  ../src/base/rapidjson/stringbuffer.h \
  ../src/base/rapidjson/prettywriter.h ../src/base/rapidjson/writer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h
 
 ../src/base/json_object.h:
 
@@ -97,6 +97,6 @@ src/base/json_object.o: ../src/base/json_object.cpp \
 
 ../src/base/rapidjson/writer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:

File diff suppressed because it is too large
+ 1 - 1
Release/src/base/subdir.mk


File diff suppressed because it is too large
+ 1 - 1
Release/src/core/subdir.mk


+ 52 - 52
Release/src/core/update_assistant.d

@@ -3,16 +3,16 @@ src/core/update_assistant.o: ../src/core/update_assistant.cpp \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/http_client.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/http_request.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/http_response.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curlver.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/system.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/easy.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/multi.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/urlapi.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curlver.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/system.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/easy.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/multi.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/urlapi.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/json_object.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/json_array.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/rapidjson/document.h \
@@ -39,29 +39,29 @@ src/core/update_assistant.o: ../src/core/update_assistant.cpp \
  d:\myprogram\c++\linux_transfer_box_2.0\src\base\rapidjson\stream.h \
  d:\myprogram\c++\linux_transfer_box_2.0\src\base\rapidjson\rapidjson.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/json_object.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/restclient.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h
 
 ../src/core/update_assistant.h:
@@ -72,25 +72,25 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/base/http_request.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/base/http_response.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curlver.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curlver.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/system.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/system.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/easy.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/easy.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/multi.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/multi.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/urlapi.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/urlapi.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/base/json_object.h:
 
@@ -144,43 +144,43 @@ d:\myprogram\c++\linux_transfer_box_2.0\src\base\rapidjson\rapidjson.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/base/json_object.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/restclient.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h:
 
@@ -188,6 +188,6 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:

+ 34 - 34
Release/src/module/HumitureSensors.d

@@ -1,33 +1,33 @@
 src/module/HumitureSensors.o: ../src/module/HumitureSensors.cpp \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/I2CHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/I2CHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/CrcCheckUtil.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/strings.hpp \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
  ../src/module/HumitureSensors.h
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/I2CHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/I2CHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/CrcCheckUtil.h:
 
@@ -37,37 +37,37 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h:
 
@@ -75,7 +75,7 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 

File diff suppressed because it is too large
+ 1 - 1
Release/src/module/subdir.mk


+ 10 - 10
Release/src/net/DhcpClient.d

@@ -1,18 +1,18 @@
 src/net/DhcpClient.o: ../src/net/DhcpClient.cpp ../src/net/DhcpClient.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h
 
 ../src/net/DhcpClient.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:

+ 4 - 4
Release/src/net/net.d

@@ -1,9 +1,9 @@
 src/net/net.o: ../src/net/net.cpp ../src/net/net.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h
 
 ../src/net/net.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:

+ 32 - 32
Release/src/net/s433Server.d

@@ -1,26 +1,26 @@
 src/net/s433Server.o: ../src/net/s433Server.cpp ../src/net/s433Server.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolSender.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
@@ -32,37 +32,37 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h:
 
@@ -70,7 +70,7 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 

File diff suppressed because it is too large
+ 1 - 1
Release/src/net/subdir.mk


+ 62 - 65
Release/src/net/tcp_client.d

@@ -1,84 +1,83 @@
 src/net/tcp_client.o: ../src/net/tcp_client.cpp ../src/net/tcp_client.h \
  ../src/net/net.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h \
  ../src/net/tcp_model.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/entry/EasyuiContext.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/ime/IMEContext.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/NetManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/EthernetManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/MessageQueue.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiInfo.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiCtrl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/LTE4GManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/SoftApManager.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/entry/EasyuiContext.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/ime/IMEContext.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/NetManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/EthernetManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/MessageQueue.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiInfo.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/LTE4GManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/SoftApManager.h
 
 ../src/net/tcp_client.h:
 
 ../src/net/net.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h:
 
@@ -86,38 +85,36 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h:
 
 ../src/net/tcp_model.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/entry/EasyuiContext.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/entry/EasyuiContext.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/ime/IMEContext.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/ime/IMEContext.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/NetManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/NetManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/EthernetManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/EthernetManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/MessageQueue.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/MessageQueue.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiInfo.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiInfo.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiCtrl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/LTE4GManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/LTE4GManager.h:
-
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/SoftApManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/SoftApManager.h:

BIN
Release/src/net/tcp_client.o


+ 32 - 32
Release/src/net/tcp_model.d

@@ -1,57 +1,57 @@
 src/net/tcp_model.o: ../src/net/tcp_model.cpp ../src/net/tcp_model.h \
  ../src/net/net.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/strings.hpp \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h
 
 ../src/net/tcp_model.h:
 
 ../src/net/net.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/base/strings.hpp:
 
@@ -59,13 +59,13 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h:
 
@@ -73,6 +73,6 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:

+ 18 - 18
Release/src/restclient-cpp/connection.d

@@ -1,37 +1,37 @@
 src/restclient-cpp/connection.o: ../src/restclient-cpp/connection.cpp \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/connection.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curlver.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/system.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/easy.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/multi.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/urlapi.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curlver.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/system.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/easy.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/multi.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/urlapi.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/restclient.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/helpers.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/connection.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curlver.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curlver.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/system.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/system.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/easy.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/easy.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/multi.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/multi.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/urlapi.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/urlapi.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/restclient.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/helpers.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:

+ 4 - 4
Release/src/restclient-cpp/helpers.d

@@ -1,13 +1,13 @@
 src/restclient-cpp/helpers.o: ../src/restclient-cpp/helpers.cpp \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/helpers.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/restclient.h
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/helpers.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/restclient.h:

+ 22 - 22
Release/src/restclient-cpp/restclient.d

@@ -1,40 +1,40 @@
 src/restclient-cpp/restclient.o: ../src/restclient-cpp/restclient.cpp \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/restclient.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curlver.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/system.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/easy.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/multi.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/urlapi.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curlver.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/system.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/easy.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/multi.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/urlapi.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/connection.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/ConfigManager.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/ConfigManager.h
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/restclient.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curlver.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curlver.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/system.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/system.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/easy.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/easy.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/multi.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/multi.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/curl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/curl.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\curl\7.65.3\include/curl/urlapi.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\curl\7.65.3\include/curl/urlapi.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/restclient-cpp/connection.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/ConfigManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/ConfigManager.h:

File diff suppressed because it is too large
+ 1 - 1
Release/src/restclient-cpp/subdir.mk


+ 60 - 63
Release/src/server/http_server.d

@@ -1,92 +1,91 @@
 src/server/http_server.o: ../src/server/http_server.cpp \
  ../src/server/http_server.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/shttpd/shttpd.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/ConfigManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/ConfigManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/shttpd/multipart_reader.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/shttpd/multipart_parser.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/os/MountMonitor.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/NetManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/EthernetManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/MessageQueue.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiInfo.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiCtrl.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/LTE4GManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/SoftApManager.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/os/MountMonitor.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/NetManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/EthernetManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/MessageQueue.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiInfo.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/LTE4GManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/SoftApManager.h
 
 ../src/server/http_server.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/shttpd/shttpd.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h:
 
@@ -94,34 +93,32 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/ConfigManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/ConfigManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/shttpd/multipart_reader.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/shttpd/multipart_parser.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/os/MountMonitor.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/os/MountMonitor.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/NetManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/NetManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/EthernetManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/EthernetManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/MessageQueue.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/MessageQueue.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiInfo.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/WifiInfo.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/WifiCtrl.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/LTE4GManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/LTE4GManager.h:
-
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zknet\0.0.0\include/net/SoftApManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zknet\0.0.0\include/net/SoftApManager.h:

File diff suppressed because it is too large
+ 1 - 1
Release/src/server/subdir.mk


+ 32 - 32
Release/src/service/BusinessConfig.d

@@ -1,27 +1,27 @@
 src/service/BusinessConfig.o: ../src/service/BusinessConfig.cpp \
  ../src/service/BusinessConfig.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/strings.hpp
 
@@ -29,37 +29,37 @@ src/service/BusinessConfig.o: ../src/service/BusinessConfig.cpp \
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h:
 
@@ -69,7 +69,7 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 

+ 12 - 12
Release/src/service/popup_service.d

@@ -1,22 +1,22 @@
 src/service/popup_service.o: ../src/service/popup_service.cpp \
  ../src/service/popup_service.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/entry/EasyuiContext.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/ime/IMEContext.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/entry/EasyuiContext.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/ime/IMEContext.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h
 
 ../src/service/popup_service.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/entry/EasyuiContext.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/entry/EasyuiContext.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/control/Common.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/control/Common.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/ime/IMEContext.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/ime/IMEContext.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:

File diff suppressed because it is too large
+ 1 - 1
Release/src/service/subdir.mk


+ 6 - 6
Release/src/service/time.d

@@ -1,12 +1,12 @@
 src/service/time.o: ../src/service/time.cpp ../src/service/time.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h
 
 ../src/service/time.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:

BIN
Release/src/service/time.o


+ 4 - 4
Release/src/shttpd/multipart_parser.d

@@ -1,10 +1,10 @@
 src/shttpd/multipart_parser.o: ../src/shttpd/multipart_parser.c \
  ../src/shttpd/multipart_parser.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h
 
 ../src/shttpd/multipart_parser.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:

File diff suppressed because it is too large
+ 1 - 1
Release/src/shttpd/subdir.mk


File diff suppressed because it is too large
+ 1 - 1
Release/src/subdir.mk


+ 8 - 8
Release/src/uart/ProtocolParser.d

@@ -1,14 +1,14 @@
 src/uart/ProtocolParser.o: ../src/uart/ProtocolParser.cpp \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
  ../src/uart/CommDef.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolParser.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolData.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
 ../src/uart/CommDef.h:
 
@@ -18,8 +18,8 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolData.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h:

+ 10 - 10
Release/src/uart/ProtocolSender.d

@@ -2,11 +2,11 @@ src/uart/ProtocolSender.o: ../src/uart/ProtocolSender.cpp \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolSender.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/UartContext.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolSender.h:
 
@@ -14,12 +14,12 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/UartContext.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:

+ 38 - 38
Release/src/uart/UartContext.d

@@ -2,33 +2,33 @@ src/uart/UartContext.o: ../src/uart/UartContext.cpp \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/ProtocolSender.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/UartContext.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/CrcCheckUtil.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/base/strings.hpp \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
- D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h \
+ D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h \
  D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/ByteUtil.h
 
@@ -38,11 +38,11 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/UartContext.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Thread.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Thread.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Mutex.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Mutex.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/system/Condition.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/system/Condition.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/CrcCheckUtil.h:
 
@@ -52,37 +52,37 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/service/BusinessConfig.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/uart/CommDef.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/storage/StoragePreferences.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/storage/StoragePreferences.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\zkhardware\0.0.0\include/utils/BrightnessHelper.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/TimeHelper.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/TimeHelper.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/utils/TimeUtil.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/manager/LanguageManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/manager/LanguageManager.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/json.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/json.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/autolink.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/autolink.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/config.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/config.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/version.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/version.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/value.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/value.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/forwards.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/forwards.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/reader.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/reader.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/features.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/features.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/json/writer.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/json/writer.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/utils/Log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/utils/Log.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\log\0.0.0\include/android/log.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\log\0.0.0\include/android/log.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_client.h:
 
@@ -90,7 +90,7 @@ D:\MyProgram\C++\linux_transfer_box_2.0\src/net/net.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 
-D:\zkswe\FlyThingsPreview\bin\.dep\public\z20\easyui\0.0.0\include/security/SecurityManager.h:
+D:\zkswe\FlyThingsPreview\bin\.dep\public\z21\easyui\0.0.0\include/security/SecurityManager.h:
 
 D:\MyProgram\C++\linux_transfer_box_2.0\src/net/tcp_model.h:
 

File diff suppressed because it is too large
+ 1 - 1
Release/src/uart/subdir.mk


+ 3 - 3
src/logic/mainLogic.cc

@@ -65,9 +65,6 @@ public:
 				StoragePreferences::putString(STORE_TCP_LOCAL_IP, root["tcp_local_ip"].asString());
 				StoragePreferences::putInt(STORE_TCP_PORT, root["tcp_port"].asInt());
 
-				//TCP启动
-				TcpClient::instance()->startTcp();
-
 				serverInfoInited = true;
 				return true;
 			}
@@ -1052,6 +1049,9 @@ static void onUI_init(){
 	// 这里也检测网络是否连接上 (有可能启动前网络已经连接触发不到回调),启动dhcp租赁检测,之后都是根据网络的连接断开执行相应的操作
 	_start_eth_dhcp_client();
 
+	//TCP启动
+	TcpClient::instance()->startTcp();
+
 	threadInit();
 	getMsg();
 

+ 2 - 2
src/net/tcp_client.cpp

@@ -62,7 +62,7 @@ public:
 	 *        false  退出线程
 	 */
 	virtual bool readyToRun() {
-		LOGD("Thread 已经创建完成");
+		LOGD("Tcp线程已经创建完成");
 		return true;
 	}
 
@@ -73,7 +73,7 @@ public:
 	 *        false 推出线程
 	 */
 	virtual bool threadLoop() {
-		LOGD("线程循环函数");
+		LOGD("Tcp线程循环函数");
 
 		//检查是否有退出线程的请求,如果有,则返回false,立即退出线程
 		if (exitPending()) {