diff options
| author | Mat Wszedybyl <mat@livio.io> | 2017-05-30 10:45:45 -0400 |
|---|---|---|
| committer | Mat Wszedybyl <mat@livio.io> | 2017-05-30 10:45:45 -0400 |
| commit | 379fa4b028139d9623d483ba5ab476023047d5c9 (patch) | |
| tree | bc28964f8d7375892a8eeaf97df1e01755d6092c | |
| parent | ab5f95832613165d0e0b38015961cf23ebf45657 (diff) | |
| download | sdl_android-feature/remove_lib_strings.tar.gz | |
refactoring more strings into constants filefeature/remove_lib_strings
15 files changed, 326 insertions, 361 deletions
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java index 9acf6e24e..c38bb17b2 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java @@ -11,6 +11,7 @@ import org.json.JSONObject; import android.util.Log; import com.smartdevicelink.proxy.TTSChunkFactory; +import com.smartdevicelink.proxy.constants.Constants; import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities; import com.smartdevicelink.proxy.rpc.ButtonCapabilities; import com.smartdevicelink.proxy.rpc.Choice; @@ -541,9 +542,9 @@ public class Test { JSON_SOFTBUTTONCAPABILITIES.put(jsonButton); jsonButton = new JSONObject(); - jsonButton.put(AudioPassThruCapabilities.KEY_AUDIO_TYPE, GENERAL_AUDIOTYPE); - jsonButton.put(AudioPassThruCapabilities.KEY_BITS_PER_SAMPLE, GENERAL_BITSPERSAMPLE); - jsonButton.put(AudioPassThruCapabilities.KEY_SAMPLING_RATE, GENERAL_SAMPLINGRATE); + jsonButton.put(Constants.KEY_AUDIO_TYPE, GENERAL_AUDIOTYPE); + jsonButton.put(Constants.KEY_BITS_PER_SAMPLE, GENERAL_BITSPERSAMPLE); + jsonButton.put(Constants.KEY_SAMPLING_RATE, GENERAL_SAMPLINGRATE); JSON_AUDIOPASSTHRUCAPABILITIES.put(jsonButton); JSON_TEXTFIELD.put(TextField.KEY_CHARACTER_SET, CharacterSet.CID1SET); diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java index 476898685..d2f44f695 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java @@ -7,6 +7,7 @@ import junit.framework.TestCase; import org.json.JSONException; import org.json.JSONObject; +import com.smartdevicelink.proxy.constants.Constants; import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities; import com.smartdevicelink.proxy.rpc.enums.AudioType; import com.smartdevicelink.proxy.rpc.enums.BitsPerSample; @@ -59,9 +60,9 @@ public class AudioPassThruCapabilitiesTest extends TestCase{ JSONObject reference = new JSONObject(); try{ - reference.put(AudioPassThruCapabilities.KEY_AUDIO_TYPE, Test.GENERAL_AUDIOTYPE); - reference.put(AudioPassThruCapabilities.KEY_BITS_PER_SAMPLE, Test.GENERAL_BITSPERSAMPLE); - reference.put(AudioPassThruCapabilities.KEY_SAMPLING_RATE, Test.GENERAL_SAMPLINGRATE); + reference.put(Constants.KEY_AUDIO_TYPE, Test.GENERAL_AUDIOTYPE); + reference.put(Constants.KEY_BITS_PER_SAMPLE, Test.GENERAL_BITSPERSAMPLE); + reference.put(Constants.KEY_SAMPLING_RATE, Test.GENERAL_SAMPLINGRATE); JSONObject underTest = msg.serializeJSON(); assertEquals(Test.MATCH, reference.length(), underTest.length()); diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java index 245ee7ec8..ac715451f 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java @@ -7,6 +7,7 @@ import junit.framework.TestCase; import org.json.JSONException; import org.json.JSONObject; +import com.smartdevicelink.proxy.constants.Constants; import com.smartdevicelink.proxy.rpc.BodyInformation; import com.smartdevicelink.proxy.rpc.enums.IgnitionStableStatus; import com.smartdevicelink.proxy.rpc.enums.IgnitionStatus; @@ -70,13 +71,13 @@ public class BodyInformationTests extends TestCase{ JSONObject reference = new JSONObject(); try{ - reference.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, Test.GENERAL_BOOLEAN); - reference.put(BodyInformation.KEY_IGNITION_STATUS, Test.GENERAL_IGNITIONSTATUS); - reference.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, Test.GENERAL_IGNITIONSTABLESTATUS); - reference.put(BodyInformation.KEY_DRIVER_DOOR_AJAR, Test.GENERAL_BOOLEAN); - reference.put(BodyInformation.KEY_PASSENGER_DOOR_AJAR, Test.GENERAL_BOOLEAN); - reference.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, Test.GENERAL_BOOLEAN); - reference.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, Test.GENERAL_BOOLEAN); + reference.put(Constants.KEY_PARK_BRAKE_ACTIVE, Test.GENERAL_BOOLEAN); + reference.put(Constants.KEY_IGNITION_STATUS, Test.GENERAL_IGNITIONSTATUS); + reference.put(Constants.KEY_IGNITION_STABLE_STATUS, Test.GENERAL_IGNITIONSTABLESTATUS); + reference.put(Constants.KEY_DRIVER_DOOR_AJAR, Test.GENERAL_BOOLEAN); + reference.put(Constants.KEY_PASSENGER_DOOR_AJAR, Test.GENERAL_BOOLEAN); + reference.put(Constants.KEY_REAR_LEFT_DOOR_AJAR, Test.GENERAL_BOOLEAN); + reference.put(Constants.KEY_REAR_RIGHT_DOOR_AJAR, Test.GENERAL_BOOLEAN); JSONObject underTest = msg.serializeJSON(); assertEquals(Test.MATCH, reference.length(), underTest.length()); diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java index 567265f37..0c43625ba 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java @@ -241,30 +241,30 @@ public class OnVehicleDataTests extends BaseRpcTests{ GPSDataObj.put(GPSData.KEY_SPEED, VehicleDataHelper.GPS_SPEED); //BELT_STATUS - beltStatusObj.put(BeltStatus.KEY_DRIVER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_DRIVER_DEPLOYED); - beltStatusObj.put(BeltStatus.KEY_PASSENGER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_PASSENGER_DEPLOYED); - beltStatusObj.put(BeltStatus.KEY_PASSENGER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_PASSENGER_BELTED); - beltStatusObj.put(BeltStatus.KEY_DRIVER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_DRIVER_BELTED); - beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_2_BELTED); - beltStatusObj.put(BeltStatus.KEY_PASSENGER_CHILD_DETECTED, VehicleDataHelper.BELT_STATUS_PASSENGER_CHILD); - beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_2_BELTED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_2_BELTED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_3_BELTED); - beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_3_BELTED); - beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_3_BELTED); - beltStatusObj.put(BeltStatus.KEY_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED); - beltStatusObj.put(BeltStatus.KEY_RIGHT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_DEPLOYED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_BELTED); + beltStatusObj.put(Constants.KEY_DRIVER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_DRIVER_DEPLOYED); + beltStatusObj.put(Constants.KEY_PASSENGER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_PASSENGER_DEPLOYED); + beltStatusObj.put(Constants.KEY_PASSENGER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_PASSENGER_BELTED); + beltStatusObj.put(Constants.KEY_DRIVER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_DRIVER_BELTED); + beltStatusObj.put(Constants.KEY_LEFT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_2_BELTED); + beltStatusObj.put(Constants.KEY_PASSENGER_CHILD_DETECTED, VehicleDataHelper.BELT_STATUS_PASSENGER_CHILD); + beltStatusObj.put(Constants.KEY_RIGHT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_2_BELTED); + beltStatusObj.put(Constants.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_2_BELTED); + beltStatusObj.put(Constants.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_3_BELTED); + beltStatusObj.put(Constants.KEY_LEFT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_3_BELTED); + beltStatusObj.put(Constants.KEY_RIGHT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_3_BELTED); + beltStatusObj.put(Constants.KEY_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED); + beltStatusObj.put(Constants.KEY_RIGHT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED); + beltStatusObj.put(Constants.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_DEPLOYED); + beltStatusObj.put(Constants.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_BELTED); //BODY_INFORMATION - bodyInformationObj.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE); - bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS); - bodyInformationObj.put(BodyInformation.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS); - bodyInformationObj.put(BodyInformation.KEY_DRIVER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_DRIVER_AJAR); - bodyInformationObj.put(BodyInformation.KEY_PASSENGER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_PASSENGER_AJAR); - bodyInformationObj.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_LEFT_AJAR); - bodyInformationObj.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_RIGHT_AJAR); + bodyInformationObj.put(Constants.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE); + bodyInformationObj.put(Constants.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS); + bodyInformationObj.put(Constants.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS); + bodyInformationObj.put(Constants.KEY_DRIVER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_DRIVER_AJAR); + bodyInformationObj.put(Constants.KEY_PASSENGER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_PASSENGER_AJAR); + bodyInformationObj.put(Constants.KEY_REAR_LEFT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_LEFT_AJAR); + bodyInformationObj.put(Constants.KEY_REAR_RIGHT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_RIGHT_AJAR); //DEVICE_STATUS deviceStatusObj.put(DeviceStatus.KEY_VOICE_REC_ON, VehicleDataHelper.DEVICE_STATUS_VOICE_REC); @@ -307,39 +307,39 @@ public class OnVehicleDataTests extends BaseRpcTests{ emergencyEventObj.put(Constants.KEY_MULTIPLE_EVENTS, VehicleDataHelper.EMERGENCY_EVENT_MULTIPLE_EVENTS); //CLUSTER_MODE_STATUS - clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_ACTIVE, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE); - clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_QUALIFICATION_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS); - clusterModeStatusObj.put(ClusterModeStatus.KEY_CAR_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_CAR_MODE_STATUS); - clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_STATUS); + clusterModeStatusObj.put(Constants.KEY_POWER_MODE_ACTIVE, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE); + clusterModeStatusObj.put(Constants.KEY_POWER_MODE_QUALIFICATION_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS); + clusterModeStatusObj.put(Constants.KEY_CAR_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_CAR_MODE_STATUS); + clusterModeStatusObj.put(Constants.KEY_POWER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_STATUS); //MY_KEY myKeyObj.put(MyKey.KEY_E_911_OVERRIDE, VehicleDataHelper.MY_KEY_E_911_OVERRIDE); - reference.put(OnVehicleData.KEY_SPEED, VehicleDataHelper.SPEED); - reference.put(OnVehicleData.KEY_RPM, VehicleDataHelper.RPM); - reference.put(OnVehicleData.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE); - reference.put(OnVehicleData.KEY_FUEL_LEVEL, VehicleDataHelper.FUEL_LEVEL); - reference.put(OnVehicleData.KEY_VIN, VehicleDataHelper.VIN); - reference.put(OnVehicleData.KEY_PRNDL, VehicleDataHelper.PRNDL_FINAL); - reference.put(OnVehicleData.KEY_TIRE_PRESSURE, tireStatusObj); - reference.put(OnVehicleData.KEY_ENGINE_TORQUE, VehicleDataHelper.ENGINE_TORQUE); - reference.put(OnVehicleData.KEY_ODOMETER, VehicleDataHelper.ODOMETER); - reference.put(OnVehicleData.KEY_GPS, GPSDataObj); - reference.put(OnVehicleData.KEY_FUEL_LEVEL_STATE, VehicleDataHelper.FUEL_LEVEL_STATE); - reference.put(OnVehicleData.KEY_INSTANT_FUEL_CONSUMPTION, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION); - reference.put(OnVehicleData.KEY_BELT_STATUS, beltStatusObj); - reference.put(OnVehicleData.KEY_BODY_INFORMATION, bodyInformationObj); - reference.put(OnVehicleData.KEY_DEVICE_STATUS, deviceStatusObj); - reference.put(OnVehicleData.KEY_DRIVER_BRAKING, VehicleDataHelper.DRIVER_BRAKING); - reference.put(OnVehicleData.KEY_WIPER_STATUS, VehicleDataHelper.WIPER_STATUS); - reference.put(OnVehicleData.KEY_HEAD_LAMP_STATUS, headLampStatusObj); - reference.put(OnVehicleData.KEY_ACC_PEDAL_POSITION, VehicleDataHelper.ACC_PEDAL_POSITION); - reference.put(OnVehicleData.KEY_STEERING_WHEEL_ANGLE, VehicleDataHelper.STEERING_WHEEL_ANGLE); - reference.put(OnVehicleData.KEY_E_CALL_INFO, ECallInfoObj); - reference.put(OnVehicleData.KEY_AIRBAG_STATUS, airbagStatusObj); - reference.put(OnVehicleData.KEY_EMERGENCY_EVENT, emergencyEventObj); - reference.put(OnVehicleData.KEY_CLUSTER_MODE_STATUS, clusterModeStatusObj); - reference.put(OnVehicleData.KEY_MY_KEY, myKeyObj); + reference.put(Constants.KEY_SPEED, VehicleDataHelper.SPEED); + reference.put(Constants.KEY_RPM, VehicleDataHelper.RPM); + reference.put(Constants.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE); + reference.put(Constants.KEY_FUEL_LEVEL, VehicleDataHelper.FUEL_LEVEL); + reference.put(Constants.KEY_VIN, VehicleDataHelper.VIN); + reference.put(Constants.KEY_PRNDL, VehicleDataHelper.PRNDL_FINAL); + reference.put(Constants.KEY_TIRE_PRESSURE, tireStatusObj); + reference.put(Constants.KEY_ENGINE_TORQUE, VehicleDataHelper.ENGINE_TORQUE); + reference.put(Constants.KEY_ODOMETER, VehicleDataHelper.ODOMETER); + reference.put(Constants.KEY_GPS, GPSDataObj); + reference.put(Constants.KEY_FUEL_LEVEL_STATE, VehicleDataHelper.FUEL_LEVEL_STATE); + reference.put(Constants.KEY_INSTANT_FUEL_CONSUMPTION, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION); + reference.put(Constants.KEY_BELT_STATUS, beltStatusObj); + reference.put(Constants.KEY_BODY_INFORMATION, bodyInformationObj); + reference.put(Constants.KEY_DEVICE_STATUS, deviceStatusObj); + reference.put(Constants.KEY_DRIVER_BRAKING, VehicleDataHelper.DRIVER_BRAKING); + reference.put(Constants.KEY_WIPER_STATUS, VehicleDataHelper.WIPER_STATUS); + reference.put(Constants.KEY_HEAD_LAMP_STATUS, headLampStatusObj); + reference.put(Constants.KEY_ACC_PEDAL_POSITION, VehicleDataHelper.ACC_PEDAL_POSITION); + reference.put(Constants.KEY_STEERING_WHEEL_ANGLE, VehicleDataHelper.STEERING_WHEEL_ANGLE); + reference.put(Constants.KEY_E_CALL_INFO, ECallInfoObj); + reference.put(Constants.KEY_AIRBAG_STATUS, airbagStatusObj); + reference.put(Constants.KEY_EMERGENCY_EVENT, emergencyEventObj); + reference.put(Constants.KEY_CLUSTER_MODE_STATUS, clusterModeStatusObj); + reference.put(Constants.KEY_MY_KEY, myKeyObj); JSONObject underTest = msg.serializeJSON(); //go inside underTest and only return the JSONObject inside the parameters key inside the notification key diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java index 21a33aac0..abb43f977 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java @@ -11,6 +11,7 @@ import org.json.JSONObject; import com.smartdevicelink.marshal.JsonRPCMarshaller; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCMessage; +import com.smartdevicelink.proxy.constants.Constants; import com.smartdevicelink.proxy.rpc.Alert; import com.smartdevicelink.proxy.rpc.SoftButton; import com.smartdevicelink.proxy.rpc.TTSChunk; @@ -57,14 +58,14 @@ public class AlertTests extends BaseRpcTests{ JSONObject result = new JSONObject(); try{ - result.put(Alert.KEY_DURATION, Test.GENERAL_INT); - result.put(Alert.KEY_ALERT_TEXT_1, Test.GENERAL_STRING); - result.put(Alert.KEY_ALERT_TEXT_2, Test.GENERAL_STRING); - result.put(Alert.KEY_ALERT_TEXT_3, Test.GENERAL_STRING); - result.put(Alert.KEY_PLAY_TONE, Test.GENERAL_BOOLEAN); - result.put(Alert.KEY_PROGRESS_INDICATOR, Test.GENERAL_BOOLEAN); - result.put(Alert.KEY_TTS_CHUNKS, Test.JSON_TTSCHUNKS); - result.put(Alert.KEY_SOFT_BUTTONS, Test.JSON_SOFTBUTTONS); + result.put(Constants.KEY_DURATION, Test.GENERAL_INT); + result.put(Constants.KEY_ALERT_TEXT_1, Test.GENERAL_STRING); + result.put(Constants.KEY_ALERT_TEXT_2, Test.GENERAL_STRING); + result.put(Constants.KEY_ALERT_TEXT_3, Test.GENERAL_STRING); + result.put(Constants.KEY_PLAY_TONE, Test.GENERAL_BOOLEAN); + result.put(Constants.KEY_PROGRESS_INDICATOR, Test.GENERAL_BOOLEAN); + result.put(Constants.KEY_TTS_CHUNKS, Test.JSON_TTSCHUNKS); + result.put(Constants.KEY_SOFT_BUTTONS, Test.JSON_SOFTBUTTONS); }catch(JSONException e){ fail(Test.JSON_FAIL); } @@ -129,14 +130,14 @@ public class AlertTests extends BaseRpcTests{ assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Alert.KEY_PLAY_TONE), cmd.getPlayTone()); - assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Alert.KEY_DURATION), cmd.getDuration()); - assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_1), cmd.getAlertText1()); - assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_2), cmd.getAlertText2()); - assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_3), cmd.getAlertText3()); - assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Alert.KEY_PROGRESS_INDICATOR), cmd.getProgressIndicator()); + assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Constants.KEY_PLAY_TONE), cmd.getPlayTone()); + assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Constants.KEY_DURATION), cmd.getDuration()); + assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Constants.KEY_ALERT_TEXT_1), cmd.getAlertText1()); + assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Constants.KEY_ALERT_TEXT_2), cmd.getAlertText2()); + assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Constants.KEY_ALERT_TEXT_3), cmd.getAlertText3()); + assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Constants.KEY_PROGRESS_INDICATOR), cmd.getProgressIndicator()); - JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Alert.KEY_TTS_CHUNKS); + JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Constants.KEY_TTS_CHUNKS); List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>(); for (int index = 0; index < ttsChunkArray.length(); index++) { TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsChunkArray.get(index)) ); @@ -144,7 +145,7 @@ public class AlertTests extends BaseRpcTests{ } assertTrue(Test.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks())); - JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Alert.KEY_SOFT_BUTTONS); + JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Constants.KEY_SOFT_BUTTONS); List<SoftButton> softButtonList = new ArrayList<SoftButton>(); for (int index = 0; index < softButtonArray.length(); index++) { SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) ); diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java index d3ecbdfeb..f88a09c2b 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java @@ -11,6 +11,7 @@ import org.json.JSONObject; import com.smartdevicelink.marshal.JsonRPCMarshaller; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCMessage; +import com.smartdevicelink.proxy.constants.Constants; import com.smartdevicelink.proxy.rpc.PerformAudioPassThru; import com.smartdevicelink.proxy.rpc.TTSChunk; import com.smartdevicelink.proxy.rpc.enums.AudioType; @@ -58,14 +59,14 @@ public class PerformAudioPassThruTests extends BaseRpcTests { JSONObject result = new JSONObject(); try { - result.put(PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1, Test.GENERAL_STRING); - result.put(PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2, Test.GENERAL_STRING); - result.put(PerformAudioPassThru.KEY_MUTE_AUDIO, Test.GENERAL_BOOLEAN); - result.put(PerformAudioPassThru.KEY_MAX_DURATION, Test.GENERAL_INT); - result.put(PerformAudioPassThru.KEY_AUDIO_TYPE, Test.GENERAL_AUDIOTYPE); - result.put(PerformAudioPassThru.KEY_SAMPLING_RATE, Test.GENERAL_SAMPLINGRATE); - result.put(PerformAudioPassThru.KEY_BITS_PER_SAMPLE, Test.GENERAL_BITSPERSAMPLE); - result.put(PerformAudioPassThru.KEY_INITIAL_PROMPT, Test.JSON_TTSCHUNKS); + result.put(Constants.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1, Test.GENERAL_STRING); + result.put(Constants.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2, Test.GENERAL_STRING); + result.put(Constants.KEY_MUTE_AUDIO, Test.GENERAL_BOOLEAN); + result.put(Constants.KEY_MAX_DURATION, Test.GENERAL_INT); + result.put(Constants.KEY_AUDIO_TYPE, Test.GENERAL_AUDIOTYPE); + result.put(Constants.KEY_SAMPLING_RATE, Test.GENERAL_SAMPLINGRATE); + result.put(Constants.KEY_BITS_PER_SAMPLE, Test.GENERAL_BITSPERSAMPLE); + result.put(Constants.KEY_INITIAL_PROMPT, Test.JSON_TTSCHUNKS); } catch (JSONException e) { fail(Test.JSON_FAIL); } @@ -134,14 +135,14 @@ public class PerformAudioPassThruTests extends BaseRpcTests { assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformAudioPassThru.KEY_MAX_DURATION), (Integer)cmd.getMaxDuration()); - assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1), cmd.getAudioPassThruDisplayText1()); - assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2), cmd.getAudioPassThruDisplayText2()); - assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PerformAudioPassThru.KEY_MUTE_AUDIO), cmd.getMuteAudio()); - assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_SAMPLING_RATE), cmd.getSamplingRate().toString()); - assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_TYPE), cmd.getAudioType().toString()); + assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Constants.KEY_MAX_DURATION), (Integer)cmd.getMaxDuration()); + assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Constants.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1), cmd.getAudioPassThruDisplayText1()); + assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Constants.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2), cmd.getAudioPassThruDisplayText2()); + assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Constants.KEY_MUTE_AUDIO), cmd.getMuteAudio()); + assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Constants.KEY_SAMPLING_RATE), cmd.getSamplingRate().toString()); + assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Constants.KEY_AUDIO_TYPE), cmd.getAudioType().toString()); - JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformAudioPassThru.KEY_INITIAL_PROMPT); + JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Constants.KEY_INITIAL_PROMPT); List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>(); for (int index = 0; index < ttsChunkArray.length(); index++) { TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsChunkArray.get(index)) ); @@ -149,7 +150,7 @@ public class PerformAudioPassThruTests extends BaseRpcTests { } assertTrue(Test.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getInitialPrompt())); - assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_BITS_PER_SAMPLE), cmd.getBitsPerSample().toString()); + assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Constants.KEY_BITS_PER_SAMPLE), cmd.getBitsPerSample().toString()); } catch (JSONException e) { fail(Test.JSON_FAIL); } diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java index a479da245..1603d65c7 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java @@ -8,6 +8,7 @@ import org.json.JSONObject; import com.smartdevicelink.marshal.JsonRPCMarshaller; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCMessage; +import com.smartdevicelink.proxy.constants.Constants; import com.smartdevicelink.proxy.rpc.AlertResponse; import com.smartdevicelink.test.BaseRpcTests; import com.smartdevicelink.test.JsonUtils; @@ -44,7 +45,7 @@ public class AlertResponseTests extends BaseRpcTests{ JSONObject result = new JSONObject(); try{ - result.put(AlertResponse.KEY_TRY_AGAIN_TIME, TRY_AGAIN_TIME); + result.put(Constants.KEY_TRY_AGAIN_TIME, TRY_AGAIN_TIME); }catch(JSONException e){ fail(Test.JSON_FAIL); } @@ -84,11 +85,11 @@ public class AlertResponseTests extends BaseRpcTests{ assertNotNull(Test.NOT_NULL, body); // Test everything in the json body. - assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(body, Constants.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(body, Constants.KEY_CORRELATION_ID), cmd.getCorrelationID()); - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AlertResponse.KEY_TRY_AGAIN_TIME), cmd.getTryAgainTime()); + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, Constants.KEY_PARAMETERS); + assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Constants.KEY_TRY_AGAIN_TIME), cmd.getTryAgainTime()); } catch (JSONException e) { e.printStackTrace(); diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java index 314a2f419..74f95ab46 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java @@ -9,6 +9,7 @@ import org.json.JSONObject; import com.smartdevicelink.marshal.JsonRPCMarshaller; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCMessage; +import com.smartdevicelink.proxy.constants.Constants; import com.smartdevicelink.proxy.rpc.AirbagStatus; import com.smartdevicelink.proxy.rpc.BeltStatus; import com.smartdevicelink.proxy.rpc.BodyInformation; @@ -148,30 +149,30 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{ GPSDataObj.put(GPSData.KEY_SPEED, VehicleDataHelper.GPS_SPEED); //BELT_STATUS - beltStatusObj.put(BeltStatus.KEY_DRIVER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_DRIVER_DEPLOYED); - beltStatusObj.put(BeltStatus.KEY_PASSENGER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_PASSENGER_DEPLOYED); - beltStatusObj.put(BeltStatus.KEY_PASSENGER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_PASSENGER_BELTED); - beltStatusObj.put(BeltStatus.KEY_DRIVER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_DRIVER_BELTED); - beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_2_BELTED); - beltStatusObj.put(BeltStatus.KEY_PASSENGER_CHILD_DETECTED, VehicleDataHelper.BELT_STATUS_PASSENGER_CHILD); - beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_2_BELTED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_2_BELTED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_3_BELTED); - beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_3_BELTED); - beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_3_BELTED); - beltStatusObj.put(BeltStatus.KEY_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED); - beltStatusObj.put(BeltStatus.KEY_RIGHT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_DEPLOYED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_BELTED); + beltStatusObj.put(Constants.KEY_DRIVER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_DRIVER_DEPLOYED); + beltStatusObj.put(Constants.KEY_PASSENGER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_PASSENGER_DEPLOYED); + beltStatusObj.put(Constants.KEY_PASSENGER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_PASSENGER_BELTED); + beltStatusObj.put(Constants.KEY_DRIVER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_DRIVER_BELTED); + beltStatusObj.put(Constants.KEY_LEFT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_2_BELTED); + beltStatusObj.put(Constants.KEY_PASSENGER_CHILD_DETECTED, VehicleDataHelper.BELT_STATUS_PASSENGER_CHILD); + beltStatusObj.put(Constants.KEY_RIGHT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_2_BELTED); + beltStatusObj.put(Constants.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_2_BELTED); + beltStatusObj.put(Constants.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_3_BELTED); + beltStatusObj.put(Constants.KEY_LEFT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_3_BELTED); + beltStatusObj.put(Constants.KEY_RIGHT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_3_BELTED); + beltStatusObj.put(Constants.KEY_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED); + beltStatusObj.put(Constants.KEY_RIGHT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED); + beltStatusObj.put(Constants.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_DEPLOYED); + beltStatusObj.put(Constants.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_BELTED); //BODY_INFORMATION - bodyInformationObj.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE); - bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS); - bodyInformationObj.put(BodyInformation.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS); - bodyInformationObj.put(BodyInformation.KEY_DRIVER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_DRIVER_AJAR); - bodyInformationObj.put(BodyInformation.KEY_PASSENGER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_PASSENGER_AJAR); - bodyInformationObj.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_LEFT_AJAR); - bodyInformationObj.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_RIGHT_AJAR); + bodyInformationObj.put(Constants.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE); + bodyInformationObj.put(Constants.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS); + bodyInformationObj.put(Constants.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS); + bodyInformationObj.put(Constants.KEY_DRIVER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_DRIVER_AJAR); + bodyInformationObj.put(Constants.KEY_PASSENGER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_PASSENGER_AJAR); + bodyInformationObj.put(Constants.KEY_REAR_LEFT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_LEFT_AJAR); + bodyInformationObj.put(Constants.KEY_REAR_RIGHT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_RIGHT_AJAR); //DEVICE_STATUS deviceStatusObj.put(DeviceStatus.KEY_VOICE_REC_ON, VehicleDataHelper.DEVICE_STATUS_VOICE_REC); @@ -197,56 +198,56 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{ ECallInfoObj.put(ECallInfo.KEY_E_CALL_CONFIRMATION_STATUS, VehicleDataHelper.E_CALL_INFO_CONFIRMATION_STATUS); //AIRBAG_STATUS - airbagStatusObj.put(AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED); + airbagStatusObj.put(Constants.KEY_DRIVER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_DEPLOYED); + airbagStatusObj.put(Constants.KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED); + airbagStatusObj.put(Constants.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED); + airbagStatusObj.put(Constants.KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED); + airbagStatusObj.put(Constants.KEY_PASSENGER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_DEPLOYED); + airbagStatusObj.put(Constants.KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED); + airbagStatusObj.put(Constants.KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED); + airbagStatusObj.put(Constants.KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED); //EMERGENCY_EVENT - emergencyEventObj.put(EmergencyEvent.KEY_EMERGENCY_EVENT_TYPE, VehicleDataHelper.EMERGENCY_EVENT_TYPE); - emergencyEventObj.put(EmergencyEvent.KEY_FUEL_CUTOFF_STATUS, VehicleDataHelper.EMERGENCY_EVENT_FUEL_CUTOFF_STATUS); - emergencyEventObj.put(EmergencyEvent.KEY_ROLLOVER_EVENT, VehicleDataHelper.EMERGENCY_EVENT_ROLLOVER_EVENT); - emergencyEventObj.put(EmergencyEvent.KEY_MAXIMUM_CHANGE_VELOCITY, VehicleDataHelper.EMERGENCY_EVENT_MAX_CHANGE_VELOCITY); - emergencyEventObj.put(EmergencyEvent.KEY_MULTIPLE_EVENTS, VehicleDataHelper.EMERGENCY_EVENT_MULTIPLE_EVENTS); + emergencyEventObj.put(Constants.KEY_EMERGENCY_EVENT_TYPE, VehicleDataHelper.EMERGENCY_EVENT_TYPE); + emergencyEventObj.put(Constants.KEY_FUEL_CUTOFF_STATUS, VehicleDataHelper.EMERGENCY_EVENT_FUEL_CUTOFF_STATUS); + emergencyEventObj.put(Constants.KEY_ROLLOVER_EVENT, VehicleDataHelper.EMERGENCY_EVENT_ROLLOVER_EVENT); + emergencyEventObj.put(Constants.KEY_MAXIMUM_CHANGE_VELOCITY, VehicleDataHelper.EMERGENCY_EVENT_MAX_CHANGE_VELOCITY); + emergencyEventObj.put(Constants.KEY_MULTIPLE_EVENTS, VehicleDataHelper.EMERGENCY_EVENT_MULTIPLE_EVENTS); //CLUSTER_MODE_STATUS - clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_ACTIVE, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE); - clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_QUALIFICATION_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS); - clusterModeStatusObj.put(ClusterModeStatus.KEY_CAR_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_CAR_MODE_STATUS); - clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_STATUS); + clusterModeStatusObj.put(Constants.KEY_POWER_MODE_ACTIVE, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE); + clusterModeStatusObj.put(Constants.KEY_POWER_MODE_QUALIFICATION_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS); + clusterModeStatusObj.put(Constants.KEY_CAR_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_CAR_MODE_STATUS); + clusterModeStatusObj.put(Constants.KEY_POWER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_STATUS); //MY_KEY myKeyObj.put(MyKey.KEY_E_911_OVERRIDE, VehicleDataHelper.MY_KEY_E_911_OVERRIDE); - reference.put(GetVehicleDataResponse.KEY_SPEED, VehicleDataHelper.SPEED); - reference.put(GetVehicleDataResponse.KEY_RPM, VehicleDataHelper.RPM); - reference.put(GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE); - reference.put(GetVehicleDataResponse.KEY_FUEL_LEVEL, VehicleDataHelper.FUEL_LEVEL); - reference.put(GetVehicleDataResponse.KEY_VIN, VehicleDataHelper.VIN); - reference.put(GetVehicleDataResponse.KEY_PRNDL, VehicleDataHelper.PRNDL_FINAL); - reference.put(GetVehicleDataResponse.KEY_TIRE_PRESSURE, tireStatusObj); - reference.put(GetVehicleDataResponse.KEY_ENGINE_TORQUE, VehicleDataHelper.ENGINE_TORQUE); - reference.put(GetVehicleDataResponse.KEY_ODOMETER, VehicleDataHelper.ODOMETER); - reference.put(GetVehicleDataResponse.KEY_GPS, GPSDataObj); - reference.put(GetVehicleDataResponse.KEY_FUEL_LEVEL_STATE, VehicleDataHelper.FUEL_LEVEL_STATE); - reference.put(GetVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION); - reference.put(GetVehicleDataResponse.KEY_BELT_STATUS, beltStatusObj); - reference.put(GetVehicleDataResponse.KEY_BODY_INFORMATION, bodyInformationObj); - reference.put(GetVehicleDataResponse.KEY_DEVICE_STATUS, deviceStatusObj); - reference.put(GetVehicleDataResponse.KEY_DRIVER_BRAKING, VehicleDataHelper.DRIVER_BRAKING); - reference.put(GetVehicleDataResponse.KEY_WIPER_STATUS, VehicleDataHelper.WIPER_STATUS); - reference.put(GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS, headLampStatusObj); - reference.put(GetVehicleDataResponse.KEY_ACC_PEDAL_POSITION, VehicleDataHelper.ACC_PEDAL_POSITION); - reference.put(GetVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, VehicleDataHelper.STEERING_WHEEL_ANGLE); - reference.put(GetVehicleDataResponse.KEY_E_CALL_INFO, ECallInfoObj); - reference.put(GetVehicleDataResponse.KEY_AIRBAG_STATUS, airbagStatusObj); - reference.put(GetVehicleDataResponse.KEY_EMERGENCY_EVENT, emergencyEventObj); - reference.put(GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS, clusterModeStatusObj); - reference.put(GetVehicleDataResponse.KEY_MY_KEY, myKeyObj); + reference.put(Constants.KEY_SPEED, VehicleDataHelper.SPEED); + reference.put(Constants.KEY_RPM, VehicleDataHelper.RPM); + reference.put(Constants.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE); + reference.put(Constants.KEY_FUEL_LEVEL, VehicleDataHelper.FUEL_LEVEL); + reference.put(Constants.KEY_VIN, VehicleDataHelper.VIN); + reference.put(Constants.KEY_PRNDL, VehicleDataHelper.PRNDL_FINAL); + reference.put(Constants.KEY_TIRE_PRESSURE, tireStatusObj); + reference.put(Constants.KEY_ENGINE_TORQUE, VehicleDataHelper.ENGINE_TORQUE); + reference.put(Constants.KEY_ODOMETER, VehicleDataHelper.ODOMETER); + reference.put(Constants.KEY_GPS, GPSDataObj); + reference.put(Constants.KEY_FUEL_LEVEL_STATE, VehicleDataHelper.FUEL_LEVEL_STATE); + reference.put(Constants.KEY_INSTANT_FUEL_CONSUMPTION, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION); + reference.put(Constants.KEY_BELT_STATUS, beltStatusObj); + reference.put(Constants.KEY_BODY_INFORMATION, bodyInformationObj); + reference.put(Constants.KEY_DEVICE_STATUS, deviceStatusObj); + reference.put(Constants.KEY_DRIVER_BRAKING, VehicleDataHelper.DRIVER_BRAKING); + reference.put(Constants.KEY_WIPER_STATUS, VehicleDataHelper.WIPER_STATUS); + reference.put(Constants.KEY_HEAD_LAMP_STATUS, headLampStatusObj); + reference.put(Constants.KEY_ACC_PEDAL_POSITION, VehicleDataHelper.ACC_PEDAL_POSITION); + reference.put(Constants.KEY_STEERING_WHEEL_ANGLE, VehicleDataHelper.STEERING_WHEEL_ANGLE); + reference.put(Constants.KEY_E_CALL_INFO, ECallInfoObj); + reference.put(Constants.KEY_AIRBAG_STATUS, airbagStatusObj); + reference.put(Constants.KEY_EMERGENCY_EVENT, emergencyEventObj); + reference.put(Constants.KEY_CLUSTER_MODE_STATUS, clusterModeStatusObj); + reference.put(Constants.KEY_MY_KEY, myKeyObj); JSONObject underTest = msg.serializeJSON(); diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java index 811d65a42..6bc367936 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java @@ -6,6 +6,7 @@ import java.util.List; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
+import com.smartdevicelink.proxy.constants.Constants;
/**
* Provides information to the user using either TTS, the Display or both and
@@ -116,14 +117,6 @@ import com.smartdevicelink.proxy.RPCRequest; * @see Speak
*/
public class Alert extends RPCRequest {
- public static final String KEY_PLAY_TONE = "playTone";
- public static final String KEY_DURATION = "duration";
- public static final String KEY_ALERT_TEXT_1 = "alertText1";
- public static final String KEY_ALERT_TEXT_2 = "alertText2";
- public static final String KEY_ALERT_TEXT_3 = "alertText3";
- public static final String KEY_PROGRESS_INDICATOR = "progressIndicator";
- public static final String KEY_TTS_CHUNKS = "ttsChunks";
- public static final String KEY_SOFT_BUTTONS = "softButtons";
/**
* Constructs a new Alert object
@@ -149,7 +142,7 @@ public class Alert extends RPCRequest { * in the first field during the Alert
*/
public String getAlertText1() {
- return (String) parameters.get(KEY_ALERT_TEXT_1);
+ return (String) parameters.get(Constants.KEY_ALERT_TEXT_1);
}
/**
* Sets the String to be displayed in the first field of the display during
@@ -168,9 +161,9 @@ public class Alert extends RPCRequest { */
public void setAlertText1(String alertText1) {
if (alertText1 != null) {
- parameters.put(KEY_ALERT_TEXT_1, alertText1);
+ parameters.put(Constants.KEY_ALERT_TEXT_1, alertText1);
} else {
- parameters.remove(KEY_ALERT_TEXT_1);
+ parameters.remove(Constants.KEY_ALERT_TEXT_1);
}
}
/**
@@ -181,7 +174,7 @@ public class Alert extends RPCRequest { * in the second field during the Alert
*/
public String getAlertText2() {
- return (String) parameters.get(KEY_ALERT_TEXT_2);
+ return (String) parameters.get(Constants.KEY_ALERT_TEXT_2);
}
/**
* Sets the String to be displayed in the second field of the display during
@@ -201,9 +194,9 @@ public class Alert extends RPCRequest { */
public void setAlertText2(String alertText2) {
if (alertText2 != null) {
- parameters.put(KEY_ALERT_TEXT_2, alertText2);
+ parameters.put(Constants.KEY_ALERT_TEXT_2, alertText2);
} else {
- parameters.remove(KEY_ALERT_TEXT_2);
+ parameters.remove(Constants.KEY_ALERT_TEXT_2);
}
}
@@ -217,7 +210,7 @@ public class Alert extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public String getAlertText3() {
- return (String) parameters.get(KEY_ALERT_TEXT_3);
+ return (String) parameters.get(Constants.KEY_ALERT_TEXT_3);
}
/**
@@ -240,9 +233,9 @@ public class Alert extends RPCRequest { */
public void setAlertText3(String alertText3) {
if (alertText3 != null) {
- parameters.put(KEY_ALERT_TEXT_3, alertText3);
+ parameters.put(Constants.KEY_ALERT_TEXT_3, alertText3);
} else {
- parameters.remove(KEY_ALERT_TEXT_3);
+ parameters.remove(Constants.KEY_ALERT_TEXT_3);
}
}
/**
@@ -254,8 +247,8 @@ public class Alert extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<TTSChunk> getTtsChunks() {
- if (parameters.get(KEY_TTS_CHUNKS) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_TTS_CHUNKS);
+ if (parameters.get(Constants.KEY_TTS_CHUNKS) instanceof List<?>) {
+ List<?> list = (List<?>)parameters.get(Constants.KEY_TTS_CHUNKS);
if (list != null && list.size() > 0) {
Object obj = list.get(0);
if (obj instanceof TTSChunk) {
@@ -281,9 +274,9 @@ public class Alert extends RPCRequest { */
public void setTtsChunks(List<TTSChunk> ttsChunks) {
if (ttsChunks != null) {
- parameters.put(KEY_TTS_CHUNKS, ttsChunks);
+ parameters.put(Constants.KEY_TTS_CHUNKS, ttsChunks);
} else {
- parameters.remove(KEY_TTS_CHUNKS);
+ parameters.remove(Constants.KEY_TTS_CHUNKS);
}
}
/**
@@ -293,7 +286,7 @@ public class Alert extends RPCRequest { * displayed portion of the alert, in milliseconds
*/
public Integer getDuration() {
- return (Integer) parameters.get(KEY_DURATION);
+ return (Integer) parameters.get(Constants.KEY_DURATION);
}
/**
* <p>Sets the duration of the displayed portion of the alert, in milliseconds.
@@ -314,9 +307,9 @@ public class Alert extends RPCRequest { */
public void setDuration(Integer duration) {
if (duration != null) {
- parameters.put(KEY_DURATION, duration);
+ parameters.put(Constants.KEY_DURATION, duration);
} else {
- parameters.remove(KEY_DURATION);
+ parameters.remove(Constants.KEY_DURATION);
}
}
/**
@@ -326,7 +319,7 @@ public class Alert extends RPCRequest { * TTS (if any) is spoken
*/
public Boolean getPlayTone() {
- return (Boolean) parameters.get(KEY_PLAY_TONE);
+ return (Boolean) parameters.get(Constants.KEY_PLAY_TONE);
}
/**
* Sets whether the alert tone should be played before the TTS (if any) is
@@ -340,9 +333,9 @@ public class Alert extends RPCRequest { */
public void setPlayTone(Boolean playTone) {
if (playTone != null) {
- parameters.put(KEY_PLAY_TONE, playTone);
+ parameters.put(Constants.KEY_PLAY_TONE, playTone);
} else {
- parameters.remove(KEY_PLAY_TONE);
+ parameters.remove(Constants.KEY_PLAY_TONE);
}
}
@@ -355,8 +348,8 @@ public class Alert extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<SoftButton> getSoftButtons() {
- if (parameters.get(KEY_SOFT_BUTTONS) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_SOFT_BUTTONS);
+ if (parameters.get(Constants.KEY_SOFT_BUTTONS) instanceof List<?>) {
+ List<?> list = (List<?>)parameters.get(Constants.KEY_SOFT_BUTTONS);
if (list != null && list.size() > 0) {
Object obj = list.get(0);
if (obj instanceof SoftButton) {
@@ -391,13 +384,13 @@ public class Alert extends RPCRequest { public void setSoftButtons(List<SoftButton> softButtons) {
if (softButtons != null) {
- parameters.put(KEY_SOFT_BUTTONS, softButtons);
+ parameters.put(Constants.KEY_SOFT_BUTTONS, softButtons);
} else {
- parameters.remove(KEY_SOFT_BUTTONS);
+ parameters.remove(Constants.KEY_SOFT_BUTTONS);
}
}
public Boolean getProgressIndicator() {
- final Object obj = parameters.get(KEY_PROGRESS_INDICATOR);
+ final Object obj = parameters.get(Constants.KEY_PROGRESS_INDICATOR);
if (obj instanceof Boolean) {
return (Boolean) obj;
}
@@ -405,9 +398,9 @@ public class Alert extends RPCRequest { }
public void setProgressIndicator(Boolean progressIndicator) {
if (progressIndicator != null) {
- parameters.put(KEY_PROGRESS_INDICATOR, progressIndicator);
+ parameters.put(Constants.KEY_PROGRESS_INDICATOR, progressIndicator);
} else {
- parameters.remove(KEY_PROGRESS_INDICATOR);
+ parameters.remove(Constants.KEY_PROGRESS_INDICATOR);
}
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java index cea706d4e..a6df82773 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java @@ -4,6 +4,7 @@ import java.util.Hashtable; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
+import com.smartdevicelink.proxy.constants.Constants;
/**
* Alert Response is sent, when Alert has been called
@@ -11,7 +12,6 @@ import com.smartdevicelink.proxy.RPCResponse; * @since SmartDeviceLink 1.0
*/
public class AlertResponse extends RPCResponse {
- public static final String KEY_TRY_AGAIN_TIME = "tryAgainTime";
/**
* Constructs a new AlertResponse object
@@ -32,13 +32,13 @@ public class AlertResponse extends RPCResponse { super(hash);
}
public Integer getTryAgainTime() {
- return (Integer) parameters.get(KEY_TRY_AGAIN_TIME);
+ return (Integer) parameters.get(Constants.KEY_TRY_AGAIN_TIME);
}
public void setTryAgainTime(Integer tryAgainTime) {
if (tryAgainTime != null) {
- parameters.put(KEY_TRY_AGAIN_TIME, tryAgainTime);
+ parameters.put(Constants.KEY_TRY_AGAIN_TIME, tryAgainTime);
} else {
- parameters.remove(KEY_TRY_AGAIN_TIME);
+ parameters.remove(Constants.KEY_TRY_AGAIN_TIME);
}
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java index 48cfd129b..7e7156c42 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java @@ -3,6 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.constants.Constants;
import com.smartdevicelink.proxy.rpc.enums.AudioType;
import com.smartdevicelink.proxy.rpc.enums.BitsPerSample;
import com.smartdevicelink.proxy.rpc.enums.SamplingRate;
@@ -46,9 +47,6 @@ import com.smartdevicelink.proxy.rpc.enums.SamplingRate; * @since SmartDeviceLink 2.0
*/
public class AudioPassThruCapabilities extends RPCStruct {
- public static final String KEY_SAMPLING_RATE = "samplingRate";
- public static final String KEY_AUDIO_TYPE = "audioType";
- public static final String KEY_BITS_PER_SAMPLE = "bitsPerSample";
/**
* Constructs a newly allocated AudioPassThruCapabilities object
@@ -69,9 +67,9 @@ public class AudioPassThruCapabilities extends RPCStruct { */
public void setSamplingRate(SamplingRate samplingRate) {
if (samplingRate != null) {
- store.put(KEY_SAMPLING_RATE, samplingRate);
+ store.put(Constants.KEY_SAMPLING_RATE, samplingRate);
} else {
- store.remove(KEY_SAMPLING_RATE);
+ store.remove(Constants.KEY_SAMPLING_RATE);
}
}
@@ -80,7 +78,7 @@ public class AudioPassThruCapabilities extends RPCStruct { * @return the sampling rate for AudioPassThru
*/
public SamplingRate getSamplingRate() {
- Object obj = store.get(KEY_SAMPLING_RATE);
+ Object obj = store.get(Constants.KEY_SAMPLING_RATE);
if (obj instanceof SamplingRate) {
return (SamplingRate) obj;
} else if (obj instanceof String) {
@@ -95,9 +93,9 @@ public class AudioPassThruCapabilities extends RPCStruct { */
public void setBitsPerSample(BitsPerSample bitsPerSample) {
if (bitsPerSample != null) {
- store.put(KEY_BITS_PER_SAMPLE, bitsPerSample);
+ store.put(Constants.KEY_BITS_PER_SAMPLE, bitsPerSample);
} else {
- store.remove(KEY_BITS_PER_SAMPLE);
+ store.remove(Constants.KEY_BITS_PER_SAMPLE);
}
}
@@ -106,7 +104,7 @@ public class AudioPassThruCapabilities extends RPCStruct { * @return the sample depth in bit for AudioPassThru
*/
public BitsPerSample getBitsPerSample() {
- Object obj = store.get(KEY_BITS_PER_SAMPLE);
+ Object obj = store.get(Constants.KEY_BITS_PER_SAMPLE);
if (obj instanceof BitsPerSample) {
return (BitsPerSample) obj;
} else if (obj instanceof String) {
@@ -121,9 +119,9 @@ public class AudioPassThruCapabilities extends RPCStruct { */
public void setAudioType(AudioType audioType) {
if (audioType != null) {
- store.put(KEY_AUDIO_TYPE, audioType);
+ store.put(Constants.KEY_AUDIO_TYPE, audioType);
} else {
- store.remove(KEY_AUDIO_TYPE);
+ store.remove(Constants.KEY_AUDIO_TYPE);
}
}
@@ -132,7 +130,7 @@ public class AudioPassThruCapabilities extends RPCStruct { * @return the audiotype for AudioPassThru
*/
public AudioType getAudioType() {
- Object obj = store.get(KEY_AUDIO_TYPE);
+ Object obj = store.get(Constants.KEY_AUDIO_TYPE);
if (obj instanceof AudioType) {
return (AudioType) obj;
} else if (obj instanceof String) {
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java index 71db21640..07bf19c3a 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java @@ -3,6 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.constants.Constants;
import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
/** The status of the seat belts.
*
@@ -114,21 +115,6 @@ import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus; */
public class BeltStatus extends RPCStruct {
- public static final String KEY_DRIVER_BELT_DEPLOYED = "driverBeltDeployed";
- public static final String KEY_PASSENGER_BELT_DEPLOYED = "passengerBeltDeployed";
- public static final String KEY_PASSENGER_BUCKLE_BELTED = "passengerBuckleBelted";
- public static final String KEY_DRIVER_BUCKLE_BELTED = "driverBuckleBelted";
- public static final String KEY_LEFT_ROW_2_BUCKLE_BELTED = "leftRow2BuckleBelted";
- public static final String KEY_PASSENGER_CHILD_DETECTED = "passengerChildDetected";
- public static final String KEY_RIGHT_ROW_2_BUCKLE_BELTED = "rightRow2BuckleBelted";
- public static final String KEY_MIDDLE_ROW_2_BUCKLE_BELTED = "middleRow2BuckleBelted";
- public static final String KEY_MIDDLE_ROW_3_BUCKLE_BELTED = "middleRow3BuckleBelted";
- public static final String KEY_LEFT_ROW_3_BUCKLE_BELTED = "leftRow3BuckleBelted";
- public static final String KEY_RIGHT_ROW_3_BUCKLE_BELTED = "rightRow3BuckleBelted";
- public static final String KEY_REAR_INFLATABLE_BELTED = "rearInflatableBelted";
- public static final String KEY_RIGHT_REAR_INFLATABLE_BELTED = "rightRearInflatableBelted";
- public static final String KEY_MIDDLE_ROW_1_BELT_DEPLOYED = "middleRow1BeltDeployed";
- public static final String KEY_MIDDLE_ROW_1_BUCKLE_BELTED = "middleRow1BuckleBelted";
/** Constructs a new BeltStatus object indicated by the Hashtable
* parameter
* @param hash
@@ -144,13 +130,13 @@ public class BeltStatus extends RPCStruct { public void setDriverBeltDeployed(VehicleDataEventStatus driverBeltDeployed) {
if (driverBeltDeployed != null) {
- store.put(KEY_DRIVER_BELT_DEPLOYED, driverBeltDeployed);
+ store.put(Constants.KEY_DRIVER_BELT_DEPLOYED, driverBeltDeployed);
} else {
- store.remove(KEY_DRIVER_BELT_DEPLOYED);
+ store.remove(Constants.KEY_DRIVER_BELT_DEPLOYED);
}
}
public VehicleDataEventStatus getDriverBeltDeployed() {
- Object obj = store.get(KEY_DRIVER_BELT_DEPLOYED);
+ Object obj = store.get(Constants.KEY_DRIVER_BELT_DEPLOYED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -160,13 +146,13 @@ public class BeltStatus extends RPCStruct { }
public void setPassengerBeltDeployed(VehicleDataEventStatus passengerBeltDeployed) {
if (passengerBeltDeployed != null) {
- store.put(KEY_PASSENGER_BELT_DEPLOYED, passengerBeltDeployed);
+ store.put(Constants.KEY_PASSENGER_BELT_DEPLOYED, passengerBeltDeployed);
} else {
- store.remove(KEY_PASSENGER_BELT_DEPLOYED);
+ store.remove(Constants.KEY_PASSENGER_BELT_DEPLOYED);
}
}
public VehicleDataEventStatus getPassengerBeltDeployed() {
- Object obj = store.get(KEY_PASSENGER_BELT_DEPLOYED);
+ Object obj = store.get(Constants.KEY_PASSENGER_BELT_DEPLOYED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -176,13 +162,13 @@ public class BeltStatus extends RPCStruct { }
public void setPassengerBuckleBelted(VehicleDataEventStatus passengerBuckleBelted) {
if (passengerBuckleBelted != null) {
- store.put(KEY_PASSENGER_BUCKLE_BELTED, passengerBuckleBelted);
+ store.put(Constants.KEY_PASSENGER_BUCKLE_BELTED, passengerBuckleBelted);
} else {
- store.remove(KEY_PASSENGER_BUCKLE_BELTED);
+ store.remove(Constants.KEY_PASSENGER_BUCKLE_BELTED);
}
}
public VehicleDataEventStatus getPassengerBuckleBelted() {
- Object obj = store.get(KEY_PASSENGER_BUCKLE_BELTED);
+ Object obj = store.get(Constants.KEY_PASSENGER_BUCKLE_BELTED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -192,13 +178,13 @@ public class BeltStatus extends RPCStruct { }
public void setDriverBuckleBelted(VehicleDataEventStatus driverBuckleBelted) {
if (driverBuckleBelted != null) {
- store.put(KEY_DRIVER_BUCKLE_BELTED, driverBuckleBelted);
+ store.put(Constants.KEY_DRIVER_BUCKLE_BELTED, driverBuckleBelted);
} else {
- store.remove(KEY_DRIVER_BUCKLE_BELTED);
+ store.remove(Constants.KEY_DRIVER_BUCKLE_BELTED);
}
}
public VehicleDataEventStatus getDriverBuckleBelted() {
- Object obj = store.get(KEY_DRIVER_BUCKLE_BELTED);
+ Object obj = store.get(Constants.KEY_DRIVER_BUCKLE_BELTED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -208,13 +194,13 @@ public class BeltStatus extends RPCStruct { }
public void setLeftRow2BuckleBelted(VehicleDataEventStatus leftRow2BuckleBelted) {
if (leftRow2BuckleBelted != null) {
- store.put(KEY_LEFT_ROW_2_BUCKLE_BELTED, leftRow2BuckleBelted);
+ store.put(Constants.KEY_LEFT_ROW_2_BUCKLE_BELTED, leftRow2BuckleBelted);
} else {
- store.remove(KEY_LEFT_ROW_2_BUCKLE_BELTED);
+ store.remove(Constants.KEY_LEFT_ROW_2_BUCKLE_BELTED);
}
}
public VehicleDataEventStatus getLeftRow2BuckleBelted() {
- Object obj = store.get(KEY_LEFT_ROW_2_BUCKLE_BELTED);
+ Object obj = store.get(Constants.KEY_LEFT_ROW_2_BUCKLE_BELTED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -224,13 +210,13 @@ public class BeltStatus extends RPCStruct { }
public void setPassengerChildDetected(VehicleDataEventStatus passengerChildDetected) {
if (passengerChildDetected != null) {
- store.put(KEY_PASSENGER_CHILD_DETECTED, passengerChildDetected);
+ store.put(Constants.KEY_PASSENGER_CHILD_DETECTED, passengerChildDetected);
} else {
- store.remove(KEY_PASSENGER_CHILD_DETECTED);
+ store.remove(Constants.KEY_PASSENGER_CHILD_DETECTED);
}
}
public VehicleDataEventStatus getPassengerChildDetected() {
- Object obj = store.get(KEY_PASSENGER_CHILD_DETECTED);
+ Object obj = store.get(Constants.KEY_PASSENGER_CHILD_DETECTED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -240,13 +226,13 @@ public class BeltStatus extends RPCStruct { }
public void setRightRow2BuckleBelted(VehicleDataEventStatus rightRow2BuckleBelted) {
if (rightRow2BuckleBelted != null) {
- store.put(KEY_RIGHT_ROW_2_BUCKLE_BELTED, rightRow2BuckleBelted);
+ store.put(Constants.KEY_RIGHT_ROW_2_BUCKLE_BELTED, rightRow2BuckleBelted);
} else {
- store.remove(KEY_RIGHT_ROW_2_BUCKLE_BELTED);
+ store.remove(Constants.KEY_RIGHT_ROW_2_BUCKLE_BELTED);
}
}
public VehicleDataEventStatus getRightRow2BuckleBelted() {
- Object obj = store.get(KEY_RIGHT_ROW_2_BUCKLE_BELTED);
+ Object obj = store.get(Constants.KEY_RIGHT_ROW_2_BUCKLE_BELTED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -256,13 +242,13 @@ public class BeltStatus extends RPCStruct { }
public void setMiddleRow2BuckleBelted(VehicleDataEventStatus middleRow2BuckleBelted) {
if (middleRow2BuckleBelted != null) {
- store.put(KEY_MIDDLE_ROW_2_BUCKLE_BELTED, middleRow2BuckleBelted);
+ store.put(Constants.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, middleRow2BuckleBelted);
} else {
- store.remove(KEY_MIDDLE_ROW_2_BUCKLE_BELTED);
+ store.remove(Constants.KEY_MIDDLE_ROW_2_BUCKLE_BELTED);
}
}
public VehicleDataEventStatus getMiddleRow2BuckleBelted() {
- Object obj = store.get(KEY_MIDDLE_ROW_2_BUCKLE_BELTED);
+ Object obj = store.get(Constants.KEY_MIDDLE_ROW_2_BUCKLE_BELTED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -272,13 +258,13 @@ public class BeltStatus extends RPCStruct { }
public void setMiddleRow3BuckleBelted(VehicleDataEventStatus middleRow3BuckleBelted) {
if (middleRow3BuckleBelted != null) {
- store.put(KEY_MIDDLE_ROW_3_BUCKLE_BELTED, middleRow3BuckleBelted);
+ store.put(Constants.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, middleRow3BuckleBelted);
} else {
- store.remove(KEY_MIDDLE_ROW_3_BUCKLE_BELTED);
+ store.remove(Constants.KEY_MIDDLE_ROW_3_BUCKLE_BELTED);
}
}
public VehicleDataEventStatus getMiddleRow3BuckleBelted() {
- Object obj = store.get(KEY_MIDDLE_ROW_3_BUCKLE_BELTED);
+ Object obj = store.get(Constants.KEY_MIDDLE_ROW_3_BUCKLE_BELTED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -288,13 +274,13 @@ public class BeltStatus extends RPCStruct { }
public void setLeftRow3BuckleBelted(VehicleDataEventStatus leftRow3BuckleBelted) {
if (leftRow3BuckleBelted != null) {
- store.put(KEY_LEFT_ROW_3_BUCKLE_BELTED, leftRow3BuckleBelted);
+ store.put(Constants.KEY_LEFT_ROW_3_BUCKLE_BELTED, leftRow3BuckleBelted);
} else {
- store.remove(KEY_LEFT_ROW_3_BUCKLE_BELTED);
+ store.remove(Constants.KEY_LEFT_ROW_3_BUCKLE_BELTED);
}
}
public VehicleDataEventStatus getLeftRow3BuckleBelted() {
- Object obj = store.get(KEY_LEFT_ROW_3_BUCKLE_BELTED);
+ Object obj = store.get(Constants.KEY_LEFT_ROW_3_BUCKLE_BELTED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -304,13 +290,13 @@ public class BeltStatus extends RPCStruct { }
public void setRightRow3BuckleBelted(VehicleDataEventStatus rightRow3BuckleBelted) {
if (rightRow3BuckleBelted != null) {
- store.put(KEY_RIGHT_ROW_3_BUCKLE_BELTED, rightRow3BuckleBelted);
+ store.put(Constants.KEY_RIGHT_ROW_3_BUCKLE_BELTED, rightRow3BuckleBelted);
} else {
- store.remove(KEY_RIGHT_ROW_3_BUCKLE_BELTED);
+ store.remove(Constants.KEY_RIGHT_ROW_3_BUCKLE_BELTED);
}
}
public VehicleDataEventStatus getRightRow3BuckleBelted() {
- Object obj = store.get(KEY_RIGHT_ROW_3_BUCKLE_BELTED);
+ Object obj = store.get(Constants.KEY_RIGHT_ROW_3_BUCKLE_BELTED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -320,13 +306,13 @@ public class BeltStatus extends RPCStruct { }
public void setLeftRearInflatableBelted(VehicleDataEventStatus rearInflatableBelted) {
if (rearInflatableBelted != null) {
- store.put(KEY_REAR_INFLATABLE_BELTED, rearInflatableBelted);
+ store.put(Constants.KEY_REAR_INFLATABLE_BELTED, rearInflatableBelted);
} else {
- store.remove(KEY_REAR_INFLATABLE_BELTED);
+ store.remove(Constants.KEY_REAR_INFLATABLE_BELTED);
}
}
public VehicleDataEventStatus getLeftRearInflatableBelted() {
- Object obj = store.get(KEY_REAR_INFLATABLE_BELTED);
+ Object obj = store.get(Constants.KEY_REAR_INFLATABLE_BELTED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -336,13 +322,13 @@ public class BeltStatus extends RPCStruct { }
public void setRightRearInflatableBelted(VehicleDataEventStatus rightRearInflatableBelted) {
if (rightRearInflatableBelted != null) {
- store.put(KEY_RIGHT_REAR_INFLATABLE_BELTED, rightRearInflatableBelted);
+ store.put(Constants.KEY_RIGHT_REAR_INFLATABLE_BELTED, rightRearInflatableBelted);
} else {
- store.remove(KEY_RIGHT_REAR_INFLATABLE_BELTED);
+ store.remove(Constants.KEY_RIGHT_REAR_INFLATABLE_BELTED);
}
}
public VehicleDataEventStatus getRightRearInflatableBelted() {
- Object obj = store.get(KEY_RIGHT_REAR_INFLATABLE_BELTED);
+ Object obj = store.get(Constants.KEY_RIGHT_REAR_INFLATABLE_BELTED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -352,13 +338,13 @@ public class BeltStatus extends RPCStruct { }
public void setMiddleRow1BeltDeployed(VehicleDataEventStatus middleRow1BeltDeployed) {
if (middleRow1BeltDeployed != null) {
- store.put(KEY_MIDDLE_ROW_1_BELT_DEPLOYED, middleRow1BeltDeployed);
+ store.put(Constants.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, middleRow1BeltDeployed);
} else {
- store.remove(KEY_MIDDLE_ROW_1_BELT_DEPLOYED);
+ store.remove(Constants.KEY_MIDDLE_ROW_1_BELT_DEPLOYED);
}
}
public VehicleDataEventStatus getMiddleRow1BeltDeployed() {
- Object obj = store.get(KEY_MIDDLE_ROW_1_BELT_DEPLOYED);
+ Object obj = store.get(Constants.KEY_MIDDLE_ROW_1_BELT_DEPLOYED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
@@ -368,13 +354,13 @@ public class BeltStatus extends RPCStruct { }
public void setMiddleRow1BuckleBelted(VehicleDataEventStatus middleRow1BuckleBelted) {
if (middleRow1BuckleBelted != null) {
- store.put(KEY_MIDDLE_ROW_1_BUCKLE_BELTED, middleRow1BuckleBelted);
+ store.put(Constants.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, middleRow1BuckleBelted);
} else {
- store.remove(KEY_MIDDLE_ROW_1_BUCKLE_BELTED);
+ store.remove(Constants.KEY_MIDDLE_ROW_1_BUCKLE_BELTED);
}
}
public VehicleDataEventStatus getMiddleRow1BuckleBelted() {
- Object obj = store.get(KEY_MIDDLE_ROW_1_BUCKLE_BELTED);
+ Object obj = store.get(Constants.KEY_MIDDLE_ROW_1_BUCKLE_BELTED);
if (obj instanceof VehicleDataEventStatus) {
return (VehicleDataEventStatus) obj;
} else if (obj instanceof String) {
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java index 038b1970e..140eb7d12 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java @@ -3,6 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.constants.Constants;
import com.smartdevicelink.proxy.rpc.enums.IgnitionStableStatus;
import com.smartdevicelink.proxy.rpc.enums.IgnitionStatus;
/** The body information including power modes.
@@ -84,13 +85,6 @@ import com.smartdevicelink.proxy.rpc.enums.IgnitionStatus; */
public class BodyInformation extends RPCStruct {
- public static final String KEY_PARK_BRAKE_ACTIVE = "parkBrakeActive";
- public static final String KEY_IGNITION_STABLE_STATUS = "ignitionStableStatus";
- public static final String KEY_IGNITION_STATUS = "ignitionStatus";
- public static final String KEY_DRIVER_DOOR_AJAR = "driverDoorAjar";
- public static final String KEY_PASSENGER_DOOR_AJAR = "passengerDoorAjar";
- public static final String KEY_REAR_LEFT_DOOR_AJAR = "rearLeftDoorAjar";
- public static final String KEY_REAR_RIGHT_DOOR_AJAR = "rearRightDoorAjar";
/** Constructs a new BodyInformation object indicated by the Hashtable
* parameter
* @param hash
@@ -106,23 +100,23 @@ public class BodyInformation extends RPCStruct { public void setParkBrakeActive(Boolean parkBrakeActive) {
if (parkBrakeActive != null) {
- store.put(KEY_PARK_BRAKE_ACTIVE, parkBrakeActive);
+ store.put(Constants.KEY_PARK_BRAKE_ACTIVE, parkBrakeActive);
} else {
- store.remove(KEY_PARK_BRAKE_ACTIVE);
+ store.remove(Constants.KEY_PARK_BRAKE_ACTIVE);
}
}
public Boolean getParkBrakeActive() {
- return (Boolean) store.get(KEY_PARK_BRAKE_ACTIVE);
+ return (Boolean) store.get(Constants.KEY_PARK_BRAKE_ACTIVE);
}
public void setIgnitionStableStatus(IgnitionStableStatus ignitionStableStatus) {
if (ignitionStableStatus != null) {
- store.put(KEY_IGNITION_STABLE_STATUS, ignitionStableStatus);
+ store.put(Constants.KEY_IGNITION_STABLE_STATUS, ignitionStableStatus);
} else {
- store.remove(KEY_IGNITION_STABLE_STATUS);
+ store.remove(Constants.KEY_IGNITION_STABLE_STATUS);
}
}
public IgnitionStableStatus getIgnitionStableStatus() {
- Object obj = store.get(KEY_IGNITION_STABLE_STATUS);
+ Object obj = store.get(Constants.KEY_IGNITION_STABLE_STATUS);
if (obj instanceof IgnitionStableStatus) {
return (IgnitionStableStatus) obj;
} else if (obj instanceof String) {
@@ -132,13 +126,13 @@ public class BodyInformation extends RPCStruct { }
public void setIgnitionStatus(IgnitionStatus ignitionStatus) {
if (ignitionStatus != null) {
- store.put(KEY_IGNITION_STATUS, ignitionStatus);
+ store.put(Constants.KEY_IGNITION_STATUS, ignitionStatus);
} else {
- store.remove(KEY_IGNITION_STATUS);
+ store.remove(Constants.KEY_IGNITION_STATUS);
}
}
public IgnitionStatus getIgnitionStatus() {
- Object obj = store.get(KEY_IGNITION_STATUS);
+ Object obj = store.get(Constants.KEY_IGNITION_STATUS);
if (obj instanceof IgnitionStatus) {
return (IgnitionStatus) obj;
} else if (obj instanceof String) {
@@ -149,47 +143,47 @@ public class BodyInformation extends RPCStruct { public void setDriverDoorAjar(Boolean driverDoorAjar) {
if (driverDoorAjar != null) {
- store.put(KEY_DRIVER_DOOR_AJAR, driverDoorAjar);
+ store.put(Constants.KEY_DRIVER_DOOR_AJAR, driverDoorAjar);
} else {
- store.remove(KEY_DRIVER_DOOR_AJAR);
+ store.remove(Constants.KEY_DRIVER_DOOR_AJAR);
}
}
public Boolean getDriverDoorAjar() {
- return (Boolean) store.get(KEY_DRIVER_DOOR_AJAR);
+ return (Boolean) store.get(Constants.KEY_DRIVER_DOOR_AJAR);
}
public void setPassengerDoorAjar(Boolean passengerDoorAjar) {
if (passengerDoorAjar != null) {
- store.put(KEY_PASSENGER_DOOR_AJAR, passengerDoorAjar);
+ store.put(Constants.KEY_PASSENGER_DOOR_AJAR, passengerDoorAjar);
} else {
- store.remove(KEY_PASSENGER_DOOR_AJAR);
+ store.remove(Constants.KEY_PASSENGER_DOOR_AJAR);
}
}
public Boolean getPassengerDoorAjar() {
- return (Boolean) store.get(KEY_PASSENGER_DOOR_AJAR);
+ return (Boolean) store.get(Constants.KEY_PASSENGER_DOOR_AJAR);
}
public void setRearLeftDoorAjar(Boolean rearLeftDoorAjar) {
if (rearLeftDoorAjar != null) {
- store.put(KEY_REAR_LEFT_DOOR_AJAR, rearLeftDoorAjar);
+ store.put(Constants.KEY_REAR_LEFT_DOOR_AJAR, rearLeftDoorAjar);
} else {
- store.remove(KEY_REAR_LEFT_DOOR_AJAR);
+ store.remove(Constants.KEY_REAR_LEFT_DOOR_AJAR);
}
}
public Boolean getRearLeftDoorAjar() {
- return (Boolean) store.get(KEY_REAR_LEFT_DOOR_AJAR);
+ return (Boolean) store.get(Constants.KEY_REAR_LEFT_DOOR_AJAR);
}
public void setRearRightDoorAjar(Boolean rearRightDoorAjar) {
if (rearRightDoorAjar != null) {
- store.put(KEY_REAR_RIGHT_DOOR_AJAR, rearRightDoorAjar);
+ store.put(Constants.KEY_REAR_RIGHT_DOOR_AJAR, rearRightDoorAjar);
} else {
- store.remove(KEY_REAR_RIGHT_DOOR_AJAR);
+ store.remove(Constants.KEY_REAR_RIGHT_DOOR_AJAR);
}
}
public Boolean getRearRightDoorAjar() {
- return (Boolean) store.get(KEY_REAR_RIGHT_DOOR_AJAR);
+ return (Boolean) store.get(Constants.KEY_REAR_RIGHT_DOOR_AJAR);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java index 2bc59736e..db6e8a0fc 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java @@ -4,6 +4,7 @@ import java.util.Hashtable; import java.util.List;
import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.constants.Constants;
import com.smartdevicelink.util.DebugTool;
/**
@@ -56,13 +57,6 @@ import com.smartdevicelink.util.DebugTool; * @see Image
*/
public class Choice extends RPCStruct {
- public static final String KEY_SECONDARY_TEXT = "secondaryText";
- public static final String KEY_TERTIARY_TEXT = "tertiaryText";
- public static final String KEY_SECONDARY_IMAGE = "secondaryImage";
- public static final String KEY_MENU_NAME = "menuName";
- public static final String KEY_VR_COMMANDS = "vrCommands";
- public static final String KEY_CHOICE_ID = "choiceID";
- public static final String KEY_IMAGE = "image";
/**
* Constructs a newly allocated Choice object
*/
@@ -79,7 +73,7 @@ public class Choice extends RPCStruct { * @return choiceID Min: 0; Max: 65535
*/
public Integer getChoiceID() {
- return (Integer) store.get(KEY_CHOICE_ID);
+ return (Integer) store.get(Constants.KEY_CHOICE_ID);
}
/**
* Set the application-scoped identifier that uniquely identifies this choice.
@@ -87,9 +81,9 @@ public class Choice extends RPCStruct { */
public void setChoiceID(Integer choiceID) {
if (choiceID != null) {
- store.put(KEY_CHOICE_ID, choiceID);
+ store.put(Constants.KEY_CHOICE_ID, choiceID);
} else {
- store.remove(KEY_CHOICE_ID);
+ store.remove(Constants.KEY_CHOICE_ID);
}
}
/**
@@ -99,7 +93,7 @@ public class Choice extends RPCStruct { * @return menuName the menu name
*/
public String getMenuName() {
- return (String) store.get(KEY_MENU_NAME);
+ return (String) store.get(Constants.KEY_MENU_NAME);
}
/**
* Text which appears in menu, representing this choice.
@@ -109,9 +103,9 @@ public class Choice extends RPCStruct { */
public void setMenuName(String menuName) {
if (menuName != null) {
- store.put(KEY_MENU_NAME, menuName);
+ store.put(Constants.KEY_MENU_NAME, menuName);
} else {
- store.remove(KEY_MENU_NAME);
+ store.remove(Constants.KEY_MENU_NAME);
}
}
/**
@@ -121,8 +115,8 @@ public class Choice extends RPCStruct { */
@SuppressWarnings("unchecked")
public List<String> getVrCommands() {
- if (store.get(KEY_VR_COMMANDS) instanceof List<?>) {
- List<?> list = (List<?>)store.get( KEY_VR_COMMANDS);
+ if (store.get(Constants.KEY_VR_COMMANDS) instanceof List<?>) {
+ List<?> list = (List<?>)store.get( Constants.KEY_VR_COMMANDS);
if (list != null && list.size() > 0) {
Object obj = list.get(0);
if (obj instanceof String) {
@@ -139,9 +133,9 @@ public class Choice extends RPCStruct { */
public void setVrCommands(List<String> vrCommands) {
if (vrCommands != null) {
- store.put(KEY_VR_COMMANDS, vrCommands);
+ store.put(Constants.KEY_VR_COMMANDS, vrCommands);
} else {
- store.remove(KEY_VR_COMMANDS);
+ store.remove(Constants.KEY_VR_COMMANDS);
}
}
/**
@@ -150,9 +144,9 @@ public class Choice extends RPCStruct { */
public void setImage(Image image) {
if (image != null) {
- store.put(KEY_IMAGE, image);
+ store.put(Constants.KEY_IMAGE, image);
} else {
- store.remove(KEY_IMAGE);
+ store.remove(Constants.KEY_IMAGE);
}
}
/**
@@ -161,34 +155,34 @@ public class Choice extends RPCStruct { */
@SuppressWarnings("unchecked")
public Image getImage() {
- Object obj = store.get(KEY_IMAGE);
+ Object obj = store.get(Constants.KEY_IMAGE);
if (obj instanceof Image) {
return (Image) obj;
} else if (obj instanceof Hashtable) {
try {
return new Image((Hashtable<String, Object>) obj);
} catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_IMAGE, e);
+ DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + Constants.KEY_IMAGE, e);
}
}
return null;
}
public String getSecondaryText() {
- return (String) store.get(KEY_SECONDARY_TEXT);
+ return (String) store.get(Constants.KEY_SECONDARY_TEXT);
}
public void setSecondaryText(String secondaryText) {
if (secondaryText != null) {
- store.put(KEY_SECONDARY_TEXT, secondaryText);
+ store.put(Constants.KEY_SECONDARY_TEXT, secondaryText);
}
else {
- store.remove(KEY_SECONDARY_TEXT);
+ store.remove(Constants.KEY_SECONDARY_TEXT);
}
}
public String getTertiaryText() {
- return (String) store.get(KEY_TERTIARY_TEXT);
+ return (String) store.get(Constants.KEY_TERTIARY_TEXT);
}
public void setTertiaryText(String tertiaryText) {
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java index 0e663f63d..f9e7ca02d 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java @@ -6,6 +6,7 @@ import java.util.List; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
+import com.smartdevicelink.proxy.constants.Constants;
import com.smartdevicelink.proxy.rpc.enums.AudioType;
import com.smartdevicelink.proxy.rpc.enums.BitsPerSample;
import com.smartdevicelink.proxy.rpc.enums.SamplingRate;
@@ -94,14 +95,6 @@ import com.smartdevicelink.proxy.rpc.enums.SamplingRate; * @see EndAudioPassThru
*/
public class PerformAudioPassThru extends RPCRequest {
- public static final String KEY_MAX_DURATION = "maxDuration";
- public static final String KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1 = "audioPassThruDisplayText1";
- public static final String KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2 = "audioPassThruDisplayText2";
- public static final String KEY_MUTE_AUDIO = "muteAudio";
- public static final String KEY_SAMPLING_RATE = "samplingRate";
- public static final String KEY_AUDIO_TYPE = "audioType";
- public static final String KEY_INITIAL_PROMPT = "initialPrompt";
- public static final String KEY_BITS_PER_SAMPLE = "bitsPerSample";
/**
* Constructs a new PerformAudioPassThru object
@@ -142,9 +135,9 @@ public class PerformAudioPassThru extends RPCRequest { */
public void setInitialPrompt(List<TTSChunk> initialPrompt) {
if (initialPrompt != null) {
- parameters.put(KEY_INITIAL_PROMPT, initialPrompt);
+ parameters.put(Constants.KEY_INITIAL_PROMPT, initialPrompt);
} else {
- parameters.remove(KEY_INITIAL_PROMPT);
+ parameters.remove(Constants.KEY_INITIAL_PROMPT);
}
}
@@ -158,8 +151,8 @@ public class PerformAudioPassThru extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<TTSChunk> getInitialPrompt() {
- if (parameters.get(KEY_INITIAL_PROMPT) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_INITIAL_PROMPT);
+ if (parameters.get(Constants.KEY_INITIAL_PROMPT) instanceof List<?>) {
+ List<?> list = (List<?>)parameters.get(Constants.KEY_INITIAL_PROMPT);
if (list != null && list.size() > 0) {
Object obj = list.get(0);
if (obj instanceof TTSChunk) {
@@ -187,9 +180,9 @@ public class PerformAudioPassThru extends RPCRequest { */
public void setAudioPassThruDisplayText1(String audioPassThruDisplayText1) {
if (audioPassThruDisplayText1 != null) {
- parameters.put(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1, audioPassThruDisplayText1);
+ parameters.put(Constants.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1, audioPassThruDisplayText1);
} else {
- parameters.remove(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1);
+ parameters.remove(Constants.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1);
}
}
@@ -200,7 +193,7 @@ public class PerformAudioPassThru extends RPCRequest { * displayed during audio capture
*/
public String getAudioPassThruDisplayText1() {
- return (String) parameters.get(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1);
+ return (String) parameters.get(Constants.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1);
}
/**
@@ -214,9 +207,9 @@ public class PerformAudioPassThru extends RPCRequest { */
public void setAudioPassThruDisplayText2(String audioPassThruDisplayText2) {
if (audioPassThruDisplayText2 != null) {
- parameters.put(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2, audioPassThruDisplayText2);
+ parameters.put(Constants.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2, audioPassThruDisplayText2);
} else {
- parameters.remove(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2);
+ parameters.remove(Constants.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2);
}
}
@@ -227,7 +220,7 @@ public class PerformAudioPassThru extends RPCRequest { * displayed during audio capture
*/
public String getAudioPassThruDisplayText2() {
- return (String) parameters.get(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2);
+ return (String) parameters.get(Constants.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2);
}
/**
@@ -238,9 +231,9 @@ public class PerformAudioPassThru extends RPCRequest { */
public void setSamplingRate(SamplingRate samplingRate) {
if (samplingRate != null) {
- parameters.put(KEY_SAMPLING_RATE, samplingRate);
+ parameters.put(Constants.KEY_SAMPLING_RATE, samplingRate);
} else {
- parameters.remove(KEY_SAMPLING_RATE);
+ parameters.remove(Constants.KEY_SAMPLING_RATE);
}
}
@@ -250,7 +243,7 @@ public class PerformAudioPassThru extends RPCRequest { * @return SamplingRate -a SamplingRate value
*/
public SamplingRate getSamplingRate() {
- Object obj = parameters.get(KEY_SAMPLING_RATE);
+ Object obj = parameters.get(Constants.KEY_SAMPLING_RATE);
if (obj instanceof SamplingRate) {
return (SamplingRate) obj;
} else if (obj instanceof String) {
@@ -270,9 +263,9 @@ public class PerformAudioPassThru extends RPCRequest { */
public void setMaxDuration(Integer maxDuration) {
if (maxDuration != null) {
- parameters.put(KEY_MAX_DURATION, maxDuration);
+ parameters.put(Constants.KEY_MAX_DURATION, maxDuration);
} else {
- parameters.remove(KEY_MAX_DURATION);
+ parameters.remove(Constants.KEY_MAX_DURATION);
}
}
@@ -283,7 +276,7 @@ public class PerformAudioPassThru extends RPCRequest { * recording in milliseconds
*/
public Integer getMaxDuration() {
- return (Integer) parameters.get(KEY_MAX_DURATION);
+ return (Integer) parameters.get(Constants.KEY_MAX_DURATION);
}
/**
@@ -294,9 +287,9 @@ public class PerformAudioPassThru extends RPCRequest { */
public void setBitsPerSample(BitsPerSample audioQuality) {
if (audioQuality != null) {
- parameters.put(KEY_BITS_PER_SAMPLE, audioQuality);
+ parameters.put(Constants.KEY_BITS_PER_SAMPLE, audioQuality);
} else {
- parameters.remove(KEY_BITS_PER_SAMPLE);
+ parameters.remove(Constants.KEY_BITS_PER_SAMPLE);
}
}
@@ -306,7 +299,7 @@ public class PerformAudioPassThru extends RPCRequest { * @return BitsPerSample -a BitsPerSample value
*/
public BitsPerSample getBitsPerSample() {
- Object obj = parameters.get(KEY_BITS_PER_SAMPLE);
+ Object obj = parameters.get(Constants.KEY_BITS_PER_SAMPLE);
if (obj instanceof BitsPerSample) {
return (BitsPerSample) obj;
} else if (obj instanceof String) {
@@ -323,9 +316,9 @@ public class PerformAudioPassThru extends RPCRequest { */
public void setAudioType(AudioType audioType) {
if (audioType != null) {
- parameters.put(KEY_AUDIO_TYPE, audioType);
+ parameters.put(Constants.KEY_AUDIO_TYPE, audioType);
} else {
- parameters.remove(KEY_AUDIO_TYPE);
+ parameters.remove(Constants.KEY_AUDIO_TYPE);
}
}
@@ -335,7 +328,7 @@ public class PerformAudioPassThru extends RPCRequest { * @return AudioType -an AudioType
*/
public AudioType getAudioType() {
- Object obj = parameters.get(KEY_AUDIO_TYPE);
+ Object obj = parameters.get(Constants.KEY_AUDIO_TYPE);
if (obj instanceof AudioType) {
return (AudioType) obj;
} else if (obj instanceof String) {
@@ -353,7 +346,7 @@ public class PerformAudioPassThru extends RPCRequest { * should be muted during the APT session
*/
public Boolean getMuteAudio() {
- return (Boolean) parameters.get(KEY_MUTE_AUDIO);
+ return (Boolean) parameters.get(Constants.KEY_MUTE_AUDIO);
}
/**
@@ -369,9 +362,9 @@ public class PerformAudioPassThru extends RPCRequest { */
public void setMuteAudio(Boolean muteAudio) {
if (muteAudio != null) {
- parameters.put(KEY_MUTE_AUDIO, muteAudio);
+ parameters.put(Constants.KEY_MUTE_AUDIO, muteAudio);
} else {
- parameters.remove(KEY_MUTE_AUDIO);
+ parameters.remove(Constants.KEY_MUTE_AUDIO);
}
}
}
|