|
|
|
@ -171,6 +171,15 @@ public class ChannelActivity extends AppCompatActivity {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
int requestTemplate = jsonObject.optInt("requestTemplate", 2);
|
|
|
|
|
String requestTemplateText = Integer.toString(requestTemplate) + "-";
|
|
|
|
|
for (int idx = 0; idx < binding.requestTemplates.getCount(); idx++) {
|
|
|
|
|
String text = (String)binding.requestTemplates.getItemAtPosition(idx);
|
|
|
|
|
if (text.startsWith(requestTemplateText)) {
|
|
|
|
|
binding.requestTemplates.setSelection(idx);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
binding.exposuretime.setText(Integer.toString(jsonObject.optInt("exposureTime", 0)));
|
|
|
|
|
binding.sensitivity.setText(Integer.toString(jsonObject.optInt("sensitivity", 0)));
|
|
|
|
|
binding.btnZoom.setChecked(jsonObject.optInt("zoom", 0) == 1);
|
|
|
|
@ -272,6 +281,13 @@ public class ChannelActivity extends AppCompatActivity {
|
|
|
|
|
sceneModeText = sceneModeText.substring(0, sceneModeText.indexOf(" -"));
|
|
|
|
|
sceneMode = Integer.parseInt(sceneModeText);
|
|
|
|
|
jsonObject.put("sceneMode", sceneMode);
|
|
|
|
|
|
|
|
|
|
int requestTemplate = 2;
|
|
|
|
|
String requestTemplateText = (String)binding.requestTemplates.getSelectedItem();
|
|
|
|
|
requestTemplateText = requestTemplateText.substring(0, requestTemplateText.indexOf("-"));
|
|
|
|
|
requestTemplate = Integer.parseInt(requestTemplateText);
|
|
|
|
|
jsonObject.put("requestTemplate", requestTemplate);
|
|
|
|
|
|
|
|
|
|
jsonObject.put("exposureTime", Integer.parseInt(binding.exposuretime.getText().toString()));
|
|
|
|
|
jsonObject.put("sensitivity", Integer.parseInt(binding.sensitivity.getText().toString()));
|
|
|
|
|
jsonObject.put("zoom", binding.btnZoom.isChecked() ? 1 : 0);
|
|
|
|
|