From 2cfcf006b87c24157df2c8c53641c3de2f2a3757 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Fri, 19 May 2023 17:56:29 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E9=87=8D=E5=91=BD=E5=90=8Dapp=20moudle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
{myapplication => app}/.gitignore | 0
{myapplication => app}/build.gradle | 0
.../libs/libuvccamera-release.aar | Bin
{myapplication => app}/proguard-rules.pro | 0
{myapplication => app}/src/main/AndroidManifest.xml | 0
.../com/example/myapplication/MainActivity.java | 2 +-
.../java/com/example/myapplication/RxHelper.java | 0
.../SurfaceTextureListenerWrapper.java | 0
.../java/com/example/myapplication/UVCActivity.java | 0
.../myapplication/player/ProVideoActivity.java | 0
.../example/myapplication/player/ProVideoView.java | 0
.../myapplication/player/VideoControllerView.java | 0
.../myapplication/player/utils/FileUtil.java | 0
.../example/myapplication/player/utils/SPUtil.java | 0
.../src/main/jniLibs/arm64-v8a/libproffmpeg.so | Bin
.../src/main/jniLibs/arm64-v8a/libproplayer.so | Bin
.../src/main/jniLibs/arm64-v8a/libprosdl.so | Bin
.../src/main/jniLibs/armeabi-v7a/libproffmpeg.so | Bin
.../src/main/jniLibs/armeabi-v7a/libproplayer.so | Bin
.../src/main/jniLibs/armeabi-v7a/libprosdl.so | Bin
.../src/main/jniLibs/x86/libproffmpeg.so | Bin
.../src/main/jniLibs/x86/libproplayer.so | Bin
.../src/main/jniLibs/x86/libprosdl.so | Bin
.../src/main/res/drawable-xhdpi/new_fast_click.png | Bin
.../src/main/res/drawable-xhdpi/new_fast_white.png | Bin
.../main/res/drawable-xhdpi/new_forward_click.png | Bin
.../main/res/drawable-xhdpi/new_forward_white.png | Bin
.../src/main/res/drawable-xhdpi/new_full.png | Bin
.../src/main/res/drawable-xhdpi/new_full_white.png | Bin
.../main/res/drawable-xhdpi/new_moveback_click.png | Bin
.../main/res/drawable-xhdpi/new_moveback_white.png | Bin
.../src/main/res/drawable-xhdpi/new_play.png | Bin
.../src/main/res/drawable-xhdpi/new_play_white.png | Bin
.../src/main/res/drawable-xhdpi/new_slow_click.png | Bin
.../src/main/res/drawable-xhdpi/new_slow_white.png | Bin
.../main/res/drawable-xhdpi/new_snapshot_click.png | Bin
.../main/res/drawable-xhdpi/new_snapshot_white.png | Bin
.../src/main/res/drawable-xhdpi/new_stop.png | Bin
.../src/main/res/drawable-xhdpi/new_stop_white.png | Bin
.../main/res/drawable-xhdpi/new_stretch_click.png | Bin
.../main/res/drawable-xhdpi/new_stretch_white.png | Bin
.../src/main/res/drawable-xhdpi/new_thumb.png | Bin
.../main/res/drawable-xhdpi/new_videotape_click.png | Bin
.../main/res/drawable-xhdpi/new_videotape_white.png | Bin
.../src/main/res/drawable/anim.xml | 0
.../main/res/drawable/ic_launcher_background.xml | 0
.../src/main/res/drawable/loading.gif | Bin
.../src/main/res/drawable/new_fast_btn.xml | 0
.../src/main/res/drawable/new_forward_btn.xml | 0
.../src/main/res/drawable/new_lost.png | Bin
.../src/main/res/drawable/new_moveback_btn.xml | 0
.../src/main/res/drawable/new_slow_btn.xml | 0
.../src/main/res/drawable/new_snapshot_btn.xml | 0
.../src/main/res/drawable/new_stretch_btn.xml | 0
.../src/main/res/drawable/new_videotape_btn.xml | 0
.../src/main/res/drawable/red_dot.xml | 0
.../main/res/drawable/seekbar_progress_drawable.xml | 0
.../src/main/res/drawable/transparent_dot.xml | 0
.../src/main/res/layout/activity_main.xml | 0
.../src/main/res/layout/activity_main_pro.xml | 0
.../src/main/res/layout/activity_uvc.xml | 0
.../src/main/res/layout/change_camera_param.xml | 0
.../src/main/res/layout/media_controller.xml | 0
.../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 0
.../res/mipmap-anydpi-v26/ic_launcher_round.xml | 0
.../src/main/res/mipmap-hdpi/ic_launcher.png | Bin
.../main/res/mipmap-hdpi/ic_launcher_foreground.png | Bin
.../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin
.../src/main/res/mipmap-mdpi/ic_launcher.png | Bin
.../main/res/mipmap-mdpi/ic_launcher_foreground.png | Bin
.../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin
.../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin
.../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin
.../src/main/res/mipmap-xhdpi/ic_launcher_round.png | Bin
.../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin
.../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin
.../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin
.../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin
.../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin
.../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin
.../src/main/res/values/attrs.xml | 0
.../src/main/res/values/colors.xml | 0
.../src/main/res/values/strings.xml | 0
.../src/main/res/values/styles.xml | 0
.../src/main/res/xml/device_filter.xml | 0
settings.gradle | 2 +-
86 files changed, 2 insertions(+), 2 deletions(-)
rename {myapplication => app}/.gitignore (100%)
rename {myapplication => app}/build.gradle (100%)
rename {myapplication => app}/libs/libuvccamera-release.aar (100%)
rename {myapplication => app}/proguard-rules.pro (100%)
rename {myapplication => app}/src/main/AndroidManifest.xml (100%)
rename {myapplication => app}/src/main/java/com/example/myapplication/MainActivity.java (99%)
rename {myapplication => app}/src/main/java/com/example/myapplication/RxHelper.java (100%)
rename {myapplication => app}/src/main/java/com/example/myapplication/SurfaceTextureListenerWrapper.java (100%)
rename {myapplication => app}/src/main/java/com/example/myapplication/UVCActivity.java (100%)
rename {myapplication => app}/src/main/java/com/example/myapplication/player/ProVideoActivity.java (100%)
rename {myapplication => app}/src/main/java/com/example/myapplication/player/ProVideoView.java (100%)
rename {myapplication => app}/src/main/java/com/example/myapplication/player/VideoControllerView.java (100%)
rename {myapplication => app}/src/main/java/com/example/myapplication/player/utils/FileUtil.java (100%)
rename {myapplication => app}/src/main/java/com/example/myapplication/player/utils/SPUtil.java (100%)
rename {myapplication => app}/src/main/jniLibs/arm64-v8a/libproffmpeg.so (100%)
rename {myapplication => app}/src/main/jniLibs/arm64-v8a/libproplayer.so (100%)
rename {myapplication => app}/src/main/jniLibs/arm64-v8a/libprosdl.so (100%)
rename {myapplication => app}/src/main/jniLibs/armeabi-v7a/libproffmpeg.so (100%)
rename {myapplication => app}/src/main/jniLibs/armeabi-v7a/libproplayer.so (100%)
rename {myapplication => app}/src/main/jniLibs/armeabi-v7a/libprosdl.so (100%)
rename {myapplication => app}/src/main/jniLibs/x86/libproffmpeg.so (100%)
rename {myapplication => app}/src/main/jniLibs/x86/libproplayer.so (100%)
rename {myapplication => app}/src/main/jniLibs/x86/libprosdl.so (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_fast_click.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_fast_white.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_forward_click.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_forward_white.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_full.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_full_white.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_moveback_click.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_moveback_white.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_play.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_play_white.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_slow_click.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_slow_white.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_snapshot_click.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_snapshot_white.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_stop.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_stop_white.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_stretch_click.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_stretch_white.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_thumb.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_videotape_click.png (100%)
rename {myapplication => app}/src/main/res/drawable-xhdpi/new_videotape_white.png (100%)
rename {myapplication => app}/src/main/res/drawable/anim.xml (100%)
rename {myapplication => app}/src/main/res/drawable/ic_launcher_background.xml (100%)
rename {myapplication => app}/src/main/res/drawable/loading.gif (100%)
rename {myapplication => app}/src/main/res/drawable/new_fast_btn.xml (100%)
rename {myapplication => app}/src/main/res/drawable/new_forward_btn.xml (100%)
rename {myapplication => app}/src/main/res/drawable/new_lost.png (100%)
rename {myapplication => app}/src/main/res/drawable/new_moveback_btn.xml (100%)
rename {myapplication => app}/src/main/res/drawable/new_slow_btn.xml (100%)
rename {myapplication => app}/src/main/res/drawable/new_snapshot_btn.xml (100%)
rename {myapplication => app}/src/main/res/drawable/new_stretch_btn.xml (100%)
rename {myapplication => app}/src/main/res/drawable/new_videotape_btn.xml (100%)
rename {myapplication => app}/src/main/res/drawable/red_dot.xml (100%)
rename {myapplication => app}/src/main/res/drawable/seekbar_progress_drawable.xml (100%)
rename {myapplication => app}/src/main/res/drawable/transparent_dot.xml (100%)
rename {myapplication => app}/src/main/res/layout/activity_main.xml (100%)
rename {myapplication => app}/src/main/res/layout/activity_main_pro.xml (100%)
rename {myapplication => app}/src/main/res/layout/activity_uvc.xml (100%)
rename {myapplication => app}/src/main/res/layout/change_camera_param.xml (100%)
rename {myapplication => app}/src/main/res/layout/media_controller.xml (100%)
rename {myapplication => app}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%)
rename {myapplication => app}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%)
rename {myapplication => app}/src/main/res/mipmap-hdpi/ic_launcher.png (100%)
rename {myapplication => app}/src/main/res/mipmap-hdpi/ic_launcher_foreground.png (100%)
rename {myapplication => app}/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%)
rename {myapplication => app}/src/main/res/mipmap-mdpi/ic_launcher.png (100%)
rename {myapplication => app}/src/main/res/mipmap-mdpi/ic_launcher_foreground.png (100%)
rename {myapplication => app}/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%)
rename {myapplication => app}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%)
rename {myapplication => app}/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png (100%)
rename {myapplication => app}/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%)
rename {myapplication => app}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%)
rename {myapplication => app}/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png (100%)
rename {myapplication => app}/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%)
rename {myapplication => app}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%)
rename {myapplication => app}/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png (100%)
rename {myapplication => app}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%)
rename {myapplication => app}/src/main/res/values/attrs.xml (100%)
rename {myapplication => app}/src/main/res/values/colors.xml (100%)
rename {myapplication => app}/src/main/res/values/strings.xml (100%)
rename {myapplication => app}/src/main/res/values/styles.xml (100%)
rename {myapplication => app}/src/main/res/xml/device_filter.xml (100%)
diff --git a/myapplication/.gitignore b/app/.gitignore
similarity index 100%
rename from myapplication/.gitignore
rename to app/.gitignore
diff --git a/myapplication/build.gradle b/app/build.gradle
similarity index 100%
rename from myapplication/build.gradle
rename to app/build.gradle
diff --git a/myapplication/libs/libuvccamera-release.aar b/app/libs/libuvccamera-release.aar
similarity index 100%
rename from myapplication/libs/libuvccamera-release.aar
rename to app/libs/libuvccamera-release.aar
diff --git a/myapplication/proguard-rules.pro b/app/proguard-rules.pro
similarity index 100%
rename from myapplication/proguard-rules.pro
rename to app/proguard-rules.pro
diff --git a/myapplication/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from myapplication/src/main/AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/myapplication/src/main/java/com/example/myapplication/MainActivity.java b/app/src/main/java/com/example/myapplication/MainActivity.java
similarity index 99%
rename from myapplication/src/main/java/com/example/myapplication/MainActivity.java
rename to app/src/main/java/com/example/myapplication/MainActivity.java
index 3059a19..3860ec9 100644
--- a/myapplication/src/main/java/com/example/myapplication/MainActivity.java
+++ b/app/src/main/java/com/example/myapplication/MainActivity.java
@@ -35,7 +35,7 @@ public class MainActivity extends AppCompatActivity {
private static final int REQUEST_CAMERA_PERMISSION = 1000;
private static final int REQUEST_MEDIA_PROJECTION = 1001;
- public static final String HOST = "cloud.easydarwin.org";
+ public static final String HOST = "192.168.51.189";
private MediaStream mediaStream;
private Single<MediaStream> getMediaStream() {
diff --git a/myapplication/src/main/java/com/example/myapplication/RxHelper.java b/app/src/main/java/com/example/myapplication/RxHelper.java
similarity index 100%
rename from myapplication/src/main/java/com/example/myapplication/RxHelper.java
rename to app/src/main/java/com/example/myapplication/RxHelper.java
diff --git a/myapplication/src/main/java/com/example/myapplication/SurfaceTextureListenerWrapper.java b/app/src/main/java/com/example/myapplication/SurfaceTextureListenerWrapper.java
similarity index 100%
rename from myapplication/src/main/java/com/example/myapplication/SurfaceTextureListenerWrapper.java
rename to app/src/main/java/com/example/myapplication/SurfaceTextureListenerWrapper.java
diff --git a/myapplication/src/main/java/com/example/myapplication/UVCActivity.java b/app/src/main/java/com/example/myapplication/UVCActivity.java
similarity index 100%
rename from myapplication/src/main/java/com/example/myapplication/UVCActivity.java
rename to app/src/main/java/com/example/myapplication/UVCActivity.java
diff --git a/myapplication/src/main/java/com/example/myapplication/player/ProVideoActivity.java b/app/src/main/java/com/example/myapplication/player/ProVideoActivity.java
similarity index 100%
rename from myapplication/src/main/java/com/example/myapplication/player/ProVideoActivity.java
rename to app/src/main/java/com/example/myapplication/player/ProVideoActivity.java
diff --git a/myapplication/src/main/java/com/example/myapplication/player/ProVideoView.java b/app/src/main/java/com/example/myapplication/player/ProVideoView.java
similarity index 100%
rename from myapplication/src/main/java/com/example/myapplication/player/ProVideoView.java
rename to app/src/main/java/com/example/myapplication/player/ProVideoView.java
diff --git a/myapplication/src/main/java/com/example/myapplication/player/VideoControllerView.java b/app/src/main/java/com/example/myapplication/player/VideoControllerView.java
similarity index 100%
rename from myapplication/src/main/java/com/example/myapplication/player/VideoControllerView.java
rename to app/src/main/java/com/example/myapplication/player/VideoControllerView.java
diff --git a/myapplication/src/main/java/com/example/myapplication/player/utils/FileUtil.java b/app/src/main/java/com/example/myapplication/player/utils/FileUtil.java
similarity index 100%
rename from myapplication/src/main/java/com/example/myapplication/player/utils/FileUtil.java
rename to app/src/main/java/com/example/myapplication/player/utils/FileUtil.java
diff --git a/myapplication/src/main/java/com/example/myapplication/player/utils/SPUtil.java b/app/src/main/java/com/example/myapplication/player/utils/SPUtil.java
similarity index 100%
rename from myapplication/src/main/java/com/example/myapplication/player/utils/SPUtil.java
rename to app/src/main/java/com/example/myapplication/player/utils/SPUtil.java
diff --git a/myapplication/src/main/jniLibs/arm64-v8a/libproffmpeg.so b/app/src/main/jniLibs/arm64-v8a/libproffmpeg.so
similarity index 100%
rename from myapplication/src/main/jniLibs/arm64-v8a/libproffmpeg.so
rename to app/src/main/jniLibs/arm64-v8a/libproffmpeg.so
diff --git a/myapplication/src/main/jniLibs/arm64-v8a/libproplayer.so b/app/src/main/jniLibs/arm64-v8a/libproplayer.so
similarity index 100%
rename from myapplication/src/main/jniLibs/arm64-v8a/libproplayer.so
rename to app/src/main/jniLibs/arm64-v8a/libproplayer.so
diff --git a/myapplication/src/main/jniLibs/arm64-v8a/libprosdl.so b/app/src/main/jniLibs/arm64-v8a/libprosdl.so
similarity index 100%
rename from myapplication/src/main/jniLibs/arm64-v8a/libprosdl.so
rename to app/src/main/jniLibs/arm64-v8a/libprosdl.so
diff --git a/myapplication/src/main/jniLibs/armeabi-v7a/libproffmpeg.so b/app/src/main/jniLibs/armeabi-v7a/libproffmpeg.so
similarity index 100%
rename from myapplication/src/main/jniLibs/armeabi-v7a/libproffmpeg.so
rename to app/src/main/jniLibs/armeabi-v7a/libproffmpeg.so
diff --git a/myapplication/src/main/jniLibs/armeabi-v7a/libproplayer.so b/app/src/main/jniLibs/armeabi-v7a/libproplayer.so
similarity index 100%
rename from myapplication/src/main/jniLibs/armeabi-v7a/libproplayer.so
rename to app/src/main/jniLibs/armeabi-v7a/libproplayer.so
diff --git a/myapplication/src/main/jniLibs/armeabi-v7a/libprosdl.so b/app/src/main/jniLibs/armeabi-v7a/libprosdl.so
similarity index 100%
rename from myapplication/src/main/jniLibs/armeabi-v7a/libprosdl.so
rename to app/src/main/jniLibs/armeabi-v7a/libprosdl.so
diff --git a/myapplication/src/main/jniLibs/x86/libproffmpeg.so b/app/src/main/jniLibs/x86/libproffmpeg.so
similarity index 100%
rename from myapplication/src/main/jniLibs/x86/libproffmpeg.so
rename to app/src/main/jniLibs/x86/libproffmpeg.so
diff --git a/myapplication/src/main/jniLibs/x86/libproplayer.so b/app/src/main/jniLibs/x86/libproplayer.so
similarity index 100%
rename from myapplication/src/main/jniLibs/x86/libproplayer.so
rename to app/src/main/jniLibs/x86/libproplayer.so
diff --git a/myapplication/src/main/jniLibs/x86/libprosdl.so b/app/src/main/jniLibs/x86/libprosdl.so
similarity index 100%
rename from myapplication/src/main/jniLibs/x86/libprosdl.so
rename to app/src/main/jniLibs/x86/libprosdl.so
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_fast_click.png b/app/src/main/res/drawable-xhdpi/new_fast_click.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_fast_click.png
rename to app/src/main/res/drawable-xhdpi/new_fast_click.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_fast_white.png b/app/src/main/res/drawable-xhdpi/new_fast_white.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_fast_white.png
rename to app/src/main/res/drawable-xhdpi/new_fast_white.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_forward_click.png b/app/src/main/res/drawable-xhdpi/new_forward_click.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_forward_click.png
rename to app/src/main/res/drawable-xhdpi/new_forward_click.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_forward_white.png b/app/src/main/res/drawable-xhdpi/new_forward_white.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_forward_white.png
rename to app/src/main/res/drawable-xhdpi/new_forward_white.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_full.png b/app/src/main/res/drawable-xhdpi/new_full.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_full.png
rename to app/src/main/res/drawable-xhdpi/new_full.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_full_white.png b/app/src/main/res/drawable-xhdpi/new_full_white.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_full_white.png
rename to app/src/main/res/drawable-xhdpi/new_full_white.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_moveback_click.png b/app/src/main/res/drawable-xhdpi/new_moveback_click.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_moveback_click.png
rename to app/src/main/res/drawable-xhdpi/new_moveback_click.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_moveback_white.png b/app/src/main/res/drawable-xhdpi/new_moveback_white.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_moveback_white.png
rename to app/src/main/res/drawable-xhdpi/new_moveback_white.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_play.png b/app/src/main/res/drawable-xhdpi/new_play.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_play.png
rename to app/src/main/res/drawable-xhdpi/new_play.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_play_white.png b/app/src/main/res/drawable-xhdpi/new_play_white.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_play_white.png
rename to app/src/main/res/drawable-xhdpi/new_play_white.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_slow_click.png b/app/src/main/res/drawable-xhdpi/new_slow_click.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_slow_click.png
rename to app/src/main/res/drawable-xhdpi/new_slow_click.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_slow_white.png b/app/src/main/res/drawable-xhdpi/new_slow_white.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_slow_white.png
rename to app/src/main/res/drawable-xhdpi/new_slow_white.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_snapshot_click.png b/app/src/main/res/drawable-xhdpi/new_snapshot_click.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_snapshot_click.png
rename to app/src/main/res/drawable-xhdpi/new_snapshot_click.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_snapshot_white.png b/app/src/main/res/drawable-xhdpi/new_snapshot_white.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_snapshot_white.png
rename to app/src/main/res/drawable-xhdpi/new_snapshot_white.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_stop.png b/app/src/main/res/drawable-xhdpi/new_stop.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_stop.png
rename to app/src/main/res/drawable-xhdpi/new_stop.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_stop_white.png b/app/src/main/res/drawable-xhdpi/new_stop_white.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_stop_white.png
rename to app/src/main/res/drawable-xhdpi/new_stop_white.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_stretch_click.png b/app/src/main/res/drawable-xhdpi/new_stretch_click.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_stretch_click.png
rename to app/src/main/res/drawable-xhdpi/new_stretch_click.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_stretch_white.png b/app/src/main/res/drawable-xhdpi/new_stretch_white.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_stretch_white.png
rename to app/src/main/res/drawable-xhdpi/new_stretch_white.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_thumb.png b/app/src/main/res/drawable-xhdpi/new_thumb.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_thumb.png
rename to app/src/main/res/drawable-xhdpi/new_thumb.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_videotape_click.png b/app/src/main/res/drawable-xhdpi/new_videotape_click.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_videotape_click.png
rename to app/src/main/res/drawable-xhdpi/new_videotape_click.png
diff --git a/myapplication/src/main/res/drawable-xhdpi/new_videotape_white.png b/app/src/main/res/drawable-xhdpi/new_videotape_white.png
similarity index 100%
rename from myapplication/src/main/res/drawable-xhdpi/new_videotape_white.png
rename to app/src/main/res/drawable-xhdpi/new_videotape_white.png
diff --git a/myapplication/src/main/res/drawable/anim.xml b/app/src/main/res/drawable/anim.xml
similarity index 100%
rename from myapplication/src/main/res/drawable/anim.xml
rename to app/src/main/res/drawable/anim.xml
diff --git a/myapplication/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from myapplication/src/main/res/drawable/ic_launcher_background.xml
rename to app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/myapplication/src/main/res/drawable/loading.gif b/app/src/main/res/drawable/loading.gif
similarity index 100%
rename from myapplication/src/main/res/drawable/loading.gif
rename to app/src/main/res/drawable/loading.gif
diff --git a/myapplication/src/main/res/drawable/new_fast_btn.xml b/app/src/main/res/drawable/new_fast_btn.xml
similarity index 100%
rename from myapplication/src/main/res/drawable/new_fast_btn.xml
rename to app/src/main/res/drawable/new_fast_btn.xml
diff --git a/myapplication/src/main/res/drawable/new_forward_btn.xml b/app/src/main/res/drawable/new_forward_btn.xml
similarity index 100%
rename from myapplication/src/main/res/drawable/new_forward_btn.xml
rename to app/src/main/res/drawable/new_forward_btn.xml
diff --git a/myapplication/src/main/res/drawable/new_lost.png b/app/src/main/res/drawable/new_lost.png
similarity index 100%
rename from myapplication/src/main/res/drawable/new_lost.png
rename to app/src/main/res/drawable/new_lost.png
diff --git a/myapplication/src/main/res/drawable/new_moveback_btn.xml b/app/src/main/res/drawable/new_moveback_btn.xml
similarity index 100%
rename from myapplication/src/main/res/drawable/new_moveback_btn.xml
rename to app/src/main/res/drawable/new_moveback_btn.xml
diff --git a/myapplication/src/main/res/drawable/new_slow_btn.xml b/app/src/main/res/drawable/new_slow_btn.xml
similarity index 100%
rename from myapplication/src/main/res/drawable/new_slow_btn.xml
rename to app/src/main/res/drawable/new_slow_btn.xml
diff --git a/myapplication/src/main/res/drawable/new_snapshot_btn.xml b/app/src/main/res/drawable/new_snapshot_btn.xml
similarity index 100%
rename from myapplication/src/main/res/drawable/new_snapshot_btn.xml
rename to app/src/main/res/drawable/new_snapshot_btn.xml
diff --git a/myapplication/src/main/res/drawable/new_stretch_btn.xml b/app/src/main/res/drawable/new_stretch_btn.xml
similarity index 100%
rename from myapplication/src/main/res/drawable/new_stretch_btn.xml
rename to app/src/main/res/drawable/new_stretch_btn.xml
diff --git a/myapplication/src/main/res/drawable/new_videotape_btn.xml b/app/src/main/res/drawable/new_videotape_btn.xml
similarity index 100%
rename from myapplication/src/main/res/drawable/new_videotape_btn.xml
rename to app/src/main/res/drawable/new_videotape_btn.xml
diff --git a/myapplication/src/main/res/drawable/red_dot.xml b/app/src/main/res/drawable/red_dot.xml
similarity index 100%
rename from myapplication/src/main/res/drawable/red_dot.xml
rename to app/src/main/res/drawable/red_dot.xml
diff --git a/myapplication/src/main/res/drawable/seekbar_progress_drawable.xml b/app/src/main/res/drawable/seekbar_progress_drawable.xml
similarity index 100%
rename from myapplication/src/main/res/drawable/seekbar_progress_drawable.xml
rename to app/src/main/res/drawable/seekbar_progress_drawable.xml
diff --git a/myapplication/src/main/res/drawable/transparent_dot.xml b/app/src/main/res/drawable/transparent_dot.xml
similarity index 100%
rename from myapplication/src/main/res/drawable/transparent_dot.xml
rename to app/src/main/res/drawable/transparent_dot.xml
diff --git a/myapplication/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from myapplication/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/activity_main.xml
diff --git a/myapplication/src/main/res/layout/activity_main_pro.xml b/app/src/main/res/layout/activity_main_pro.xml
similarity index 100%
rename from myapplication/src/main/res/layout/activity_main_pro.xml
rename to app/src/main/res/layout/activity_main_pro.xml
diff --git a/myapplication/src/main/res/layout/activity_uvc.xml b/app/src/main/res/layout/activity_uvc.xml
similarity index 100%
rename from myapplication/src/main/res/layout/activity_uvc.xml
rename to app/src/main/res/layout/activity_uvc.xml
diff --git a/myapplication/src/main/res/layout/change_camera_param.xml b/app/src/main/res/layout/change_camera_param.xml
similarity index 100%
rename from myapplication/src/main/res/layout/change_camera_param.xml
rename to app/src/main/res/layout/change_camera_param.xml
diff --git a/myapplication/src/main/res/layout/media_controller.xml b/app/src/main/res/layout/media_controller.xml
similarity index 100%
rename from myapplication/src/main/res/layout/media_controller.xml
rename to app/src/main/res/layout/media_controller.xml
diff --git a/myapplication/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from myapplication/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/myapplication/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from myapplication/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/myapplication/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/myapplication/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/myapplication/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/myapplication/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/myapplication/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/myapplication/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/myapplication/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/myapplication/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/myapplication/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/myapplication/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/myapplication/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/myapplication/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/myapplication/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/myapplication/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/myapplication/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from myapplication/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/myapplication/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
similarity index 100%
rename from myapplication/src/main/res/values/attrs.xml
rename to app/src/main/res/values/attrs.xml
diff --git a/myapplication/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from myapplication/src/main/res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/myapplication/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from myapplication/src/main/res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/myapplication/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from myapplication/src/main/res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/myapplication/src/main/res/xml/device_filter.xml b/app/src/main/res/xml/device_filter.xml
similarity index 100%
rename from myapplication/src/main/res/xml/device_filter.xml
rename to app/src/main/res/xml/device_filter.xml
diff --git a/settings.gradle b/settings.gradle
index 4531efe..70506fb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include ':myapplication' //, ':libuvccamera-release'
+include ':app' //, ':libuvccamera-release'
include ':library'
include ':ijkplayer-java'
include ':commonSPort'