diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cf10b8d0..ed03619d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,7 +77,8 @@
+ android:exported="false"
+ android:label="@string/activity_channel_title" />
0 ? (new JSONObject(stringBuilder.toString())) : (new JSONObject());
- jsonObject.put("CMDID", cmdid);
- jsonObject.put("Server", server);
- jsonObject.put("Port", port);
- jsonObject.put("Protocol", protocol);
- jsonObject.put("NetworkProtocol", networkProtocol);
+ jsonObject.put("CMDID", appConfig.cmdid);
+ jsonObject.put("Server", appConfig.server);
+ jsonObject.put("Port", appConfig.port);
+ jsonObject.put("Protocol", appConfig.protocol);
+ jsonObject.put("NetworkProtocol", appConfig.networkProtocol);
+
+ if (appConfig.heartbeat > 0) {
+ jsonObject.put("heartbeat", appConfig.heartbeat);
+ } else {
+ jsonObject.remove("heartbeat");
+ }
+ if (appConfig.packetSize > 0) {
+ jsonObject.put("packetSize", appConfig.packetSize);
+ } else {
+ jsonObject.remove("packetSize");
+ }
outputStreamWriter = new OutputStreamWriter(new FileOutputStream(new File(appPath + "data/App.json")), "UTF-8");
outputStreamWriter.write(jsonObject.toString());
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 5b6de180..c3b501cd 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -62,7 +62,7 @@
android:maxLines="1"
android:inputType="text"
android:imeOptions="actionDone"
- android:text="47.96.238.157"
+ android:hint="main_server"
app:layout_constraintStart_toStartOf="@+id/cmdid"
app:layout_constraintTop_toBottomOf="@+id/cmdid" />
@@ -89,6 +89,56 @@
app:layout_constraintLeft_toRightOf="@+id/port"
app:layout_constraintTop_toTopOf="@+id/port" />
+
+
+
+
+
+
+
+
@@ -110,7 +160,7 @@
android:enabled="false"
android:text="Stop"
app:layout_constraintStart_toEndOf="@+id/startServBtn"
- app:layout_constraintTop_toBottomOf="@+id/port" />
+ app:layout_constraintTop_toBottomOf="@+id/heartbeat" />
+
+
+
+
+
+ app:layout_constraintTop_toBottomOf="@+id/resolutionCX" />
+ app:layout_constraintTop_toBottomOf="@+id/resolutionCX" />
+ app:layout_constraintTop_toBottomOf="@+id/resolutionCX" />
+
+
+
+
+
+
+
+
@@ -102,7 +152,7 @@
android:enabled="false"
android:text="Stop"
app:layout_constraintStart_toEndOf="@+id/startServBtn"
- app:layout_constraintTop_toBottomOf="@+id/port" />
+ app:layout_constraintTop_toBottomOf="@+id/heartbeat" />