Merge pull request #1092 from mrapitis/feature/radio_climate_update

Feature/issue 960 Remote Control - Radio and Climate Parameter Update

4 files changed, 87 insertions, 0 deletions

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java
index 6961faf94..5a4a39c14 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java
@@ -61,6 +61,7 @@ public class ClimateControlCapabilities extends RPCStruct{
     public static final String KEY_HEATED_WIND_SHIELD_AVAILABLE = "heatedWindshieldAvailable";
     public static final String KEY_HEATED_REAR_WINDOW_AVAILABLE = "heatedRearWindowAvailable";
     public static final String KEY_HEATED_MIRRORS_AVAILABLE = "heatedMirrorsAvailable";
+    public static final String KEY_CLIMATE_ENABLE_AVAILABLE = "climateEnableAvailable";
 
     public ClimateControlCapabilities() {
     }
@@ -403,4 +404,24 @@ public class ClimateControlCapabilities extends RPCStruct{
     public Boolean getHeatedMirrorsAvailable() {
 	    return getBoolean(KEY_HEATED_MIRRORS_AVAILABLE);
     }
+
+    /**
+     * Sets the climateEnableAvailable portion of the ClimateControlCapabilities class
+     *
+     * @param climateEnableAvailable Availability of the control of enable/disable climate control.
+     *                               True: Available, False: Not Available, Not present: Not Available.
+     */
+    public void setClimateEnableAvailable(Boolean climateEnableAvailable) {
+        setValue(KEY_CLIMATE_ENABLE_AVAILABLE, climateEnableAvailable);
+    }
+
+    /**
+     * Gets the climateEnableAvailable portion of the ClimateControlCapabilities class
+     *
+     * @return Boolean - Availability of the control of enable/disable climate control.
+     * True: Available, False: Not Available, Not present: Not Available.
+     */
+    public Boolean getClimateEnableAvailable() {
+        return getBoolean(KEY_CLIMATE_ENABLE_AVAILABLE);
+    }
 }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java
index 4f9a8d09f..365a74044 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java
@@ -52,6 +52,7 @@ public class ClimateControlData extends RPCStruct{
     public static final String KEY_HEATED_WIND_SHIELD_ENABLE = "heatedWindshieldEnable";
     public static final String KEY_HEATED_REAR_WINDOW_ENABLE = "heatedRearWindowEnable";
     public static final String KEY_HEATED_MIRRORS_ENABLE = "heatedMirrorsEnable";
+    public static final String KEY_CLIMATE_ENABLE = "climateEnable";
 
     public ClimateControlData() {
     }
@@ -211,4 +212,22 @@ public class ClimateControlData extends RPCStruct{
     public Boolean getHeatedMirrorsEnable() {
         return getBoolean(KEY_HEATED_MIRRORS_ENABLE);
     }
+
+    /**
+     * Sets the climateEnable portion of the ClimateControlData class
+     *
+     * @param climateEnable Value false means disabled, value true means enabled.
+     */
+    public void setClimateEnable(Boolean climateEnable) {
+        setValue(KEY_CLIMATE_ENABLE, climateEnable);
+    }
+
+    /**
+     * Gets the climateEnable portion of the ClimateControlData class
+     *
+     * @return Boolean - Value false means disabled, value true means enabled.
+     */
+    public Boolean getClimateEnable() {
+        return getBoolean(KEY_CLIMATE_ENABLE);
+    }
 }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
index da987e48a..e729c2934 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
@@ -54,6 +54,7 @@ public class RadioControlCapabilities extends RPCStruct{
     public static final String KEY_HD_RADIO_ENABLE_AVAILABLE = "hdRadioEnableAvailable";
     public static final String KEY_SIRIUS_XM_RADIO_AVAILABLE = "siriusxmRadioAvailable";
     public static final String KEY_SIS_DATA_AVAILABLE = "sisDataAvailable";
+    public static final String KEY_AVAILABLE_HD_CHANNELS_AVAILABLE = "availableHdChannelsAvailable";
 
     public RadioControlCapabilities() {
     }
@@ -204,6 +205,7 @@ public class RadioControlCapabilities extends RPCStruct{
      * Availability of the getting the number of available HD channels.
      * True: Available, False: Not Available, Not present: Not Available.
      */
+    @Deprecated
     public void setAvailableHDsAvailable(Boolean availableHDsAvailable) {
         setValue(KEY_AVAILABLE_HDS_AVAILABLE, availableHDsAvailable);
     }
@@ -214,11 +216,33 @@ public class RadioControlCapabilities extends RPCStruct{
      * @return Boolean - Availability of the getting the number of available HD channels.
      * True: Available, False: Not Available, Not present: Not Available.
      */
+    @Deprecated
     public Boolean getAvailableHDsAvailable() {
         return getBoolean(KEY_AVAILABLE_HDS_AVAILABLE);
     }
 
     /**
+     * Sets the availableHdChannelsAvailable portion of the RadioControlCapabilities class
+     *
+     * @param availableHdChannelsAvailable
+     * Availability of the list of available HD sub-channel indexes.
+     * True: Available, False: Not Available, Not present: Not Available.
+     */
+    public void setAvailableHdChannelsAvailable(Boolean availableHdChannelsAvailable) {
+        setValue(KEY_AVAILABLE_HD_CHANNELS_AVAILABLE, availableHdChannelsAvailable);
+    }
+
+    /**
+     * Gets the availableHdChannelsAvailable portion of the RadioControlCapabilities class
+     *
+     * @return Boolean - Availability of the list of available HD sub-channel indexes.
+     * True: Available, False: Not Available, Not present: Not Available.
+     */
+    public Boolean getAvailableHdChannelsAvailable() {
+        return getBoolean(KEY_AVAILABLE_HD_CHANNELS_AVAILABLE);
+    }
+
+    /**
      * Sets the stateAvailable portion of the RadioControlCapabilities class
      *
      * @param stateAvailable
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java
index 8fbd001fb..4de584a9f 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java
@@ -36,6 +36,7 @@ import com.smartdevicelink.proxy.rpc.enums.RadioBand;
 import com.smartdevicelink.proxy.rpc.enums.RadioState;
 
 import java.util.Hashtable;
+import java.util.List;
 
 /**
  * Include information (both read-only and changeable data) about a
@@ -54,6 +55,7 @@ public class RadioControlData extends RPCStruct{
     public static final String KEY_STATE= "state";
     public static final String KEY_HD_RADIO_ENABLE = "hdRadioEnable";
     public static final String KEY_SIS_DATA = "sisData";
+    public static final String KEY_AVAILABLE_HD_CHANNELS= "availableHdChannels";
 
     public RadioControlData() {
     }
@@ -144,6 +146,7 @@ public class RadioControlData extends RPCStruct{
      * @param availableHDs
      * Number of HD sub-channels if available.
      */
+    @Deprecated
     public void setAvailableHDs(Integer availableHDs) {
         setValue(KEY_AVAILABLE_HDS, availableHDs);
     }
@@ -153,6 +156,7 @@ public class RadioControlData extends RPCStruct{
      *
      * @return Integer - Number of HD sub-channels if available.
      */
+    @Deprecated
     public Integer getAvailableHDs() {
         return getInteger(KEY_AVAILABLE_HDS);
     }
@@ -290,4 +294,23 @@ public class RadioControlData extends RPCStruct{
     public SisData getSisData() {
         return (SisData) getObject(SisData.class, KEY_SIS_DATA);
     }
+
+    /**
+     * Sets the availableHdChannels portion of the RadioControlData class
+     *
+     * @param availableHdChannels List of available hd sub-channel indexes, empty list means no Hd channel is available, read-only.
+     */
+    public void setAvailableHdChannels(List<Integer> availableHdChannels){
+        setValue(KEY_AVAILABLE_HD_CHANNELS, availableHdChannels);
+    }
+
+    /**
+     * Gets the availableHdChannels portion of the RadioControlData class
+     *
+     * @return List<Integer> - List of available hd sub-channel indexes, empty list means no Hd channel is available, read-only.
+     */
+    @SuppressWarnings("unchecked")
+    public List<Integer> getAvailableHdChannels(){
+        return (List<Integer>) getObject(Integer.class,KEY_AVAILABLE_HD_CHANNELS);
+    }
 }