|
42 | 42 | import com.regula.documentreader.api.results.authenticity.DocumentReaderAuthenticityCheck; |
43 | 43 | import com.regula.documentreader.api.results.authenticity.DocumentReaderAuthenticityElement; |
44 | 44 | import com.regula.documentreader.api.results.authenticity.DocumentReaderAuthenticityResult; |
| 45 | +import com.regula.documentreader.api.results.authenticity.DocumentReaderUvFiberElement; |
45 | 46 | import com.regula.documentreader.api.results.rfid.AccessControlProcedureType; |
46 | 47 | import com.regula.documentreader.api.results.rfid.Application; |
47 | 48 | import com.regula.documentreader.api.results.rfid.Attribute; |
@@ -606,9 +607,9 @@ static JSONObject generateDocumentReaderNotification(DocumentReaderNotification |
606 | 607 | JSONObject result = new JSONObject(); |
607 | 608 | if (input == null) return result; |
608 | 609 | try { |
609 | | - result.put("code", input.code & 0xFFFF0000); |
610 | | - result.put("number", input.code & 0x0000FFFF); |
611 | | - result.put("value", input.value); |
| 610 | + result.put("code", input.getNotificationCode()); |
| 611 | + result.put("attachment", input.getDataFileType()); |
| 612 | + result.put("value", input.getProgress()); |
612 | 613 | } catch (JSONException e) { |
613 | 614 | e.printStackTrace(); |
614 | 615 | } |
@@ -1141,6 +1142,28 @@ static JSONObject generateBytesData(BytesData input) { |
1141 | 1142 | return result; |
1142 | 1143 | } |
1143 | 1144 |
|
| 1145 | + static JSONObject generateDocumentReaderUvFiberElement(DocumentReaderUvFiberElement input, Context context) { |
| 1146 | + JSONObject result = new JSONObject(); |
| 1147 | + if (input == null) return result; |
| 1148 | + try { |
| 1149 | + result.put("rectArray", generateList(input.rectArray, JSONConstructor::generateDocReaderFieldRect)); |
| 1150 | + result.put("rectCount", input.rectCount); |
| 1151 | + result.put("expectedCount", input.expectedCount); |
| 1152 | + result.put("width", generateIntArray(input.width)); |
| 1153 | + result.put("length", generateIntArray(input.length)); |
| 1154 | + result.put("area", generateIntArray(input.area)); |
| 1155 | + result.put("colorValues", generateIntArray(input.colorValues)); |
| 1156 | + result.put("status", input.status); |
| 1157 | + result.put("elementType", input.elementType); |
| 1158 | + result.put("elementDiagnose", input.elementDiagnose); |
| 1159 | + result.put("elementTypeName", input.getElementTypeName(context)); |
| 1160 | + result.put("elementDiagnoseName", input.getElementDiagnoseName(context)); |
| 1161 | + } catch (JSONException e) { |
| 1162 | + e.printStackTrace(); |
| 1163 | + } |
| 1164 | + return result; |
| 1165 | + } |
| 1166 | + |
1144 | 1167 | static JSONObject generateDocumentReaderResults(DocumentReaderResults input, Context context) { |
1145 | 1168 | JSONObject result = new JSONObject(); |
1146 | 1169 | if (input == null) return result; |
@@ -2172,6 +2195,61 @@ static TAChallenge TAChallengeFromJSON(JSONObject input) { |
2172 | 2195 | return null; |
2173 | 2196 | } |
2174 | 2197 |
|
| 2198 | + static DocumentReaderUvFiberElement DocumentReaderUvFiberElementFromJSON(JSONObject input) { |
| 2199 | + try { |
| 2200 | + DocumentReaderUvFiberElement result = new DocumentReaderUvFiberElement(); |
| 2201 | + if (input.has("rectArray")){ |
| 2202 | + JSONArray jsonArray_rectArray = input.getJSONArray("rectArray"); |
| 2203 | + List<DocReaderFieldRect> rectArray = new ArrayList<>(); |
| 2204 | + for (int i = 0; i < jsonArray_rectArray.length(); i++) |
| 2205 | + rectArray.add(DocReaderFieldRectFromJSON(jsonArray_rectArray.getJSONObject(i))); |
| 2206 | + result.rectArray = rectArray; |
| 2207 | + } |
| 2208 | + if (input.has("rectCount")) |
| 2209 | + result.rectCount = input.getInt("rectCount"); |
| 2210 | + if (input.has("expectedCount")) |
| 2211 | + result.expectedCount = input.getInt("expectedCount"); |
| 2212 | + if (input.has("width")){ |
| 2213 | + JSONArray jsonArray_width = input.getJSONArray("width"); |
| 2214 | + int[] width = new int[jsonArray_width.length()]; |
| 2215 | + for (int i = 0; i < jsonArray_width.length(); i++) |
| 2216 | + width[i] = jsonArray_width.getInt(i); |
| 2217 | + result.width = width; |
| 2218 | + } |
| 2219 | + if (input.has("length")){ |
| 2220 | + JSONArray jsonArray_length = input.getJSONArray("length"); |
| 2221 | + int[] length = new int[jsonArray_length.length()]; |
| 2222 | + for (int i = 0; i < jsonArray_length.length(); i++) |
| 2223 | + length[i] = jsonArray_length.getInt(i); |
| 2224 | + result.length = length; |
| 2225 | + } |
| 2226 | + if (input.has("area")){ |
| 2227 | + JSONArray jsonArray_area = input.getJSONArray("area"); |
| 2228 | + int[] area = new int[jsonArray_area.length()]; |
| 2229 | + for (int i = 0; i < jsonArray_area.length(); i++) |
| 2230 | + area[i] = jsonArray_area.getInt(i); |
| 2231 | + result.area = area; |
| 2232 | + } |
| 2233 | + if (input.has("colorValues")){ |
| 2234 | + JSONArray jsonArray_colorValues = input.getJSONArray("colorValues"); |
| 2235 | + int[] colorValues = new int[jsonArray_colorValues.length()]; |
| 2236 | + for (int i = 0; i < jsonArray_colorValues.length(); i++) |
| 2237 | + colorValues[i] = jsonArray_colorValues.getInt(i); |
| 2238 | + result.colorValues = colorValues; |
| 2239 | + } |
| 2240 | + if (input.has("status")) |
| 2241 | + result.status = input.getInt("status"); |
| 2242 | + if (input.has("elementType")) |
| 2243 | + result.elementType = input.getInt("elementType"); |
| 2244 | + if (input.has("elementDiagnose")) |
| 2245 | + result.elementDiagnose = input.getInt("elementDiagnose"); |
| 2246 | + return result; |
| 2247 | + } catch (JSONException e) { |
| 2248 | + e.printStackTrace(); |
| 2249 | + } |
| 2250 | + return null; |
| 2251 | + } |
| 2252 | + |
2175 | 2253 | static DocumentReaderResults DocumentReaderResultsFromJSON(JSONObject input) { |
2176 | 2254 | try { |
2177 | 2255 | DocumentReaderResults result = new DocumentReaderResults(); |
|
0 commit comments