Skip to content

Commit db4e662

Browse files
seokhee-leeseokhee-lee
committed
Fix errors and update build.gradle for JitPack
The following changes are updated: - Use JitPack for Connect-SDK to apply the latest update in master - Fix build error with the latest Connect-SDK - Broke links for media sharing with contents in connectsdk.com - Show each services as separated items in the device picker (the default setting in the lastest Connect-SDK library)
1 parent 9090ee7 commit db4e662

File tree

4 files changed

+53
-34
lines changed

4 files changed

+53
-34
lines changed

‎AndroidManifest.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
android:versionCode="12"
55
android:versionName="1.6.0" >
66

7-
<uses-sdk
8-
android:minSdkVersion="10"
9-
android:targetSdkVersion="22" />
10-
117
<uses-permission android:name="android.permission.INTERNET"/>
128
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
139
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
@@ -33,10 +29,6 @@
3329
<category android:name="android.intent.category.LAUNCHER" />
3430
</intent-filter>
3531
</activity>
36-
37-
<meta-data
38-
android:name="com.google.android.gms.version"
39-
android:value="@integer/google_play_services_version" />
4032
</application>
4133

4234
</manifest>

‎build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
buildscript {
22
repositories {
3+
google()
34
jcenter()
45
}
56
dependencies {
6-
classpath 'com.android.tools.build:gradle:1.2.3'
7+
classpath 'com.android.tools.build:gradle:4.0.1'
78
}
89
}
910

1011
allprojects {
1112
repositories {
13+
google()
1214
jcenter()
15+
maven { url "https://jitpack.io" }
1316
}
1417
}
1518

@@ -18,7 +21,6 @@ apply plugin: 'com.android.application'
1821

