Skip to content

Commit 0884802

Browse files
author
uis
committed
层叠重构
1 parent 364b6e9 commit 0884802

9 files changed

Lines changed: 521 additions & 585 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.4.2'
12+
classpath 'com.android.tools.build:gradle:3.6.3'
1313
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
1414
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1515
}

demo/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ dependencies {
2929
implementation 'com.makeramen:roundedimageview:2.3.0'
3030
implementation 'com.google.code.gson:gson:2.8.5'
3131
implementation "androidx.viewpager:viewpager:${androidx}"
32-
implementation 'com.facebook.fresco:fresco:2.0.0'
33-
implementation 'com.huxq17.xrefreshview:xrefreshview:3.6.9'
32+
implementation 'com.facebook.fresco:fresco:2.2.0'
3433
implementation project(':stacklayout')
3534
}

demo/src/main/java/com/uis/stackview/demo/activity/MainActivity.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
import android.view.View;
77
import android.view.ViewGroup;
88
import android.view.WindowManager;
9-
10-
import com.andview.refreshview.XRefreshView;
11-
import com.andview.refreshview.utils.LogUtils;
12-
import com.facebook.common.logging.FLog;
139
import com.facebook.drawee.backends.pipeline.Fresco;
1410
import com.facebook.imagepipeline.core.ImagePipelineConfig;
1511
import com.uis.stackview.demo.R;
@@ -42,8 +38,6 @@ protected void onCreate(Bundle savedInstanceState) {
4238
ViewGroup.LayoutParams params = findViewById(R.id.view).getLayoutParams();
4339
params.height = getResources().getDimensionPixelSize(R.dimen.status_height);
4440
}
45-
FLog.setMinimumLoggingLevel(FLog.VERBOSE);
46-
LogUtils.enableLog(false);
4741
if(!Fresco.hasBeenInitialized()) {
4842
ImagePipelineConfig config = ImagePipelineConfig.newBuilder(getApplicationContext())
4943
.setDiskCacheEnabled(true)
@@ -55,19 +49,6 @@ protected void onCreate(Bundle savedInstanceState) {
5549
final List<ItemEntity> dataList = StackAdapter.initDataList(this);
5650
final StackAdapter stackAdapter = new StackAdapter();
5751
final RecyclerView recyclerView = findViewById(R.id.recyclerView);
58-
final XRefreshView freshView = findViewById(R.id.refreshView);
59-
60-
freshView.setAutoLoadMore(false);
61-
freshView.setSilenceLoadMore(false);
62-
freshView.setXRefreshViewListener(new XRefreshView.SimpleXRefreshListener(){
63-
@Override
64-
public void onRefresh(boolean isPullDown) {
65-
freshView.stopRefresh();
66-
stackAdapter.dataList = dataList.subList(0,6);
67-
stackAdapter.notifyDataSetChanged();
68-
}
69-
});
70-
7152

7253
ViewPager viewPager = findViewById(R.id.viewPager);
7354
ViewPagerAdapter adapter = new ViewPagerAdapter(dataList);

demo/src/main/java/com/uis/stackview/demo/activity/StackAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static class StackVH extends RecyclerView.ViewHolder{
8383
StackLayout.StackAdapter adapter = new StackLayout.StackAdapter() {
8484

8585
@Override
86-
public View onCreateView(ViewGroup parent) {
86+
public View onCreateView(ViewGroup parent,int viewType) {
8787
return LayoutInflater.from(parent.getContext()).inflate(R.layout.item_layout,parent,false);
8888
}
8989

demo/src/main/res/layout/activity_main.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,9 @@
1717
android:paddingRight="80dp"
1818
>
1919
</androidx.viewpager.widget.ViewPager>
20-
<com.andview.refreshview.XRefreshView
21-
android:id="@+id/refreshView"
20+
<androidx.recyclerview.widget.RecyclerView
21+
android:id="@+id/recyclerView"
2222
android:layout_width="match_parent"
2323
android:layout_height="match_parent">
24-
<androidx.recyclerview.widget.RecyclerView
25-
android:id="@+id/recyclerView"
26-
android:layout_width="match_parent"
27-
android:layout_height="match_parent">
28-
</androidx.recyclerview.widget.RecyclerView>
29-
</com.andview.refreshview.XRefreshView>
24+
</androidx.recyclerview.widget.RecyclerView>
3025
</LinearLayout>

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 commit comments

Comments
 (0)