Skip to content

Commit 2c06f2f

Browse files
committed
improve mqtt user experience
1 parent a922e8e commit 2c06f2f

30 files changed

+178
-665
lines changed

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -187,30 +187,12 @@
187187
{ "name": "<init>", "parameterTypes": [] }
188188
]
189189
},
190-
{
191-
"name" : "iot.technology.client.toolkit.mqtt.service.node.PublishMessageNode",
192-
"methods": [
193-
{ "name": "<init>", "parameterTypes": [] }
194-
]
195-
},
196-
{
197-
"name" : "iot.technology.client.toolkit.mqtt.service.node.SubscribeMessageNode",
198-
"methods": [
199-
{ "name": "<init>", "parameterTypes": [] }
200-
]
201-
},
202190
{
203191
"name" : "iot.technology.client.toolkit.mqtt.service.node.SettingsNameNode",
204192
"methods": [
205193
{ "name": "<init>", "parameterTypes": [] }
206194
]
207195
},
208-
{
209-
"name" : "iot.technology.client.toolkit.mqtt.service.node.MqttSelectConfigNode",
210-
"methods": [
211-
{ "name": "<init>", "parameterTypes": [] }
212-
]
213-
},
214196
{
215197
"name" : "iot.technology.client.toolkit.mqtt.service.node.MqttAppConfigNode",
216198
"methods": [

toolkit-app/src/main/resources/i18n/messages.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ general.reference= reference:
1212
general.main.page.help=look at `toolkit <command> --help`, to ge help for a given subcommand or concept.
1313
general.subCommand.help=Displays help information about the specified command
1414
general.subCommand.exit=Exit the current context
15+
general.used=used
16+
general.unused=unused
1517

1618
#config.settings
1719
config.header= General configuration, such as i18n.

toolkit-app/src/main/resources/i18n/messages_de.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ general.reference= Hinweis
1212
general.main.page.help=Siehe toolkit <Befehl> --help',um Hilfe zu einem bestimmten Unterbefehl oder Konzept zu erhalten.
1313
general.subCommand.help=Displays help information about the specified command
1414
general.subCommand.exit=Exit the current context
15+
general.used=used
16+
general.unused=unused
1517

1618
#config.settings
1719
config.header=General configuration, such as i18n.

toolkit-app/src/main/resources/i18n/messages_fr.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ general.reference= r
1212
general.main.page.help=Regardez toolkit < command > --help', pour obtenir de l'aide pour une sous-commande ou un concept donné.
1313
general.subCommand.help=Displays help information about the specified command
1414
general.subCommand.exit=Exit the current context
15+
general.used=used
16+
general.unused=unused
1517

1618
#config.settings
1719
config.header=General configuration, such as i18n.

toolkit-app/src/main/resources/i18n/messages_zh.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ general.reference= \u53c2\u89c1:
1212
general.main.page.help=\u67e5\u770b\u0060\u0074\u006f\u006f\u006c\u006b\u0069\u0074\u0020\u003c\u547d\u4ee4\u003e\u0020\u002d\u002d\u0068\u0065\u006c\u0070\u0060\u002c\u0020\u4ee5\u83b7\u5f97\u7ed9\u5b9a\u5b50\u547d\u4ee4\u6216\u6982\u5ff5\u7684\u5e2e\u52a9
1313
general.subCommand.help=\u53d1\u9001\u663e\u793a\u6307\u5b9a\u547d\u4ee4\u7684\u5e2e\u52a9\u4fe1\u606f
1414
general.subCommand.exit=\u9000\u51fa\u5f53\u524d\u4e0a\u4e0b\u6587
15+
general.used=\u6b63\u5728\u4f7f\u7528
16+
general.unused=\u672a\u4f7f\u7528
1517

1618
#config.settings
1719
config.header=\u901a\u7528\u8bbe\u7f6e,\u4f8b\u5982\u591a\u8bed\u8a00

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,8 @@ public interface EmojiEnum {
3232

3333
String disconnectEmoji = "\uD83D\uDEAB";
3434

35+
String usedEmoji = "\uD83D\uDD34";
36+
37+
String unusedEmoji = "\uD83D\uDFE2";
38+
3539
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,10 @@ public enum MqttSettingsCodeEnum {
6464

6565
MQTT_BIZ_TYPE("biz", "iot.technology.client.toolkit.mqtt.service.node.MqttBizTypeNode"),
6666

67-
PUBLISH_MESSAGE("publishMessage", "iot.technology.client.toolkit.mqtt.service.node.PublishMessageNode"),
68-
69-
SUBSCRIBE_MESSAGE("subscribeMessage", "iot.technology.client.toolkit.mqtt.service.node.SubscribeMessageNode"),
70-
7167
MQTT_APP_CONFIG("mqttAppConfig", "iot.technology.client.toolkit.mqtt.service.node.MqttAppConfigNode"),
7268

7369
SETTINGS_NAME("settingsName", "iot.technology.client.toolkit.mqtt.service.node.SettingsNameNode"),
7470

75-
SELECT_CONFIG("selectConfig", "iot.technology.client.toolkit.mqtt.service.node.MqttSelectConfigNode"),
76-
7771
// wait for commands
7872
CALL("call", ""),
7973

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ public enum NodeTypeEnum {
2222

2323
MQTT_DEFAULT("mqtt_default"),
2424

25-
MQTT_PUBLISH("mqtt_pub"),
26-
27-
MQTT_SUBSCRIBE("mqtt_sub"),
28-
2925
MQTT_SETTINGS("mqtt_settings");
3026

3127
private final String type;

toolkit-mqtt/src/main/java/iot/technology/client/toolkit/mqtt/command/MqttCommand.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@
1818
import iot.technology.client.toolkit.common.constants.ExitCodeEnum;
1919
import iot.technology.client.toolkit.common.constants.StorageConstants;
2020
import iot.technology.client.toolkit.mqtt.command.sub.*;
21-
import org.jetbrains.annotations.NotNull;
2221
import picocli.CommandLine;
2322

2423
import java.util.ResourceBundle;
2524
import java.util.concurrent.Callable;
2625

27-
import static iot.technology.client.toolkit.common.utils.ColorUtils.colorItalic;
28-
2926
/**
3027
* @author mushuwei
3128
*/
@@ -41,9 +38,7 @@
4138
subcommands = {
4239
MqttDescribeCommand.class,
4340
MqttSettingsCommand.class,
44-
MqttPublishCommand.class,
4541
MqttShellCommand.class,
46-
MqttSubscribeCommand.class,
4742
},
4843
footerHeading = "%nCopyright (c) 2019-2023, ${bundle:general.copyright}",
4944
footer = "%nDeveloped by mushuwei")

toolkit-mqtt/src/main/java/iot/technology/client/toolkit/mqtt/command/sub/MqttPublishCommand.java

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)