Skip to content

Commit 6224c67

Browse files
committed
修改
1 parent 6992a17 commit 6224c67

File tree

7 files changed

+7
-41
lines changed

7 files changed

+7
-41
lines changed

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/example/administrator/webviewlist/MainActivity.java

+1-10
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected void onCreate(Bundle savedInstanceState) {
2828
webScrollLayout = (WebScrollLayout)findViewById(R.id.my_layout);
2929
recyclerView = (RecyclerView)findViewById(R.id.recycler);
3030
recyclerView.setLayoutManager(new LinearLayoutManager(this));
31-
WebViewAdapter webViewAdapter = new WebViewAdapter(new MyAdapter(),"http://wap.4c.cn");
31+
WebViewAdapter webViewAdapter = new WebViewAdapter(new MyAdapter());
3232
webScrollLayout.setRecyclerviewScrollBottomListener(new WebScrollLayout.RecyclerviewScrollBottom() {
3333
@Override
3434
public void onScrollBottom() {
@@ -37,15 +37,6 @@ public void onScrollBottom() {
3737
});
3838
webViewAdapter.attachLayout(webScrollLayout);
3939
final ScrollWebView scrollWebView = new ScrollWebView(this);
40-
scrollWebView.setWebViewClient(new WebViewClient(){
41-
@Override
42-
public void onPageFinished(WebView view, String url) {
43-
super.onPageFinished(view, url);
44-
45-
boolean s= scrollWebView.pageDown(true);
46-
Log.d("加载完毕",s+"");
47-
}
48-
});
4940
scrollWebView.loadUrl("http://wap.4c.cn");
5041
webViewAdapter.attachWebView(scrollWebView);
5142
recyclerView.setAdapter(webViewAdapter);

webviewscroll/src/main/java/com/example/webviewscroll/ScrollWebView.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void setOnCustomScroolChangeListener(ScrollInterface scrollInterface) {
8282

8383
public interface ScrollInterface {
8484

85-
public void onSChanged(int l, int t, int oldl, int oldt);
85+
void onSChanged(int l, int t, int oldl, int oldt);
8686

8787
}
8888

webviewscroll/src/main/java/com/example/webviewscroll/WebScrollLayout.java

+3-11
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
3939
onScrollTop(false);
4040
}
4141
if (newState == RecyclerView.SCROLL_STATE_IDLE) {
42-
int count = recyclerView.getAdapter().getItemCount();
4342
//获取最后一个完全显示的ItemPosition
4443
int lastVisibleItem = manager.findLastCompletelyVisibleItemPosition();
4544
int totalItemCount = manager.getItemCount();
@@ -77,7 +76,7 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
7776
@Override
7877
public void onSChanged(int l, int t, int oldl, int oldt) {
7978
float webViewContentHeight = mDispatchWebView.getContentHeight() * mDispatchWebView.getScale();
80-
//WebView的现高度
79+
Log.d("高度",mDispatchWebView.getContentHeight()+"");
8180
float webViewCurrentHeight = (mDispatchWebView.getHeight() + mDispatchWebView.getScrollY());
8281
if ((webViewContentHeight - webViewCurrentHeight) == 0) {
8382
System.out.println("WebView滑动到了底端");
@@ -106,16 +105,9 @@ public WebScrollLayout(Context context, AttributeSet attrs, int defStyleAttr) {
106105

107106
}
108107

109-
//手势事件拦截判断
110108
@Override
111109
public boolean onInterceptTouchEvent(MotionEvent ev) {
112-
/**
113-
* 当在页面某节点的touchstart事件里调用preventHostViewTouchMove时
114-
* 此时拦截后续的TouchMove事件给mDispatchWebView
115-
* 但在这之前mDispatchWebView会收到一个Touch Cancel消息
116-
* 这时应该让mDispatchWebView暂时忽略这个Cancel事件(在TouchUp后恢复)
117-
* 避免打断页面DOM节点绑定的事件处理流程而导致节点不跟手或不响应
118-
* */
110+
119111
if (ev.getAction() == MotionEvent.ACTION_MOVE && isIntercept) {
120112
{
121113
if (mDispatchWebView.isScroll()) {
@@ -178,7 +170,7 @@ private void onScrollTop(boolean istop) { //recyclerview是否滑动到顶部
178170
if (!isScrollUp && istop && mDispatchWebView.isScroll()) {
179171
mDispatchWebView.ignoreTouchCancel(true);
180172
isIntercept = true;
181-
}else {
173+
}else if (mDispatchWebView!=null){
182174
mDispatchWebView.ignoreTouchCancel(false);
183175
isIntercept = false;
184176
}

webviewscroll/src/main/java/com/example/webviewscroll/WebViewAdapter.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
public class WebViewAdapter<T> extends RecyclerView.Adapter<RecyclerView.ViewHolder>
1515
{
1616

17-
private String url = "";
1817
private int TPYE_WEB_VIEW=10;
1918
private RecyclerView.Adapter mInnerAdapter;
2019
private WebScrollLayout layout;
@@ -27,10 +26,9 @@ public void setmInnerAdapter(RecyclerView.Adapter mInnerAdapter) {
2726
this.mInnerAdapter = mInnerAdapter;
2827
}
2928

30-
public WebViewAdapter(RecyclerView.Adapter adapter, String url)
29+
public WebViewAdapter(RecyclerView.Adapter adapter)
3130
{
3231
mInnerAdapter = adapter;
33-
this.url = url;
3432

3533
}
3634

webviewscroll/src/main/res/layout/view_web.xml

-12
This file was deleted.

0 commit comments

Comments
 (0)