提交 071e7ad9 authored 作者: autulin's avatar autulin

将demoActivity移出libarary

上级 45de32ae
......@@ -16,6 +16,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".DemoActivity" />
</application>
</manifest>
\ No newline at end of file
package com.autulin.gb28181library;
package com.example.autulin.gb28181_android;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
......@@ -10,15 +10,11 @@ import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
import com.autulin.gb28181library.MediaOutput;
import com.autulin.gb28181library.MediaRecorderBase;
import com.autulin.gb28181library.MediaRecorderNative;
import com.autulin.gb28181library.utils.DeviceUtils;
import java.io.File;
import java.io.IOException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.SocketException;
import java.net.UnknownHostException;
public class DemoActivity extends AppCompatActivity implements
MediaRecorderBase.OnErrorListener, MediaRecorderBase.OnPreparedListener {
......
......@@ -5,7 +5,6 @@ import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.widget.TextView;
import com.autulin.gb28181library.DemoActivity;
import com.autulin.gb28181library.JNIBridge;
public class MainActivity extends AppCompatActivity {
......
......@@ -41,10 +41,4 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
}
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.autulin.gb28181library">
<application>
<activity android:name=".DemoActivity"></activity>
</application>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
......
......@@ -169,7 +169,7 @@ public abstract class MediaRecorderBase implements Callback, PreviewCallback, IM
/**
* 是否正在录制
*/
protected volatile boolean mRecording;
public volatile boolean mRecording;
/**
* PreviewFrame调用次数,测试用
*/
......
package com.autulin.gb28181library;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() {
assertEquals(4, 2 + 2);
}
}
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论