From e5f4548cc36a41221421d9813d94ad21bb460893 Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Fri, 19 May 2023 18:00:10 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E9=87=8D=E5=91=BD=E5=90=8Dlib=20moudle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- {ijkplayer-java => library-ijkplayer}/.gitignore | 0 {ijkplayer-java => library-ijkplayer}/build.gradle | 0 .../proguard-rules.pro | 0 .../src/main/.classpath | 0 .../src/main/.project | 0 .../src/main/.settings/org.eclipse.jdt.core.prefs | 0 .../src/main/AndroidManifest.xml | 0 .../main/java/tv/danmaku/ijk/media/Settings.java | 0 .../ijk/media/player/AbstractMediaPlayer.java | 0 .../ijk/media/player/AndroidMediaPlayer.java | 0 .../tv/danmaku/ijk/media/player/IMediaPlayer.java | 0 .../ijk/media/player/ISurfaceTextureHolder.java | 0 .../ijk/media/player/ISurfaceTextureHost.java | 0 .../tv/danmaku/ijk/media/player/IjkLibLoader.java | 0 .../danmaku/ijk/media/player/IjkMediaCodecInfo.java | 0 .../tv/danmaku/ijk/media/player/IjkMediaMeta.java | 0 .../tv/danmaku/ijk/media/player/IjkMediaPlayer.java | 0 .../tv/danmaku/ijk/media/player/IjkTimedText.java | 0 .../java/tv/danmaku/ijk/media/player/MediaInfo.java | 0 .../danmaku/ijk/media/player/MediaPlayerProxy.java | 0 .../ijk/media/player/TextureMediaPlayer.java | 0 .../tv/danmaku/ijk/media/player/TxtOverlayAdd.java | 0 .../media/player/annotations/AccessedByNative.java | 0 .../media/player/annotations/CalledByNative.java | 0 .../media/player/exceptions/IjkMediaException.java | 0 .../danmaku/ijk/media/player/ffmpeg/FFmpegApi.java | 0 .../ijk/media/player/misc/AndroidMediaFormat.java | 0 .../ijk/media/player/misc/AndroidTrackInfo.java | 0 .../danmaku/ijk/media/player/misc/IIjkIOHttp.java | 0 .../ijk/media/player/misc/IMediaDataSource.java | 0 .../danmaku/ijk/media/player/misc/IMediaFormat.java | 0 .../danmaku/ijk/media/player/misc/ITrackInfo.java | 0 .../ijk/media/player/misc/IjkMediaFormat.java | 0 .../danmaku/ijk/media/player/misc/IjkTrackInfo.java | 0 .../danmaku/ijk/media/player/pragma/DebugLog.java | 0 .../tv/danmaku/ijk/media/player/pragma/Pragma.java | 0 .../ijk/media/widget/media/FileMediaDataSource.java | 0 .../ijk/media/widget/media/IMediaController.java | 0 .../danmaku/ijk/media/widget/media/IRenderView.java | 0 .../ijk/media/widget/media/IjkVideoView.java | 0 .../ijk/media/widget/media/MeasureHelper.java | 0 .../ijk/media/widget/media/MediaPlayerCompat.java | 0 .../ijk/media/widget/media/SurfaceRenderView.java | 0 .../ijk/media/widget/media/TextureRenderView.java | 0 .../src/main/project.properties | 0 .../src/main/res/values/strings.xml | 0 {library => library-push}/.gitignore | 0 {library => library-push}/build.gradle | 0 .../libs/libuvccamera-common.jar | Bin .../libs/libuvccamera-release.aar | Bin {library => library-push}/proguard-rules.pro | 0 {library => library-push}/src/.gitignore | 0 .../org/easydarwin/easypusher/ApplicationTest.java | 0 .../easydarwin/easypusher/SplashActivityTest.java | 0 .../src/main/AndroidManifest.xml | 0 .../src/main/assets/zk/SIMYOU.ttf | Bin .../main/java/com/android/webrtc/audio/AudioIO.java | 0 .../java/com/android/webrtc/audio/MobileAEC.java | 0 .../main/java/org/easydarwin/audio/AudioStream.java | 0 .../main/java/org/easydarwin/bus/StartRecord.java | 0 .../main/java/org/easydarwin/bus/StopRecord.java | 0 .../main/java/org/easydarwin/bus/StreamStat.java | 0 .../java/org/easydarwin/bus/SupportResolution.java | 0 .../src/main/java/org/easydarwin/config/Config.java | 0 .../org/easydarwin/easypusher/EasyApplication.java | 0 .../main/java/org/easydarwin/hw/CodecManager.java | 0 .../java/org/easydarwin/hw/EncoderDebugger.java | 0 .../main/java/org/easydarwin/hw/NV21Convertor.java | 0 .../main/java/org/easydarwin/muxer/EasyMuxer.java | 0 .../main/java/org/easydarwin/push/EasyPusher.java | 0 .../main/java/org/easydarwin/push/HWConsumer.java | 0 .../main/java/org/easydarwin/push/InitCallback.java | 0 .../main/java/org/easydarwin/push/MediaStream.java | 0 .../java/org/easydarwin/push/PushScreenService.java | 0 .../src/main/java/org/easydarwin/push/Pusher.java | 0 .../main/java/org/easydarwin/push/SWConsumer.java | 0 .../java/org/easydarwin/push/UVCCameraService.java | 0 .../java/org/easydarwin/push/VideoConsumer.java | 0 .../src/main/java/org/easydarwin/sw/JNIUtil.java | 0 .../src/main/java/org/easydarwin/sw/TxtOverlay.java | 0 .../main/java/org/easydarwin/sw/X264Encoder.java | 0 .../org/easydarwin/util/AbstractSubscriber.java | 0 .../src/main/java/org/easydarwin/util/Util.java | 0 .../src/main/java/org/easydarwin/util/YUVUtils.java | 0 .../src/main/jniLibs/arm64-v8a/libTxtOverlay.so | Bin .../src/main/jniLibs/arm64-v8a/libUtils.so | Bin .../src/main/jniLibs/arm64-v8a/libeasypusher.so | Bin .../src/main/jniLibs/arm64-v8a/libx264enc.so | Bin .../src/main/jniLibs/armeabi-v7a/libTxtOverlay.so | Bin .../src/main/jniLibs/armeabi-v7a/libUtils.so | Bin .../src/main/jniLibs/armeabi-v7a/libeasypusher.so | Bin .../src/main/jniLibs/armeabi-v7a/libx264enc.so | Bin .../src/main/jniLibs/x86/libTxtOverlay.so | Bin .../src/main/jniLibs/x86/libUtils.so | Bin .../src/main/jniLibs/x86/libeasypusher.so | Bin .../src/main/jniLibs/x86/libx264enc.so | Bin .../src/main/res/drawable-hdpi/float_button.png | Bin .../res/drawable-hdpi/ic_close_pushing_screen.png | Bin .../res/drawable-hdpi/ic_pusher_screen_pushing.png | Bin .../res/drawable-mdpi/ic_close_pushing_screen.png | Bin .../res/drawable-mdpi/ic_pusher_screen_pushing.png | Bin .../res/drawable-xhdpi/ic_close_pushing_screen.png | Bin .../res/drawable-xhdpi/ic_pusher_screen_pushing.png | Bin .../res/drawable-xxhdpi/ic_close_pushing_screen.png | Bin .../drawable-xxhdpi/ic_pusher_screen_pushing.png | Bin .../src/main/res/values/strings.xml | 0 .../org/easydarwin/easypusher/ExampleUnitTest.java | 0 {commonSPort => library-serialPort}/.gitignore | 0 {commonSPort => library-serialPort}/build.gradle | 0 .../consumer-rules.pro | 0 .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../main/java/com/common/queue/BlockTaskQueue.java | 0 .../main/java/com/common/queue/Task/BaseTask.java | 0 .../main/java/com/common/queue/Task/DemoTask.java | 0 .../src/main/java/com/common/queue/Task/ITask.java | 0 .../main/java/com/common/queue/Task/TaskEvent.java | 0 .../java/com/common/queue/Task/TaskPriority.java | 0 .../main/java/com/common/queue/TaskExecutor.java | 0 .../main/java/com/common/queue/TaskScheduler.java | 0 .../java/com/common/serialport/EasySerialPort.kt | 0 .../main/java/com/common/serialport/SendMsgTask.kt | 0 .../java/com/common/serialport/inter/IHelper.kt | 0 .../com/common/serialport/inter/SerialPortHelper.kt | 0 .../com/common/serialport/utils/CommonPortUtils.kt | 0 .../java/com/common/serialport/utils/DataUtils.java | 0 .../com/common/serialport/utils/SinglePortUtils.kt | 0 settings.gradle | 6 +++--- 129 files changed, 5 insertions(+), 5 deletions(-) rename {ijkplayer-java => library-ijkplayer}/.gitignore (100%) rename {ijkplayer-java => library-ijkplayer}/build.gradle (100%) rename {ijkplayer-java => library-ijkplayer}/proguard-rules.pro (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/.classpath (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/.project (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/.settings/org.eclipse.jdt.core.prefs (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/AndroidManifest.xml (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/Settings.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/ISurfaceTextureHolder.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/ISurfaceTextureHost.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/IjkLibLoader.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/IjkMediaCodecInfo.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/IjkMediaMeta.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/IjkTimedText.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/MediaInfo.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/MediaPlayerProxy.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/TextureMediaPlayer.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/TxtOverlayAdd.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/annotations/CalledByNative.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/exceptions/IjkMediaException.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/ffmpeg/FFmpegApi.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/misc/AndroidMediaFormat.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/misc/AndroidTrackInfo.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/misc/IIjkIOHttp.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/misc/IMediaDataSource.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/misc/IMediaFormat.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/misc/ITrackInfo.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/misc/IjkMediaFormat.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/misc/IjkTrackInfo.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/pragma/DebugLog.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/player/pragma/Pragma.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/widget/media/FileMediaDataSource.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/widget/media/IMediaController.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/widget/media/IRenderView.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/widget/media/IjkVideoView.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/widget/media/MeasureHelper.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/widget/media/MediaPlayerCompat.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/widget/media/SurfaceRenderView.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/java/tv/danmaku/ijk/media/widget/media/TextureRenderView.java (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/project.properties (100%) rename {ijkplayer-java => library-ijkplayer}/src/main/res/values/strings.xml (100%) rename {library => library-push}/.gitignore (100%) rename {library => library-push}/build.gradle (100%) rename {library => library-push}/libs/libuvccamera-common.jar (100%) rename {library => library-push}/libs/libuvccamera-release.aar (100%) rename {library => library-push}/proguard-rules.pro (100%) rename {library => library-push}/src/.gitignore (100%) rename {library => library-push}/src/androidTest/java/org/easydarwin/easypusher/ApplicationTest.java (100%) rename {library => library-push}/src/androidTest/java/org/easydarwin/easypusher/SplashActivityTest.java (100%) rename {library => library-push}/src/main/AndroidManifest.xml (100%) rename {library => library-push}/src/main/assets/zk/SIMYOU.ttf (100%) rename {library => library-push}/src/main/java/com/android/webrtc/audio/AudioIO.java (100%) rename {library => library-push}/src/main/java/com/android/webrtc/audio/MobileAEC.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/audio/AudioStream.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/bus/StartRecord.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/bus/StopRecord.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/bus/StreamStat.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/bus/SupportResolution.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/config/Config.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/easypusher/EasyApplication.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/hw/CodecManager.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/hw/EncoderDebugger.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/hw/NV21Convertor.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/muxer/EasyMuxer.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/push/EasyPusher.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/push/HWConsumer.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/push/InitCallback.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/push/MediaStream.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/push/PushScreenService.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/push/Pusher.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/push/SWConsumer.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/push/UVCCameraService.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/push/VideoConsumer.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/sw/JNIUtil.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/sw/TxtOverlay.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/sw/X264Encoder.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/util/AbstractSubscriber.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/util/Util.java (100%) rename {library => library-push}/src/main/java/org/easydarwin/util/YUVUtils.java (100%) rename {library => library-push}/src/main/jniLibs/arm64-v8a/libTxtOverlay.so (100%) rename {library => library-push}/src/main/jniLibs/arm64-v8a/libUtils.so (100%) rename {library => library-push}/src/main/jniLibs/arm64-v8a/libeasypusher.so (100%) rename {library => library-push}/src/main/jniLibs/arm64-v8a/libx264enc.so (100%) rename {library => library-push}/src/main/jniLibs/armeabi-v7a/libTxtOverlay.so (100%) rename {library => library-push}/src/main/jniLibs/armeabi-v7a/libUtils.so (100%) rename {library => library-push}/src/main/jniLibs/armeabi-v7a/libeasypusher.so (100%) rename {library => library-push}/src/main/jniLibs/armeabi-v7a/libx264enc.so (100%) rename {library => library-push}/src/main/jniLibs/x86/libTxtOverlay.so (100%) rename {library => library-push}/src/main/jniLibs/x86/libUtils.so (100%) rename {library => library-push}/src/main/jniLibs/x86/libeasypusher.so (100%) rename {library => library-push}/src/main/jniLibs/x86/libx264enc.so (100%) rename {library => library-push}/src/main/res/drawable-hdpi/float_button.png (100%) rename {library => library-push}/src/main/res/drawable-hdpi/ic_close_pushing_screen.png (100%) rename {library => library-push}/src/main/res/drawable-hdpi/ic_pusher_screen_pushing.png (100%) rename {library => library-push}/src/main/res/drawable-mdpi/ic_close_pushing_screen.png (100%) rename {library => library-push}/src/main/res/drawable-mdpi/ic_pusher_screen_pushing.png (100%) rename {library => library-push}/src/main/res/drawable-xhdpi/ic_close_pushing_screen.png (100%) rename {library => library-push}/src/main/res/drawable-xhdpi/ic_pusher_screen_pushing.png (100%) rename {library => library-push}/src/main/res/drawable-xxhdpi/ic_close_pushing_screen.png (100%) rename {library => library-push}/src/main/res/drawable-xxhdpi/ic_pusher_screen_pushing.png (100%) rename {library => library-push}/src/main/res/values/strings.xml (100%) rename {library => library-push}/src/test/java/org/easydarwin/easypusher/ExampleUnitTest.java (100%) rename {commonSPort => library-serialPort}/.gitignore (100%) rename {commonSPort => library-serialPort}/build.gradle (100%) rename {commonSPort => library-serialPort}/consumer-rules.pro (100%) rename {commonSPort => library-serialPort}/proguard-rules.pro (100%) rename {commonSPort => library-serialPort}/src/main/AndroidManifest.xml (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/queue/BlockTaskQueue.java (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/queue/Task/BaseTask.java (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/queue/Task/DemoTask.java (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/queue/Task/ITask.java (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/queue/Task/TaskEvent.java (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/queue/Task/TaskPriority.java (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/queue/TaskExecutor.java (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/queue/TaskScheduler.java (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/serialport/EasySerialPort.kt (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/serialport/SendMsgTask.kt (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/serialport/inter/IHelper.kt (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/serialport/inter/SerialPortHelper.kt (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/serialport/utils/CommonPortUtils.kt (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/serialport/utils/DataUtils.java (100%) rename {commonSPort => library-serialPort}/src/main/java/com/common/serialport/utils/SinglePortUtils.kt (100%) diff --git a/app/build.gradle b/app/build.gradle index d26a4b0..54ea2e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,7 +47,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' - implementation project(':library') + implementation project(':library-push') implementation(name: 'libuvccamera-release', ext: 'aar') { exclude module: 'support-v4' exclude module: 'appcompat-v7' @@ -57,6 +57,6 @@ dependencies { implementation 'com.github.bumptech.glide:glide:4.12.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.4.1' - implementation project(path: ':ijkplayer-java') + implementation project(path: ':library-ijkplayer') annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0' } diff --git a/ijkplayer-java/.gitignore b/library-ijkplayer/.gitignore similarity index 100% rename from ijkplayer-java/.gitignore rename to library-ijkplayer/.gitignore diff --git a/ijkplayer-java/build.gradle b/library-ijkplayer/build.gradle similarity index 100% rename from ijkplayer-java/build.gradle rename to library-ijkplayer/build.gradle diff --git a/ijkplayer-java/proguard-rules.pro b/library-ijkplayer/proguard-rules.pro similarity index 100% rename from ijkplayer-java/proguard-rules.pro rename to library-ijkplayer/proguard-rules.pro diff --git a/ijkplayer-java/src/main/.classpath b/library-ijkplayer/src/main/.classpath similarity index 100% rename from ijkplayer-java/src/main/.classpath rename to library-ijkplayer/src/main/.classpath diff --git a/ijkplayer-java/src/main/.project b/library-ijkplayer/src/main/.project similarity index 100% rename from ijkplayer-java/src/main/.project rename to library-ijkplayer/src/main/.project diff --git a/ijkplayer-java/src/main/.settings/org.eclipse.jdt.core.prefs b/library-ijkplayer/src/main/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from ijkplayer-java/src/main/.settings/org.eclipse.jdt.core.prefs rename to library-ijkplayer/src/main/.settings/org.eclipse.jdt.core.prefs diff --git a/ijkplayer-java/src/main/AndroidManifest.xml b/library-ijkplayer/src/main/AndroidManifest.xml similarity index 100% rename from ijkplayer-java/src/main/AndroidManifest.xml rename to library-ijkplayer/src/main/AndroidManifest.xml diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/Settings.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/Settings.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/Settings.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/Settings.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/ISurfaceTextureHolder.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ISurfaceTextureHolder.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/ISurfaceTextureHolder.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ISurfaceTextureHolder.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/ISurfaceTextureHost.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ISurfaceTextureHost.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/ISurfaceTextureHost.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ISurfaceTextureHost.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkLibLoader.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkLibLoader.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkLibLoader.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkLibLoader.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaCodecInfo.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaCodecInfo.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaCodecInfo.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaCodecInfo.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaMeta.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaMeta.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaMeta.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaMeta.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkTimedText.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkTimedText.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkTimedText.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkTimedText.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/MediaInfo.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/MediaInfo.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/MediaInfo.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/MediaInfo.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/MediaPlayerProxy.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/MediaPlayerProxy.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/MediaPlayerProxy.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/MediaPlayerProxy.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/TextureMediaPlayer.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/TextureMediaPlayer.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/TextureMediaPlayer.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/TextureMediaPlayer.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/TxtOverlayAdd.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/TxtOverlayAdd.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/TxtOverlayAdd.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/TxtOverlayAdd.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/annotations/CalledByNative.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/annotations/CalledByNative.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/annotations/CalledByNative.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/annotations/CalledByNative.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/exceptions/IjkMediaException.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/exceptions/IjkMediaException.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/exceptions/IjkMediaException.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/exceptions/IjkMediaException.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/ffmpeg/FFmpegApi.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ffmpeg/FFmpegApi.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/ffmpeg/FFmpegApi.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ffmpeg/FFmpegApi.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/AndroidMediaFormat.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/AndroidMediaFormat.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/AndroidMediaFormat.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/AndroidMediaFormat.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/AndroidTrackInfo.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/AndroidTrackInfo.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/AndroidTrackInfo.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/AndroidTrackInfo.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/IIjkIOHttp.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/IIjkIOHttp.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/IIjkIOHttp.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/IIjkIOHttp.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/IMediaDataSource.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/IMediaDataSource.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/IMediaDataSource.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/IMediaDataSource.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/IMediaFormat.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/IMediaFormat.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/IMediaFormat.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/IMediaFormat.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/ITrackInfo.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/ITrackInfo.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/ITrackInfo.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/ITrackInfo.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/IjkMediaFormat.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/IjkMediaFormat.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/IjkMediaFormat.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/IjkMediaFormat.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/IjkTrackInfo.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/IjkTrackInfo.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/misc/IjkTrackInfo.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/misc/IjkTrackInfo.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/pragma/DebugLog.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/pragma/DebugLog.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/pragma/DebugLog.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/pragma/DebugLog.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/pragma/Pragma.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/pragma/Pragma.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/pragma/Pragma.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/player/pragma/Pragma.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/FileMediaDataSource.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/FileMediaDataSource.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/FileMediaDataSource.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/FileMediaDataSource.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/IMediaController.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/IMediaController.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/IMediaController.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/IMediaController.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/IRenderView.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/IRenderView.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/IRenderView.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/IRenderView.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/IjkVideoView.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/IjkVideoView.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/IjkVideoView.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/IjkVideoView.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/MeasureHelper.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/MeasureHelper.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/MeasureHelper.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/MeasureHelper.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/MediaPlayerCompat.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/MediaPlayerCompat.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/MediaPlayerCompat.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/MediaPlayerCompat.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/SurfaceRenderView.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/SurfaceRenderView.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/SurfaceRenderView.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/SurfaceRenderView.java diff --git a/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/TextureRenderView.java b/library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/TextureRenderView.java similarity index 100% rename from ijkplayer-java/src/main/java/tv/danmaku/ijk/media/widget/media/TextureRenderView.java rename to library-ijkplayer/src/main/java/tv/danmaku/ijk/media/widget/media/TextureRenderView.java diff --git a/ijkplayer-java/src/main/project.properties b/library-ijkplayer/src/main/project.properties similarity index 100% rename from ijkplayer-java/src/main/project.properties rename to library-ijkplayer/src/main/project.properties diff --git a/ijkplayer-java/src/main/res/values/strings.xml b/library-ijkplayer/src/main/res/values/strings.xml similarity index 100% rename from ijkplayer-java/src/main/res/values/strings.xml rename to library-ijkplayer/src/main/res/values/strings.xml diff --git a/library/.gitignore b/library-push/.gitignore similarity index 100% rename from library/.gitignore rename to library-push/.gitignore diff --git a/library/build.gradle b/library-push/build.gradle similarity index 100% rename from library/build.gradle rename to library-push/build.gradle diff --git a/library/libs/libuvccamera-common.jar b/library-push/libs/libuvccamera-common.jar similarity index 100% rename from library/libs/libuvccamera-common.jar rename to library-push/libs/libuvccamera-common.jar diff --git a/library/libs/libuvccamera-release.aar b/library-push/libs/libuvccamera-release.aar similarity index 100% rename from library/libs/libuvccamera-release.aar rename to library-push/libs/libuvccamera-release.aar diff --git a/library/proguard-rules.pro b/library-push/proguard-rules.pro similarity index 100% rename from library/proguard-rules.pro rename to library-push/proguard-rules.pro diff --git a/library/src/.gitignore b/library-push/src/.gitignore similarity index 100% rename from library/src/.gitignore rename to library-push/src/.gitignore diff --git a/library/src/androidTest/java/org/easydarwin/easypusher/ApplicationTest.java b/library-push/src/androidTest/java/org/easydarwin/easypusher/ApplicationTest.java similarity index 100% rename from library/src/androidTest/java/org/easydarwin/easypusher/ApplicationTest.java rename to library-push/src/androidTest/java/org/easydarwin/easypusher/ApplicationTest.java diff --git a/library/src/androidTest/java/org/easydarwin/easypusher/SplashActivityTest.java b/library-push/src/androidTest/java/org/easydarwin/easypusher/SplashActivityTest.java similarity index 100% rename from library/src/androidTest/java/org/easydarwin/easypusher/SplashActivityTest.java rename to library-push/src/androidTest/java/org/easydarwin/easypusher/SplashActivityTest.java diff --git a/library/src/main/AndroidManifest.xml b/library-push/src/main/AndroidManifest.xml similarity index 100% rename from library/src/main/AndroidManifest.xml rename to library-push/src/main/AndroidManifest.xml diff --git a/library/src/main/assets/zk/SIMYOU.ttf b/library-push/src/main/assets/zk/SIMYOU.ttf similarity index 100% rename from library/src/main/assets/zk/SIMYOU.ttf rename to library-push/src/main/assets/zk/SIMYOU.ttf diff --git a/library/src/main/java/com/android/webrtc/audio/AudioIO.java b/library-push/src/main/java/com/android/webrtc/audio/AudioIO.java similarity index 100% rename from library/src/main/java/com/android/webrtc/audio/AudioIO.java rename to library-push/src/main/java/com/android/webrtc/audio/AudioIO.java diff --git a/library/src/main/java/com/android/webrtc/audio/MobileAEC.java b/library-push/src/main/java/com/android/webrtc/audio/MobileAEC.java similarity index 100% rename from library/src/main/java/com/android/webrtc/audio/MobileAEC.java rename to library-push/src/main/java/com/android/webrtc/audio/MobileAEC.java diff --git a/library/src/main/java/org/easydarwin/audio/AudioStream.java b/library-push/src/main/java/org/easydarwin/audio/AudioStream.java similarity index 100% rename from library/src/main/java/org/easydarwin/audio/AudioStream.java rename to library-push/src/main/java/org/easydarwin/audio/AudioStream.java diff --git a/library/src/main/java/org/easydarwin/bus/StartRecord.java b/library-push/src/main/java/org/easydarwin/bus/StartRecord.java similarity index 100% rename from library/src/main/java/org/easydarwin/bus/StartRecord.java rename to library-push/src/main/java/org/easydarwin/bus/StartRecord.java diff --git a/library/src/main/java/org/easydarwin/bus/StopRecord.java b/library-push/src/main/java/org/easydarwin/bus/StopRecord.java similarity index 100% rename from library/src/main/java/org/easydarwin/bus/StopRecord.java rename to library-push/src/main/java/org/easydarwin/bus/StopRecord.java diff --git a/library/src/main/java/org/easydarwin/bus/StreamStat.java b/library-push/src/main/java/org/easydarwin/bus/StreamStat.java similarity index 100% rename from library/src/main/java/org/easydarwin/bus/StreamStat.java rename to library-push/src/main/java/org/easydarwin/bus/StreamStat.java diff --git a/library/src/main/java/org/easydarwin/bus/SupportResolution.java b/library-push/src/main/java/org/easydarwin/bus/SupportResolution.java similarity index 100% rename from library/src/main/java/org/easydarwin/bus/SupportResolution.java rename to library-push/src/main/java/org/easydarwin/bus/SupportResolution.java diff --git a/library/src/main/java/org/easydarwin/config/Config.java b/library-push/src/main/java/org/easydarwin/config/Config.java similarity index 100% rename from library/src/main/java/org/easydarwin/config/Config.java rename to library-push/src/main/java/org/easydarwin/config/Config.java diff --git a/library/src/main/java/org/easydarwin/easypusher/EasyApplication.java b/library-push/src/main/java/org/easydarwin/easypusher/EasyApplication.java similarity index 100% rename from library/src/main/java/org/easydarwin/easypusher/EasyApplication.java rename to library-push/src/main/java/org/easydarwin/easypusher/EasyApplication.java diff --git a/library/src/main/java/org/easydarwin/hw/CodecManager.java b/library-push/src/main/java/org/easydarwin/hw/CodecManager.java similarity index 100% rename from library/src/main/java/org/easydarwin/hw/CodecManager.java rename to library-push/src/main/java/org/easydarwin/hw/CodecManager.java diff --git a/library/src/main/java/org/easydarwin/hw/EncoderDebugger.java b/library-push/src/main/java/org/easydarwin/hw/EncoderDebugger.java similarity index 100% rename from library/src/main/java/org/easydarwin/hw/EncoderDebugger.java rename to library-push/src/main/java/org/easydarwin/hw/EncoderDebugger.java diff --git a/library/src/main/java/org/easydarwin/hw/NV21Convertor.java b/library-push/src/main/java/org/easydarwin/hw/NV21Convertor.java similarity index 100% rename from library/src/main/java/org/easydarwin/hw/NV21Convertor.java rename to library-push/src/main/java/org/easydarwin/hw/NV21Convertor.java diff --git a/library/src/main/java/org/easydarwin/muxer/EasyMuxer.java b/library-push/src/main/java/org/easydarwin/muxer/EasyMuxer.java similarity index 100% rename from library/src/main/java/org/easydarwin/muxer/EasyMuxer.java rename to library-push/src/main/java/org/easydarwin/muxer/EasyMuxer.java diff --git a/library/src/main/java/org/easydarwin/push/EasyPusher.java b/library-push/src/main/java/org/easydarwin/push/EasyPusher.java similarity index 100% rename from library/src/main/java/org/easydarwin/push/EasyPusher.java rename to library-push/src/main/java/org/easydarwin/push/EasyPusher.java diff --git a/library/src/main/java/org/easydarwin/push/HWConsumer.java b/library-push/src/main/java/org/easydarwin/push/HWConsumer.java similarity index 100% rename from library/src/main/java/org/easydarwin/push/HWConsumer.java rename to library-push/src/main/java/org/easydarwin/push/HWConsumer.java diff --git a/library/src/main/java/org/easydarwin/push/InitCallback.java b/library-push/src/main/java/org/easydarwin/push/InitCallback.java similarity index 100% rename from library/src/main/java/org/easydarwin/push/InitCallback.java rename to library-push/src/main/java/org/easydarwin/push/InitCallback.java diff --git a/library/src/main/java/org/easydarwin/push/MediaStream.java b/library-push/src/main/java/org/easydarwin/push/MediaStream.java similarity index 100% rename from library/src/main/java/org/easydarwin/push/MediaStream.java rename to library-push/src/main/java/org/easydarwin/push/MediaStream.java diff --git a/library/src/main/java/org/easydarwin/push/PushScreenService.java b/library-push/src/main/java/org/easydarwin/push/PushScreenService.java similarity index 100% rename from library/src/main/java/org/easydarwin/push/PushScreenService.java rename to library-push/src/main/java/org/easydarwin/push/PushScreenService.java diff --git a/library/src/main/java/org/easydarwin/push/Pusher.java b/library-push/src/main/java/org/easydarwin/push/Pusher.java similarity index 100% rename from library/src/main/java/org/easydarwin/push/Pusher.java rename to library-push/src/main/java/org/easydarwin/push/Pusher.java diff --git a/library/src/main/java/org/easydarwin/push/SWConsumer.java b/library-push/src/main/java/org/easydarwin/push/SWConsumer.java similarity index 100% rename from library/src/main/java/org/easydarwin/push/SWConsumer.java rename to library-push/src/main/java/org/easydarwin/push/SWConsumer.java diff --git a/library/src/main/java/org/easydarwin/push/UVCCameraService.java b/library-push/src/main/java/org/easydarwin/push/UVCCameraService.java similarity index 100% rename from library/src/main/java/org/easydarwin/push/UVCCameraService.java rename to library-push/src/main/java/org/easydarwin/push/UVCCameraService.java diff --git a/library/src/main/java/org/easydarwin/push/VideoConsumer.java b/library-push/src/main/java/org/easydarwin/push/VideoConsumer.java similarity index 100% rename from library/src/main/java/org/easydarwin/push/VideoConsumer.java rename to library-push/src/main/java/org/easydarwin/push/VideoConsumer.java diff --git a/library/src/main/java/org/easydarwin/sw/JNIUtil.java b/library-push/src/main/java/org/easydarwin/sw/JNIUtil.java similarity index 100% rename from library/src/main/java/org/easydarwin/sw/JNIUtil.java rename to library-push/src/main/java/org/easydarwin/sw/JNIUtil.java diff --git a/library/src/main/java/org/easydarwin/sw/TxtOverlay.java b/library-push/src/main/java/org/easydarwin/sw/TxtOverlay.java similarity index 100% rename from library/src/main/java/org/easydarwin/sw/TxtOverlay.java rename to library-push/src/main/java/org/easydarwin/sw/TxtOverlay.java diff --git a/library/src/main/java/org/easydarwin/sw/X264Encoder.java b/library-push/src/main/java/org/easydarwin/sw/X264Encoder.java similarity index 100% rename from library/src/main/java/org/easydarwin/sw/X264Encoder.java rename to library-push/src/main/java/org/easydarwin/sw/X264Encoder.java diff --git a/library/src/main/java/org/easydarwin/util/AbstractSubscriber.java b/library-push/src/main/java/org/easydarwin/util/AbstractSubscriber.java similarity index 100% rename from library/src/main/java/org/easydarwin/util/AbstractSubscriber.java rename to library-push/src/main/java/org/easydarwin/util/AbstractSubscriber.java diff --git a/library/src/main/java/org/easydarwin/util/Util.java b/library-push/src/main/java/org/easydarwin/util/Util.java similarity index 100% rename from library/src/main/java/org/easydarwin/util/Util.java rename to library-push/src/main/java/org/easydarwin/util/Util.java diff --git a/library/src/main/java/org/easydarwin/util/YUVUtils.java b/library-push/src/main/java/org/easydarwin/util/YUVUtils.java similarity index 100% rename from library/src/main/java/org/easydarwin/util/YUVUtils.java rename to library-push/src/main/java/org/easydarwin/util/YUVUtils.java diff --git a/library/src/main/jniLibs/arm64-v8a/libTxtOverlay.so b/library-push/src/main/jniLibs/arm64-v8a/libTxtOverlay.so similarity index 100% rename from library/src/main/jniLibs/arm64-v8a/libTxtOverlay.so rename to library-push/src/main/jniLibs/arm64-v8a/libTxtOverlay.so diff --git a/library/src/main/jniLibs/arm64-v8a/libUtils.so b/library-push/src/main/jniLibs/arm64-v8a/libUtils.so similarity index 100% rename from library/src/main/jniLibs/arm64-v8a/libUtils.so rename to library-push/src/main/jniLibs/arm64-v8a/libUtils.so diff --git a/library/src/main/jniLibs/arm64-v8a/libeasypusher.so b/library-push/src/main/jniLibs/arm64-v8a/libeasypusher.so similarity index 100% rename from library/src/main/jniLibs/arm64-v8a/libeasypusher.so rename to library-push/src/main/jniLibs/arm64-v8a/libeasypusher.so diff --git a/library/src/main/jniLibs/arm64-v8a/libx264enc.so b/library-push/src/main/jniLibs/arm64-v8a/libx264enc.so similarity index 100% rename from library/src/main/jniLibs/arm64-v8a/libx264enc.so rename to library-push/src/main/jniLibs/arm64-v8a/libx264enc.so diff --git a/library/src/main/jniLibs/armeabi-v7a/libTxtOverlay.so b/library-push/src/main/jniLibs/armeabi-v7a/libTxtOverlay.so similarity index 100% rename from library/src/main/jniLibs/armeabi-v7a/libTxtOverlay.so rename to library-push/src/main/jniLibs/armeabi-v7a/libTxtOverlay.so diff --git a/library/src/main/jniLibs/armeabi-v7a/libUtils.so b/library-push/src/main/jniLibs/armeabi-v7a/libUtils.so similarity index 100% rename from library/src/main/jniLibs/armeabi-v7a/libUtils.so rename to library-push/src/main/jniLibs/armeabi-v7a/libUtils.so diff --git a/library/src/main/jniLibs/armeabi-v7a/libeasypusher.so b/library-push/src/main/jniLibs/armeabi-v7a/libeasypusher.so similarity index 100% rename from library/src/main/jniLibs/armeabi-v7a/libeasypusher.so rename to library-push/src/main/jniLibs/armeabi-v7a/libeasypusher.so diff --git a/library/src/main/jniLibs/armeabi-v7a/libx264enc.so b/library-push/src/main/jniLibs/armeabi-v7a/libx264enc.so similarity index 100% rename from library/src/main/jniLibs/armeabi-v7a/libx264enc.so rename to library-push/src/main/jniLibs/armeabi-v7a/libx264enc.so diff --git a/library/src/main/jniLibs/x86/libTxtOverlay.so b/library-push/src/main/jniLibs/x86/libTxtOverlay.so similarity index 100% rename from library/src/main/jniLibs/x86/libTxtOverlay.so rename to library-push/src/main/jniLibs/x86/libTxtOverlay.so diff --git a/library/src/main/jniLibs/x86/libUtils.so b/library-push/src/main/jniLibs/x86/libUtils.so similarity index 100% rename from library/src/main/jniLibs/x86/libUtils.so rename to library-push/src/main/jniLibs/x86/libUtils.so diff --git a/library/src/main/jniLibs/x86/libeasypusher.so b/library-push/src/main/jniLibs/x86/libeasypusher.so similarity index 100% rename from library/src/main/jniLibs/x86/libeasypusher.so rename to library-push/src/main/jniLibs/x86/libeasypusher.so diff --git a/library/src/main/jniLibs/x86/libx264enc.so b/library-push/src/main/jniLibs/x86/libx264enc.so similarity index 100% rename from library/src/main/jniLibs/x86/libx264enc.so rename to library-push/src/main/jniLibs/x86/libx264enc.so diff --git a/library/src/main/res/drawable-hdpi/float_button.png b/library-push/src/main/res/drawable-hdpi/float_button.png similarity index 100% rename from library/src/main/res/drawable-hdpi/float_button.png rename to library-push/src/main/res/drawable-hdpi/float_button.png diff --git a/library/src/main/res/drawable-hdpi/ic_close_pushing_screen.png b/library-push/src/main/res/drawable-hdpi/ic_close_pushing_screen.png similarity index 100% rename from library/src/main/res/drawable-hdpi/ic_close_pushing_screen.png rename to library-push/src/main/res/drawable-hdpi/ic_close_pushing_screen.png diff --git a/library/src/main/res/drawable-hdpi/ic_pusher_screen_pushing.png b/library-push/src/main/res/drawable-hdpi/ic_pusher_screen_pushing.png similarity index 100% rename from library/src/main/res/drawable-hdpi/ic_pusher_screen_pushing.png rename to library-push/src/main/res/drawable-hdpi/ic_pusher_screen_pushing.png diff --git a/library/src/main/res/drawable-mdpi/ic_close_pushing_screen.png b/library-push/src/main/res/drawable-mdpi/ic_close_pushing_screen.png similarity index 100% rename from library/src/main/res/drawable-mdpi/ic_close_pushing_screen.png rename to library-push/src/main/res/drawable-mdpi/ic_close_pushing_screen.png diff --git a/library/src/main/res/drawable-mdpi/ic_pusher_screen_pushing.png b/library-push/src/main/res/drawable-mdpi/ic_pusher_screen_pushing.png similarity index 100% rename from library/src/main/res/drawable-mdpi/ic_pusher_screen_pushing.png rename to library-push/src/main/res/drawable-mdpi/ic_pusher_screen_pushing.png diff --git a/library/src/main/res/drawable-xhdpi/ic_close_pushing_screen.png b/library-push/src/main/res/drawable-xhdpi/ic_close_pushing_screen.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/ic_close_pushing_screen.png rename to library-push/src/main/res/drawable-xhdpi/ic_close_pushing_screen.png diff --git a/library/src/main/res/drawable-xhdpi/ic_pusher_screen_pushing.png b/library-push/src/main/res/drawable-xhdpi/ic_pusher_screen_pushing.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/ic_pusher_screen_pushing.png rename to library-push/src/main/res/drawable-xhdpi/ic_pusher_screen_pushing.png diff --git a/library/src/main/res/drawable-xxhdpi/ic_close_pushing_screen.png b/library-push/src/main/res/drawable-xxhdpi/ic_close_pushing_screen.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/ic_close_pushing_screen.png rename to library-push/src/main/res/drawable-xxhdpi/ic_close_pushing_screen.png diff --git a/library/src/main/res/drawable-xxhdpi/ic_pusher_screen_pushing.png b/library-push/src/main/res/drawable-xxhdpi/ic_pusher_screen_pushing.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/ic_pusher_screen_pushing.png rename to library-push/src/main/res/drawable-xxhdpi/ic_pusher_screen_pushing.png diff --git a/library/src/main/res/values/strings.xml b/library-push/src/main/res/values/strings.xml similarity index 100% rename from library/src/main/res/values/strings.xml rename to library-push/src/main/res/values/strings.xml diff --git a/library/src/test/java/org/easydarwin/easypusher/ExampleUnitTest.java b/library-push/src/test/java/org/easydarwin/easypusher/ExampleUnitTest.java similarity index 100% rename from library/src/test/java/org/easydarwin/easypusher/ExampleUnitTest.java rename to library-push/src/test/java/org/easydarwin/easypusher/ExampleUnitTest.java diff --git a/commonSPort/.gitignore b/library-serialPort/.gitignore similarity index 100% rename from commonSPort/.gitignore rename to library-serialPort/.gitignore diff --git a/commonSPort/build.gradle b/library-serialPort/build.gradle similarity index 100% rename from commonSPort/build.gradle rename to library-serialPort/build.gradle diff --git a/commonSPort/consumer-rules.pro b/library-serialPort/consumer-rules.pro similarity index 100% rename from commonSPort/consumer-rules.pro rename to library-serialPort/consumer-rules.pro diff --git a/commonSPort/proguard-rules.pro b/library-serialPort/proguard-rules.pro similarity index 100% rename from commonSPort/proguard-rules.pro rename to library-serialPort/proguard-rules.pro diff --git a/commonSPort/src/main/AndroidManifest.xml b/library-serialPort/src/main/AndroidManifest.xml similarity index 100% rename from commonSPort/src/main/AndroidManifest.xml rename to library-serialPort/src/main/AndroidManifest.xml diff --git a/commonSPort/src/main/java/com/common/queue/BlockTaskQueue.java b/library-serialPort/src/main/java/com/common/queue/BlockTaskQueue.java similarity index 100% rename from commonSPort/src/main/java/com/common/queue/BlockTaskQueue.java rename to library-serialPort/src/main/java/com/common/queue/BlockTaskQueue.java diff --git a/commonSPort/src/main/java/com/common/queue/Task/BaseTask.java b/library-serialPort/src/main/java/com/common/queue/Task/BaseTask.java similarity index 100% rename from commonSPort/src/main/java/com/common/queue/Task/BaseTask.java rename to library-serialPort/src/main/java/com/common/queue/Task/BaseTask.java diff --git a/commonSPort/src/main/java/com/common/queue/Task/DemoTask.java b/library-serialPort/src/main/java/com/common/queue/Task/DemoTask.java similarity index 100% rename from commonSPort/src/main/java/com/common/queue/Task/DemoTask.java rename to library-serialPort/src/main/java/com/common/queue/Task/DemoTask.java diff --git a/commonSPort/src/main/java/com/common/queue/Task/ITask.java b/library-serialPort/src/main/java/com/common/queue/Task/ITask.java similarity index 100% rename from commonSPort/src/main/java/com/common/queue/Task/ITask.java rename to library-serialPort/src/main/java/com/common/queue/Task/ITask.java diff --git a/commonSPort/src/main/java/com/common/queue/Task/TaskEvent.java b/library-serialPort/src/main/java/com/common/queue/Task/TaskEvent.java similarity index 100% rename from commonSPort/src/main/java/com/common/queue/Task/TaskEvent.java rename to library-serialPort/src/main/java/com/common/queue/Task/TaskEvent.java diff --git a/commonSPort/src/main/java/com/common/queue/Task/TaskPriority.java b/library-serialPort/src/main/java/com/common/queue/Task/TaskPriority.java similarity index 100% rename from commonSPort/src/main/java/com/common/queue/Task/TaskPriority.java rename to library-serialPort/src/main/java/com/common/queue/Task/TaskPriority.java diff --git a/commonSPort/src/main/java/com/common/queue/TaskExecutor.java b/library-serialPort/src/main/java/com/common/queue/TaskExecutor.java similarity index 100% rename from commonSPort/src/main/java/com/common/queue/TaskExecutor.java rename to library-serialPort/src/main/java/com/common/queue/TaskExecutor.java diff --git a/commonSPort/src/main/java/com/common/queue/TaskScheduler.java b/library-serialPort/src/main/java/com/common/queue/TaskScheduler.java similarity index 100% rename from commonSPort/src/main/java/com/common/queue/TaskScheduler.java rename to library-serialPort/src/main/java/com/common/queue/TaskScheduler.java diff --git a/commonSPort/src/main/java/com/common/serialport/EasySerialPort.kt b/library-serialPort/src/main/java/com/common/serialport/EasySerialPort.kt similarity index 100% rename from commonSPort/src/main/java/com/common/serialport/EasySerialPort.kt rename to library-serialPort/src/main/java/com/common/serialport/EasySerialPort.kt diff --git a/commonSPort/src/main/java/com/common/serialport/SendMsgTask.kt b/library-serialPort/src/main/java/com/common/serialport/SendMsgTask.kt similarity index 100% rename from commonSPort/src/main/java/com/common/serialport/SendMsgTask.kt rename to library-serialPort/src/main/java/com/common/serialport/SendMsgTask.kt diff --git a/commonSPort/src/main/java/com/common/serialport/inter/IHelper.kt b/library-serialPort/src/main/java/com/common/serialport/inter/IHelper.kt similarity index 100% rename from commonSPort/src/main/java/com/common/serialport/inter/IHelper.kt rename to library-serialPort/src/main/java/com/common/serialport/inter/IHelper.kt diff --git a/commonSPort/src/main/java/com/common/serialport/inter/SerialPortHelper.kt b/library-serialPort/src/main/java/com/common/serialport/inter/SerialPortHelper.kt similarity index 100% rename from commonSPort/src/main/java/com/common/serialport/inter/SerialPortHelper.kt rename to library-serialPort/src/main/java/com/common/serialport/inter/SerialPortHelper.kt diff --git a/commonSPort/src/main/java/com/common/serialport/utils/CommonPortUtils.kt b/library-serialPort/src/main/java/com/common/serialport/utils/CommonPortUtils.kt similarity index 100% rename from commonSPort/src/main/java/com/common/serialport/utils/CommonPortUtils.kt rename to library-serialPort/src/main/java/com/common/serialport/utils/CommonPortUtils.kt diff --git a/commonSPort/src/main/java/com/common/serialport/utils/DataUtils.java b/library-serialPort/src/main/java/com/common/serialport/utils/DataUtils.java similarity index 100% rename from commonSPort/src/main/java/com/common/serialport/utils/DataUtils.java rename to library-serialPort/src/main/java/com/common/serialport/utils/DataUtils.java diff --git a/commonSPort/src/main/java/com/common/serialport/utils/SinglePortUtils.kt b/library-serialPort/src/main/java/com/common/serialport/utils/SinglePortUtils.kt similarity index 100% rename from commonSPort/src/main/java/com/common/serialport/utils/SinglePortUtils.kt rename to library-serialPort/src/main/java/com/common/serialport/utils/SinglePortUtils.kt diff --git a/settings.gradle b/settings.gradle index 70506fb..908ffb3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ include ':app' //, ':libuvccamera-release' -include ':library' -include ':ijkplayer-java' -include ':commonSPort' +include ':library-push' +include ':library-ijkplayer' +include ':library-serialPort'