1922
android {
2023
compileSdkVersion 22
21-
buildToolsVersion "22.0.1"
2224

2325
defaultConfig {
2426
applicationId "com.connectsdk.sampler"
@@ -49,7 +51,8 @@ android {
4951

5052
}
5153

52-
5354
dependencies {
54-
compile 'com.connectsdk:connect-sdk-android:1.6.0'
55+
implementation 'com.github.ConnectSDK:Connect-SDK-Android-Lite:master-SNAPSHOT'
56+
implementation 'com.android.support:support-v4:22.2.1'
57+
implementation 'com.android.support:appcompat-v7:22.+'
5558
}

‎src/com/connectsdk/sampler/MainActivity.java

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.connectsdk.device.DevicePicker;
3636
import com.connectsdk.discovery.DiscoveryManager;
3737
import com.connectsdk.discovery.DiscoveryManager.PairingLevel;
38+
import com.connectsdk.discovery.DiscoveryProvider;
3839
import com.connectsdk.sampler.fragments.BaseFragment;
3940
import com.connectsdk.service.DeviceService;
4041
import com.connectsdk.service.DeviceService.PairingType;
@@ -56,6 +57,8 @@ public class MainActivity extends ActionBarActivity implements ActionBar.TabList
5657

5758
SectionsPagerAdapter mSectionsPagerAdapter;
5859

60+
private DiscoveryManager mDiscoveryManager;
61+
5962
ViewPager mViewPager;
6063
ActionBar actionBar;
6164

@@ -157,8 +160,30 @@ public void onPageSelected(int position) {
157160

158161
setupPicker();
159162

160-
DiscoveryManager.getInstance().registerDefaultDeviceTypes();
161-
DiscoveryManager.getInstance().setPairingLevel(PairingLevel.ON);
163+
mDiscoveryManager = DiscoveryManager.getInstance();
164+
mDiscoveryManager.registerDefaultDeviceTypes();
165+
mDiscoveryManager.setPairingLevel(PairingLevel.ON);
166+
167+
// To show all services in a device, a device item in DevicePickerList
168+
// mDiscoveryManager.setServiceIntegration(true);
169+
170+
// To search devices with specific service types
171+
/*
172+
try {
173+
// AirPlay
174+
mDiscoveryManager.registerDeviceService((Class<DeviceService>) Class.forName("com.connectsdk.service.AirPlayService"),
175+
(Class<DiscoveryProvider>)Class.forName("com.connectsdk.discovery.provider.ZeroconfDiscoveryProvider"));
176+
// webOS SSAP (Simple Service Access Protocol)
177+
mDiscoveryManager.registerDeviceService((Class<DeviceService>) Class.forName("com.connectsdk.service.WebOSTVService"),
178+
(Class<DiscoveryProvider>)Class.forName("com.connectsdk.discovery.provider.SSDPDiscoveryProvider"));
179+
// DLNA
180+
mDiscoveryManager.registerDeviceService((Class<DeviceService>) Class.forName("com.connectsdk.service.DLNAService"),
181+
(Class<DiscoveryProvider>)Class.forName("com.connectsdk.discovery.provider.SSDPDiscoveryProvider"));
182+
} catch (ClassNotFoundException e) {
183+
e.printStackTrace();
184+
}
185+
*/
186+
162187
DiscoveryManager.getInstance().start();
163188
}
164189

@@ -305,8 +330,11 @@ void connectEnded(ConnectableDevice device) {
305330
if (pairingCodeDialog.isShowing()) {
306331
pairingCodeDialog.dismiss();
307332
}
308-
mTV.removeListener(deviceListener);
309-
mTV = null;
333+
334+
if (mTV.isConnecting == false) {
335+
mTV.removeListener(deviceListener);
336+
mTV = null;
337+
}
310338
}
311339

312340
@Override

‎src/com/connectsdk/sampler/fragments/MediaPlayerFragment.java

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,10 @@
5757
import java.util.concurrent.TimeUnit;
5858

5959
public class MediaPlayerFragment extends BaseFragment {
60-
public static final String URL_SUBTITLES_WEBVTT =
61-
"http://ec2-54-201-108-205.us-west-2.compute.amazonaws.com/samples/media/sintel_en.vtt";
62-
public static final String URL_SUBTITLE_SRT =
63-
"http://ec2-54-201-108-205.us-west-2.compute.amazonaws.com/samples/media/sintel_en.srt";
64-
public static final String URL_VIDEO_MP4 =
65-
"http://ec2-54-201-108-205.us-west-2.compute.amazonaws.com/samples/media/video.mp4";
66-
public static final String URL_IMAGE_ICON =
67-
"http://ec2-54-201-108-205.us-west-2.compute.amazonaws.com/samples/media/videoIcon.jpg";
60+
public static final String URL_SUBTITLES_WEBVTT = "http://connectsdk.com/ConnectSDK.vtt";
61+
public static final String URL_SUBTITLE_SRT = "http://connectsdk.com/ConnectSDK.srt";
62+
public static final String URL_VIDEO_MP4 = "http://connectsdk.com/ConnectSDK.mp4";
63+
public static final String URL_IMAGE_ICON = "http://connectsdk.com/ConnectSDK_Logo.jpg";
6864

6965
public Button photoButton;
7066
public Button videoButton;
@@ -311,10 +307,10 @@ else if (isPlayingImage) {
311307
}
312308

313309
private void playAudio() {
314-
String mediaURL = "http://ec2-54-201-108-205.us-west-2.compute.amazonaws.com/samples/media/audio.mp3";
315-
String iconURL = "http://ec2-54-201-108-205.us-west-2.compute.amazonaws.com/samples/media/audioIcon.jpg";
316-
String title = "The Song that Doesn't End";
317-
String description = "Lamb Chop's Play Along";
310+
String mediaURL = "http://connectsdk.com/ConnectSDK.mp3";
311+
String iconURL = "http://connectsdk.com/ConnectSDK_Logo.jpg";
312+
String title = "Connect SDK";
313+
String description = "One SDK Eight Media Platforms";
318314
String mimeType = "audio/mp3";
319315
boolean shouldLoop = loopingButton.isChecked();
320316

@@ -385,11 +381,11 @@ public void onSuccess(MediaLaunchObject object) {
385381
private void showImage() {
386382
disableMedia();
387383

388-
String imagePath = "http://ec2-54-201-108-205.us-west-2.compute.amazonaws.com/samples/media/photo.jpg";
384+
String imagePath = "http://connectsdk.com/ConnectSDK.jpg";
389385
String mimeType = "image/jpeg";
390-
String title = "Sintel Character Design";
391-
String description = "Blender Open Movie Project";
392-
String icon = "http://ec2-54-201-108-205.us-west-2.compute.amazonaws.com/samples/media/photoIcon.jpg";
386+
String title = "Connect SDK";
387+
String description = "One SDK Eight Media Platforms";
388+
String icon = "http://connectsdk.com/ConnectSDK_Logo.jpg";
393389

394390
MediaInfo mediaInfo = new MediaInfo.Builder(imagePath, mimeType)
395391
.setTitle(title)
@@ -430,8 +426,8 @@ private void playVideo() {
430426
}
431427

432428
MediaInfo mediaInfo = new MediaInfo.Builder(URL_VIDEO_MP4, "video/mp4")
433-
.setTitle("Sintel Trailer")
434-
.setDescription("Blender Open Movie Project")
429+
.setTitle("Connect SDK")
430+
.setDescription("One SDK Eight Media Platforms")
435431
.setIcon(URL_IMAGE_ICON)
436432
.setSubtitleInfo(subtitleBuilder == null ? null : subtitleBuilder.build())
437433
.build();

0 commit comments

Comments
 (0)