aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/org/traccar/model/Command.java3
-rw-r--r--src/org/traccar/protocol/Gps103Protocol.java3
-rw-r--r--src/org/traccar/protocol/Gps103ProtocolEncoder.java4
-rw-r--r--web/app/store/CommandTypes.js2
-rw-r--r--web/l10n/cn.js2
-rw-r--r--web/l10n/de.js2
-rw-r--r--web/l10n/en.js4
-rw-r--r--web/l10n/es.js2
-rw-r--r--web/l10n/fr.js2
-rw-r--r--web/l10n/pl.js2
-rw-r--r--web/l10n/pt.js12
-rw-r--r--web/l10n/ru.js2
-rw-r--r--web/l10n/th.js2
13 files changed, 23 insertions, 19 deletions
diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java
index defa904f7..4558d31ce 100644
--- a/src/org/traccar/model/Command.java
+++ b/src/org/traccar/model/Command.java
@@ -22,8 +22,9 @@ public class Command implements Factory {
public Map<String, Object> getOther() { return other; }
public void setOther(Map<String, Object> other) { this.other = other; }
+ public static final String TYPE_POSITION_SINGLE = "positionSingle";
+ public static final String TYPE_POSITION_PERIODIC = "positionPeriodic";
public static final String TYPE_POSITION_STOP = "positionStop";
- public static final String TYPE_POSITION_FIX = "positionFix";
public static final String TYPE_ENGINE_STOP = "engineStop";
public static final String TYPE_ENGINE_RESUME = "engineResume";
diff --git a/src/org/traccar/protocol/Gps103Protocol.java b/src/org/traccar/protocol/Gps103Protocol.java
index 59d8e62a7..dcac04c5b 100644
--- a/src/org/traccar/protocol/Gps103Protocol.java
+++ b/src/org/traccar/protocol/Gps103Protocol.java
@@ -31,8 +31,9 @@ public class Gps103Protocol extends BaseProtocol {
public Gps103Protocol() {
super("gps103");
setSupportedCommands(
+ Command.TYPE_POSITION_SINGLE,
+ Command.TYPE_POSITION_PERIODIC,
Command.TYPE_POSITION_STOP,
- Command.TYPE_POSITION_FIX,
Command.TYPE_ENGINE_STOP,
Command.TYPE_ENGINE_RESUME);
}
diff --git a/src/org/traccar/protocol/Gps103ProtocolEncoder.java b/src/org/traccar/protocol/Gps103ProtocolEncoder.java
index 3273d2706..df0b50954 100644
--- a/src/org/traccar/protocol/Gps103ProtocolEncoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolEncoder.java
@@ -43,7 +43,9 @@ public class Gps103ProtocolEncoder extends StringProtocolEncoder implements Stri
switch (command.getType()) {
case Command.TYPE_POSITION_STOP:
return formatCommand(command, "**,imei:{%s},A;", Command.KEY_UNIQUE_ID);
- case Command.TYPE_POSITION_FIX:
+ case Command.TYPE_POSITION_SINGLE:
+ return formatCommand(command, "**,imei:{%s},B;", Command.KEY_UNIQUE_ID);
+ case Command.TYPE_POSITION_PERIODIC:
return formatCommand(command, "**,imei:{%s},C,{%s};", this, Command.KEY_UNIQUE_ID, Command.KEY_FREQUENCY);
case Command.TYPE_ENGINE_STOP:
return formatCommand(command, "**,imei:{%s},J;", Command.KEY_UNIQUE_ID);
diff --git a/web/app/store/CommandTypes.js b/web/app/store/CommandTypes.js
index bb5a4d024..f646424bf 100644
--- a/web/app/store/CommandTypes.js
+++ b/web/app/store/CommandTypes.js
@@ -18,8 +18,8 @@ Ext.define('Traccar.store.CommandTypes', {
extend: 'Ext.data.Store',
fields: ['key', 'name'],
data: [
+ {'key': 'positionPeriodic', 'name': strings.command_position_periodic},
{'key': 'positionStop', 'name': strings.command_position_stop},
- {'key': 'positionFix', 'name': strings.command_position_fix},
{'key': 'engineStop', 'name': strings.command_engine_stop},
{'key': 'engineResume', 'name': strings.command_engine_resume}
]
diff --git a/web/l10n/cn.js b/web/l10n/cn.js
index 78f364b86..cf76e4e35 100644
--- a/web/l10n/cn.js
+++ b/web/l10n/cn.js
@@ -77,8 +77,8 @@ var strings = {
command_title: '命令',
command_send: '发送',
command_type: '类型',
+ command_position_periodic: '位置获取',
command_position_stop: '位置停止',
- command_position_fix: '位置获取',
command_engine_stop: '引擎熄火',
command_engine_resume: '引擎启动',
command_frequency: '频率',
diff --git a/web/l10n/de.js b/web/l10n/de.js
index 4991dc1cd..47a214c83 100644
--- a/web/l10n/de.js
+++ b/web/l10n/de.js
@@ -77,8 +77,8 @@ var strings = {
command_title: 'Befehl',
command_send: 'Senden',
command_type: 'Typ',
+ command_position_periodic: 'Position Fix',
command_position_stop: 'Position Stop',
- command_position_fix: 'Position Fix',
command_engine_stop: 'Motor Stop',
command_engine_resume: 'Motor fortsetzen',
command_frequency: 'Frequenz',
diff --git a/web/l10n/en.js b/web/l10n/en.js
index e32e869d8..5abdfab1b 100644
--- a/web/l10n/en.js
+++ b/web/l10n/en.js
@@ -77,8 +77,8 @@ var strings = {
command_title: 'Command',
command_send: 'Send',
command_type: 'Type',
- command_position_stop: 'Position Stop',
- command_position_fix: 'Position Fix',
+ command_position_periodic: 'Periodic Position Reporting',
+ command_position_stop: 'Stop Position Reporting',
command_engine_stop: 'Engine Stop',
command_engine_resume: 'Engine Resume',
command_frequency: 'Frequency',
diff --git a/web/l10n/es.js b/web/l10n/es.js
index 0b7b434ba..31601a652 100644
--- a/web/l10n/es.js
+++ b/web/l10n/es.js
@@ -77,8 +77,8 @@ var strings = {
command_title: 'Command (*)',
command_send: 'Send (*)',
command_type: 'Type (*)',
+ command_position_periodic: 'Position Fix (*)',
command_position_stop: 'Position Stop (*)',
- command_position_fix: 'Position Fix (*)',
command_engine_stop: 'Engine Stop (*)',
command_engine_resume: 'Engine Resume (*)',
command_frequency: 'Frequency (*)',
diff --git a/web/l10n/fr.js b/web/l10n/fr.js
index 1061aa974..71b6965a8 100644
--- a/web/l10n/fr.js
+++ b/web/l10n/fr.js
@@ -77,8 +77,8 @@ var strings = {
command_title: 'Command (*)',
command_send: 'Send (*)',
command_type: 'Type (*)',
+ command_position_periodic: 'Position Fix (*)',
command_position_stop: 'Position Stop (*)',
- command_position_fix: 'Position Fix (*)',
command_engine_stop: 'Engine Stop (*)',
command_engine_resume: 'Engine Resume (*)',
command_frequency: 'Frequency (*)',
diff --git a/web/l10n/pl.js b/web/l10n/pl.js
index 8338435c2..05f64711a 100644
--- a/web/l10n/pl.js
+++ b/web/l10n/pl.js
@@ -77,8 +77,8 @@ var strings = {
command_title: 'Zdarzenie',
command_send: 'Wyślij',
command_type: 'Typ',
+ command_position_periodic: 'Pozycja - Fix',
command_position_stop: 'Pozycja - Stop',
- command_position_fix: 'Pozycja - Fix',
command_engine_stop: 'Silnik - Stop',
command_engine_resume: 'Silnik - Praca',
command_frequency: 'Częstotliwość',
diff --git a/web/l10n/pt.js b/web/l10n/pt.js
index a862165a9..ed1350f6e 100644
--- a/web/l10n/pt.js
+++ b/web/l10n/pt.js
@@ -76,11 +76,11 @@ var strings = {
command_title: 'Comando',
command_send: 'Enviar',
- command_type: 'Tipo' ,
- command_position_stop: 'Parar Posição' ,
- command_position_fix: 'Posição Tempo' ,
- command_engine_stop: 'Bloqueio Veículo' ,
- command_engine_resume: 'Desbloqueio Veículo' ,
- command_frequency: 'Frequência' ,
+ command_type: 'Tipo',
+ command_position_periodic: 'Posição Tempo',
+ command_position_stop: 'Parar Posição',
+ command_engine_stop: 'Bloqueio Veículo',
+ command_engine_resume: 'Desbloqueio Veículo',
+ command_frequency: 'Frequência',
command_unit: 'Unidade'
};
diff --git a/web/l10n/ru.js b/web/l10n/ru.js
index 481aa2cac..605717eeb 100644
--- a/web/l10n/ru.js
+++ b/web/l10n/ru.js
@@ -77,8 +77,8 @@ var strings = {
command_title: 'Команда',
command_send: 'Отправить',
command_type: 'Тип',
+ command_position_periodic: 'Начать Отслеживание',
command_position_stop: 'Отменить Отслеживание',
- command_position_fix: 'Начать Отслеживание',
command_engine_stop: 'Заблокировать Двигатель',
command_engine_resume: 'Разблокировать Двигатель',
command_frequency: 'Частота',
diff --git a/web/l10n/th.js b/web/l10n/th.js
index d3c46c8ee..131279fce 100644
--- a/web/l10n/th.js
+++ b/web/l10n/th.js
@@ -77,8 +77,8 @@ var strings = {
command_title: 'Command (*)',
command_send: 'Send (*)',
command_type: 'Type (*)',
+ command_position_periodic: 'Position Fix (*)',
command_position_stop: 'Position Stop (*)',
- command_position_fix: 'Position Fix (*)',
command_engine_stop: 'Engine Stop (*)',
command_engine_resume: 'Engine Resume (*)',
command_frequency: 'Frequency (*)',
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 01:39:28 +0000