tt/HaiNaOSLenovo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.0.7

Browse Source 
update:
bugfixes:增加刷新和没有数据提醒
This commit is contained in:
Fanhuitong
2023-05-25 10:45:27 +08:00
parent a7aa344d92
commit 62c5aa58ac
10 changed files with 145 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -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"

28
app/src/main/java/com/uiui/videoplayer/activity/pic/GalleryActivity.java
View File

@@ -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<PhotoInfo> 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

18
app/src/main/java/com/uiui/videoplayer/activity/video/VideoActivity.java
View File

@@ -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<String> 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);

BIN
app/src/main/res/drawable-hdpi/menu_refresh.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/drawable-hdpi/no_data.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/src/main/res/drawable-hdpi/no_video_data.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.4 KiB

29
app/src/main/res/layout-land/activity_video.xml
View File

@@ -38,6 +38,15 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_refresh"
android:layout_width="@dimen/dp_16"
android:layout_height="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_8"
android:src="@drawable/menu_refresh"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -62,19 +71,23 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_nodata"
android:layout_width="@dimen/dp_128"
android:layout_height="@dimen/dp_128"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.369">
<ImageView
android:id="@+id/imageView3"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:src="@drawable/no_video_data"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/no_data"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -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" />

30
app/src/main/res/layout-port/activity_video.xml
View File

@@ -38,6 +38,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_refresh"
android:layout_width="@dimen/dp_16"
android:layout_height="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_8"
android:src="@drawable/menu_refresh"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -62,19 +72,23 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_nodata"
android:layout_width="@dimen/dp_128"
android:layout_height="@dimen/dp_128"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.369">
<ImageView
android:id="@+id/imageView3"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:src="@drawable/no_video_data"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/no_data"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -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" />

66
app/src/main/res/layout/activity_gallery.xml
View File

@@ -38,23 +38,73 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_refresh"
android:layout_width="@dimen/dp_16"
android:layout_height="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_8"
android:src="@drawable/menu_refresh"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayout"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout">
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/white">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_nodata"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.369">
<ImageView
android:id="@+id/imageView3"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/no_data"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tips"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_32"
android:text="没有数据"
android:textColor="@color/defaultColor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView3" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values/strings.xml
View File

@@ -1,4 +1,4 @@
<resources>
<string name="app_name">我的视频</string>
<string name="app_name">家庭空间</string>
<string name="download_now">正在下载%s</string>
</resources>