From 2356c5f7a38b28a3dc60cd2f23f784693d972873 Mon Sep 17 00:00:00 2001 From: xuexiangjys Date: Wed, 9 Dec 2020 21:48:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=833.0.1=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++++----- docs/README.md | 8 ++++---- .../java/com/xuexiang/xpage/base/XPageActivity.java | 2 +- .../xpage/base/XPageContainerListFragment.java | 10 +++++----- .../java/com/xuexiang/xpage/base/XPageFragment.java | 4 ++-- .../com/xuexiang/xpage/base/XPageListFragment.java | 8 ++++++++ .../xuexiang/xpage/base/XPageSimpleListFragment.java | 7 ++++--- 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 84f1007..ac052d2 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![I](https://img.shields.io/github/issues/xuexiangjys/XPage.svg)](https://github.com/xuexiangjys/XPage/issues) [![Star](https://img.shields.io/github/stars/xuexiangjys/XPage.svg)](https://github.com/xuexiangjys/XPage) -一个非常方便的fragment页面框架！还不赶紧点击[使用说明文档](https://github.com/xuexiangjys/XPage/wiki)，体验一下吧！ +一个非常方便的Fragment页面框架！还不赶紧点击[使用说明文档](https://github.com/xuexiangjys/XPage/wiki)，体验一下吧！ 另外，你还可以参见[XPage视频教程](https://space.bilibili.com/483850585/channel/detail?cid=150979)进行学习。 @@ -78,8 +78,8 @@ allprojects { dependencies { ... // XPage - implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.0' - annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.0' + implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.1' + annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.1' // ButterKnife的sdk implementation 'com.jakewharton:butterknife:10.1.0' annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0' @@ -108,8 +108,8 @@ apply plugin: 'kotlin-kapt' dependencies { ... //XPage - implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.0' - kapt 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.0' + implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.1' + kapt 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.1' //ButterKnife的sdk implementation 'com.jakewharton:butterknife:10.1.0' kapt 'com.jakewharton:butterknife-compiler:10.1.0' diff --git a/docs/README.md b/docs/README.md index 2f5a270..7536f99 100644 --- a/docs/README.md +++ b/docs/README.md @@ -47,8 +47,8 @@ allprojects { dependencies { ... // XPage - implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.0' - annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.0' + implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.1' + annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.1' // ButterKnife的sdk implementation 'com.jakewharton:butterknife:10.1.0' annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0' @@ -77,8 +77,8 @@ apply plugin: 'kotlin-kapt' dependencies { ... //XPage - implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.0' - kapt 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.0' + implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.1' + kapt 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.1' //ButterKnife的sdk implementation 'com.jakewharton:butterknife:10.1.0' kapt 'com.jakewharton:butterknife-compiler:10.1.0' diff --git a/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageActivity.java b/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageActivity.java index d7102e6..253cb59 100755 --- a/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageActivity.java +++ b/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageActivity.java @@ -1095,7 +1095,7 @@ public boolean dispatchTouchEvent(MotionEvent ev) { } /** - * 处理向下点击事件【默认在这里做隐藏输入框的处理，不想处理的话，可以重写改方法】 + * 处理向下点击事件【默认在这里做隐藏输入框的处理，不想处理的话，可以重写该方法】 * * @param ev 点击事件 */ diff --git a/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageContainerListFragment.java b/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageContainerListFragment.java index b4b0637..6fa5632 100644 --- a/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageContainerListFragment.java +++ b/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageContainerListFragment.java @@ -42,21 +42,21 @@ public Class[] getSimplePageClasses() { /** * 获取页面的类集合[使用@Page注解进行注册的页面] * - * @return + * @return 页面的类集合 */ protected abstract Class[] getPagesClasses(); /** * 获取页面名称集合 * - * @param classes - * @return + * @param classes 页面类集合 + * @return 页面名称集合 */ private List getSimplePageNames(Class... classes) { List simplePageList = new ArrayList<>(); if (classes != null && classes.length > 0) { - for (int i = 0; i < classes.length; i++) { - simplePageList.add(PageConfig.getPageInfo(classes[i]).getName()); + for (Class aClass : classes) { + simplePageList.add(PageConfig.getPageInfo(aClass).getName()); } } return simplePageList; diff --git a/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageFragment.java b/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageFragment.java index 4c87e71..1bc2b69 100755 --- a/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageFragment.java +++ b/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageFragment.java @@ -646,7 +646,7 @@ public void onDestroy() { /** * 获取根布局 * - * @return + * @return 根布局 */ public View getRootView() { return mRootView; @@ -725,7 +725,7 @@ public interface OnFragmentFinishListener { * * @param requestCode 请求码 * @param resultCode 结果码 - * @param intent + * @param intent 返回的数据 */ void onFragmentResult(int requestCode, int resultCode, Intent intent); } diff --git a/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageListFragment.java b/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageListFragment.java index c49991a..dca99a9 100755 --- a/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageListFragment.java +++ b/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageListFragment.java @@ -40,4 +40,12 @@ protected void initListeners() { protected ListView getListView() { return mListView; } + + @Override + public void onDestroyView() { + if (mListView != null) { + mListView.setOnItemClickListener(null); + } + super.onDestroyView(); + } } diff --git a/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageSimpleListFragment.java b/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageSimpleListFragment.java index 3e08431..5a0ec8e 100755 --- a/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageSimpleListFragment.java +++ b/xpage-lib/src/main/java/com/xuexiang/xpage/base/XPageSimpleListFragment.java @@ -39,7 +39,8 @@ public void onItemClick(AdapterView adapterView, View view, int position, lon /** * 初始化例子 * - * @return + * @param lists 例子数据 + * @return 例子数据 */ protected abstract List initSimpleData(List lists); @@ -51,11 +52,11 @@ public void onItemClick(AdapterView adapterView, View view, int position, lon protected abstract void onItemClick(int position); @Override - public void onDestroy() { + public void onDestroyView() { if (mSimpleData != null && mSimpleData.size() > 0) { mSimpleData.clear(); } - super.onDestroy(); + super.onDestroyView(); } protected String getSimpleDataItem(int position) {