From 1cb1145c7fd880e33dbe44a9c24541a019f08233 Mon Sep 17 00:00:00 2001 From: xinbaicheng Date: Wed, 9 Nov 2016 21:05:43 +0800 Subject: [PATCH] update sdk and demo --- {LiveDemo => KSYLiveDemo}/.gitignore | 1 + {LiveDemo => KSYLiveDemo}/.idea/compiler.xml | 0 .../.idea/copyright/profiles_settings.xml | 0 {LiveDemo => KSYLiveDemo}/.idea/encodings.xml | 0 {LiveDemo => KSYLiveDemo}/.idea/gradle.xml | 8 +- {LiveDemo => KSYLiveDemo}/.idea/misc.xml | 16 + {LiveDemo => KSYLiveDemo}/.idea/modules.xml | 3 +- .../.idea/runConfigurations.xml | 0 {LiveDemo => KSYLiveDemo}/app/.gitignore | 0 {LiveDemo => KSYLiveDemo}/app/build.gradle | 19 +- {LiveDemo => KSYLiveDemo}/app/libs/zxing.jar | Bin .../app}/proguard-rules.pro | 2 +- .../app/src/main/AndroidManifest.xml | 72 +- .../com/ksyun/live/demo/MainActivity.java | 7 +- .../player}/activity/CaptureActivity.java | 12 +- .../player}/activity/HistoryActivity.java | 49 +- .../activity/JieVideoListViewAdapter.java | 11 +- .../demo/player}/activity/LocalFragment.java | 60 +- .../demo/player/activity/MediaController.java | 603 ++++++ .../player}/activity/NetMediaActivty.java | 82 +- .../demo/player}/activity/PlayerActivity.java | 25 +- .../player}/activity/SettingActivity.java | 54 +- .../demo/player/activity/SurfaceActivity.java | 1668 ++++++++--------- .../activity/TextureSurfaceRenderer.java | 172 ++ .../player/activity/TextureVideoActivity.java | 602 ++++++ .../activity/TextureViewMediaActivity.java | 170 ++ .../activity/VideoTextureSurfaceRenderer.java | 221 +++ .../live/demo/player}/model/GetList.java | 6 +- .../player}/model/MyVideoThumbLoader.java | 23 +- .../live/demo/player}/model/NetDbAdapter.java | 5 +- .../demo/player}/model/NetbaseHelper.java | 2 +- .../live/demo/player}/model/Strings.java | 2 +- .../live/demo/player}/util/Application.java | 2 +- .../live/demo/player}/util/AsyncCallback.java | 2 +- .../com/ksyun/live/demo/player}/util/Cpu.java | 2 +- .../live/demo/player}/util/Extensions.java | 2 +- .../live/demo/player}/util/LoadedImage.java | 2 +- .../demo/player}/util/PlayerPopupWindow.java | 4 +- .../live/demo/player}/util/QosObject.java | 2 +- .../live/demo/player}/util/QosThread.java | 22 +- .../live/demo/player}/util/QyDataBase.java | 2 +- .../demo/player}/util/QyDataBaseHelper.java | 2 +- .../demo/player/util/RawResourceReader.java | 40 + .../live/demo/player}/util/Settings.java | 8 +- .../live/demo/player/util/ShaderHelper.java | 103 + .../live/demo/player/util/TextureHelper.java | 45 + .../ksyun/live/demo/player}/util/Video.java | 4 +- .../zxing/camera/AutoFocusCallback.java | 2 +- .../camera/CameraConfigurationManager.java | 2 +- .../player}/zxing/camera/CameraManager.java | 2 +- .../zxing/camera/FlashlightManager.java | 2 +- .../camera/PlanarYUVLuminanceSource.java | 2 +- .../player}/zxing/camera/PreviewCallback.java | 2 +- .../decoding/CaptureActivityHandler.java | 8 +- .../zxing/decoding/DecodeFormatManager.java | 2 +- .../player}/zxing/decoding/DecodeHandler.java | 9 +- .../player}/zxing/decoding/DecodeThread.java | 5 +- .../zxing/decoding/FinishListener.java | 2 +- .../zxing/decoding/InactivityTimer.java | 2 +- .../demo/player}/zxing/decoding/Intents.java | 2 +- .../zxing/encoding/EncodingHandler.java | 2 +- .../view/ViewfinderResultPointCallback.java | 2 +- .../player}/zxing/view/ViewfinderView.java | 4 +- .../media/streamer/demo/CameraActivity.java | 822 ++++++++ .../media/streamer/demo/CameraHintView.java | 138 ++ .../media/streamer/demo/DemoActivity.java | 134 ++ .../media/streamer/demo/DemoAudioFilter.java | 56 + .../ksyun/media/streamer/demo/DemoFilter.java | 33 + .../media/streamer/demo/DemoFilter2.java | 34 + .../media/streamer/demo/DemoFilter3.java | 34 + .../media/streamer/demo/DemoFilter4.java | 34 + .../app/src/main/res/anim/slide_in_bottom.xml | 0 .../app/src/main/res/anim/slide_in_top.xml | 0 .../app/src/main/res/anim/slide_left_in.xml | 0 .../app/src/main/res/anim/slide_left_out.xml | 0 .../src/main/res/anim/slide_out_bottom.xml | 0 .../app/src/main/res/anim/slide_out_top.xml | 0 .../app/src/main/res/anim/slide_right_in.xml | 0 .../app/src/main/res/anim/slide_right_out.xml | 0 .../app/src/main/res/anim/slide_stand.xml | 0 .../main/res/drawable-xhdpi}/ic_launcher.png | Bin .../drawable-xhdpi}/record_exit_disable.png | Bin .../drawable-xhdpi}/record_exit_normal.png | Bin .../record_exitsure_normal.png | Bin .../drawable-xhdpi}/record_flash_disable.png | Bin .../record_flash_highlighted.png | Bin .../drawable-xhdpi}/record_flash_normal.png | Bin .../record_switch_camera_disable.png | Bin .../record_switch_camera_highlighted.png | Bin .../record_switch_camera_normal.png | Bin .../src/main/res/drawable-xxhdpi/ksy_logo.png | Bin 0 -> 5665 bytes .../app/src/main/res/drawable/ic_launcher.png | Bin 0 -> 3134 bytes .../src/main/res/drawable/ic_media_pause.png | Bin 0 -> 599 bytes .../src/main/res/drawable/ic_media_play.png | Bin 0 -> 1163 bytes .../main/res/drawable/qyvideo_pause_btn.png | Bin .../main/res/drawable/qyvideo_start_btn.png | Bin .../res/drawable/recorder_delete_icon.xml | 0 .../main/res/drawable/recorder_flash_icon.xml | 0 .../res/drawable/recorder_rotate_icon.xml | 0 .../app/src/main/res/drawable/video_image.png | Bin .../src/main/res/layout/activity_history.xml | 0 .../app/src/main/res/layout/activity_main.xml | 0 .../layout/activity_md_using_surface_view.xml | 0 .../layout/activity_md_using_texture_view.xml | 0 .../app/src/main/res/layout/activity_net.xml | 0 .../src/main/res/layout/activity_player.xml | 2 +- .../src/main/res/layout/activity_setting.xml | 11 +- .../src/main/res/layout/activity_stream.xml | 0 .../src/main/res/layout/activity_surface.xml | 212 +++ .../app/src/main/res/layout/camera.xml | 2 +- .../src/main/res/layout/camera_activity.xml | 11 +- .../src/main/res/layout/camera_bottombar.xml | 80 +- .../src/main/res/layout/camera_titlebar.xml | 8 +- .../app/src/main/res/layout/demo_activity.xml | 208 ++ .../src/main/res/layout/fragment_local.xml | 12 +- .../main/res/layout/glrender_view_layout.xml | 12 + .../app/src/main/res/layout/list_history.xml | 0 .../app/src/main/res/layout/list_local.xml | 0 .../app/src/main/res/layout/listlayout.xml | 0 .../src/main/res/layout/media_actionbar.xml | 0 .../src/main/res/layout/media_controller.xml | 58 + .../app/src/main/res/layout/net_actionbar.xml | 0 .../app/src/main/res/layout/pippopwindow.xml | 0 .../app/src/main/res/layout/popup_layout.xml | 0 .../app/src/main/res/layout/popupwindow.xml | 10 +- .../app/src/main/res/layout/qianyi_player.xml | 0 .../main/res/layout/simple_spinner_item.xml | 0 .../src/main/res/layout/texture_player.xml | 184 ++ .../src/main/res/layout/videopopwindow.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../app/src/main/res/raw/beep.ogg | Bin .../src/main/res/raw/fragment_sharder.glsl | 9 + .../app/src/main/res/raw/realm_properties | 0 .../app/src/main/res/raw/vetext_sharder.glsl | 9 + .../app/src/main/res/values-w820dp/dimens.xml | 0 .../app/src/main/res/values/colors.xml | 0 .../app/src/main/res/values/dimens.xml | 0 .../app/src/main/res/values/ids.xml | 0 .../app/src/main/res/values/strings.xml | 5 + .../app/src/main/res/values/styles.xml | 2 +- {LiveDemo => KSYLiveDemo}/build.gradle | 2 +- KSYLiveDemo/build_streamer.sh | 87 + {LiveDemo => KSYLiveDemo}/gradle.properties | 5 +- .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 2 +- {LiveDemo => KSYLiveDemo}/gradlew | 0 {LiveDemo => KSYLiveDemo}/gradlew.bat | 180 +- .../libksylive}/.gitignore | 0 .../libksylive}/build.gradle | 12 +- .../livelib => KSYLiveDemo/libksylive}/libs | 0 .../libksylive}/proguard-rules.pro | 4 +- .../libksylive}/src/main/AndroidManifest.xml | 2 +- .../src/main/res/values/strings.xml | 3 + KSYLiveDemo/settings.gradle | 1 + LiveDemo/.idea/.name | 1 - LiveDemo/app/libs/arm64-v8a/libBugly.so | Bin 133072 -> 0 bytes LiveDemo/app/libs/armeabi-v7a/libBugly.so | Bin 91572 -> 0 bytes LiveDemo/app/libs/bugly_crash_release.jar | Bin 224785 -> 0 bytes LiveDemo/app/libs/x86/libBugly.so | Bin 153064 -> 0 bytes .../com/ksyun/live/demo/CameraActivity.java | 1092 ----------- .../live/demo/CameraActivityAudioEffect.java | 746 -------- .../live/demo/CameraActivityAudioMix.java | 810 -------- .../ksyun/live/demo/CameraActivityBeauty.java | 746 -------- .../ksyun/live/demo/CameraActivityOther.java | 752 -------- .../ksyun/live/demo/CameraActivityPip.java | 1066 ----------- .../live/demo/CameraActivityWaterLogo.java | 739 -------- .../java/com/ksyun/live/demo/DEMOFILTER.java | 34 - .../java/com/ksyun/live/demo/DEMOFILTER2.java | 34 - .../java/com/ksyun/live/demo/DEMOFILTER3.java | 34 - .../java/com/ksyun/live/demo/DEMOFILTER4.java | 34 - .../com/ksyun/live/demo/GroupFilterDemo.java | 25 - .../java/com/ksyun/live/demo/Settings.java | 20 - .../com/ksyun/live/demo/StreamActivity.java | 410 ---- .../live/demo/activity/SpinnerHelper.java | 84 - .../layout/camera_activity_audio_effect.xml | 47 - .../res/layout/camera_activity_audio_mix.xml | 47 - .../res/layout/camera_activity_beauty.xml | 47 - .../main/res/layout/camera_activity_other.xml | 47 - .../main/res/layout/camera_activity_pip.xml | 47 - .../res/layout/camera_activity_waterlogo.xml | 47 - .../layout/camera_bottombar_audio_effect.xml | 79 - .../res/layout/camera_bottombar_audio_mix.xml | 114 -- .../res/layout/camera_bottombar_beauty.xml | 58 - .../res/layout/camera_bottombar_other.xml | 80 - .../main/res/layout/camera_bottombar_pip.xml | 84 - .../res/layout/camera_bottombar_waterlogo.xml | 64 - .../com/ksy/livelib/demo/ApplicationTest.java | 13 - .../livelib/src/main/res/values/strings.xml | 3 - .../com/ksy/livelib/demo/ExampleUnitTest.java | 15 - LiveDemo/settings.gradle | 1 - libs/arm64-v8a/libDenoise_export.so | Bin 17736 -> 0 bytes libs/arm64-v8a/libaudio_effect.so | Bin 673664 -> 0 bytes libs/arm64-v8a/libksylive.so | Bin 6577640 -> 6533488 bytes libs/arm64-v8a/libreverb.so | Bin 13704 -> 0 bytes libs/armeabi-v7a/libDenoise_export.so | Bin 21620 -> 0 bytes libs/armeabi-v7a/libaudio_effect.so | Bin 345488 -> 0 bytes libs/armeabi-v7a/libksylive.so | Bin 4865924 -> 4825680 bytes libs/armeabi-v7a/libreverb.so | Bin 13460 -> 0 bytes libs/ksylive3.0.jar | Bin 224868 -> 0 bytes libs/ksylive4.0.jar | Bin 0 -> 288420 bytes libs/libksyplayer.jar | Bin 144440 -> 127755 bytes libs/x86/libDenoise_export.so | Bin 25692 -> 0 bytes libs/x86/libaudio_effect.so | Bin 587164 -> 0 bytes libs/x86/libksylive.so | Bin 6735308 -> 6723768 bytes libs/x86/libreverb.so | Bin 13356 -> 0 bytes 209 files changed, 5315 insertions(+), 8710 deletions(-) rename {LiveDemo => KSYLiveDemo}/.gitignore (82%) rename {LiveDemo => KSYLiveDemo}/.idea/compiler.xml (100%) rename {LiveDemo => KSYLiveDemo}/.idea/copyright/profiles_settings.xml (100%) rename {LiveDemo => KSYLiveDemo}/.idea/encodings.xml (100%) rename {LiveDemo => KSYLiveDemo}/.idea/gradle.xml (75%) rename {LiveDemo => KSYLiveDemo}/.idea/misc.xml (84%) rename {LiveDemo => KSYLiveDemo}/.idea/modules.xml (52%) rename {LiveDemo => KSYLiveDemo}/.idea/runConfigurations.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/.gitignore (100%) rename {LiveDemo => KSYLiveDemo}/app/build.gradle (64%) rename {LiveDemo => KSYLiveDemo}/app/libs/zxing.jar (100%) rename {LiveDemo/livelib => KSYLiveDemo/app}/proguard-rules.pro (88%) rename {LiveDemo => KSYLiveDemo}/app/src/main/AndroidManifest.xml (63%) rename {LiveDemo => KSYLiveDemo}/app/src/main/java/com/ksyun/live/demo/MainActivity.java (80%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/activity/CaptureActivity.java (94%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/activity/HistoryActivity.java (50%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/activity/JieVideoListViewAdapter.java (89%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/activity/LocalFragment.java (72%) create mode 100644 KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/MediaController.java rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/activity/NetMediaActivty.java (70%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/activity/PlayerActivity.java (76%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/activity/SettingActivity.java (71%) rename LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/VideoPlayerActivity.java => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/SurfaceActivity.java (84%) mode change 100755 => 100644 create mode 100755 KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/TextureSurfaceRenderer.java create mode 100644 KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/TextureVideoActivity.java create mode 100755 KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/TextureViewMediaActivity.java create mode 100755 KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/VideoTextureSurfaceRenderer.java rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/model/GetList.java (96%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/model/MyVideoThumbLoader.java (79%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/model/NetDbAdapter.java (96%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/model/NetbaseHelper.java (96%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/model/Strings.java (99%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/util/Application.java (84%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/util/AsyncCallback.java (76%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/util/Cpu.java (95%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/util/Extensions.java (97%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/util/LoadedImage.java (86%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/util/PlayerPopupWindow.java (93%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/util/QosObject.java (76%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/util/QosThread.java (62%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/util/QyDataBase.java (94%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/util/QyDataBaseHelper.java (98%) create mode 100755 KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/RawResourceReader.java rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/util/Settings.java (64%) create mode 100755 KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/ShaderHelper.java create mode 100755 KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/TextureHelper.java rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/util/Video.java (96%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/camera/AutoFocusCallback.java (96%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/camera/CameraConfigurationManager.java (99%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/camera/CameraManager.java (99%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/camera/FlashlightManager.java (98%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/camera/PlanarYUVLuminanceSource.java (98%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/camera/PreviewCallback.java (97%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/decoding/CaptureActivityHandler.java (94%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/decoding/DecodeFormatManager.java (98%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/decoding/DecodeHandler.java (93%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/decoding/DecodeThread.java (95%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/decoding/FinishListener.java (96%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/decoding/InactivityTimer.java (97%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/decoding/Intents.java (99%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/encoding/EncodingHandler.java (95%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/view/ViewfinderResultPointCallback.java (95%) rename {LiveDemo/app/src/main/java/com/ksyun/live/demo => KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player}/zxing/view/ViewfinderView.java (98%) create mode 100644 KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/CameraActivity.java create mode 100644 KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/CameraHintView.java create mode 100644 KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoActivity.java create mode 100644 KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoAudioFilter.java create mode 100644 KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter.java create mode 100644 KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter2.java create mode 100644 KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter3.java create mode 100644 KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter4.java rename {LiveDemo => KSYLiveDemo}/app/src/main/res/anim/slide_in_bottom.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/anim/slide_in_top.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/anim/slide_left_in.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/anim/slide_left_out.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/anim/slide_out_bottom.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/anim/slide_out_top.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/anim/slide_right_in.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/anim/slide_right_out.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/anim/slide_stand.xml (100%) rename {LiveDemo/app/src/main/res/drawable => KSYLiveDemo/app/src/main/res/drawable-xhdpi}/ic_launcher.png (100%) rename {LiveDemo/app/src/main/res/drawable => KSYLiveDemo/app/src/main/res/drawable-xhdpi}/record_exit_disable.png (100%) rename {LiveDemo/app/src/main/res/drawable => KSYLiveDemo/app/src/main/res/drawable-xhdpi}/record_exit_normal.png (100%) rename {LiveDemo/app/src/main/res/drawable => KSYLiveDemo/app/src/main/res/drawable-xhdpi}/record_exitsure_normal.png (100%) rename {LiveDemo/app/src/main/res/drawable => KSYLiveDemo/app/src/main/res/drawable-xhdpi}/record_flash_disable.png (100%) rename {LiveDemo/app/src/main/res/drawable => KSYLiveDemo/app/src/main/res/drawable-xhdpi}/record_flash_highlighted.png (100%) rename {LiveDemo/app/src/main/res/drawable => KSYLiveDemo/app/src/main/res/drawable-xhdpi}/record_flash_normal.png (100%) rename {LiveDemo/app/src/main/res/drawable => KSYLiveDemo/app/src/main/res/drawable-xhdpi}/record_switch_camera_disable.png (100%) rename {LiveDemo/app/src/main/res/drawable => KSYLiveDemo/app/src/main/res/drawable-xhdpi}/record_switch_camera_highlighted.png (100%) rename {LiveDemo/app/src/main/res/drawable => KSYLiveDemo/app/src/main/res/drawable-xhdpi}/record_switch_camera_normal.png (100%) create mode 100644 KSYLiveDemo/app/src/main/res/drawable-xxhdpi/ksy_logo.png create mode 100644 KSYLiveDemo/app/src/main/res/drawable/ic_launcher.png create mode 100755 KSYLiveDemo/app/src/main/res/drawable/ic_media_pause.png create mode 100755 KSYLiveDemo/app/src/main/res/drawable/ic_media_play.png rename {LiveDemo => KSYLiveDemo}/app/src/main/res/drawable/qyvideo_pause_btn.png (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/drawable/qyvideo_start_btn.png (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/drawable/recorder_delete_icon.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/drawable/recorder_flash_icon.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/drawable/recorder_rotate_icon.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/drawable/video_image.png (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/activity_history.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/activity_main.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/activity_md_using_surface_view.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/activity_md_using_texture_view.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/activity_net.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/activity_player.xml (89%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/activity_setting.xml (92%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/activity_stream.xml (100%) create mode 100644 KSYLiveDemo/app/src/main/res/layout/activity_surface.xml rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/camera.xml (96%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/camera_activity.xml (83%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/camera_bottombar.xml (71%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/camera_titlebar.xml (86%) create mode 100755 KSYLiveDemo/app/src/main/res/layout/demo_activity.xml rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/fragment_local.xml (65%) create mode 100644 KSYLiveDemo/app/src/main/res/layout/glrender_view_layout.xml rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/list_history.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/list_local.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/listlayout.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/media_actionbar.xml (100%) create mode 100755 KSYLiveDemo/app/src/main/res/layout/media_controller.xml rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/net_actionbar.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/pippopwindow.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/popup_layout.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/popupwindow.xml (85%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/qianyi_player.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/simple_spinner_item.xml (100%) create mode 100644 KSYLiveDemo/app/src/main/res/layout/texture_player.xml rename {LiveDemo => KSYLiveDemo}/app/src/main/res/layout/videopopwindow.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/raw/beep.ogg (100%) create mode 100755 KSYLiveDemo/app/src/main/res/raw/fragment_sharder.glsl rename {LiveDemo => KSYLiveDemo}/app/src/main/res/raw/realm_properties (100%) create mode 100755 KSYLiveDemo/app/src/main/res/raw/vetext_sharder.glsl rename {LiveDemo => KSYLiveDemo}/app/src/main/res/values-w820dp/dimens.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/values/colors.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/values/dimens.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/values/ids.xml (100%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/values/strings.xml (89%) rename {LiveDemo => KSYLiveDemo}/app/src/main/res/values/styles.xml (99%) rename {LiveDemo => KSYLiveDemo}/build.gradle (88%) create mode 100755 KSYLiveDemo/build_streamer.sh rename {LiveDemo => KSYLiveDemo}/gradle.properties (78%) rename {LiveDemo => KSYLiveDemo}/gradle/wrapper/gradle-wrapper.jar (100%) rename {LiveDemo => KSYLiveDemo}/gradle/wrapper/gradle-wrapper.properties (93%) rename {LiveDemo => KSYLiveDemo}/gradlew (100%) rename {LiveDemo => KSYLiveDemo}/gradlew.bat (96%) rename {LiveDemo/livelib => KSYLiveDemo/libksylive}/.gitignore (100%) rename {LiveDemo/livelib => KSYLiveDemo/libksylive}/build.gradle (58%) rename {LiveDemo/livelib => KSYLiveDemo/libksylive}/libs (100%) rename {LiveDemo/app => KSYLiveDemo/libksylive}/proguard-rules.pro (83%) rename {LiveDemo/livelib => KSYLiveDemo/libksylive}/src/main/AndroidManifest.xml (86%) create mode 100644 KSYLiveDemo/libksylive/src/main/res/values/strings.xml create mode 100644 KSYLiveDemo/settings.gradle delete mode 100644 LiveDemo/.idea/.name delete mode 100755 LiveDemo/app/libs/arm64-v8a/libBugly.so delete mode 100755 LiveDemo/app/libs/armeabi-v7a/libBugly.so delete mode 100644 LiveDemo/app/libs/bugly_crash_release.jar delete mode 100755 LiveDemo/app/libs/x86/libBugly.so delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivity.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityAudioEffect.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityAudioMix.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityBeauty.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityOther.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityPip.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityWaterLogo.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER2.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER3.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER4.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/GroupFilterDemo.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/Settings.java delete mode 100644 LiveDemo/app/src/main/java/com/ksyun/live/demo/StreamActivity.java delete mode 100755 LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/SpinnerHelper.java delete mode 100644 LiveDemo/app/src/main/res/layout/camera_activity_audio_effect.xml delete mode 100644 LiveDemo/app/src/main/res/layout/camera_activity_audio_mix.xml delete mode 100644 LiveDemo/app/src/main/res/layout/camera_activity_beauty.xml delete mode 100644 LiveDemo/app/src/main/res/layout/camera_activity_other.xml delete mode 100644 LiveDemo/app/src/main/res/layout/camera_activity_pip.xml delete mode 100644 LiveDemo/app/src/main/res/layout/camera_activity_waterlogo.xml delete mode 100644 LiveDemo/app/src/main/res/layout/camera_bottombar_audio_effect.xml delete mode 100644 LiveDemo/app/src/main/res/layout/camera_bottombar_audio_mix.xml delete mode 100644 LiveDemo/app/src/main/res/layout/camera_bottombar_beauty.xml delete mode 100644 LiveDemo/app/src/main/res/layout/camera_bottombar_other.xml delete mode 100644 LiveDemo/app/src/main/res/layout/camera_bottombar_pip.xml delete mode 100644 LiveDemo/app/src/main/res/layout/camera_bottombar_waterlogo.xml delete mode 100644 LiveDemo/livelib/src/androidTest/java/com/ksy/livelib/demo/ApplicationTest.java delete mode 100644 LiveDemo/livelib/src/main/res/values/strings.xml delete mode 100644 LiveDemo/livelib/src/test/java/com/ksy/livelib/demo/ExampleUnitTest.java delete mode 100644 LiveDemo/settings.gradle delete mode 100755 libs/arm64-v8a/libDenoise_export.so delete mode 100755 libs/arm64-v8a/libaudio_effect.so delete mode 100755 libs/arm64-v8a/libreverb.so delete mode 100755 libs/armeabi-v7a/libDenoise_export.so delete mode 100755 libs/armeabi-v7a/libaudio_effect.so delete mode 100755 libs/armeabi-v7a/libreverb.so delete mode 100644 libs/ksylive3.0.jar create mode 100644 libs/ksylive4.0.jar delete mode 100755 libs/x86/libDenoise_export.so delete mode 100755 libs/x86/libaudio_effect.so delete mode 100755 libs/x86/libreverb.so diff --git a/LiveDemo/.gitignore b/KSYLiveDemo/.gitignore similarity index 82% rename from LiveDemo/.gitignore rename to KSYLiveDemo/.gitignore index c6cbe56..39fb081 100644 --- a/LiveDemo/.gitignore +++ b/KSYLiveDemo/.gitignore @@ -6,3 +6,4 @@ .DS_Store /build /captures +.externalNativeBuild diff --git a/LiveDemo/.idea/compiler.xml b/KSYLiveDemo/.idea/compiler.xml similarity index 100% rename from LiveDemo/.idea/compiler.xml rename to KSYLiveDemo/.idea/compiler.xml diff --git a/LiveDemo/.idea/copyright/profiles_settings.xml b/KSYLiveDemo/.idea/copyright/profiles_settings.xml similarity index 100% rename from LiveDemo/.idea/copyright/profiles_settings.xml rename to KSYLiveDemo/.idea/copyright/profiles_settings.xml diff --git a/LiveDemo/.idea/encodings.xml b/KSYLiveDemo/.idea/encodings.xml similarity index 100% rename from LiveDemo/.idea/encodings.xml rename to KSYLiveDemo/.idea/encodings.xml diff --git a/LiveDemo/.idea/gradle.xml b/KSYLiveDemo/.idea/gradle.xml similarity index 75% rename from LiveDemo/.idea/gradle.xml rename to KSYLiveDemo/.idea/gradle.xml index 508b3d9..2d66085 100644 --- a/LiveDemo/.idea/gradle.xml +++ b/KSYLiveDemo/.idea/gradle.xml @@ -9,14 +9,10 @@ - + diff --git a/LiveDemo/.idea/misc.xml b/KSYLiveDemo/.idea/misc.xml similarity index 84% rename from LiveDemo/.idea/misc.xml rename to KSYLiveDemo/.idea/misc.xml index 5d19981..7158618 100644 --- a/LiveDemo/.idea/misc.xml +++ b/KSYLiveDemo/.idea/misc.xml @@ -43,4 +43,20 @@ + + + + + 1.8 + + + + + + + \ No newline at end of file diff --git a/LiveDemo/.idea/modules.xml b/KSYLiveDemo/.idea/modules.xml similarity index 52% rename from LiveDemo/.idea/modules.xml rename to KSYLiveDemo/.idea/modules.xml index fc24b25..47a38b5 100644 --- a/LiveDemo/.idea/modules.xml +++ b/KSYLiveDemo/.idea/modules.xml @@ -2,8 +2,9 @@ - + + \ No newline at end of file diff --git a/LiveDemo/.idea/runConfigurations.xml b/KSYLiveDemo/.idea/runConfigurations.xml similarity index 100% rename from LiveDemo/.idea/runConfigurations.xml rename to KSYLiveDemo/.idea/runConfigurations.xml diff --git a/LiveDemo/app/.gitignore b/KSYLiveDemo/app/.gitignore similarity index 100% rename from LiveDemo/app/.gitignore rename to KSYLiveDemo/app/.gitignore diff --git a/LiveDemo/app/build.gradle b/KSYLiveDemo/app/build.gradle similarity index 64% rename from LiveDemo/app/build.gradle rename to KSYLiveDemo/app/build.gradle index d444681..8e46482 100644 --- a/LiveDemo/app/build.gradle +++ b/KSYLiveDemo/app/build.gradle @@ -2,36 +2,27 @@ apply plugin: 'com.android.application' android { compileSdkVersion 24 - buildToolsVersion "24.0.0" - + buildToolsVersion "24.0.1" defaultConfig { applicationId "com.ksyun.live.demo" - minSdkVersion 16 + minSdkVersion 15 targetSdkVersion 24 versionCode 1 versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } - buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - - sourceSets{ - main{ - jniLibs.srcDir 'libs' - } - } } dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:24.1.1' + compile 'com.android.support:appcompat-v7:24.2.1' compile 'com.android.support:design:24.1.1' + compile project(':libksylive') compile files('libs/zxing.jar') - compile files('libs/bugly_crash_release.jar') - compile project(':livelib') } diff --git a/LiveDemo/app/libs/zxing.jar b/KSYLiveDemo/app/libs/zxing.jar similarity index 100% rename from LiveDemo/app/libs/zxing.jar rename to KSYLiveDemo/app/libs/zxing.jar diff --git a/LiveDemo/livelib/proguard-rules.pro b/KSYLiveDemo/app/proguard-rules.pro similarity index 88% rename from LiveDemo/livelib/proguard-rules.pro rename to KSYLiveDemo/app/proguard-rules.pro index 7718b1c..f6159eb 100644 --- a/LiveDemo/livelib/proguard-rules.pro +++ b/KSYLiveDemo/app/proguard-rules.pro @@ -1,6 +1,6 @@ # Add project specific ProGuard rules here. # By default, the flags in this file are appended to flags specified -# in /Users/liubohua/Library/Android/sdk/tools/proguard/proguard-android.txt +# in /Users/le/Library/Android/sdk/tools/proguard/proguard-android.txt # You can edit the include path and order by changing the proguardFiles # directive in build.gradle. # diff --git a/LiveDemo/app/src/main/AndroidManifest.xml b/KSYLiveDemo/app/src/main/AndroidManifest.xml similarity index 63% rename from LiveDemo/app/src/main/AndroidManifest.xml rename to KSYLiveDemo/app/src/main/AndroidManifest.xml index 13c9be3..fa770ee 100644 --- a/LiveDemo/app/src/main/AndroidManifest.xml +++ b/KSYLiveDemo/app/src/main/AndroidManifest.xml @@ -1,17 +1,12 @@ - - - - - - - + package="com.ksyun.live.demo" + android:installLocation="preferExternal"> + @@ -33,13 +28,13 @@ - + @@ -47,52 +42,47 @@ + - - - - - + /> - - - - - - + + + - + + + + + + - \ No newline at end of file + diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/MainActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/MainActivity.java similarity index 80% rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/MainActivity.java rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/MainActivity.java index f9ccbea..be9b132 100644 --- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/MainActivity.java +++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/MainActivity.java @@ -6,8 +6,8 @@ import android.view.View; import android.widget.Button; -import com.ksyun.live.demo.activity.PlayerActivity; -import com.tencent.bugly.crashreport.CrashReport; +import com.ksyun.live.demo.player.activity.PlayerActivity; +import com.ksyun.media.streamer.demo.DemoActivity; public class MainActivity extends AppCompatActivity { @@ -20,14 +20,13 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - CrashReport.initCrashReport(getApplicationContext(), "900040861", true); btn_player = (Button)findViewById(R.id.btn_player); btn_stream = (Button)findViewById(R.id.btn_stream); btn_stream.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Intent intent = new Intent(MainActivity.this,StreamActivity.class); + Intent intent = new Intent(MainActivity.this,DemoActivity.class); startActivity(intent); } }); diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/CaptureActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/CaptureActivity.java similarity index 94% rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/CaptureActivity.java rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/CaptureActivity.java index a645b85..8a9c5b1 100644 --- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/CaptureActivity.java +++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/CaptureActivity.java @@ -1,4 +1,4 @@ -package com.ksyun.live.demo.activity; +package com.ksyun.live.demo.player.activity; import android.app.Activity; import android.content.Intent; @@ -21,16 +21,16 @@ import com.google.zxing.BarcodeFormat; import com.google.zxing.Result; import com.ksyun.live.demo.R; -import com.ksyun.live.demo.zxing.camera.CameraManager; -import com.ksyun.live.demo.zxing.decoding.CaptureActivityHandler; -import com.ksyun.live.demo.zxing.decoding.InactivityTimer; -import com.ksyun.live.demo.zxing.view.ViewfinderView; - +import com.ksyun.live.demo.player.zxing.camera.CameraManager; +import com.ksyun.live.demo.player.zxing.decoding.CaptureActivityHandler; +import com.ksyun.live.demo.player.zxing.decoding.InactivityTimer; +import com.ksyun.live.demo.player.zxing.view.ViewfinderView; import java.io.IOException; import java.util.Vector; + /** * Initial the camera * @author Ryan.Tang diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/HistoryActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/HistoryActivity.java similarity index 50% rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/HistoryActivity.java rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/HistoryActivity.java index d678688..9beb3fb 100644 --- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/HistoryActivity.java +++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/HistoryActivity.java @@ -1,4 +1,4 @@ -package com.ksyun.live.demo.activity; +package com.ksyun.live.demo.player.activity; import android.app.Activity; import android.content.Context; @@ -8,37 +8,31 @@ import android.os.Bundle; import android.view.View; import android.widget.AdapterView; +import android.widget.ArrayAdapter; import android.widget.ListView; -import android.widget.SimpleAdapter; import com.ksyun.live.demo.R; -import com.ksyun.live.demo.model.NetDbAdapter; -import com.ksyun.live.demo.util.Settings; +import com.ksyun.live.demo.player.model.NetDbAdapter; +import com.ksyun.live.demo.player.util.Settings; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; /** * Created by liubohua on 16/7/20. */ public class HistoryActivity extends Activity{ private ListView hislist; - private ArrayList> listurl; + private ArrayList listurl; private Cursor cursor; private NetDbAdapter NetDb; private SharedPreferences settings; - private String choosevr; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_history); - listurl = new ArrayList>(); - settings = getSharedPreferences("SETTINGS", Context.MODE_PRIVATE); - choosevr = settings.getString("choose_vr","信息为空"); + listurl = new ArrayList(); hislist = (ListView) findViewById(R.id.list_history); NetDb = new NetDbAdapter(HistoryActivity.this); @@ -46,26 +40,39 @@ protected void onCreate(Bundle savedInstanceState) { cursor = NetDb.getAllData(); cursor.moveToFirst(); if(cursor.getCount()>0){ - Map map = new HashMap(); - map.put("url", cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH))); - listurl.add(map); + listurl.add( cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH))); } while(cursor.moveToNext()){ - Map map = new HashMap(); - map.put("url", cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH))); - listurl.add(map); + listurl.add( cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH))); } - SimpleAdapter adapter = new SimpleAdapter(this,listurl,R.layout.list_history,new String[]{"url"},new int[]{R.id.list_history_txt}); + ArrayAdapter adapter = new ArrayAdapter(this,android.R.layout.simple_expandable_list_item_1,listurl); hislist.setAdapter(adapter); hislist.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView adapterView, View view, int i, long l) { - String path = listurl.get(i).get("url"); - Intent intent = new Intent(HistoryActivity.this,VideoPlayerActivity.class); + String path = listurl.get(i); + + String chooseview; + settings = getSharedPreferences("SETTINGS", Context.MODE_PRIVATE); + chooseview = settings.getString("choose_view","undefind"); + + if(chooseview.equals(Settings.USEKSYTEXTURE)){ + Intent intent = new Intent(HistoryActivity.this,TextureVideoActivity.class); intent.putExtra("path",path); startActivity(intent); + } + else if (chooseview.equals(Settings.USEKGLRENDER)){ + Intent intent = new Intent(HistoryActivity.this,TextureViewMediaActivity.class); + intent.putExtra("path",path); + startActivity(intent); + } + else{ + Intent intent = new Intent(HistoryActivity.this,SurfaceActivity.class); + intent.putExtra("path",path); + startActivity(intent); + } } }); diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/JieVideoListViewAdapter.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/JieVideoListViewAdapter.java similarity index 89% rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/JieVideoListViewAdapter.java rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/JieVideoListViewAdapter.java index 781d4da..ce187d0 100644 --- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/JieVideoListViewAdapter.java +++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/JieVideoListViewAdapter.java @@ -1,7 +1,6 @@ -package com.ksyun.live.demo.activity; +package com.ksyun.live.demo.player.activity; import android.content.Context; -import android.provider.MediaStore; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -9,14 +8,13 @@ import android.widget.ImageView; import android.widget.TextView; +import com.ksyun.live.demo.player.model.MyVideoThumbLoader; import com.ksyun.live.demo.R; -import com.ksyun.live.demo.model.MyVideoThumbLoader; -import com.ksyun.live.demo.util.Video; +import com.ksyun.live.demo.player.util.Video; import java.util.ArrayList; import java.util.List; - /** * Created by liubohua on 16/7/12. */ @@ -26,7 +24,6 @@ public class JieVideoListViewAdapter extends BaseAdapter { private LayoutInflater mLayoutInflater; private MyVideoThumbLoader mVideoThumbLoader; - public JieVideoListViewAdapter(Context context, List