herel/mq1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use constants of strings

Browse Source
This commit is contained in:
Rene Luria
2022-04-26 15:43:07 +02:00
parent de0ff18112
commit fd65f7fd3e
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ch/luria/mq1/MqttService.java
+7 -5
View File
@@ -19,6 +19,8 @@ public class MqttService extends Service {
private Mqtt5AsyncClient client; private Mqtt5AsyncClient client;
private static final String TAG = "MQTT Service"; private static final String TAG = "MQTT Service";
private final IBinder binder = new LocalBinder(); private final IBinder binder = new LocalBinder();
private static final String mqttHost = "192.168.178.64";
private static final int mqttPort = 1883;
public class LocalBinder extends Binder { public class LocalBinder extends Binder {
public MqttService getService() { public MqttService getService() {
@@ -34,8 +36,8 @@ public class MqttService extends Service {
Log.i(TAG, "connecting"); Log.i(TAG, "connecting");
client = Mqtt5Client.builder() client = Mqtt5Client.builder()
.identifier(UUID.randomUUID().toString()) .identifier(UUID.randomUUID().toString())
.serverHost("192.168.178.64") .serverHost(mqttHost)
.serverPort(1883) .serverPort(mqttPort)
.buildAsync(); .buildAsync();
} }
} }
@@ -93,7 +95,7 @@ public class MqttService extends Service {
intent.setAction("ch.luria.mq1"); intent.setAction("ch.luria.mq1");
try { try {
final JSONObject obj = new JSONObject(msg); final JSONObject obj = new JSONObject(msg);
String state = obj.getString("state"); String state = obj.getString(getString(R.string.mqtt_state_field));
intent.putExtra("STATE", state); intent.putExtra("STATE", state);
sendBroadcast(intent); sendBroadcast(intent);
} catch (JSONException e) { } catch (JSONException e) {
@@ -129,7 +131,7 @@ public class MqttService extends Service {
public void doToggle(boolean state) { public void doToggle(boolean state) {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
try { try {
obj.put("state", state ? "ON" : "OFF"); obj.put(getString(R.string.mqtt_state_field), state ? "ON" : "OFF");
Log.i(TAG, "doToggle: " + obj); Log.i(TAG, "doToggle: " + obj);
publishMessage(getString(R.string.mqtt_base_topic) + "/" + getString(R.string.mqtt_room_address) + "/set", obj.toString()); publishMessage(getString(R.string.mqtt_base_topic) + "/" + getString(R.string.mqtt_room_address) + "/set", obj.toString());
} catch (JSONException e) { } catch (JSONException e) {
@@ -140,7 +142,7 @@ public class MqttService extends Service {
public void getStatus() { public void getStatus() {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
try { try {
obj.put("state", ""); obj.put(getString(R.string.mqtt_state_field), "");
Log.i(TAG, "getStatus()"); Log.i(TAG, "getStatus()");
publishMessage(getString(R.string.mqtt_base_topic) + "/" + getString(R.string.mqtt_room_address) + "/get", obj.toString()); publishMessage(getString(R.string.mqtt_base_topic) + "/" + getString(R.string.mqtt_room_address) + "/get", obj.toString());
} catch (JSONException e) { } catch (JSONException e) {
app/src/main/res/values/strings.xml
+1
View File
@@ -5,4 +5,5 @@
<string name="room_name">Chambre d\'Isaac</string> <string name="room_name">Chambre d\'Isaac</string>
<string name="mqtt_base_topic">zigbee2mqtt</string> <string name="mqtt_base_topic">zigbee2mqtt</string>
<string name="mqtt_room_address">Ampoule Chambre Isaac</string> <string name="mqtt_room_address">Ampoule Chambre Isaac</string>
<string name="mqtt_state_field">state</string>
</resources> </resources>