diff --git a/library/build.gradle b/JZVideo/build.gradle similarity index 100% rename from library/build.gradle rename to JZVideo/build.gradle diff --git a/library/src/main/AndroidManifest.xml b/JZVideo/src/main/AndroidManifest.xml similarity index 100% rename from library/src/main/AndroidManifest.xml rename to JZVideo/src/main/AndroidManifest.xml diff --git a/library/src/main/java/cn/jzvd/JZDataSource.java b/JZVideo/src/main/java/cn/jzvd/JZDataSource.java similarity index 100% rename from library/src/main/java/cn/jzvd/JZDataSource.java rename to JZVideo/src/main/java/cn/jzvd/JZDataSource.java diff --git a/library/src/main/java/cn/jzvd/JZMediaInterface.java b/JZVideo/src/main/java/cn/jzvd/JZMediaInterface.java similarity index 100% rename from library/src/main/java/cn/jzvd/JZMediaInterface.java rename to JZVideo/src/main/java/cn/jzvd/JZMediaInterface.java diff --git a/library/src/main/java/cn/jzvd/JZMediaSystem.java b/JZVideo/src/main/java/cn/jzvd/JZMediaSystem.java similarity index 100% rename from library/src/main/java/cn/jzvd/JZMediaSystem.java rename to JZVideo/src/main/java/cn/jzvd/JZMediaSystem.java diff --git a/library/src/main/java/cn/jzvd/JZTextureView.java b/JZVideo/src/main/java/cn/jzvd/JZTextureView.java similarity index 100% rename from library/src/main/java/cn/jzvd/JZTextureView.java rename to JZVideo/src/main/java/cn/jzvd/JZTextureView.java diff --git a/library/src/main/java/cn/jzvd/JZUtils.java b/JZVideo/src/main/java/cn/jzvd/JZUtils.java similarity index 100% rename from library/src/main/java/cn/jzvd/JZUtils.java rename to JZVideo/src/main/java/cn/jzvd/JZUtils.java diff --git a/library/src/main/java/cn/jzvd/Jzvd.java b/JZVideo/src/main/java/cn/jzvd/Jzvd.java similarity index 100% rename from library/src/main/java/cn/jzvd/Jzvd.java rename to JZVideo/src/main/java/cn/jzvd/Jzvd.java diff --git a/library/src/main/java/cn/jzvd/JzvdStd.java b/JZVideo/src/main/java/cn/jzvd/JzvdStd.java similarity index 100% rename from library/src/main/java/cn/jzvd/JzvdStd.java rename to JZVideo/src/main/java/cn/jzvd/JzvdStd.java diff --git a/library/src/main/java/org/jzvd/jzvideo/JZVideoA.kt b/JZVideo/src/main/java/org/jzvd/jzvideo/JZVideoA.kt similarity index 100% rename from library/src/main/java/org/jzvd/jzvideo/JZVideoA.kt rename to JZVideo/src/main/java/org/jzvd/jzvideo/JZVideoA.kt diff --git a/library/src/main/res/anim/pop_from_bottom_anim_in.xml b/JZVideo/src/main/res/anim/pop_from_bottom_anim_in.xml similarity index 100% rename from library/src/main/res/anim/pop_from_bottom_anim_in.xml rename to JZVideo/src/main/res/anim/pop_from_bottom_anim_in.xml diff --git a/library/src/main/res/anim/pop_from_bottom_anim_out.xml b/JZVideo/src/main/res/anim/pop_from_bottom_anim_out.xml similarity index 100% rename from library/src/main/res/anim/pop_from_bottom_anim_out.xml rename to JZVideo/src/main/res/anim/pop_from_bottom_anim_out.xml diff --git a/library/src/main/res/drawable-xhdpi/jz_add_volume.png b/JZVideo/src/main/res/drawable-xhdpi/jz_add_volume.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_add_volume.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_add_volume.png diff --git a/library/src/main/res/drawable-xhdpi/jz_back_normal.png b/JZVideo/src/main/res/drawable-xhdpi/jz_back_normal.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_back_normal.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_back_normal.png diff --git a/library/src/main/res/drawable-xhdpi/jz_back_pressed.png b/JZVideo/src/main/res/drawable-xhdpi/jz_back_pressed.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_back_pressed.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_back_pressed.png diff --git a/library/src/main/res/drawable-xhdpi/jz_back_tiny_normal.png b/JZVideo/src/main/res/drawable-xhdpi/jz_back_tiny_normal.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_back_tiny_normal.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_back_tiny_normal.png diff --git a/library/src/main/res/drawable-xhdpi/jz_back_tiny_pressed.png b/JZVideo/src/main/res/drawable-xhdpi/jz_back_tiny_pressed.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_back_tiny_pressed.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_back_tiny_pressed.png diff --git a/library/src/main/res/drawable-xhdpi/jz_backward_icon.png b/JZVideo/src/main/res/drawable-xhdpi/jz_backward_icon.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_backward_icon.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_backward_icon.png diff --git a/library/src/main/res/drawable-xhdpi/jz_battery_level_10.png b/JZVideo/src/main/res/drawable-xhdpi/jz_battery_level_10.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_battery_level_10.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_battery_level_10.png diff --git a/library/src/main/res/drawable-xhdpi/jz_battery_level_100.png b/JZVideo/src/main/res/drawable-xhdpi/jz_battery_level_100.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_battery_level_100.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_battery_level_100.png diff --git a/library/src/main/res/drawable-xhdpi/jz_battery_level_30.png b/JZVideo/src/main/res/drawable-xhdpi/jz_battery_level_30.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_battery_level_30.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_battery_level_30.png diff --git a/library/src/main/res/drawable-xhdpi/jz_battery_level_50.png b/JZVideo/src/main/res/drawable-xhdpi/jz_battery_level_50.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_battery_level_50.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_battery_level_50.png diff --git a/library/src/main/res/drawable-xhdpi/jz_battery_level_70.png b/JZVideo/src/main/res/drawable-xhdpi/jz_battery_level_70.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_battery_level_70.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_battery_level_70.png diff --git a/library/src/main/res/drawable-xhdpi/jz_battery_level_90.png b/JZVideo/src/main/res/drawable-xhdpi/jz_battery_level_90.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_battery_level_90.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_battery_level_90.png diff --git a/library/src/main/res/drawable-xhdpi/jz_brightness_video.png b/JZVideo/src/main/res/drawable-xhdpi/jz_brightness_video.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_brightness_video.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_brightness_video.png diff --git a/library/src/main/res/drawable-xhdpi/jz_clarity_popwindow_bg.9.png b/JZVideo/src/main/res/drawable-xhdpi/jz_clarity_popwindow_bg.9.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_clarity_popwindow_bg.9.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_clarity_popwindow_bg.9.png diff --git a/library/src/main/res/drawable-xhdpi/jz_close_volume.png b/JZVideo/src/main/res/drawable-xhdpi/jz_close_volume.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_close_volume.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_close_volume.png diff --git a/library/src/main/res/drawable-xhdpi/jz_enlarge.png b/JZVideo/src/main/res/drawable-xhdpi/jz_enlarge.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_enlarge.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_enlarge.png diff --git a/library/src/main/res/drawable-xhdpi/jz_forward_icon.png b/JZVideo/src/main/res/drawable-xhdpi/jz_forward_icon.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_forward_icon.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_forward_icon.png diff --git a/library/src/main/res/drawable-xhdpi/jz_loading_bg.png b/JZVideo/src/main/res/drawable-xhdpi/jz_loading_bg.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_loading_bg.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_loading_bg.png diff --git a/library/src/main/res/drawable-xhdpi/jz_pause_normal.png b/JZVideo/src/main/res/drawable-xhdpi/jz_pause_normal.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_pause_normal.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_pause_normal.png diff --git a/library/src/main/res/drawable-xhdpi/jz_pause_pressed.png b/JZVideo/src/main/res/drawable-xhdpi/jz_pause_pressed.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_pause_pressed.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_pause_pressed.png diff --git a/library/src/main/res/drawable-xhdpi/jz_play_normal.png b/JZVideo/src/main/res/drawable-xhdpi/jz_play_normal.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_play_normal.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_play_normal.png diff --git a/library/src/main/res/drawable-xhdpi/jz_play_pressed.png b/JZVideo/src/main/res/drawable-xhdpi/jz_play_pressed.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_play_pressed.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_play_pressed.png diff --git a/library/src/main/res/drawable-xhdpi/jz_restart_normal.png b/JZVideo/src/main/res/drawable-xhdpi/jz_restart_normal.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_restart_normal.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_restart_normal.png diff --git a/library/src/main/res/drawable-xhdpi/jz_restart_pressed.png b/JZVideo/src/main/res/drawable-xhdpi/jz_restart_pressed.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_restart_pressed.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_restart_pressed.png diff --git a/library/src/main/res/drawable-xhdpi/jz_share_normal.png b/JZVideo/src/main/res/drawable-xhdpi/jz_share_normal.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_share_normal.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_share_normal.png diff --git a/library/src/main/res/drawable-xhdpi/jz_share_pressed.png b/JZVideo/src/main/res/drawable-xhdpi/jz_share_pressed.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_share_pressed.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_share_pressed.png diff --git a/library/src/main/res/drawable-xhdpi/jz_shrink.png b/JZVideo/src/main/res/drawable-xhdpi/jz_shrink.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_shrink.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_shrink.png diff --git a/library/src/main/res/drawable-xhdpi/jz_volume_icon.png b/JZVideo/src/main/res/drawable-xhdpi/jz_volume_icon.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/jz_volume_icon.png rename to JZVideo/src/main/res/drawable-xhdpi/jz_volume_icon.png diff --git a/library/src/main/res/drawable/jz_bottom_bg.9.png b/JZVideo/src/main/res/drawable/jz_bottom_bg.9.png similarity index 100% rename from library/src/main/res/drawable/jz_bottom_bg.9.png rename to JZVideo/src/main/res/drawable/jz_bottom_bg.9.png diff --git a/library/src/main/res/drawable/jz_bottom_progress.xml b/JZVideo/src/main/res/drawable/jz_bottom_progress.xml similarity index 100% rename from library/src/main/res/drawable/jz_bottom_progress.xml rename to JZVideo/src/main/res/drawable/jz_bottom_progress.xml diff --git a/library/src/main/res/drawable/jz_bottom_seek_poster.xml b/JZVideo/src/main/res/drawable/jz_bottom_seek_poster.xml similarity index 100% rename from library/src/main/res/drawable/jz_bottom_seek_poster.xml rename to JZVideo/src/main/res/drawable/jz_bottom_seek_poster.xml diff --git a/library/src/main/res/drawable/jz_bottom_seek_progress.xml b/JZVideo/src/main/res/drawable/jz_bottom_seek_progress.xml similarity index 100% rename from library/src/main/res/drawable/jz_bottom_seek_progress.xml rename to JZVideo/src/main/res/drawable/jz_bottom_seek_progress.xml diff --git a/library/src/main/res/drawable/jz_clarity_popwindow_bg.9.png b/JZVideo/src/main/res/drawable/jz_clarity_popwindow_bg.9.png similarity index 100% rename from library/src/main/res/drawable/jz_clarity_popwindow_bg.9.png rename to JZVideo/src/main/res/drawable/jz_clarity_popwindow_bg.9.png diff --git a/library/src/main/res/drawable/jz_click_back_selector.xml b/JZVideo/src/main/res/drawable/jz_click_back_selector.xml similarity index 100% rename from library/src/main/res/drawable/jz_click_back_selector.xml rename to JZVideo/src/main/res/drawable/jz_click_back_selector.xml diff --git a/library/src/main/res/drawable/jz_click_back_tiny_selector.xml b/JZVideo/src/main/res/drawable/jz_click_back_tiny_selector.xml similarity index 100% rename from library/src/main/res/drawable/jz_click_back_tiny_selector.xml rename to JZVideo/src/main/res/drawable/jz_click_back_tiny_selector.xml diff --git a/library/src/main/res/drawable/jz_click_pause_selector.xml b/JZVideo/src/main/res/drawable/jz_click_pause_selector.xml similarity index 100% rename from library/src/main/res/drawable/jz_click_pause_selector.xml rename to JZVideo/src/main/res/drawable/jz_click_pause_selector.xml diff --git a/library/src/main/res/drawable/jz_click_play_selector.xml b/JZVideo/src/main/res/drawable/jz_click_play_selector.xml similarity index 100% rename from library/src/main/res/drawable/jz_click_play_selector.xml rename to JZVideo/src/main/res/drawable/jz_click_play_selector.xml diff --git a/library/src/main/res/drawable/jz_click_replay_selector.xml b/JZVideo/src/main/res/drawable/jz_click_replay_selector.xml similarity index 100% rename from library/src/main/res/drawable/jz_click_replay_selector.xml rename to JZVideo/src/main/res/drawable/jz_click_replay_selector.xml diff --git a/library/src/main/res/drawable/jz_click_share_selector.xml b/JZVideo/src/main/res/drawable/jz_click_share_selector.xml similarity index 100% rename from library/src/main/res/drawable/jz_click_share_selector.xml rename to JZVideo/src/main/res/drawable/jz_click_share_selector.xml diff --git a/library/src/main/res/drawable/jz_dialog_progress.xml b/JZVideo/src/main/res/drawable/jz_dialog_progress.xml similarity index 100% rename from library/src/main/res/drawable/jz_dialog_progress.xml rename to JZVideo/src/main/res/drawable/jz_dialog_progress.xml diff --git a/library/src/main/res/drawable/jz_dialog_progress_bg.xml b/JZVideo/src/main/res/drawable/jz_dialog_progress_bg.xml similarity index 100% rename from library/src/main/res/drawable/jz_dialog_progress_bg.xml rename to JZVideo/src/main/res/drawable/jz_dialog_progress_bg.xml diff --git a/library/src/main/res/drawable/jz_loading.xml b/JZVideo/src/main/res/drawable/jz_loading.xml similarity index 100% rename from library/src/main/res/drawable/jz_loading.xml rename to JZVideo/src/main/res/drawable/jz_loading.xml diff --git a/library/src/main/res/drawable/jz_retry.xml b/JZVideo/src/main/res/drawable/jz_retry.xml similarity index 100% rename from library/src/main/res/drawable/jz_retry.xml rename to JZVideo/src/main/res/drawable/jz_retry.xml diff --git a/library/src/main/res/drawable/jz_seek_poster_normal.xml b/JZVideo/src/main/res/drawable/jz_seek_poster_normal.xml similarity index 100% rename from library/src/main/res/drawable/jz_seek_poster_normal.xml rename to JZVideo/src/main/res/drawable/jz_seek_poster_normal.xml diff --git a/library/src/main/res/drawable/jz_seek_poster_pressed.xml b/JZVideo/src/main/res/drawable/jz_seek_poster_pressed.xml similarity index 100% rename from library/src/main/res/drawable/jz_seek_poster_pressed.xml rename to JZVideo/src/main/res/drawable/jz_seek_poster_pressed.xml diff --git a/library/src/main/res/drawable/jz_title_bg.9.png b/JZVideo/src/main/res/drawable/jz_title_bg.9.png similarity index 100% rename from library/src/main/res/drawable/jz_title_bg.9.png rename to JZVideo/src/main/res/drawable/jz_title_bg.9.png diff --git a/library/src/main/res/drawable/jz_volume_progress_bg.xml b/JZVideo/src/main/res/drawable/jz_volume_progress_bg.xml similarity index 100% rename from library/src/main/res/drawable/jz_volume_progress_bg.xml rename to JZVideo/src/main/res/drawable/jz_volume_progress_bg.xml diff --git a/library/src/main/res/layout/jz_dialog_brightness.xml b/JZVideo/src/main/res/layout/jz_dialog_brightness.xml similarity index 100% rename from library/src/main/res/layout/jz_dialog_brightness.xml rename to JZVideo/src/main/res/layout/jz_dialog_brightness.xml diff --git a/library/src/main/res/layout/jz_dialog_progress.xml b/JZVideo/src/main/res/layout/jz_dialog_progress.xml similarity index 100% rename from library/src/main/res/layout/jz_dialog_progress.xml rename to JZVideo/src/main/res/layout/jz_dialog_progress.xml diff --git a/library/src/main/res/layout/jz_dialog_volume.xml b/JZVideo/src/main/res/layout/jz_dialog_volume.xml similarity index 100% rename from library/src/main/res/layout/jz_dialog_volume.xml rename to JZVideo/src/main/res/layout/jz_dialog_volume.xml diff --git a/library/src/main/res/layout/jz_layout_clarity.xml b/JZVideo/src/main/res/layout/jz_layout_clarity.xml similarity index 100% rename from library/src/main/res/layout/jz_layout_clarity.xml rename to JZVideo/src/main/res/layout/jz_layout_clarity.xml diff --git a/library/src/main/res/layout/jz_layout_clarity_item.xml b/JZVideo/src/main/res/layout/jz_layout_clarity_item.xml similarity index 100% rename from library/src/main/res/layout/jz_layout_clarity_item.xml rename to JZVideo/src/main/res/layout/jz_layout_clarity_item.xml diff --git a/library/src/main/res/layout/jz_layout_std.xml b/JZVideo/src/main/res/layout/jz_layout_std.xml similarity index 100% rename from library/src/main/res/layout/jz_layout_std.xml rename to JZVideo/src/main/res/layout/jz_layout_std.xml diff --git a/library/src/main/res/values-es/strings.xml b/JZVideo/src/main/res/values-es/strings.xml similarity index 100% rename from library/src/main/res/values-es/strings.xml rename to JZVideo/src/main/res/values-es/strings.xml diff --git a/library/src/main/res/values-ja-rJP/strings.xml b/JZVideo/src/main/res/values-ja-rJP/strings.xml similarity index 100% rename from library/src/main/res/values-ja-rJP/strings.xml rename to JZVideo/src/main/res/values-ja-rJP/strings.xml diff --git a/library/src/main/res/values-ko-rKR/strings.xml b/JZVideo/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from library/src/main/res/values-ko-rKR/strings.xml rename to JZVideo/src/main/res/values-ko-rKR/strings.xml diff --git a/library/src/main/res/values-pt/strings.xml b/JZVideo/src/main/res/values-pt/strings.xml similarity index 100% rename from library/src/main/res/values-pt/strings.xml rename to JZVideo/src/main/res/values-pt/strings.xml diff --git a/library/src/main/res/values-tr/strings.xml b/JZVideo/src/main/res/values-tr/strings.xml similarity index 100% rename from library/src/main/res/values-tr/strings.xml rename to JZVideo/src/main/res/values-tr/strings.xml diff --git a/library/src/main/res/values-zh/strings.xml b/JZVideo/src/main/res/values-zh/strings.xml similarity index 100% rename from library/src/main/res/values-zh/strings.xml rename to JZVideo/src/main/res/values-zh/strings.xml diff --git a/library/src/main/res/values/dimens.xml b/JZVideo/src/main/res/values/dimens.xml similarity index 100% rename from library/src/main/res/values/dimens.xml rename to JZVideo/src/main/res/values/dimens.xml diff --git a/library/src/main/res/values/ids.xml b/JZVideo/src/main/res/values/ids.xml similarity index 100% rename from library/src/main/res/values/ids.xml rename to JZVideo/src/main/res/values/ids.xml diff --git a/library/src/main/res/values/strings.xml b/JZVideo/src/main/res/values/strings.xml similarity index 100% rename from library/src/main/res/values/strings.xml rename to JZVideo/src/main/res/values/strings.xml diff --git a/library/src/main/res/values/styles.xml b/JZVideo/src/main/res/values/styles.xml similarity index 100% rename from library/src/main/res/values/styles.xml rename to JZVideo/src/main/res/values/styles.xml diff --git a/library/src/main/res/xml/jz_network_security_config.xml b/JZVideo/src/main/res/xml/jz_network_security_config.xml similarity index 100% rename from library/src/main/res/xml/jz_network_security_config.xml rename to JZVideo/src/main/res/xml/jz_network_security_config.xml diff --git a/app/build.gradle b/app/build.gradle index d6d3cba..fcf6e4d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,6 +94,7 @@ dependencies { implementation 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8' implementation 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.4' debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.3' - implementation 'com.github.SheHuan:NiceImageView:1.0.5' - implementation project(path: ':library') +// implementation 'com.github.SheHuan:NiceImageView:1.0.5' + implementation project(path: ':JZVideo') + implementation project(path: ':niceimageview') } diff --git a/app/src/main/java/com/uiui/videoplayer/activity/MainActivity.java b/app/src/main/java/com/uiui/videoplayer/activity/MainActivity.java index b0a8f31..9bc37b2 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/MainActivity.java +++ b/app/src/main/java/com/uiui/videoplayer/activity/MainActivity.java @@ -48,9 +48,10 @@ public class MainActivity extends AppCompatActivity { String[] permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}; private RecyclerView recyclerView; - private TextView tips; + private TextView tips, tv_scan; private SwipeRefreshLayout refreshLayout; private VideoAdapter adapter; + private List paths = new ArrayList<>(); private RecycleGridLayoutManager mManager; @@ -62,6 +63,7 @@ public class MainActivity extends AppCompatActivity { initView(); // String rootPath = Environment.getExternalStorageDirectory().getPath() + File.separator; // traverseFolder(rootPath); + ScanTask scanTask = new ScanTask(); scanTask.execute(); } @@ -89,6 +91,7 @@ public class MainActivity extends AppCompatActivity { private void initView() { initActionBar(); tips = findViewById(R.id.tips); + tv_scan = findViewById(R.id.tv_scan); refreshLayout = findViewById(R.id.swipeRefreshLayout); refreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override @@ -111,6 +114,8 @@ public class MainActivity extends AppCompatActivity { recyclerView.addItemDecoration(new SpacesItemDecoration(getResources().getDimensionPixelSize(R.dimen.PX1x), getResources().getDimensionPixelSize(R.dimen.PX1x), getResources().getDimensionPixelSize(R.dimen.PX1x), getResources().getDimensionPixelSize(R.dimen.PX1x))); ((DefaultItemAnimator) recyclerView.getItemAnimator()).setSupportsChangeAnimations(false); + adapter = new VideoAdapter(MainActivity.this); + recyclerView.setAdapter(adapter); } private void initActionBar() { @@ -198,6 +203,8 @@ public class MainActivity extends AppCompatActivity { @Override protected List doInBackground(Void... voids) { + long s1 = System.currentTimeMillis(); + paths.clear(); List fileList = new ArrayList<>(); String rootPath = Environment.getExternalStorageDirectory().getPath() + File.separator; File file = new File(rootPath); @@ -232,6 +239,7 @@ public class MainActivity extends AppCompatActivity { } else { Log.e("traverseFolder1", "文件不存在!"); } + Log.e("ScanTask", "doInBackground: " + "Scan time = " + (System.currentTimeMillis() - s1) + "ms"); return fileList; } @@ -239,22 +247,26 @@ public class MainActivity extends AppCompatActivity { protected void onProgressUpdate(String... values) { super.onProgressUpdate(values); // Log.e("ScanTask", "onProgressUpdate: " + values[0]); + paths.add(values[0]); + tv_scan.setVisibility(View.VISIBLE); + tv_scan.setText("正在扫描：" + values[0]); + adapter.setData(paths); } @Override protected void onPostExecute(List strings) { super.onPostExecute(strings); - Log.e("ScanTask", "onPostExecute: " + strings); + Log.e("ScanTask", "onPostExecute: " + strings.size()); if (strings.size() == 0) { tips.setVisibility(View.VISIBLE); recyclerView.setVisibility(View.GONE); } else { tips.setVisibility(View.GONE); recyclerView.setVisibility(View.VISIBLE); - adapter = new VideoAdapter(MainActivity.this, strings); + adapter.setData(strings); // recyclerView.setLayoutManager(new LinearLayoutManager(MainActivity.this)); - recyclerView.setAdapter(adapter); } + tv_scan.setVisibility(View.GONE); refreshLayout.setRefreshing(false); } } diff --git a/app/src/main/java/com/uiui/videoplayer/adapter/VideoAdapter.java b/app/src/main/java/com/uiui/videoplayer/adapter/VideoAdapter.java index dd4e421..918c155 100644 --- a/app/src/main/java/com/uiui/videoplayer/adapter/VideoAdapter.java +++ b/app/src/main/java/com/uiui/videoplayer/adapter/VideoAdapter.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; +import android.graphics.drawable.Drawable; import android.media.Image; import android.media.MediaMetadataRetriever; import android.os.AsyncTask; @@ -17,10 +18,13 @@ import android.widget.TextView; import android.widget.Toast; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; +import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.transition.Transition; import com.shehuan.niv.NiceImageView; import com.uiui.videoplayer.R; import com.uiui.videoplayer.activity.ActivityTikTok; @@ -65,6 +69,11 @@ public class VideoAdapter extends RecyclerView.Adapter Bitmap frame; } + public void setData(List paths) { + this.videoPath = paths; + notifyDataSetChanged(); + } + @NonNull @Override public VideoHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { @@ -76,61 +85,66 @@ public class VideoAdapter extends RecyclerView.Adapter public void onBindViewHolder(@NonNull final VideoHolder holder, final int position) { final String path = videoPath.get(position); File file = new File(path); - if (file.exists() && file.isFile()) { +// if (file.exists() && file.isFile()) { // BitmapRetultListener bitmapRetultListener = new BitmapRetultListener() { // @Override // public void onScanCompleted(Bitmap bitmap) { // Glide.with(holder.video_image).load(bitmap).into(holder.video_image); // } // }; - Observable.create(new ObservableOnSubscribe() { - @Override - public void subscribe(ObservableEmitter emitter) throws Exception { - FFmpegMediaMetadataRetriever mmr = new FFmpegMediaMetadataRetriever(); - mmr.setDataSource(path); - String duration = mmr.extractMetadata(FFmpegMediaMetadataRetriever.METADATA_KEY_DURATION); - Bitmap bitmap = mmr.getFrameAtTime();//获得视频第一帧的Bitmap对象. - Long time = Long.valueOf(duration); + Observable.create(new ObservableOnSubscribe() { + @Override + public void subscribe(ObservableEmitter emitter) throws Exception { + FFmpegMediaMetadataRetriever mmr = new FFmpegMediaMetadataRetriever(); + mmr.setDataSource(path); + String duration = mmr.extractMetadata(FFmpegMediaMetadataRetriever.METADATA_KEY_DURATION); + Bitmap bitmap = mmr.getFrameAtTime();//获得视频第一帧的Bitmap对象. + Long time = Long.valueOf(duration); - mmr.release(); - VideoResult result = new VideoResult(); - result.frame = bitmap; - result.time = time; - emitter.onNext(result); - } - }).subscribeOn(Schedulers.newThread()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { + mmr.release(); + VideoResult result = new VideoResult(); + result.frame = bitmap; + result.time = time; + emitter.onNext(result); + } + }).subscribeOn(Schedulers.newThread()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(VideoResult result) { + try { + Glide.with(holder.video_image).load(result.frame).skipMemoryCache(false).into(new SimpleTarget() { + @Override + public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { + holder.video_image.setImageDrawable(resource); + } + }); + holder.duration.setText(Utils.TimeFormat(result.time)); + } catch (Exception e) { } + } - @Override - public void onNext(VideoResult result) { - try { - Glide.with(holder.video_image).load(result.frame).into(holder.video_image); - holder.duration.setText(Utils.TimeFormat(result.time)); - } catch (Exception e) { + @Override + public void onError(Throwable e) { - } - } + } - @Override - public void onError(Throwable e) { + @Override + public void onComplete() { - } - - @Override - public void onComplete() { - - } - }); + } + }); // this.listener = bitmapRetultListener; - holder.title.setText(getFileName(path)); - Log.e("title:", holder.title.getText().toString()); - } + holder.title.setText(getFileName(path)); + Log.e("title:", holder.title.getText().toString()); +// } holder.root.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index 3ed8fc4..5022cb9 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -1,23 +1,32 @@ - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tv_scan"> - + android:background="@color/white"> - + + - + + \ No newline at end of file diff --git a/app/src/main/res/layout-port/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml index 52d8146..5022cb9 100644 --- a/app/src/main/res/layout-port/activity_main.xml +++ b/app/src/main/res/layout-port/activity_main.xml @@ -1,24 +1,32 @@ - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tv_scan"> - + android:background="@color/white"> - + + - + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_videofile.xml b/app/src/main/res/layout/item_videofile.xml index 4d85f5b..3b305b9 100644 --- a/app/src/main/res/layout/item_videofile.xml +++ b/app/src/main/res/layout/item_videofile.xml @@ -12,12 +12,11 @@ android:layout_height="162dp" android:layout_marginTop="4dp" android:adjustViewBounds="true" - android:scaleType="fitCenter" + android:scaleType="centerCrop" app:is_cover_src="true" - app:corner_radius="5dp" - android:background="@color/black" + app:corner_radius="10dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.504" + app:layout_constraintHorizontal_bias="0.500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/niceimageview/.gitignore b/niceimageview/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/niceimageview/.gitignore @@ -0,0 +1 @@ +/build diff --git a/niceimageview/build.gradle b/niceimageview/build.gradle new file mode 100644 index 0000000..84becfb --- /dev/null +++ b/niceimageview/build.gradle @@ -0,0 +1,26 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 28 + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + + implementation 'com.android.support:appcompat-v7:28.0.0' +} diff --git a/niceimageview/proguard-rules.pro b/niceimageview/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/niceimageview/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/niceimageview/src/main/AndroidManifest.xml b/niceimageview/src/main/AndroidManifest.xml new file mode 100644 index 0000000..6dab987 --- /dev/null +++ b/niceimageview/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + diff --git a/niceimageview/src/main/java/com/shehuan/niv/NiceImageView.java b/niceimageview/src/main/java/com/shehuan/niv/NiceImageView.java new file mode 100644 index 0000000..efd189f --- /dev/null +++ b/niceimageview/src/main/java/com/shehuan/niv/NiceImageView.java @@ -0,0 +1,337 @@ +package com.shehuan.niv; + + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Path; +import android.graphics.PorterDuff; +import android.graphics.PorterDuffXfermode; +import android.graphics.RectF; +import android.graphics.Xfermode; +import android.os.Build; +import android.util.AttributeSet; + +import androidx.annotation.ColorInt; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageView; + +public class NiceImageView extends AppCompatImageView { + private Context context; + + private boolean isCircle; // 是否显示为圆形，如果为圆形则设置的corner无效 + private boolean isCoverSrc; // border、inner_border是否覆盖图片 + private int borderWidth; // 边框宽度 + private int borderColor = Color.WHITE; // 边框颜色 + private int innerBorderWidth; // 内层边框宽度 + private int innerBorderColor = Color.WHITE; // 内层边框充色 + + private int cornerRadius; // 统一设置圆角半径，优先级高于单独设置每个角的半径 + private int cornerTopLeftRadius; // 左上角圆角半径 + private int cornerTopRightRadius; // 右上角圆角半径 + private int cornerBottomLeftRadius; // 左下角圆角半径 + private int cornerBottomRightRadius; // 右下角圆角半径 + + private int maskColor; // 遮罩颜色 + + private Xfermode xfermode; + + private int width; + private int height; + private float radius; + + private float[] borderRadii; + private float[] srcRadii; + + private RectF srcRectF; // 图片占的矩形区域 + private RectF borderRectF; // 边框的矩形区域 + + private Paint paint; + private Path path; // 用来裁剪图片的ptah + private Path srcPath; // 图片区域大小的path + + public NiceImageView(Context context) { + this(context, null); + } + + public NiceImageView(Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public NiceImageView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + + this.context = context; + + TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.NiceImageView, 0, 0); + for (int i = 0; i < ta.getIndexCount(); i++) { + int attr = ta.getIndex(i); + if (attr == R.styleable.NiceImageView_is_cover_src) { + isCoverSrc = ta.getBoolean(attr, isCoverSrc); + } else if (attr == R.styleable.NiceImageView_is_circle) { + isCircle = ta.getBoolean(attr, isCircle); + } else if (attr == R.styleable.NiceImageView_border_width) { + borderWidth = ta.getDimensionPixelSize(attr, borderWidth); + } else if (attr == R.styleable.NiceImageView_border_color) { + borderColor = ta.getColor(attr, borderColor); + } else if (attr == R.styleable.NiceImageView_inner_border_width) { + innerBorderWidth = ta.getDimensionPixelSize(attr, innerBorderWidth); + } else if (attr == R.styleable.NiceImageView_inner_border_color) { + innerBorderColor = ta.getColor(attr, innerBorderColor); + } else if (attr == R.styleable.NiceImageView_corner_radius) { + cornerRadius = ta.getDimensionPixelSize(attr, cornerRadius); + } else if (attr == R.styleable.NiceImageView_corner_top_left_radius) { + cornerTopLeftRadius = ta.getDimensionPixelSize(attr, cornerTopLeftRadius); + } else if (attr == R.styleable.NiceImageView_corner_top_right_radius) { + cornerTopRightRadius = ta.getDimensionPixelSize(attr, cornerTopRightRadius); + } else if (attr == R.styleable.NiceImageView_corner_bottom_left_radius) { + cornerBottomLeftRadius = ta.getDimensionPixelSize(attr, cornerBottomLeftRadius); + } else if (attr == R.styleable.NiceImageView_corner_bottom_right_radius) { + cornerBottomRightRadius = ta.getDimensionPixelSize(attr, cornerBottomRightRadius); + } else if (attr == R.styleable.NiceImageView_mask_color) { + maskColor = ta.getColor(attr, maskColor); + } + } + ta.recycle(); + + borderRadii = new float[8]; + srcRadii = new float[8]; + + borderRectF = new RectF(); + srcRectF = new RectF(); + + paint = new Paint(); + path = new Path(); + + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O_MR1) { + xfermode = new PorterDuffXfermode(PorterDuff.Mode.DST_IN); + } else { + xfermode = new PorterDuffXfermode(PorterDuff.Mode.DST_OUT); + srcPath = new Path(); + } + + calculateRadii(); + clearInnerBorderWidth(); + } + + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + width = w; + height = h; + + initBorderRectF(); + initSrcRectF(); + } + + @Override + protected void onDraw(Canvas canvas) { + // 使用图形混合模式来显示指定区域的图片 + canvas.saveLayer(srcRectF, null, Canvas.ALL_SAVE_FLAG); + if (!isCoverSrc) { + float sx = 1.0f * (width - 2 * borderWidth - 2 * innerBorderWidth) / width; + float sy = 1.0f * (height - 2 * borderWidth - 2 * innerBorderWidth) / height; + // 缩小画布，使图片内容不被borders覆盖 + canvas.scale(sx, sy, width / 2.0f, height / 2.0f); + } + super.onDraw(canvas); + paint.reset(); + path.reset(); + if (isCircle) { + path.addCircle(width / 2.0f, height / 2.0f, radius, Path.Direction.CCW); + } else { + path.addRoundRect(srcRectF, srcRadii, Path.Direction.CCW); + } + + paint.setAntiAlias(true); + paint.setStyle(Paint.Style.FILL); + paint.setXfermode(xfermode); + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O_MR1) { + canvas.drawPath(path, paint); + } else { + srcPath.addRect(srcRectF, Path.Direction.CCW); + // 计算tempPath和path的差集 + srcPath.op(path, Path.Op.DIFFERENCE); + canvas.drawPath(srcPath, paint); + srcPath.reset();//1 + } + paint.setXfermode(null); + + // 绘制遮罩 + if (maskColor != 0) { + paint.setColor(maskColor); + canvas.drawPath(path, paint); + } + // 恢复画布 + canvas.restore(); + // 绘制边框 + drawBorders(canvas); + } + + private void drawBorders(Canvas canvas) { + if (isCircle) { + if (borderWidth > 0) { + drawCircleBorder(canvas, borderWidth, borderColor, radius - borderWidth / 2.0f); + } + if (innerBorderWidth > 0) { + drawCircleBorder(canvas, innerBorderWidth, innerBorderColor, radius - borderWidth - innerBorderWidth / 2.0f); + } + } else { + if (borderWidth > 0) { + drawRectFBorder(canvas, borderWidth, borderColor, borderRectF, borderRadii); + } + } + } + + private void drawCircleBorder(Canvas canvas, int borderWidth, int borderColor, float radius) { + initBorderPaint(borderWidth, borderColor); + path.addCircle(width / 2.0f, height / 2.0f, radius, Path.Direction.CCW); + canvas.drawPath(path, paint); + } + + private void drawRectFBorder(Canvas canvas, int borderWidth, int borderColor, RectF rectF, float[] radii) { + initBorderPaint(borderWidth, borderColor); + path.addRoundRect(rectF, radii, Path.Direction.CCW); + canvas.drawPath(path, paint); + } + + private void initBorderPaint(int borderWidth, int borderColor) { + path.reset(); + paint.setStrokeWidth(borderWidth); + paint.setColor(borderColor); + paint.setStyle(Paint.Style.STROKE); + } + + /** + * 计算外边框的RectF + */ + private void initBorderRectF() { + if (!isCircle) { + borderRectF.set(borderWidth / 2.0f, borderWidth / 2.0f, width - borderWidth / 2.0f, height - borderWidth / 2.0f); + } + } + + /** + * 计算图片原始区域的RectF + */ + private void initSrcRectF() { + if (isCircle) { + radius = Math.min(width, height) / 2.0f; + srcRectF.set(width / 2.0f - radius, height / 2.0f - radius, width / 2.0f + radius, height / 2.0f + radius); + } else { + srcRectF.set(0, 0, width, height); + if (isCoverSrc) { + srcRectF = borderRectF; + } + } + } + + /** + * 计算RectF的圆角半径 + */ + private void calculateRadii() { + if (isCircle) { + return; + } + if (cornerRadius > 0) { + for (int i = 0; i < borderRadii.length; i++) { + borderRadii[i] = cornerRadius; + srcRadii[i] = cornerRadius - borderWidth / 2.0f; + } + } else { + borderRadii[0] = borderRadii[1] = cornerTopLeftRadius; + borderRadii[2] = borderRadii[3] = cornerTopRightRadius; + borderRadii[4] = borderRadii[5] = cornerBottomRightRadius; + borderRadii[6] = borderRadii[7] = cornerBottomLeftRadius; + + srcRadii[0] = srcRadii[1] = cornerTopLeftRadius - borderWidth / 2.0f; + srcRadii[2] = srcRadii[3] = cornerTopRightRadius - borderWidth / 2.0f; + srcRadii[4] = srcRadii[5] = cornerBottomRightRadius - borderWidth / 2.0f; + srcRadii[6] = srcRadii[7] = cornerBottomLeftRadius - borderWidth / 2.0f; + } + } + + private void calculateRadiiAndRectF(boolean reset) { + if (reset) { + cornerRadius = 0; + } + calculateRadii(); + initBorderRectF(); + invalidate(); + } + + /** + * 目前圆角矩形情况下不支持inner_border，需要将其置0 + */ + private void clearInnerBorderWidth() { + if (!isCircle) { + this.innerBorderWidth = 0; + } + } + + public void isCoverSrc(boolean isCoverSrc) { + this.isCoverSrc = isCoverSrc; + initSrcRectF(); + invalidate(); + } + + public void isCircle(boolean isCircle) { + this.isCircle = isCircle; + clearInnerBorderWidth(); + initSrcRectF(); + invalidate(); + } + + public void setBorderWidth(int borderWidth) { + this.borderWidth = Utils.dp2px(context, borderWidth); + calculateRadiiAndRectF(false); + } + + public void setBorderColor(@ColorInt int borderColor) { + this.borderColor = borderColor; + invalidate(); + } + + public void setInnerBorderWidth(int innerBorderWidth) { + this.innerBorderWidth = Utils.dp2px(context, innerBorderWidth); + clearInnerBorderWidth(); + invalidate(); + } + + public void setInnerBorderColor(@ColorInt int innerBorderColor) { + this.innerBorderColor = innerBorderColor; + invalidate(); + } + + public void setCornerRadius(int cornerRadius) { + this.cornerRadius = Utils.dp2px(context, cornerRadius); + calculateRadiiAndRectF(false); + } + + public void setCornerTopLeftRadius(int cornerTopLeftRadius) { + this.cornerTopLeftRadius = Utils.dp2px(context, cornerTopLeftRadius); + calculateRadiiAndRectF(true); + } + + public void setCornerTopRightRadius(int cornerTopRightRadius) { + this.cornerTopRightRadius = Utils.dp2px(context, cornerTopRightRadius); + calculateRadiiAndRectF(true); + } + + public void setCornerBottomLeftRadius(int cornerBottomLeftRadius) { + this.cornerBottomLeftRadius = Utils.dp2px(context, cornerBottomLeftRadius); + calculateRadiiAndRectF(true); + } + + public void setCornerBottomRightRadius(int cornerBottomRightRadius) { + this.cornerBottomRightRadius = Utils.dp2px(context, cornerBottomRightRadius); + calculateRadiiAndRectF(true); + } + + public void setMaskColor(@ColorInt int maskColor) { + this.maskColor = maskColor; + invalidate(); + } +} diff --git a/niceimageview/src/main/java/com/shehuan/niv/Utils.java b/niceimageview/src/main/java/com/shehuan/niv/Utils.java new file mode 100644 index 0000000..f9958ad --- /dev/null +++ b/niceimageview/src/main/java/com/shehuan/niv/Utils.java @@ -0,0 +1,11 @@ +package com.shehuan.niv; + + +import android.content.Context; + +public class Utils { + public static int dp2px(Context context, float dipValue) { + final float scale = context.getResources().getDisplayMetrics().density; + return (int) (dipValue * scale + 0.5f); + } +} diff --git a/niceimageview/src/main/res/values/attrs.xml b/niceimageview/src/main/res/values/attrs.xml new file mode 100644 index 0000000..c7c51cd --- /dev/null +++ b/niceimageview/src/main/res/values/attrs.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/niceimageview/src/main/res/values/strings.xml b/niceimageview/src/main/res/values/strings.xml new file mode 100644 index 0000000..1a1d942 --- /dev/null +++ b/niceimageview/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + niceimageview + diff --git a/settings.gradle b/settings.gradle index 81ab69e..7ca5be6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ rootProject.name='快易播放器' -include ':app', ':library' +include ':app', ':JZVideo', ':niceimageview'