diff --git a/Android/app/build.gradle b/Android/app/build.gradle index 9a845346a7225048b2a4a17ff9ede17b82b1a68e..d566d7ca4958270c19d44422d2135ed73440f27e 100644 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.easydarwin.easyipcamera" minSdkVersion 16 targetSdkVersion 21 - versionCode 6 - versionName "1.2.17.0904" + versionCode 9 + versionName "1.2.17.1213" } buildTypes { release { diff --git a/Android/app/libs/armeabi-v7a/libEasyIPCamera.so b/Android/app/libs/armeabi-v7a/libEasyIPCamera.so index 22e0a328ac35031a85cb10ff130bcbbc93452b47..49023cd482b6c0e70bbe0fc394f8761624f932e5 100644 Binary files a/Android/app/libs/armeabi-v7a/libEasyIPCamera.so and b/Android/app/libs/armeabi-v7a/libEasyIPCamera.so differ diff --git a/Android/app/src/main/java/org/easydarwin/easyipcamera/camera/EasyIPCamera.java b/Android/app/src/main/java/org/easydarwin/easyipcamera/camera/EasyIPCamera.java index a604b1022fab306e3f5e509eb07feb796c07ec88..fbed08c80b94a4e51c4d6c8c50e30cea00f65d02 100644 --- a/Android/app/src/main/java/org/easydarwin/easyipcamera/camera/EasyIPCamera.java +++ b/Android/app/src/main/java/org/easydarwin/easyipcamera/camera/EasyIPCamera.java @@ -77,7 +77,7 @@ public class EasyIPCamera { /* 回调函数定义 userptr表示用户自定义数据 */ public static void onIPCameraCallBack(int channelId, int channelState, byte[] mediaInfo, int userPtr){ - Log.d(TAG, "kim onIPCameraCallBack channelId="+channelId+", channelState="+channelState); + Log.d(TAG, "onIPCameraCallBack channelId="+channelId+", channelState="+channelState); //TODO:: synchronized (sCallbacks) { @@ -104,6 +104,10 @@ public class EasyIPCamera { public native int resetChannel(int channelId); + public native int configUser(String username, String password); + + public native int deleteUser(String username); + public interface IPCameraCallBack { void onIPCameraCallBack(int channelId, int channelState, byte[] mediaInfo, int userPtr); } diff --git a/Android/app/src/main/java/org/easydarwin/easyipcamera/camera/MediaStream.java b/Android/app/src/main/java/org/easydarwin/easyipcamera/camera/MediaStream.java index 396ab13d8ac956ef0e1a85a89fe3fa3d2d939628..6aab3769d1cdfdba856fa58e13c2db18e8e018c2 100644 --- a/Android/app/src/main/java/org/easydarwin/easyipcamera/camera/MediaStream.java +++ b/Android/app/src/main/java/org/easydarwin/easyipcamera/camera/MediaStream.java @@ -657,6 +657,7 @@ public class MediaStream implements EasyIPCamera.IPCameraCallBack { buffer.order(ByteOrder.LITTLE_ENDIAN); buffer.putInt(EasyIPCamera.VideoCodec.EASY_SDK_VIDEO_CODEC_H264); buffer.putInt(framerate); + buffer.putInt(0); // buffer.putInt(audioStream.getAudioEncCodec()); // buffer.putInt(audioStream.getSamplingRate()); // buffer.putInt(audioStream.getChannelNum()); @@ -665,6 +666,7 @@ public class MediaStream implements EasyIPCamera.IPCameraCallBack { buffer.putInt(0); buffer.putInt(0); buffer.putInt(0); + buffer.putInt(0); buffer.putInt(0);//vps length