Skip to content

Commit cb3ef5d

Browse files
sanshengshuisanshengshui
authored
Merge pull request #51 from sanshengshui/main
upgrade 0.7.5
2 parents e3e03c0 + a83626a commit cb3ef5d

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎toolkit-app/src/main/resources/META-INF/native-image/reflection-config.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@
870870
"allPublicConstructors" : true
871871
},
872872
{
873-
"name" : "iot.technology.client.toolkit.nb.service.mobile.domain.action.device.OneNetDeviceDetailBody",
873+
"name" : "iot.technology.client.toolkit.nb.service.mobile.domain.action.device.OneNetDeviceDetailRequest",
874874
"allDeclaredMethods" : true,
875875
"allPublicMethods" : true,
876876
"allDeclaredClasses" : true,
@@ -879,7 +879,7 @@
879879
"allPublicConstructors" : true
880880
},
881881
{
882-
"name" : "iot.technology.client.toolkit.nb.service.mobile.domain.action.device.OneNetDeviceDetailRequest",
882+
"name" : "iot.technology.client.toolkit.nb.service.mobile.domain.action.device.OneNetDeviceDetailResponse",
883883
"allDeclaredMethods" : true,
884884
"allPublicMethods" : true,
885885
"allDeclaredClasses" : true,
@@ -888,7 +888,7 @@
888888
"allPublicConstructors" : true
889889
},
890890
{
891-
"name" : "iot.technology.client.toolkit.nb.service.mobile.domain.action.device.OneNetDeviceDetailResponse",
891+
"name" : "iot.technology.client.toolkit.nb.service.mobile.domain.action.device.OneNetDeviceListRequest",
892892
"allDeclaredMethods" : true,
893893
"allPublicMethods" : true,
894894
"allDeclaredClasses" : true,
@@ -897,7 +897,7 @@
897897
"allPublicConstructors" : true
898898
},
899899
{
900-
"name" : "iot.technology.client.toolkit.nb.service.mobile.domain.action.device.OneNetDeviceListRequest",
900+
"name" : "iot.technology.client.toolkit.nb.service.mobile.domain.action.device.OneNetDeviceListResponse",
901901
"allDeclaredMethods" : true,
902902
"allPublicMethods" : true,
903903
"allDeclaredClasses" : true,
@@ -906,7 +906,7 @@
906906
"allPublicConstructors" : true
907907
},
908908
{
909-
"name" : "iot.technology.client.toolkit.nb.service.mobile.domain.action.device.OneNetDeviceListResponse",
909+
"name" : "iot.technology.client.toolkit.nb.service.mobile.domain.action.device.OneNetDevicePageResponse",
910910
"allDeclaredMethods" : true,
911911
"allPublicMethods" : true,
912912
"allDeclaredClasses" : true,
@@ -915,7 +915,7 @@
915915
"allPublicConstructors" : true
916916
},
917917
{
918-
"name" : "iot.technology.client.toolkit.nb.service.mobile.domain.action.device.OneNetDevicePageResponse",
918+
"name" : "iot.technology.client.toolkit.nb.service.mobile.domain.action.device.OneNetDeviceDetailBody",
919919
"allDeclaredMethods" : true,
920920
"allPublicMethods" : true,
921921
"allDeclaredClasses" : true,

‎toolkit-common/src/main/java/iot/technology/client/toolkit/common/constants/StorageConstants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ public interface StorageConstants {
2222

2323

2424
String LANG_MESSAGES = "i18n.messages";
25-
String TOOLKIT_VERSION = "v0.7.4";
25+
String TOOLKIT_VERSION = "v0.7.5";
2626
}

‎toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/mobile/OneNetService.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public OneNetProductResponse getProductDetail(MobileConfigDomain config) {
3636
if (StringUtils.isNotBlank(response.getBody())) {
3737
BaseOneNetResponse generalResponse = JsonUtils.jsonToObject(response.getBody(), BaseOneNetResponse.class);
3838
if (generalResponse.getCode().equals(OneNetRespCodeEnum.SUCCESS.getCode())) {
39-
productDetailResponse.setSuccess(Boolean.TRUE);
4039
productDetailResponse = JsonUtils.jsonToObject(response.getBody(), OneNetProductResponse.class);
40+
productDetailResponse.setSuccess(Boolean.TRUE);
4141
} else {
4242
productDetailResponse.setSuccess(Boolean.FALSE);
4343
StringBuilder sb = new StringBuilder();
@@ -73,8 +73,8 @@ public OneNetCreateDeviceResponse create(MobileConfigDomain config, OneNetCreate
7373
if (StringUtils.isNotBlank(response.getBody())) {
7474
BaseOneNetResponse generalResponse = JsonUtils.jsonToObject(response.getBody(), BaseOneNetResponse.class);
7575
if (generalResponse.getCode().equals(OneNetRespCodeEnum.SUCCESS.getCode())) {
76-
createDeviceResponse.setSuccess(Boolean.TRUE);
7776
createDeviceResponse = JsonUtils.jsonToObject(response.getBody(), OneNetCreateDeviceResponse.class);
77+
createDeviceResponse.setSuccess(Boolean.TRUE);
7878
} else {
7979
createDeviceResponse.setSuccess(Boolean.FALSE);
8080
StringBuilder sb = new StringBuilder();
@@ -109,8 +109,8 @@ public OneNetDelDeviceResponse delete(MobileConfigDomain config, OneNetDelDevice
109109
if (StringUtils.isNotBlank(response.getBody())) {
110110
BaseOneNetResponse generalResponse = JsonUtils.jsonToObject(response.getBody(), BaseOneNetResponse.class);
111111
if (generalResponse.getCode().equals(OneNetRespCodeEnum.SUCCESS.getCode())) {
112-
delDeviceResponse.setSuccess(Boolean.TRUE);
113112
delDeviceResponse = JsonUtils.jsonToObject(response.getBody(), OneNetDelDeviceResponse.class);
113+
delDeviceResponse.setSuccess(Boolean.TRUE);
114114
} else {
115115
delDeviceResponse.setSuccess(Boolean.FALSE);
116116
StringBuilder sb = new StringBuilder();
@@ -147,8 +147,8 @@ public OneNetDeviceDetailResponse get(MobileConfigDomain config, OneNetDeviceDet
147147
if (StringUtils.isNotBlank(response.getBody())) {
148148
BaseOneNetResponse generalResponse = JsonUtils.jsonToObject(response.getBody(), BaseOneNetResponse.class);
149149
if (generalResponse.getCode().equals(OneNetRespCodeEnum.SUCCESS.getCode())) {
150-
deviceDetailResponse.setSuccess(Boolean.TRUE);
151150
deviceDetailResponse = JsonUtils.jsonToObject(response.getBody(), OneNetDeviceDetailResponse.class);
151+
deviceDetailResponse.setSuccess(Boolean.TRUE);
152152
} else {
153153
deviceDetailResponse.setSuccess(Boolean.FALSE);
154154
StringBuilder sb = new StringBuilder();
@@ -183,8 +183,8 @@ public OneNetUpdateDeviceResponse update(MobileConfigDomain config, OneNetUpdate
183183
if (StringUtils.isNotBlank(response.getBody())) {
184184
BaseOneNetResponse generalResponse = JsonUtils.jsonToObject(response.getBody(), BaseOneNetResponse.class);
185185
if (generalResponse.getCode().equals(OneNetRespCodeEnum.SUCCESS.getCode())) {
186-
updateDeviceResponse.setSuccess(Boolean.TRUE);
187186
updateDeviceResponse = JsonUtils.jsonToObject(response.getBody(), OneNetUpdateDeviceResponse.class);
187+
updateDeviceResponse.setSuccess(Boolean.TRUE);
188188
} else {
189189
updateDeviceResponse.setSuccess(Boolean.FALSE);
190190
StringBuilder sb = new StringBuilder();
@@ -265,8 +265,8 @@ public OneNetCachedCommandResponse getCachedCommandList(MobileConfigDomain confi
265265
if (StringUtils.isNotBlank(response.getBody())) {
266266
BaseOneNetResponse generalResponse = JsonUtils.jsonToObject(response.getBody(), BaseOneNetResponse.class);
267267
if (generalResponse.getCode().equals(OneNetRespCodeEnum.SUCCESS.getCode())) {
268-
oneNetCachedCommandResponse.setSuccess(Boolean.TRUE);
269268
oneNetCachedCommandResponse = JsonUtils.jsonToObject(response.getBody(), OneNetCachedCommandResponse.class);
269+
oneNetCachedCommandResponse.setSuccess(Boolean.TRUE);
270270
} else {
271271
oneNetCachedCommandResponse.setSuccess(Boolean.FALSE);
272272
StringBuilder sb = new StringBuilder();
@@ -303,8 +303,8 @@ public OneNetDeviceLatestDataResponse getCurrentDataPoints(MobileConfigDomain co
303303
if (StringUtils.isNotBlank(response.getBody())) {
304304
BaseOneNetResponse generalResponse = JsonUtils.jsonToObject(response.getBody(), BaseOneNetResponse.class);
305305
if (generalResponse.getCode().equals(OneNetRespCodeEnum.SUCCESS.getCode())) {
306-
deviceLatestDataResponse.setSuccess(Boolean.TRUE);
307306
deviceLatestDataResponse = JsonUtils.jsonToObject(response.getBody(), OneNetDeviceLatestDataResponse.class);
307+
deviceLatestDataResponse.setSuccess(Boolean.TRUE);
308308
} else {
309309
deviceLatestDataResponse.setSuccess(Boolean.FALSE);
310310
StringBuilder sb = new StringBuilder();
@@ -356,8 +356,8 @@ public OneNetDeviceHisDataResponse getHisDataPoints(MobileConfigDomain config, S
356356
if (StringUtils.isNotBlank(response.getBody())) {
357357
BaseOneNetResponse generalResponse = JsonUtils.jsonToObject(response.getBody(), BaseOneNetResponse.class);
358358
if (generalResponse.getCode().equals(OneNetRespCodeEnum.SUCCESS.getCode())) {
359-
deviceHisDataResponse.setSuccess(Boolean.TRUE);
360359
deviceHisDataResponse = JsonUtils.jsonToObject(response.getBody(), OneNetDeviceHisDataResponse.class);
360+
deviceHisDataResponse.setSuccess(Boolean.TRUE);
361361
} else {
362362
deviceHisDataResponse.setSuccess(Boolean.FALSE);
363363
StringBuilder sb = new StringBuilder();

‎toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/processor/mobile/OneNetHelpProcessor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ public void handle(ProcessContext context) {
9595
bundle.getString("nb.cmd.psk.desc")))
9696
.append(StringUtils.lineSeparator());
9797
sb.append(String.format("%s %s",
98-
ColorUtils.colorBold("-auth_code ", "green"),
98+
ColorUtils.colorBold("-auth_code ", "green"),
9999
bundle.getString("nb.cmd.auth_code.desc")))
100100
.append(StringUtils.lineSeparator());
101101
sb.append(String.format("%s %s",
102-
ColorUtils.colorBold("-lat ", "green"),
102+
ColorUtils.colorBold("-lat ", "green"),
103103
bundle.getString("nb.cmd.lat.desc")))
104104
.append(StringUtils.lineSeparator());
105105
sb.append(String.format("%s %s",
106-
ColorUtils.colorBold("-lon ", "green"),
106+
ColorUtils.colorBold("-lon ", "green"),
107107
bundle.getString("nb.cmd.lon.desc")))
108108
.append(StringUtils.lineSeparator());
109109
System.out.print(sb);
@@ -195,7 +195,7 @@ public void handle(ProcessContext context) {
195195
case "history-log":
196196
case "hl":
197197
sb.append(ColorUtils.colorBold("Usage: ", "black")
198-
+ String.format("> %s %s <imei> [%s <name>] [%s <startTime>] [%s <endTime>]",
198+
+ String.format("> %s %s <imei> [%s <name>] [%s <startTime>] [%s <endTime>] [%s <sort>]",
199199
ColorUtils.colorBold("hl", "green"),
200200
ColorUtils.colorBold("-imei", "green"),
201201
ColorUtils.colorBold("-limit", "green"),

0 commit comments

Comments
 (0)