From 611a7520cf3d279e796c741adbf7c127b1156863 Mon Sep 17 00:00:00 2001 From: "restyled-io[bot]" <32688539+restyled-io[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 05:57:07 -0800 Subject: [PATCH] Restyle TV 31718 - update android sample app with TV2 cluster features (#31720) * Restyled by whitespace * Restyled by google-java-format * Restyled by clang-format --------- Co-authored-by: Restyled.io --- .../android/java/MediaPlaybackManager.h | 8 +-- .../matter/tv/server/tvapp/ChannelInfo.java | 8 ++- .../tv/server/tvapp/ChannelManager.java | 20 +++++--- .../tv/server/tvapp/ChannelManagerStub.java | 48 +++++++++++------- .../tv/server/tvapp/ChannelProgramInfo.java | 49 ++++++++++--------- .../server/tvapp/ChannelProgramResponse.java | 14 +++--- .../tv/server/tvapp/MediaPlaybackManager.java | 14 +++--- .../tvapp/MediaPlaybackManagerStub.java | 5 +- .../matter/tv/server/tvapp/MediaTrack.java | 17 +++---- 9 files changed, 105 insertions(+), 78 deletions(-) diff --git a/examples/tv-app/android/java/MediaPlaybackManager.h b/examples/tv-app/android/java/MediaPlaybackManager.h index fb35f0bdb1e5f9..914462fea57fb2 100644 --- a/examples/tv-app/android/java/MediaPlaybackManager.h +++ b/examples/tv-app/android/java/MediaPlaybackManager.h @@ -105,10 +105,10 @@ class MediaPlaybackManager : public MediaPlaybackDelegate uint32_t GetFeatureMap(chip::EndpointId endpoint) override; private: - jobject mMediaPlaybackManagerObject = nullptr; - jmethodID mRequestMethod = nullptr; - jmethodID mGetAttributeMethod = nullptr; - jmethodID mGetPositionMethod = nullptr; + jobject mMediaPlaybackManagerObject = nullptr; + jmethodID mRequestMethod = nullptr; + jmethodID mGetAttributeMethod = nullptr; + jmethodID mGetPositionMethod = nullptr; jmethodID mGetAvailableTracksMethod = nullptr; jmethodID mActivateTrackMethod = nullptr; jmethodID mDeactivateTextTrackMethod = nullptr; diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelInfo.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelInfo.java index 67390820d7da7e..6f0421c1c08f34 100644 --- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelInfo.java +++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelInfo.java @@ -40,7 +40,13 @@ public enum ChannelType { public ChannelType type; public ChannelInfo( - int majorNumber, int minorNumber, String name, String callSign, String affiliateCallSign, String identifier, ChannelType type) { + int majorNumber, + int minorNumber, + String name, + String callSign, + String affiliateCallSign, + String identifier, + ChannelType type) { this.status = kSuccess; this.majorNumber = majorNumber; this.minorNumber = minorNumber; diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelManager.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelManager.java index 6f96cd8bf91b92..646d37ab46670e 100644 --- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelManager.java +++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelManager.java @@ -33,10 +33,18 @@ public interface ChannelManager { boolean skipChannel(int count); - ChannelProgramResponse getProgramGuide(long startTime, long endTime, ChannelInfo[] channels, String pageToken, boolean series, Map.Entry[] externalIDList, String data); - - boolean recordProgram(String identifier, boolean series, Map.Entry[] externalIDList, String data); - - boolean cancelRecordProgram(String identifier, boolean series, Map.Entry[] externalIDList, String data); - + ChannelProgramResponse getProgramGuide( + long startTime, + long endTime, + ChannelInfo[] channels, + String pageToken, + boolean series, + Map.Entry[] externalIDList, + String data); + + boolean recordProgram( + String identifier, boolean series, Map.Entry[] externalIDList, String data); + + boolean cancelRecordProgram( + String identifier, boolean series, Map.Entry[] externalIDList, String data); } diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelManagerStub.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelManagerStub.java index 92e35f85eab413..1320f8b295e8d9 100644 --- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelManagerStub.java +++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelManagerStub.java @@ -18,12 +18,11 @@ package com.matter.tv.server.tvapp; import android.util.Log; +import com.matter.tv.server.tvapp.ChannelInfo.ChannelType; import java.util.ArrayList; import java.util.List; import java.util.Map; -import com.matter.tv.server.tvapp.ChannelInfo.ChannelType; - public class ChannelManagerStub implements ChannelManager { private static final String TAG = ChannelManagerStub.class.getSimpleName(); @@ -32,22 +31,29 @@ public class ChannelManagerStub implements ChannelManager { private ChannelInfo currentChannel; ChannelInfo chanAbc = new ChannelInfo(6, 0, "ABC", "KAAL-TV", "KAAL", "id-1", ChannelType.Cable); - ChannelInfo chanPbs = new ChannelInfo(9, 1, "PBS", "KCTS-TV", "KCTS", "id-2", ChannelType.Satellite); - ChannelInfo chanWor = new ChannelInfo(9, 3, "World Channel", "KCTS-TV", "KCTS","id-4", ChannelType.Terrestrial); + ChannelInfo chanPbs = + new ChannelInfo(9, 1, "PBS", "KCTS-TV", "KCTS", "id-2", ChannelType.Satellite); + ChannelInfo chanWor = + new ChannelInfo(9, 3, "World Channel", "KCTS-TV", "KCTS", "id-4", ChannelType.Terrestrial); private ChannelInfo[] channelList = { chanAbc, chanPbs, chanWor, - new ChannelInfo(9, 2, "PBS Kids", "KCTS-TV", "KCTS","id-3", ChannelType.OTT) + new ChannelInfo(9, 2, "PBS Kids", "KCTS-TV", "KCTS", "id-3", ChannelType.OTT) }; private ChannelProgramInfo[] programList = { - new ChannelProgramInfo("progid-abc1", chanAbc, 0, 30*60, "First Show", "First subtitle", "First Description"), - new ChannelProgramInfo("progid-pbs1", chanPbs, 0, 30*60, "Show 2", "subtitle 2", "Description 2"), - new ChannelProgramInfo("progid-abc2", chanAbc, 30*60, 60*60, "Show 3", "subtitle 3", "Description 3"), - new ChannelProgramInfo("progid-abc3", chanAbc, 30*60, 60*60, "Show 4", "subtitle 4", "Description 4"), - new ChannelProgramInfo("id-5", chanWor, 60*60, 90*60, "Show 5", "subtitle 5", "Description 5"), + new ChannelProgramInfo( + "progid-abc1", chanAbc, 0, 30 * 60, "First Show", "First subtitle", "First Description"), + new ChannelProgramInfo( + "progid-pbs1", chanPbs, 0, 30 * 60, "Show 2", "subtitle 2", "Description 2"), + new ChannelProgramInfo( + "progid-abc2", chanAbc, 30 * 60, 60 * 60, "Show 3", "subtitle 3", "Description 3"), + new ChannelProgramInfo( + "progid-abc3", chanAbc, 30 * 60, 60 * 60, "Show 4", "subtitle 4", "Description 4"), + new ChannelProgramInfo( + "id-5", chanWor, 60 * 60, 90 * 60, "Show 5", "subtitle 5", "Description 5"), }; public ChannelManagerStub(int endpoint) { @@ -160,16 +166,22 @@ public boolean skipChannel(int count) { } @Override - public ChannelProgramResponse getProgramGuide(long startTime, long endTime, ChannelInfo[] channels, String pageToken, boolean series, Map.Entry[] externalIDList, String data) - { + public ChannelProgramResponse getProgramGuide( + long startTime, + long endTime, + ChannelInfo[] channels, + String pageToken, + boolean series, + Map.Entry[] externalIDList, + String data) { ChannelProgramResponse resp = new ChannelProgramResponse(); resp.programs = programList; return resp; } @Override - public boolean recordProgram(String identifier, boolean series, Map.Entry[] externalIDList, String data) - { + public boolean recordProgram( + String identifier, boolean series, Map.Entry[] externalIDList, String data) { for (ChannelProgramInfo program : programList) { if (program.identifier.equals(identifier)) { program.recordFlagSeries = series; @@ -181,12 +193,11 @@ public boolean recordProgram(String identifier, boolean series, Map.Entry[] externalIDList, String data) - { + public boolean cancelRecordProgram( + String identifier, boolean series, Map.Entry[] externalIDList, String data) { for (ChannelProgramInfo program : programList) { if (program.identifier.equals(identifier)) { - if (series) - { + if (series) { program.recordFlagSeries = false; } program.recordFlagScheduled = false; @@ -195,5 +206,4 @@ public boolean cancelRecordProgram(String identifier, boolean series, Map.Entry< } return false; } - } diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelProgramInfo.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelProgramInfo.java index 0dd773f88a00f7..6f76f3b4ba1391 100644 --- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelProgramInfo.java +++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelProgramInfo.java @@ -19,29 +19,34 @@ import java.util.Map; -import com.matter.tv.server.tvapp.ChannelInfo.ChannelType; - public class ChannelProgramInfo { - public String identifier; - public ChannelInfo channel; - public long startTime; - public long endTime; - public String title; - public String subTitle; - public String description; - public boolean recordFlagScheduled = false; - public boolean recordFlagSeries = false; - public boolean recordFlagRecorded = false; - public Map.Entry[] externalIDList; + public String identifier; + public ChannelInfo channel; + public long startTime; + public long endTime; + public String title; + public String subTitle; + public String description; + public boolean recordFlagScheduled = false; + public boolean recordFlagSeries = false; + public boolean recordFlagRecorded = false; + public Map.Entry[] externalIDList; - public ChannelProgramInfo(String identifier, ChannelInfo channel, long startTime, long endTime, String title, String subTitle, String description) { - this.identifier = identifier; - this.channel = channel; - this.startTime = startTime; - this.endTime = endTime; - this.title = title; - this.subTitle = subTitle; - this.description = description; - } + public ChannelProgramInfo( + String identifier, + ChannelInfo channel, + long startTime, + long endTime, + String title, + String subTitle, + String description) { + this.identifier = identifier; + this.channel = channel; + this.startTime = startTime; + this.endTime = endTime; + this.title = title; + this.subTitle = subTitle; + this.description = description; + } } diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelProgramResponse.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelProgramResponse.java index 9bb57e051d930a..da321963688bd6 100644 --- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelProgramResponse.java +++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/ChannelProgramResponse.java @@ -1,11 +1,11 @@ package com.matter.tv.server.tvapp; public class ChannelProgramResponse { - ChannelProgramInfo[] programs; - int previousLimit = -1; - String previousAfter; - String previousBefore; - int nextLimit = -1; - String nextAfter; - String nextBefore; + ChannelProgramInfo[] programs; + int previousLimit = -1; + String previousAfter; + String previousBefore; + int nextLimit = -1; + String nextAfter; + String nextBefore; } diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaPlaybackManager.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaPlaybackManager.java index 3d3127c7261fe2..6c0b04a374b442 100755 --- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaPlaybackManager.java +++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaPlaybackManager.java @@ -122,16 +122,16 @@ public interface MediaPlaybackManager { /** * Get the available tracks - * - * @param audio true=audio, false=text + * + * @param audio true=audio, false=text * @return list of available tracks */ MediaTrack[] getAvailableTracks(boolean audio); /** * activate the given track - * - * @param audio true=audio, false=text + * + * @param audio true=audio, false=text * @param id track id * @return the response status defined in RESPONSE_STATUS_XXX */ @@ -139,16 +139,16 @@ public interface MediaPlaybackManager { /** * Deactivate the current test track + * * @return the response status defined in RESPONSE_STATUS_XXX */ int deactivateTextTrack(); /** * Get the active track - * - * @param audio true=audio, false=text + * + * @param audio true=audio, false=text * @return active track or null */ MediaTrack getActiveTrack(boolean audio); - } diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaPlaybackManagerStub.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaPlaybackManagerStub.java index caddb80d11998c..a6b9afcc603338 100755 --- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaPlaybackManagerStub.java +++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaPlaybackManagerStub.java @@ -82,7 +82,7 @@ public long getAttributes(int attributesId) { Log.d(TAG, "getAttributes SampledPosition SeekRangeStart " + startTime + " at " + endpoint); return startTime; - // TODO: add audio/text track available/active attributes + // TODO: add audio/text track available/active attributes } return -1; @@ -231,8 +231,7 @@ public int deactivateTextTrack() { } @Override - public MediaTrack getActiveTrack(boolean audio) - { + public MediaTrack getActiveTrack(boolean audio) { return (audio ? activeAudioTrack : activeTextTrack); } } diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaTrack.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaTrack.java index f7e17eac6c53ec..c2a24fa63a186f 100644 --- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaTrack.java +++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaTrack.java @@ -1,15 +1,14 @@ package com.matter.tv.server.tvapp; -import java.util.Date; public class MediaTrack { - public String id; - public String languageCode; - public String displayName; + public String id; + public String languageCode; + public String displayName; - public MediaTrack(String id, String languageCode, String displayName) { - this.id = id; - this.languageCode = languageCode; - this.displayName = displayName; - } + public MediaTrack(String id, String languageCode, String displayName) { + this.id = id; + this.languageCode = languageCode; + this.displayName = displayName; + } }