Commit 176eea5f909e6c4ddff243b6f3bae54b9bd6b77a
1 parent
b6ec78b8
引用包修改
Showing
60 changed files
with
129 additions
and
154 deletions
app/src/main/java/com/cnlive/demo/MainActivity.java
| ... | ... | @@ -5,16 +5,14 @@ import androidx.appcompat.app.AppCompatActivity; |
| 5 | 5 | import androidx.databinding.DataBindingUtil; |
| 6 | 6 | |
| 7 | 7 | import android.content.Intent; |
| 8 | -import android.os.Build; | |
| 9 | 8 | import android.os.Bundle; |
| 10 | -import android.os.Environment; | |
| 11 | 9 | import android.view.View; |
| 12 | 10 | |
| 13 | 11 | import com.cnlive.demo.databinding.ActivityMainBinding; |
| 14 | 12 | import com.cnlive.media.ImagePicker; |
| 15 | 13 | import com.cnlive.media.PickerConfig; |
| 16 | 14 | import com.cnlive.media.meidia.entity.Media; |
| 17 | -import com.cnlive.media.utlis.GlideCacheUtil; | |
| 15 | +import com.cnlive.media.utils.GlideCacheUtil; | |
| 18 | 16 | |
| 19 | 17 | import java.util.ArrayList; |
| 20 | 18 | ... | ... |
build.gradle
config.gradle
lib_media/src/main/AndroidManifest.xml
| 1 | 1 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 2 | - package="com.cnlive.meidia"> | |
| 2 | + package="com.cnlive.media"> | |
| 3 | 3 | |
| 4 | 4 | <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> |
| 5 | 5 | <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> | ... | ... |
lib_media/src/main/java/com/cnlive/media/frame/presenter/ImageCropPrsenter.java
| ... | ... | @@ -2,9 +2,9 @@ package com.cnlive.media.frame.presenter; |
| 2 | 2 | |
| 3 | 3 | import android.text.TextUtils; |
| 4 | 4 | |
| 5 | +import com.cnlive.media.R; | |
| 5 | 6 | import com.cnlive.media.frame.view.ImageCropView; |
| 6 | 7 | import com.cnlive.media.ui.activity.ImageCropActivity; |
| 7 | -import com.cnlive.meidia.R; | |
| 8 | 8 | import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter; |
| 9 | 9 | |
| 10 | 10 | import java.io.File; | ... | ... |
lib_media/src/main/java/com/cnlive/media/frame/presenter/MediaPickerFragmentPresenter.java
| ... | ... | @@ -6,7 +6,7 @@ import android.text.TextUtils; |
| 6 | 6 | import com.cnlive.media.PickerConfig; |
| 7 | 7 | import com.cnlive.media.frame.view.MediaPickerFragmentView; |
| 8 | 8 | import com.cnlive.media.ui.activity.MediaActivity; |
| 9 | -import com.cnlive.media.utlis.AndroidQUtil; | |
| 9 | +import com.cnlive.media.utils.AndroidQUtil; | |
| 10 | 10 | import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter; |
| 11 | 11 | |
| 12 | 12 | import java.io.File; | ... | ... |
lib_media/src/main/java/com/cnlive/media/frame/presenter/MediaPresenter.java
| ... | ... | @@ -11,8 +11,7 @@ import androidx.core.app.ActivityCompat; |
| 11 | 11 | import com.cnlive.media.PickerConfig; |
| 12 | 12 | import com.cnlive.media.frame.view.MediaView; |
| 13 | 13 | import com.cnlive.media.ui.activity.MediaActivity; |
| 14 | -import com.cnlive.media.ui.activity.RecordActivity; | |
| 15 | -import com.cnlive.media.utlis.AndroidQUtil; | |
| 14 | +import com.cnlive.media.utils.AndroidQUtil; | |
| 16 | 15 | import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter; |
| 17 | 16 | |
| 18 | 17 | import java.io.File; | ... | ... |
lib_media/src/main/java/com/cnlive/media/frame/view/ImageCropView.java
| ... | ... | @@ -9,11 +9,11 @@ import android.text.TextUtils; |
| 9 | 9 | |
| 10 | 10 | import com.cnlive.libs.base.util.AlertUtil; |
| 11 | 11 | import com.cnlive.libs.base.util.FileUtils; |
| 12 | +import com.cnlive.media.R; | |
| 12 | 13 | import com.cnlive.media.meidia.entity.Media; |
| 13 | 14 | import com.cnlive.media.ui.activity.ImageCropActivity; |
| 14 | -import com.cnlive.media.utlis.AndroidQUtil; | |
| 15 | -import com.cnlive.media.utlis.observable.MeidaResultObservable; | |
| 16 | -import com.cnlive.meidia.R; | |
| 15 | +import com.cnlive.media.utils.AndroidQUtil; | |
| 16 | +import com.cnlive.media.utils.observable.MeidaResultObservable; | |
| 17 | 17 | import com.hannesdorfmann.mosby3.mvp.MvpView; |
| 18 | 18 | |
| 19 | 19 | import java.io.File; | ... | ... |
lib_media/src/main/java/com/cnlive/media/frame/view/MediaFView.java
| ... | ... | @@ -9,9 +9,9 @@ import com.cnlive.media.ui.activity.VideoPlayerActivity; |
| 9 | 9 | import com.cnlive.media.ui.fragment.MediaFragment; |
| 10 | 10 | import com.cnlive.media.ui.widget.large.ImageSource; |
| 11 | 11 | import com.cnlive.media.ui.widget.large.SubsamplingScaleImageView; |
| 12 | -import com.cnlive.media.utlis.AndroidQUtil; | |
| 13 | -import com.cnlive.media.utlis.FileTypeUtil; | |
| 14 | -import com.cnlive.media.utlis.GlideCacheUtil; | |
| 12 | +import com.cnlive.media.utils.AndroidQUtil; | |
| 13 | +import com.cnlive.media.utils.FileTypeUtil; | |
| 14 | +import com.cnlive.media.utils.GlideCacheUtil; | |
| 15 | 15 | import com.hannesdorfmann.mosby3.mvp.MvpView; |
| 16 | 16 | |
| 17 | 17 | /** | ... | ... |
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPickerFragmentView.java
| 1 | 1 | package com.cnlive.media.frame.view; |
| 2 | 2 | |
| 3 | -import android.Manifest; | |
| 4 | -import android.net.Uri; | |
| 5 | 3 | import android.os.Build; |
| 6 | 4 | import android.text.TextUtils; |
| 7 | 5 | |
| ... | ... | @@ -12,26 +10,21 @@ import androidx.recyclerview.widget.RecyclerView; |
| 12 | 10 | import com.bumptech.glide.Glide; |
| 13 | 11 | import com.cnlive.libs.base.util.AlertUtil; |
| 14 | 12 | import com.cnlive.libs.base.util.DoublePressed; |
| 15 | -import com.cnlive.libs.base.util.FileUtils; | |
| 16 | 13 | import com.cnlive.media.PickerConfig; |
| 17 | 14 | import com.cnlive.media.meidia.entity.Folder; |
| 18 | 15 | import com.cnlive.media.meidia.entity.Media; |
| 19 | -import com.cnlive.media.ui.activity.ImageCropActivity; | |
| 20 | 16 | import com.cnlive.media.ui.activity.MediaActivity; |
| 21 | -import com.cnlive.media.ui.activity.RecordActivity; | |
| 22 | 17 | import com.cnlive.media.ui.fragment.MediaPickerFragment; |
| 23 | 18 | import com.cnlive.media.ui.adapter.MediaAdapter; |
| 24 | 19 | import com.cnlive.media.ui.adapter.OnItemClickListener; |
| 25 | 20 | import com.cnlive.media.ui.widget.SpacingDecoration; |
| 26 | -import com.cnlive.media.utlis.AndroidQUtil; | |
| 27 | -import com.cnlive.media.utlis.FileTypeUtil; | |
| 28 | -import com.cnlive.media.utlis.MediaStringUtils; | |
| 29 | -import com.cnlive.media.utlis.PermissionChecker; | |
| 30 | -import com.cnlive.media.utlis.observable.MediaOpenActivityObservable; | |
| 31 | -import com.cnlive.media.utlis.observable.MediaOpenInfo; | |
| 32 | -import com.cnlive.media.utlis.observable.MediaSelectStateObservable; | |
| 33 | -import com.cnlive.media.utlis.observable.MeidaResultObservable; | |
| 34 | -import com.cnlive.meidia.R; | |
| 21 | +import com.cnlive.media.utils.FileTypeUtil; | |
| 22 | +import com.cnlive.media.utils.MediaStringUtils; | |
| 23 | +import com.cnlive.media.utils.observable.MediaOpenActivityObservable; | |
| 24 | +import com.cnlive.media.utils.observable.MediaOpenInfo; | |
| 25 | +import com.cnlive.media.utils.observable.MediaSelectStateObservable; | |
| 26 | +import com.cnlive.media.utils.observable.MeidaResultObservable; | |
| 27 | +import com.cnlive.media.R; | |
| 35 | 28 | import com.hannesdorfmann.mosby3.mvp.MvpView; |
| 36 | 29 | |
| 37 | 30 | import java.util.ArrayList; |
| ... | ... | @@ -152,12 +145,12 @@ public class MediaPickerFragmentView implements MvpView { |
| 152 | 145 | } |
| 153 | 146 | //文件大小判断 1 图片 3 视频 |
| 154 | 147 | if (media.mediaType == 1 && mActivity.maxImageSize < media.size) { |
| 155 | - String size = com.cnlive.media.utlis.FileUtils.fileSize(mActivity.maxImageSize); | |
| 148 | + String size = com.cnlive.media.utils.FileUtils.fileSize(mActivity.maxImageSize); | |
| 156 | 149 | showMessage(mActivity.getResources().getString(R.string.media_msg_size_limit) + size); |
| 157 | 150 | return false; |
| 158 | 151 | } |
| 159 | 152 | if (media.mediaType == 3 && mActivity.maxVideoSize < media.size) { |
| 160 | - String size = com.cnlive.media.utlis.FileUtils.fileSize(mActivity.maxVideoSize); | |
| 153 | + String size = com.cnlive.media.utils.FileUtils.fileSize(mActivity.maxVideoSize); | |
| 161 | 154 | showMessage(mFragment.getResources().getString(R.string.media_msg_size_limit) + size); |
| 162 | 155 | return false; |
| 163 | 156 | } | ... | ... |
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPreviewView.java
| ... | ... | @@ -9,7 +9,7 @@ import com.cnlive.libs.base.util.AlertUtil; |
| 9 | 9 | import com.cnlive.media.ui.activity.MediaActivity; |
| 10 | 10 | import com.cnlive.media.ui.adapter.MediaPreviewAdapter; |
| 11 | 11 | import com.cnlive.media.ui.fragment.MediaPreviewFragment; |
| 12 | -import com.cnlive.media.utlis.observable.MediaPageSelectStateObservable; | |
| 12 | +import com.cnlive.media.utils.observable.MediaPageSelectStateObservable; | |
| 13 | 13 | import com.hannesdorfmann.mosby3.mvp.MvpView; |
| 14 | 14 | |
| 15 | 15 | /** | ... | ... |
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPreviewViewView.java
| ... | ... | @@ -14,7 +14,7 @@ import com.cnlive.media.PickerConfig; |
| 14 | 14 | import com.cnlive.media.meidia.entity.Media; |
| 15 | 15 | import com.cnlive.media.ui.activity.MediaPreviewActivity; |
| 16 | 16 | import com.cnlive.media.ui.adapter.MediaPreviewAdapter; |
| 17 | -import com.cnlive.meidia.R; | |
| 17 | +import com.cnlive.media.R; | |
| 18 | 18 | import com.hannesdorfmann.mosby3.mvp.MvpView; |
| 19 | 19 | |
| 20 | 20 | import java.util.ArrayList; | ... | ... |
lib_media/src/main/java/com/cnlive/media/frame/view/MediaView.java
| ... | ... | @@ -22,7 +22,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; |
| 22 | 22 | import androidx.recyclerview.widget.RecyclerView; |
| 23 | 23 | |
| 24 | 24 | import com.cnlive.libs.base.util.AlertUtil; |
| 25 | -import com.cnlive.libs.base.util.FileUtils; | |
| 26 | 25 | import com.cnlive.libs.base.util.StatusBarUtil2; |
| 27 | 26 | import com.cnlive.media.PickerConfig; |
| 28 | 27 | import com.cnlive.media.meidia.entity.Folder; |
| ... | ... | @@ -34,19 +33,19 @@ import com.cnlive.media.ui.adapter.FolderAdapter; |
| 34 | 33 | import com.cnlive.media.ui.adapter.PreviewBottomMediaAdapter; |
| 35 | 34 | import com.cnlive.media.ui.fragment.MediaPickerFragment; |
| 36 | 35 | import com.cnlive.media.ui.fragment.MediaPreviewFragment; |
| 37 | -import com.cnlive.media.utlis.AlertDialogUtils; | |
| 38 | -import com.cnlive.media.utlis.AndroidQUtil; | |
| 39 | -import com.cnlive.media.utlis.FileTypeUtil; | |
| 40 | -import com.cnlive.media.utlis.MediaStringUtils; | |
| 41 | -import com.cnlive.media.utlis.PermissionChecker; | |
| 42 | -import com.cnlive.media.utlis.ScreenUtils; | |
| 43 | -import com.cnlive.media.utlis.observable.MediaAddObservable; | |
| 44 | -import com.cnlive.media.utlis.observable.MediaOpenActivityObservable; | |
| 45 | -import com.cnlive.media.utlis.observable.MediaPageSelectStateObservable; | |
| 46 | -import com.cnlive.media.utlis.observable.MediaSelectStateObservable; | |
| 47 | -import com.cnlive.media.utlis.observable.MeidaResultObservable; | |
| 48 | -import com.cnlive.media.utlis.observable.SelectStateUpdateObservable; | |
| 49 | -import com.cnlive.meidia.R; | |
| 36 | +import com.cnlive.media.utils.AlertDialogUtils; | |
| 37 | +import com.cnlive.media.utils.AndroidQUtil; | |
| 38 | +import com.cnlive.media.utils.FileTypeUtil; | |
| 39 | +import com.cnlive.media.utils.MediaStringUtils; | |
| 40 | +import com.cnlive.media.utils.PermissionChecker; | |
| 41 | +import com.cnlive.media.utils.ScreenUtils; | |
| 42 | +import com.cnlive.media.utils.observable.MediaAddObservable; | |
| 43 | +import com.cnlive.media.utils.observable.MediaOpenActivityObservable; | |
| 44 | +import com.cnlive.media.utils.observable.MediaPageSelectStateObservable; | |
| 45 | +import com.cnlive.media.utils.observable.MediaSelectStateObservable; | |
| 46 | +import com.cnlive.media.utils.observable.MeidaResultObservable; | |
| 47 | +import com.cnlive.media.utils.observable.SelectStateUpdateObservable; | |
| 48 | +import com.cnlive.media.R; | |
| 50 | 49 | import com.hannesdorfmann.mosby3.mvp.MvpView; |
| 51 | 50 | import com.qiniu.pili.droid.shortvideo.PLShortVideoEnv; |
| 52 | 51 | |
| ... | ... | @@ -330,12 +329,12 @@ public class MediaView implements MvpView { |
| 330 | 329 | } |
| 331 | 330 | //文件大小判断 1 图片 3 视频 |
| 332 | 331 | if (media.mediaType == 1 && mActivity.maxImageSize < media.size) { |
| 333 | - String size = com.cnlive.media.utlis.FileUtils.fileSize(mActivity.maxImageSize); | |
| 332 | + String size = com.cnlive.media.utils.FileUtils.fileSize(mActivity.maxImageSize); | |
| 334 | 333 | showMessage(mActivity.getResources().getString(R.string.media_msg_size_limit) + size); |
| 335 | 334 | return false; |
| 336 | 335 | } |
| 337 | 336 | if (media.mediaType == 3 && mActivity.maxVideoSize < media.size) { |
| 338 | - String size = com.cnlive.media.utlis.FileUtils.fileSize(mActivity.maxVideoSize); | |
| 337 | + String size = com.cnlive.media.utils.FileUtils.fileSize(mActivity.maxVideoSize); | |
| 339 | 338 | showMessage(mActivity.getResources().getString(R.string.media_msg_size_limit) + size); |
| 340 | 339 | return false; |
| 341 | 340 | } | ... | ... |
lib_media/src/main/java/com/cnlive/media/frame/view/RecordPreviewView.java
| ... | ... | @@ -17,18 +17,16 @@ import com.cnlive.media.meidia.entity.Media; |
| 17 | 17 | import com.cnlive.media.ui.activity.ImageCropActivity; |
| 18 | 18 | import com.cnlive.media.ui.activity.RecordActivity; |
| 19 | 19 | import com.cnlive.media.ui.fragment.RecordPreviewFragment; |
| 20 | -import com.cnlive.media.utlis.AndroidQUtil; | |
| 21 | -import com.cnlive.media.utlis.GlideCacheUtil; | |
| 22 | -import com.cnlive.media.utlis.MediaUtils; | |
| 23 | -import com.cnlive.media.utlis.album.AlbumProcessUtil; | |
| 24 | -import com.cnlive.media.utlis.album.OnSaveCallback; | |
| 25 | -import com.cnlive.media.utlis.observable.MediaAddObservable; | |
| 26 | -import com.cnlive.media.utlis.observable.MeidaResultObservable; | |
| 20 | +import com.cnlive.media.utils.GlideCacheUtil; | |
| 21 | +import com.cnlive.media.utils.MediaUtils; | |
| 22 | +import com.cnlive.media.utils.album.AlbumProcessUtil; | |
| 23 | +import com.cnlive.media.utils.album.OnSaveCallback; | |
| 24 | +import com.cnlive.media.utils.observable.MediaAddObservable; | |
| 25 | +import com.cnlive.media.utils.observable.MeidaResultObservable; | |
| 27 | 26 | import com.hannesdorfmann.mosby3.mvp.MvpView; |
| 28 | 27 | import com.qiniu.pili.droid.shortvideo.PLDisplayMode; |
| 29 | 28 | import com.qiniu.pili.droid.shortvideo.PLMediaFile; |
| 30 | 29 | import com.qiniu.pili.droid.shortvideo.PLShortVideoEditor; |
| 31 | -import com.qiniu.pili.droid.shortvideo.PLShortVideoTrimmer; | |
| 32 | 30 | import com.qiniu.pili.droid.shortvideo.PLVideoEditSetting; |
| 33 | 31 | |
| 34 | 32 | import java.io.File; | ... | ... |
lib_media/src/main/java/com/cnlive/media/frame/view/RecordView.java
| ... | ... | @@ -22,21 +22,19 @@ import com.cnlive.libs.base.util.AlertUtil; |
| 22 | 22 | import com.cnlive.media.PickerConfig; |
| 23 | 23 | import com.cnlive.media.ui.activity.RecordActivity; |
| 24 | 24 | import com.cnlive.media.ui.fragment.RecordPreviewFragment; |
| 25 | -import com.cnlive.media.utlis.AlertDialogUtils; | |
| 26 | -import com.cnlive.media.utlis.AndroidQUtil; | |
| 27 | -import com.cnlive.media.utlis.PermissionChecker; | |
| 28 | -import com.cnlive.media.utlis.ScreenUtils; | |
| 29 | -import com.cnlive.meidia.R; | |
| 25 | +import com.cnlive.media.utils.AlertDialogUtils; | |
| 26 | +import com.cnlive.media.utils.AndroidQUtil; | |
| 27 | +import com.cnlive.media.utils.PermissionChecker; | |
| 28 | +import com.cnlive.media.utils.ScreenUtils; | |
| 29 | +import com.cnlive.media.R; | |
| 30 | 30 | import com.hannesdorfmann.mosby3.mvp.MvpView; |
| 31 | 31 | import com.qiniu.pili.droid.shortvideo.PLAudioEncodeSetting; |
| 32 | 32 | import com.qiniu.pili.droid.shortvideo.PLCameraSetting; |
| 33 | 33 | import com.qiniu.pili.droid.shortvideo.PLDisplayMode; |
| 34 | 34 | import com.qiniu.pili.droid.shortvideo.PLErrorCode; |
| 35 | -import com.qiniu.pili.droid.shortvideo.PLFocusListener; | |
| 36 | 35 | import com.qiniu.pili.droid.shortvideo.PLMicrophoneSetting; |
| 37 | 36 | import com.qiniu.pili.droid.shortvideo.PLRecordSetting; |
| 38 | 37 | import com.qiniu.pili.droid.shortvideo.PLRecordStateListener; |
| 39 | -import com.qiniu.pili.droid.shortvideo.PLScreenRecorderSetting; | |
| 40 | 38 | import com.qiniu.pili.droid.shortvideo.PLShortVideoRecorder; |
| 41 | 39 | import com.qiniu.pili.droid.shortvideo.PLVideoEncodeSetting; |
| 42 | 40 | ... | ... |
lib_media/src/main/java/com/cnlive/media/frame/view/VideoPlayerView.java
| ... | ... | @@ -12,7 +12,6 @@ import com.bumptech.glide.Glide; |
| 12 | 12 | import com.cnlive.libs.base.util.AlertUtil; |
| 13 | 13 | import com.cnlive.libs.video.video.base.IMediaPlayer; |
| 14 | 14 | import com.cnlive.media.ui.activity.VideoPlayerActivity; |
| 15 | -import com.cnlive.media.utlis.AndroidQUtil; | |
| 16 | 15 | import com.hannesdorfmann.mosby3.mvp.MvpView; |
| 17 | 16 | |
| 18 | 17 | /** | ... | ... |
lib_media/src/main/java/com/cnlive/media/meidia/loader/ImageLoader.java
| ... | ... | @@ -13,8 +13,8 @@ import android.text.TextUtils; |
| 13 | 13 | import com.cnlive.media.meidia.DataCallback; |
| 14 | 14 | import com.cnlive.media.meidia.entity.Folder; |
| 15 | 15 | import com.cnlive.media.meidia.entity.Media; |
| 16 | -import com.cnlive.media.utlis.MediaUtils; | |
| 17 | -import com.cnlive.meidia.R; | |
| 16 | +import com.cnlive.media.utils.MediaUtils; | |
| 17 | +import com.cnlive.media.R; | |
| 18 | 18 | |
| 19 | 19 | import java.io.File; |
| 20 | 20 | import java.util.ArrayList; | ... | ... |
lib_media/src/main/java/com/cnlive/media/meidia/loader/MediaLoader.java
| ... | ... | @@ -13,8 +13,8 @@ import android.text.TextUtils; |
| 13 | 13 | import com.cnlive.media.meidia.DataCallback; |
| 14 | 14 | import com.cnlive.media.meidia.entity.Folder; |
| 15 | 15 | import com.cnlive.media.meidia.entity.Media; |
| 16 | -import com.cnlive.media.utlis.MediaUtils; | |
| 17 | -import com.cnlive.meidia.R; | |
| 16 | +import com.cnlive.media.utils.MediaUtils; | |
| 17 | +import com.cnlive.media.R; | |
| 18 | 18 | |
| 19 | 19 | import java.io.File; |
| 20 | 20 | import java.util.ArrayList; | ... | ... |
lib_media/src/main/java/com/cnlive/media/meidia/loader/VideoLoader.java
| ... | ... | @@ -15,7 +15,7 @@ import android.util.Log; |
| 15 | 15 | import com.cnlive.media.meidia.DataCallback; |
| 16 | 16 | import com.cnlive.media.meidia.entity.Folder; |
| 17 | 17 | import com.cnlive.media.meidia.entity.Media; |
| 18 | -import com.cnlive.meidia.R; | |
| 18 | +import com.cnlive.media.R; | |
| 19 | 19 | |
| 20 | 20 | import java.io.File; |
| 21 | 21 | import java.util.ArrayList; | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/activity/ImageCropActivity.java
| ... | ... | @@ -10,12 +10,12 @@ import android.view.View; |
| 10 | 10 | import com.cnlive.libs.base.frame.activity.MvpBindingActivity; |
| 11 | 11 | import com.cnlive.libs.base.util.StatusBarUtil2; |
| 12 | 12 | import com.cnlive.media.PickerConfig; |
| 13 | +import com.cnlive.media.R; | |
| 13 | 14 | import com.cnlive.media.frame.presenter.ImageCropPrsenter; |
| 14 | 15 | import com.cnlive.media.frame.view.ImageCropView; |
| 15 | 16 | import com.cnlive.media.model.ImagePickerCropParams; |
| 16 | 17 | import com.cnlive.media.model.ImagePickerOptions; |
| 17 | -import com.cnlive.meidia.R; | |
| 18 | -import com.cnlive.meidia.databinding.ActivityMediaCropBinding; | |
| 18 | +import com.cnlive.media.databinding.ActivityMediaCropBinding; | |
| 19 | 19 | |
| 20 | 20 | import java.io.File; |
| 21 | 21 | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/activity/MediaActivity.java
| ... | ... | @@ -12,6 +12,7 @@ import androidx.fragment.app.Fragment; |
| 12 | 12 | |
| 13 | 13 | import com.cnlive.libs.base.frame.activity.MvpBindingActivity; |
| 14 | 14 | import com.cnlive.media.PickerConfig; |
| 15 | +import com.cnlive.media.R; | |
| 15 | 16 | import com.cnlive.media.frame.presenter.MediaPresenter; |
| 16 | 17 | import com.cnlive.media.frame.view.MediaView; |
| 17 | 18 | import com.cnlive.media.meidia.DataCallback; |
| ... | ... | @@ -26,15 +27,13 @@ import com.cnlive.media.model.ImagePickerOptions; |
| 26 | 27 | import com.cnlive.media.ui.adapter.FolderAdapter; |
| 27 | 28 | import com.cnlive.media.ui.fragment.MediaPickerFragment; |
| 28 | 29 | import com.cnlive.media.ui.fragment.MediaPreviewFragment; |
| 29 | -import com.cnlive.media.utlis.PermissionChecker; | |
| 30 | -import com.cnlive.media.utlis.observable.MediaAddObservable; | |
| 31 | -import com.cnlive.media.utlis.observable.MediaOpenActivityObservable; | |
| 32 | -import com.cnlive.media.utlis.observable.MediaOpenInfo; | |
| 33 | -import com.cnlive.media.utlis.observable.MediaPageSelectStateObservable; | |
| 34 | -import com.cnlive.media.utlis.observable.MediaSelectStateObservable; | |
| 35 | -import com.cnlive.media.utlis.observable.MeidaResultObservable; | |
| 36 | -import com.cnlive.meidia.R; | |
| 37 | -import com.cnlive.meidia.databinding.ActivityMediaBinding; | |
| 30 | +import com.cnlive.media.utils.observable.MediaAddObservable; | |
| 31 | +import com.cnlive.media.utils.observable.MediaOpenActivityObservable; | |
| 32 | +import com.cnlive.media.utils.observable.MediaOpenInfo; | |
| 33 | +import com.cnlive.media.utils.observable.MediaPageSelectStateObservable; | |
| 34 | +import com.cnlive.media.utils.observable.MediaSelectStateObservable; | |
| 35 | +import com.cnlive.media.utils.observable.MeidaResultObservable; | |
| 36 | +import com.cnlive.media.databinding.ActivityMediaBinding; | |
| 38 | 37 | |
| 39 | 38 | import java.io.File; |
| 40 | 39 | import java.util.ArrayList; | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/activity/MediaPreviewActivity.java
| ... | ... | @@ -4,12 +4,12 @@ import android.os.Bundle; |
| 4 | 4 | |
| 5 | 5 | import com.cnlive.libs.base.frame.activity.MvpBindingActivity; |
| 6 | 6 | import com.cnlive.media.PickerConfig; |
| 7 | +import com.cnlive.media.R; | |
| 7 | 8 | import com.cnlive.media.frame.presenter.MediaPreviewViewPresenter; |
| 8 | 9 | import com.cnlive.media.frame.view.MediaPreviewViewView; |
| 9 | 10 | import com.cnlive.media.meidia.entity.Media; |
| 10 | 11 | import com.cnlive.media.ui.adapter.MediaPreviewAdapter; |
| 11 | -import com.cnlive.meidia.R; | |
| 12 | -import com.cnlive.meidia.databinding.ActivityPreviewImageBinding; | |
| 12 | +import com.cnlive.media.databinding.ActivityPreviewImageBinding; | |
| 13 | 13 | |
| 14 | 14 | import java.util.ArrayList; |
| 15 | 15 | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/activity/RecordActivity.java
| ... | ... | @@ -7,7 +7,6 @@ import android.content.Intent; |
| 7 | 7 | import android.graphics.Bitmap; |
| 8 | 8 | import android.graphics.Color; |
| 9 | 9 | import android.os.Bundle; |
| 10 | -import android.util.Log; | |
| 11 | 10 | import android.view.View; |
| 12 | 11 | |
| 13 | 12 | import androidx.annotation.NonNull; |
| ... | ... | @@ -17,17 +16,16 @@ import com.cnlive.libs.base.frame.activity.MvpBindingActivity; |
| 17 | 16 | import com.cnlive.libs.base.util.DoublePressed; |
| 18 | 17 | import com.cnlive.libs.base.util.StatusBarUtil2; |
| 19 | 18 | import com.cnlive.media.PickerConfig; |
| 19 | +import com.cnlive.media.R; | |
| 20 | 20 | import com.cnlive.media.frame.presenter.RecordPresenter; |
| 21 | 21 | import com.cnlive.media.frame.view.RecordView; |
| 22 | 22 | import com.cnlive.media.meidia.entity.Media; |
| 23 | 23 | import com.cnlive.media.model.ImagePickerOptions; |
| 24 | 24 | import com.cnlive.media.ui.fragment.RecordPreviewFragment; |
| 25 | 25 | import com.cnlive.media.ui.widget.record.observable.RecordCameraViewObservable; |
| 26 | -import com.cnlive.media.utlis.observable.MeidaResultObservable; | |
| 27 | -import com.cnlive.meidia.R; | |
| 28 | -import com.cnlive.meidia.databinding.ActivityRecordBinding; | |
| 26 | +import com.cnlive.media.utils.observable.MeidaResultObservable; | |
| 27 | +import com.cnlive.media.databinding.ActivityRecordBinding; | |
| 29 | 28 | import com.qiniu.pili.droid.shortvideo.PLCaptureFrameListener; |
| 30 | -import com.qiniu.pili.droid.shortvideo.PLRecordStateListener; | |
| 31 | 29 | import com.qiniu.pili.droid.shortvideo.PLShortVideoRecorder; |
| 32 | 30 | import com.qiniu.pili.droid.shortvideo.PLVideoFrame; |
| 33 | 31 | import com.qiniu.pili.droid.shortvideo.PLVideoSaveListener; | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/activity/VideoPlayerActivity.java
| ... | ... | @@ -5,12 +5,10 @@ import android.content.Intent; |
| 5 | 5 | import android.os.Bundle; |
| 6 | 6 | |
| 7 | 7 | import com.cnlive.libs.base.frame.activity.MvpBindingActivity; |
| 8 | -import com.cnlive.media.PickerConfig; | |
| 8 | +import com.cnlive.media.R; | |
| 9 | 9 | import com.cnlive.media.frame.presenter.VideoPlayerPresenter; |
| 10 | 10 | import com.cnlive.media.frame.view.VideoPlayerView; |
| 11 | -import com.cnlive.media.model.ImagePickerOptions; | |
| 12 | -import com.cnlive.meidia.R; | |
| 13 | -import com.cnlive.meidia.databinding.ActivityVideoPlayBinding; | |
| 11 | +import com.cnlive.media.databinding.ActivityVideoPlayBinding; | |
| 14 | 12 | |
| 15 | 13 | /** |
| 16 | 14 | * 作 者 : wkq | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/adapter/FolderAdapter.java
| ... | ... | @@ -11,10 +11,10 @@ import android.widget.TextView; |
| 11 | 11 | import androidx.core.content.ContextCompat; |
| 12 | 12 | |
| 13 | 13 | |
| 14 | +import com.cnlive.media.R; | |
| 14 | 15 | import com.cnlive.media.meidia.entity.Folder; |
| 15 | 16 | import com.cnlive.media.meidia.entity.Media; |
| 16 | -import com.cnlive.media.utlis.GlideCacheUtil; | |
| 17 | -import com.cnlive.meidia.R; | |
| 17 | +import com.cnlive.media.utils.GlideCacheUtil; | |
| 18 | 18 | |
| 19 | 19 | import java.util.ArrayList; |
| 20 | 20 | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/adapter/MediaAdapter.java
| ... | ... | @@ -14,13 +14,13 @@ import androidx.recyclerview.widget.RecyclerView; |
| 14 | 14 | |
| 15 | 15 | import com.cnlive.libs.base.util.StringUtils; |
| 16 | 16 | import com.cnlive.media.PickerConfig; |
| 17 | +import com.cnlive.media.R; | |
| 17 | 18 | import com.cnlive.media.meidia.entity.Media; |
| 18 | 19 | import com.cnlive.media.model.ImagePickerOptions; |
| 19 | -import com.cnlive.media.utlis.FileUtils; | |
| 20 | -import com.cnlive.media.utlis.GlideCacheUtil; | |
| 21 | -import com.cnlive.media.utlis.ScreenUtils; | |
| 22 | -import com.cnlive.meidia.R; | |
| 23 | -import com.cnlive.meidia.databinding.MediaImageItemBinding; | |
| 20 | +import com.cnlive.media.utils.FileUtils; | |
| 21 | +import com.cnlive.media.utils.GlideCacheUtil; | |
| 22 | +import com.cnlive.media.utils.ScreenUtils; | |
| 23 | +import com.cnlive.media.databinding.MediaImageItemBinding; | |
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * 作 者 : wkq | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/adapter/PreviewBottomAdapter.java
| ... | ... | @@ -10,9 +10,9 @@ import androidx.annotation.Nullable; |
| 10 | 10 | import androidx.recyclerview.widget.RecyclerView; |
| 11 | 11 | |
| 12 | 12 | |
| 13 | +import com.cnlive.media.R; | |
| 13 | 14 | import com.cnlive.media.meidia.entity.Media; |
| 14 | -import com.cnlive.media.utlis.GlideCacheUtil; | |
| 15 | -import com.cnlive.meidia.R; | |
| 15 | +import com.cnlive.media.utils.GlideCacheUtil; | |
| 16 | 16 | |
| 17 | 17 | import java.util.ArrayList; |
| 18 | 18 | import java.util.List; | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/adapter/PreviewBottomMediaAdapter.java
| ... | ... | @@ -2,19 +2,17 @@ package com.cnlive.media.ui.adapter; |
| 2 | 2 | |
| 3 | 3 | import android.content.Context; |
| 4 | 4 | import android.view.LayoutInflater; |
| 5 | -import android.view.View; | |
| 6 | 5 | import android.view.ViewGroup; |
| 7 | 6 | |
| 8 | 7 | import androidx.annotation.NonNull; |
| 9 | 8 | import androidx.databinding.DataBindingUtil; |
| 10 | 9 | import androidx.recyclerview.widget.RecyclerView; |
| 11 | 10 | |
| 11 | +import com.cnlive.media.R; | |
| 12 | 12 | import com.cnlive.media.meidia.entity.Media; |
| 13 | -import com.cnlive.media.utlis.GlideCacheUtil; | |
| 14 | -import com.cnlive.meidia.R; | |
| 15 | -import com.cnlive.meidia.databinding.MediaPreviewBottomBarItemBinding; | |
| 13 | +import com.cnlive.media.utils.GlideCacheUtil; | |
| 14 | +import com.cnlive.media.databinding.MediaPreviewBottomBarItemBinding; | |
| 16 | 15 | |
| 17 | -import java.util.ArrayList; | |
| 18 | 16 | import java.util.List; |
| 19 | 17 | |
| 20 | 18 | /** | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/fragment/MediaFragment.java
| ... | ... | @@ -6,12 +6,11 @@ import android.view.View; |
| 6 | 6 | import androidx.annotation.Nullable; |
| 7 | 7 | |
| 8 | 8 | import com.cnlive.libs.base.frame.fragment.MvpBindingFragment; |
| 9 | +import com.cnlive.media.R; | |
| 9 | 10 | import com.cnlive.media.frame.presenter.MediaFPresenter; |
| 10 | 11 | import com.cnlive.media.frame.view.MediaFView; |
| 11 | 12 | import com.cnlive.media.meidia.entity.Media; |
| 12 | -import com.cnlive.meidia.R; | |
| 13 | -import com.cnlive.meidia.databinding.FragmentMediaBinding; | |
| 14 | -import com.cnlive.meidia.databinding.FragmentPreviewBinding; | |
| 13 | +import com.cnlive.media.databinding.FragmentMediaBinding; | |
| 15 | 14 | |
| 16 | 15 | /** |
| 17 | 16 | * 作 者 : wkq | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/fragment/MediaPickerFragment.java
| ... | ... | @@ -8,15 +8,15 @@ import androidx.annotation.NonNull; |
| 8 | 8 | import androidx.annotation.Nullable; |
| 9 | 9 | |
| 10 | 10 | import com.cnlive.libs.base.frame.fragment.MvpBindingFragment; |
| 11 | +import com.cnlive.media.R; | |
| 11 | 12 | import com.cnlive.media.frame.presenter.MediaPickerFragmentPresenter; |
| 12 | 13 | import com.cnlive.media.frame.view.MediaPickerFragmentView; |
| 13 | 14 | import com.cnlive.media.meidia.entity.Folder; |
| 14 | 15 | import com.cnlive.media.meidia.entity.Media; |
| 15 | 16 | import com.cnlive.media.ui.activity.MediaActivity; |
| 16 | 17 | import com.cnlive.media.ui.adapter.MediaAdapter; |
| 17 | -import com.cnlive.media.utlis.observable.SelectStateUpdateObservable; | |
| 18 | -import com.cnlive.meidia.R; | |
| 19 | -import com.cnlive.meidia.databinding.FragmentPickerBinding; | |
| 18 | +import com.cnlive.media.utils.observable.SelectStateUpdateObservable; | |
| 19 | +import com.cnlive.media.databinding.FragmentPickerBinding; | |
| 20 | 20 | |
| 21 | 21 | import java.util.ArrayList; |
| 22 | 22 | import java.util.Observable; | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/fragment/MediaPreviewFragment.java
| ... | ... | @@ -8,13 +8,13 @@ import androidx.activity.OnBackPressedDispatcher; |
| 8 | 8 | import androidx.annotation.Nullable; |
| 9 | 9 | |
| 10 | 10 | import com.cnlive.libs.base.frame.fragment.MvpBindingFragment; |
| 11 | +import com.cnlive.media.R; | |
| 11 | 12 | import com.cnlive.media.frame.presenter.MediaPreviewPresenter; |
| 12 | 13 | import com.cnlive.media.frame.view.MediaPreviewView; |
| 13 | 14 | import com.cnlive.media.meidia.entity.Media; |
| 14 | 15 | import com.cnlive.media.ui.activity.MediaActivity; |
| 15 | 16 | import com.cnlive.media.ui.adapter.MediaPreviewAdapter; |
| 16 | -import com.cnlive.meidia.R; | |
| 17 | -import com.cnlive.meidia.databinding.FragmentPreviewBinding; | |
| 17 | +import com.cnlive.media.databinding.FragmentPreviewBinding; | |
| 18 | 18 | |
| 19 | 19 | import java.util.ArrayList; |
| 20 | 20 | import java.util.List; | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/fragment/RecordPreviewFragment.java
| ... | ... | @@ -9,12 +9,12 @@ import androidx.annotation.Nullable; |
| 9 | 9 | |
| 10 | 10 | import com.cnlive.libs.base.frame.fragment.MvpBindingFragment; |
| 11 | 11 | import com.cnlive.libs.base.util.DoublePressed; |
| 12 | +import com.cnlive.media.R; | |
| 12 | 13 | import com.cnlive.media.frame.presenter.RecordPreviewPresenter; |
| 13 | 14 | import com.cnlive.media.frame.view.RecordPreviewView; |
| 14 | 15 | import com.cnlive.media.ui.activity.RecordActivity; |
| 15 | -import com.cnlive.media.utlis.Utils; | |
| 16 | -import com.cnlive.meidia.R; | |
| 17 | -import com.cnlive.meidia.databinding.FragmentRecordPreviewBinding; | |
| 16 | +import com.cnlive.media.utils.Utils; | |
| 17 | +import com.cnlive.media.databinding.FragmentRecordPreviewBinding; | |
| 18 | 18 | import com.qiniu.pili.droid.shortvideo.PLShortVideoEditor; |
| 19 | 19 | |
| 20 | 20 | /** | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/widget/large/SubsamplingScaleImageView.java
| ... | ... | @@ -40,8 +40,8 @@ import com.cnlive.media.ui.widget.large.decoder.ImageDecoder; |
| 40 | 40 | import com.cnlive.media.ui.widget.large.decoder.ImageRegionDecoder; |
| 41 | 41 | import com.cnlive.media.ui.widget.large.decoder.SkiaImageDecoder; |
| 42 | 42 | import com.cnlive.media.ui.widget.large.decoder.SkiaImageRegionDecoder; |
| 43 | -import com.cnlive.media.utlis.ScreenUtils; | |
| 44 | -import com.cnlive.meidia.R; | |
| 43 | +import com.cnlive.media.utils.ScreenUtils; | |
| 44 | +import com.cnlive.media.R; | |
| 45 | 45 | |
| 46 | 46 | import java.lang.ref.WeakReference; |
| 47 | 47 | import java.util.ArrayList; | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/widget/record/FoucsView.java
lib_media/src/main/java/com/cnlive/media/ui/widget/record/RecordCameraView.java
| ... | ... | @@ -14,8 +14,8 @@ import androidx.databinding.DataBindingUtil; |
| 14 | 14 | |
| 15 | 15 | import com.cnlive.media.ui.widget.record.listener.ShootViewClickListener; |
| 16 | 16 | import com.cnlive.media.ui.widget.record.observable.RecordCameraViewObservable; |
| 17 | -import com.cnlive.meidia.R; | |
| 18 | -import com.cnlive.meidia.databinding.LayoutRecordCameraBinding; | |
| 17 | +import com.cnlive.media.R; | |
| 18 | +import com.cnlive.media.databinding.LayoutRecordCameraBinding; | |
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * 作 者 : wkq | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/widget/record/ReturnButton.java
lib_media/src/main/java/com/cnlive/media/ui/widget/record/ShootView.java
| ... | ... | @@ -8,15 +8,14 @@ import android.graphics.Paint; |
| 8 | 8 | import android.graphics.RectF; |
| 9 | 9 | import android.os.CountDownTimer; |
| 10 | 10 | import android.util.AttributeSet; |
| 11 | -import android.util.Log; | |
| 12 | 11 | import android.view.MotionEvent; |
| 13 | 12 | import android.view.View; |
| 14 | 13 | |
| 15 | 14 | import androidx.annotation.Nullable; |
| 16 | 15 | |
| 17 | 16 | import com.cnlive.media.PickerConfig; |
| 17 | +import com.cnlive.media.R; | |
| 18 | 18 | import com.cnlive.media.ui.widget.record.listener.ShootViewClickListener; |
| 19 | -import com.cnlive.meidia.R; | |
| 20 | 19 | |
| 21 | 20 | /** |
| 22 | 21 | * 作 者 : wkq | ... | ... |
lib_media/src/main/java/com/cnlive/media/ui/widget/record/TypeButton.java
lib_media/src/main/java/com/cnlive/media/utlis/AlertDialogUtils.java renamed to lib_media/src/main/java/com/cnlive/media/utils/AlertDialogUtils.java
| 1 | -package com.cnlive.media.utlis; | |
| 1 | +package com.cnlive.media.utils; | |
| 2 | 2 | |
| 3 | 3 | import android.app.Dialog; |
| 4 | 4 | import android.content.Context; |
| ... | ... | @@ -7,7 +7,7 @@ import android.view.View; |
| 7 | 7 | import android.view.ViewGroup; |
| 8 | 8 | import android.widget.TextView; |
| 9 | 9 | |
| 10 | -import com.cnlive.meidia.R; | |
| 10 | +import com.cnlive.media.R; | |
| 11 | 11 | |
| 12 | 12 | |
| 13 | 13 | /** | ... | ... |
lib_media/src/main/java/com/cnlive/media/utlis/AndroidQUtil.java renamed to lib_media/src/main/java/com/cnlive/media/utils/AndroidQUtil.java
lib_media/src/main/java/com/cnlive/media/utlis/BrandUtils.java renamed to lib_media/src/main/java/com/cnlive/media/utils/BrandUtils.java
lib_media/src/main/java/com/cnlive/media/utlis/DensityUtils.java renamed to lib_media/src/main/java/com/cnlive/media/utils/DensityUtils.java
lib_media/src/main/java/com/cnlive/media/utlis/FileTypeUtil.java renamed to lib_media/src/main/java/com/cnlive/media/utils/FileTypeUtil.java
lib_media/src/main/java/com/cnlive/media/utlis/FileUtils.java renamed to lib_media/src/main/java/com/cnlive/media/utils/FileUtils.java
lib_media/src/main/java/com/cnlive/media/utlis/GlideCacheUtil.java renamed to lib_media/src/main/java/com/cnlive/media/utils/GlideCacheUtil.java
| 1 | -package com.cnlive.media.utlis; | |
| 1 | +package com.cnlive.media.utils; | |
| 2 | 2 | |
| 3 | 3 | import android.annotation.SuppressLint; |
| 4 | 4 | import android.content.Context; |
| ... | ... | @@ -24,7 +24,7 @@ import com.bumptech.glide.request.RequestListener; |
| 24 | 24 | import com.bumptech.glide.request.RequestOptions; |
| 25 | 25 | import com.bumptech.glide.request.target.Target; |
| 26 | 26 | import com.cnlive.media.meidia.entity.Media; |
| 27 | -import com.cnlive.meidia.R; | |
| 27 | +import com.cnlive.media.R; | |
| 28 | 28 | |
| 29 | 29 | import java.io.File; |
| 30 | 30 | import java.math.BigDecimal; | ... | ... |
lib_media/src/main/java/com/cnlive/media/utlis/MediaStringUtils.java renamed to lib_media/src/main/java/com/cnlive/media/utils/MediaStringUtils.java
lib_media/src/main/java/com/cnlive/media/utlis/MediaUtils.java renamed to lib_media/src/main/java/com/cnlive/media/utils/MediaUtils.java
lib_media/src/main/java/com/cnlive/media/utlis/PermissionChecker.java renamed to lib_media/src/main/java/com/cnlive/media/utils/PermissionChecker.java
| 1 | -package com.cnlive.media.utlis; | |
| 1 | +package com.cnlive.media.utils; | |
| 2 | 2 | |
| 3 | 3 | import android.app.Activity; |
| 4 | 4 | import android.app.Dialog; |
| ... | ... | @@ -13,7 +13,7 @@ import android.text.TextUtils; |
| 13 | 13 | import androidx.core.app.ActivityCompat; |
| 14 | 14 | |
| 15 | 15 | |
| 16 | -import com.cnlive.meidia.R; | |
| 16 | +import com.cnlive.media.R; | |
| 17 | 17 | |
| 18 | 18 | import java.util.ArrayList; |
| 19 | 19 | import java.util.List; | ... | ... |
lib_media/src/main/java/com/cnlive/media/utlis/ScreenUtils.java renamed to lib_media/src/main/java/com/cnlive/media/utils/ScreenUtils.java
lib_media/src/main/java/com/cnlive/media/utlis/Utils.java renamed to lib_media/src/main/java/com/cnlive/media/utils/Utils.java
lib_media/src/main/java/com/cnlive/media/utlis/album/AlbumFileUtli.java renamed to lib_media/src/main/java/com/cnlive/media/utils/album/AlbumFileUtli.java
lib_media/src/main/java/com/cnlive/media/utlis/album/AlbumProcessUtil.java renamed to lib_media/src/main/java/com/cnlive/media/utils/album/AlbumProcessUtil.java
lib_media/src/main/java/com/cnlive/media/utlis/album/OnSaveCallback.java renamed to lib_media/src/main/java/com/cnlive/media/utils/album/OnSaveCallback.java
lib_media/src/main/java/com/cnlive/media/utlis/observable/MediaAddObservable.java renamed to lib_media/src/main/java/com/cnlive/media/utils/observable/MediaAddObservable.java
lib_media/src/main/java/com/cnlive/media/utlis/observable/MediaOpenActivityObservable.java renamed to lib_media/src/main/java/com/cnlive/media/utils/observable/MediaOpenActivityObservable.java
lib_media/src/main/java/com/cnlive/media/utlis/observable/MediaOpenInfo.java renamed to lib_media/src/main/java/com/cnlive/media/utils/observable/MediaOpenInfo.java
lib_media/src/main/java/com/cnlive/media/utlis/observable/MediaPageSelectStateObservable.java renamed to lib_media/src/main/java/com/cnlive/media/utils/observable/MediaPageSelectStateObservable.java
lib_media/src/main/java/com/cnlive/media/utlis/observable/MediaSelectStateObservable.java renamed to lib_media/src/main/java/com/cnlive/media/utils/observable/MediaSelectStateObservable.java
lib_media/src/main/java/com/cnlive/media/utlis/observable/MeidaResultObservable.java renamed to lib_media/src/main/java/com/cnlive/media/utils/observable/MeidaResultObservable.java
lib_media/src/main/java/com/cnlive/media/utlis/observable/SelectStateUpdateObservable.java renamed to lib_media/src/main/java/com/cnlive/media/utils/observable/SelectStateUpdateObservable.java