update for new library version

900Seconds · Nov 9, 2016 · 5492635 · 5492635
1 parent 1cdbb66
commit 5492635
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/LivestreamExample/.idea/gradle.xml b/LivestreamExample/.idea/gradle.xml
diff --git a/LivestreamExample/build.gradle b/LivestreamExample/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/LivestreamExample/livestreamsdkexample/build.gradle b/LivestreamExample/livestreamsdkexample/build.gradle
@@ -22,7 +22,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'ru.denivip:denivipcore:0.0.1'
-    compile 'com.livestream:livestream-sdk:0.1.1'
+    compile 'com.livestream:livestream-sdk:0.2.0'
     compile 'com.google.maps.android:android-maps-utils:0.4.3'
 
 }
diff --git a/LivestreamExample/livestreamsdkexample/src/main/AndroidManifest.xml b/LivestreamExample/livestreamsdkexample/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.livestreamsdk.example"
-    android:versionCode="2"
-    android:versionName="2.0" >
+    android:versionCode="3"
+    android:versionName="3.0" >
 
     <uses-sdk
         android:minSdkVersion="18"

diff --git a/...livestreamsdkexample/src/main/java/com/livestreamsdk/example/CameraStreamingActivity.java b/...livestreamsdkexample/src/main/java/com/livestreamsdk/example/CameraStreamingActivity.java
@@ -1,9 +1,9 @@
 package com.livestreamsdk.example;
 
-import android.app.Activity;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Surface;
@@ -17,7 +17,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-public class CameraStreamingActivity extends Activity implements Nine00SecondsCameraViewListener {
+public class CameraStreamingActivity extends FragmentActivity implements Nine00SecondsCameraViewListener {
 
 	private CameraFragment cameraFragment; 
 
@@ -33,7 +33,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
 			int orientation = getScreenOrientation();
 			cameraFragment.setStreamingOrientation(orientation);
-			getFragmentManager().beginTransaction()
+			getSupportFragmentManager().beginTransaction()
 			.replace(R.id.cameraViewContainer, cameraFragment)
 			.commit();
 

diff --git a/...amsdkexample/src/main/java/com/livestreamsdk/example/Nine00SecondsExampleApplication.java b/...amsdkexample/src/main/java/com/livestreamsdk/example/Nine00SecondsExampleApplication.java
@@ -16,11 +16,11 @@ public class Nine00SecondsExampleApplication extends Application implements IEve
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		TLog.addTarget(new LogCatTarget("EYEYE"));
+		TLog.addTarget(new LogCatTarget("LIVESTREAM_EXAMPLE"));
 
-		Nine00SecondsSDK.registerAppID(getBaseContext(),
+		Nine00SecondsSDK.registerAppIDWithSecret(getBaseContext(),
 				"__test_app_id", 
-				"fb1c9fe790674fdc9adcc8c6e6ae7866%2448ee433685c976b1a839d09a96fc9db61b3773774ab5f1be39b5aa4d0b194f46a667bcdc7b1d04b0e352c9d1d2c4d5b0b007986bbd345f2e21ad0f53fcb62cd5");
+				"Roophohro2kei2shiMe7");
 
 		Nine00SecondsSDK.getDispatcher().addEventListener(StreamEvent.CHUNK_SENDED, this);
 		Nine00SecondsSDK.getDispatcher().addEventListener(StreamEvent.BROADCAST_COMPLETED, this);