diff --git a/app/build.gradle b/app/build.gradle index 0cafef6..dfe0679 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiui.videoplayer" minSdkVersion 24 targetSdkVersion 28 - versionCode 107 - versionName "1.0.6" + versionCode 108 + versionName "1.0.7" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/uiui/videoplayer/activity/pic/GalleryActivity.java b/app/src/main/java/com/uiui/videoplayer/activity/pic/GalleryActivity.java index 9968ca1..fb8e89f 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/pic/GalleryActivity.java +++ b/app/src/main/java/com/uiui/videoplayer/activity/pic/GalleryActivity.java @@ -1,6 +1,7 @@ package com.uiui.videoplayer.activity.pic; import androidx.appcompat.app.AppCompatActivity; +import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -16,6 +17,7 @@ import com.uiui.videoplayer.base.BGAGridDivider; import com.uiui.videoplayer.base.BaseLightActivity; import com.uiui.videoplayer.base.GridSpaceItemDecoration; import com.uiui.videoplayer.bean.PhotoInfo; +import com.uiui.videoplayer.utils.ToastUtil; import java.util.ArrayList; import java.util.List; @@ -29,8 +31,12 @@ public class GalleryActivity extends BaseLightActivity implements GalleryContact SwipeRefreshLayout swipeRefreshLayout; @BindView(R.id.recyclerView) RecyclerView recyclerView; + @BindView(R.id.cl_nodata) + ConstraintLayout cl_nodata; @BindView(R.id.iv_back) ImageView iv_back; + @BindView(R.id.iv_refresh) + ImageView iv_refresh; private GalleryPresenter mPresenter; private PicAdapter mPicAdapter; @@ -56,8 +62,7 @@ public class GalleryActivity extends BaseLightActivity implements GalleryContact swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override public void onRefresh() { - swipeRefreshLayout.setRefreshing(true); - mPresenter.getHomePhoto(); + getHomePhoto(); } }); iv_back.setOnClickListener(new View.OnClickListener() { @@ -66,16 +71,35 @@ public class GalleryActivity extends BaseLightActivity implements GalleryContact finish(); } }); + iv_refresh.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + getHomePhoto(); + } + }); } @Override public void initData() { + getHomePhoto(); + } + + private void getHomePhoto() { + swipeRefreshLayout.setRefreshing(true); mPresenter.getHomePhoto(); } @Override public void setHomePhoto(ArrayList photoInfos) { mPicAdapter.setPhotoInfos(photoInfos); + if (photoInfos == null || photoInfos.size() == 0) { + cl_nodata.setVisibility(View.VISIBLE); + recyclerView.setVisibility(View.GONE); + ToastUtil.show("没有数据"); + } else { + cl_nodata.setVisibility(View.GONE); + recyclerView.setVisibility(View.VISIBLE); + } } @Override diff --git a/app/src/main/java/com/uiui/videoplayer/activity/video/VideoActivity.java b/app/src/main/java/com/uiui/videoplayer/activity/video/VideoActivity.java index d859549..31535e6 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/video/VideoActivity.java +++ b/app/src/main/java/com/uiui/videoplayer/activity/video/VideoActivity.java @@ -68,6 +68,8 @@ public class VideoActivity extends BaseLightActivity implements VideoContact.Vid SwipeRefreshLayout refreshLayout; @BindView(R.id.iv_back) ImageView iv_back; + @BindView(R.id.iv_refresh) + ImageView iv_refresh; private VideoPresenter mPresenter; private List paths = new ArrayList<>(); @@ -90,7 +92,6 @@ public class VideoActivity extends BaseLightActivity implements VideoContact.Vid mPresenter.getHomeVideo(); } }); - refreshLayout.setRefreshing(true); ((SimpleItemAnimator) recyclerView.getItemAnimator()).setSupportsChangeAnimations(false); int orientation = getResources().getConfiguration().orientation; if (orientation == Configuration.ORIENTATION_LANDSCAPE) { @@ -117,10 +118,21 @@ public class VideoActivity extends BaseLightActivity implements VideoContact.Vid finish(); } }); + iv_refresh.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + getHomeVideo(); + } + }); } @Override public void initData() { + getHomeVideo(); + } + + private void getHomeVideo(){ + refreshLayout.setRefreshing(true); mPresenter.getHomeVideo(); } @@ -342,8 +354,7 @@ public class VideoActivity extends BaseLightActivity implements VideoContact.Vid } break; case R.id.refresh: - refreshLayout.setRefreshing(true); - mPresenter.getHomeVideo(); + getHomeVideo(); break; case R.id.single_loop: if (null != single_loop) { @@ -407,6 +418,7 @@ public class VideoActivity extends BaseLightActivity implements VideoContact.Vid if (video == null || video.size() == 0) { cl_nodata.setVisibility(View.VISIBLE); recyclerView.setVisibility(View.GONE); + ToastUtil.show("没有数据"); } else { cl_nodata.setVisibility(View.GONE); recyclerView.setVisibility(View.VISIBLE); diff --git a/app/src/main/res/drawable-hdpi/menu_refresh.png b/app/src/main/res/drawable-hdpi/menu_refresh.png index 71eab06..e37aeea 100644 Binary files a/app/src/main/res/drawable-hdpi/menu_refresh.png and b/app/src/main/res/drawable-hdpi/menu_refresh.png differ diff --git a/app/src/main/res/drawable-hdpi/no_data.png b/app/src/main/res/drawable-hdpi/no_data.png new file mode 100644 index 0000000..e1eb6e3 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/no_data.png differ diff --git a/app/src/main/res/drawable-hdpi/no_video_data.png b/app/src/main/res/drawable-hdpi/no_video_data.png deleted file mode 100644 index a2f45fd..0000000 Binary files a/app/src/main/res/drawable-hdpi/no_video_data.png and /dev/null differ diff --git a/app/src/main/res/layout-land/activity_video.xml b/app/src/main/res/layout-land/activity_video.xml index 33ad4ca..6c8f7e6 100644 --- a/app/src/main/res/layout-land/activity_video.xml +++ b/app/src/main/res/layout-land/activity_video.xml @@ -38,6 +38,15 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.369"> @@ -83,9 +96,9 @@ android:id="@+id/tips" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="没有找到视频文件" + android:layout_marginTop="@dimen/dp_32" + android:text="没有数据" android:textColor="@color/defaultColor" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/imageView3" /> diff --git a/app/src/main/res/layout-port/activity_video.xml b/app/src/main/res/layout-port/activity_video.xml index 33ad4ca..139e3bd 100644 --- a/app/src/main/res/layout-port/activity_video.xml +++ b/app/src/main/res/layout-port/activity_video.xml @@ -38,6 +38,16 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.369"> @@ -83,9 +97,9 @@ android:id="@+id/tips" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="没有找到视频文件" + android:layout_marginTop="@dimen/dp_32" + android:text="没有数据" android:textColor="@color/defaultColor" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/imageView3" /> diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml index 888cea1..825ef07 100644 --- a/app/src/main/res/layout/activity_gallery.xml +++ b/app/src/main/res/layout/activity_gallery.xml @@ -38,23 +38,73 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + - - + android:layout_height="match_parent" + android:background="@color/white"> - + android:layout_height="match_parent"> + + + + + + + + + + - + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 77fcc17..86db884 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ - 我的视频 + 家庭空间 正在下载%s