From 62c5aa58acc18e50c1dddfe90ff7625f47a615f9 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Thu, 25 May 2023 10:45:27 +0800 Subject: [PATCH] =?UTF-8?q?version:1.0.7=20update:=20bugfixes:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=B7=E6=96=B0=E5=92=8C=E6=B2=A1=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../activity/pic/GalleryActivity.java | 28 +++++++- .../activity/video/VideoActivity.java | 18 ++++- .../main/res/drawable-hdpi/menu_refresh.png | Bin 3577 -> 1735 bytes app/src/main/res/drawable-hdpi/no_data.png | Bin 0 -> 13433 bytes .../main/res/drawable-hdpi/no_video_data.png | Bin 8579 -> 0 bytes .../main/res/layout-land/activity_video.xml | 29 +++++--- .../main/res/layout-port/activity_video.xml | 30 +++++--- app/src/main/res/layout/activity_gallery.xml | 66 +++++++++++++++--- app/src/main/res/values/strings.xml | 2 +- 10 files changed, 145 insertions(+), 32 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/no_data.png delete mode 100644 app/src/main/res/drawable-hdpi/no_video_data.png 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 71eab06187dee55333a1059f921b26f5e1c4083b..e37aeea896009fa5f9e4e07e3db67df213d03e95 100644 GIT binary patch delta 1707 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 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