Skip to content

Commit 0e49d4e

Browse files
authored
Merge pull request #4 from DigitME2/dev
changed the version number to pop up in the ptt server app for v2.17
2 parents b75fcfa + ef95ea7 commit 0e49d4e

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

app/src/main/java/com/admt/barcodereader/dataDisplayFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
175175
@Override
176176
public void onClick(View v) {
177177
onBtnSendPressed();
178-
}
178+
}
179179
});
180180

181181
Button btnCancel = (Button) view.findViewById(R.id.btnCancel);
@@ -880,6 +880,7 @@ private Map<String, String> getParameterMap() {
880880

881881
String jobIdValue = tbJobIdValue.getText().toString();
882882
jobIdValue = jobIdValue.trim();
883+
// jobIdValue.equalsIgnoreCase();
883884

884885
String jobStatus = spJobStatus.getSelectedItem().toString();
885886
jobStatus = getSystemWorkStatus(jobStatus);

app/src/main/res/layout/activity_settings_page.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
android:id="@+id/tvAppVersion"
191191
android:layout_width="match_parent"
192192
android:layout_height="30dp"
193-
android:text="Version: v2.16" />
193+
android:text="Version: v2.17" />
194194

195195

196196
</LinearLayout>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181

182182
<string name="quantity_complete_alert_message">Enter Quantity Complete-</string>
183183

184-
<string name="app_version">v2.16</string>
184+
<string name="app_version">v2.17</string>
185185

186186
<!-- Preference Titles -->
187187
<string name="messages_header">Messages</string>

0 commit comments

Comments
 (0)