diff --git a/commonLibrary/src/main/java/com/framework/base/mvp/BasePresenterImpl.java b/commonLibrary/src/main/java/com/framework/base/mvp/BasePresenterImpl.java
index 8e316b7..fba5837 100755
--- a/commonLibrary/src/main/java/com/framework/base/mvp/BasePresenterImpl.java
+++ b/commonLibrary/src/main/java/com/framework/base/mvp/BasePresenterImpl.java
@@ -52,8 +52,24 @@ public void onNetWorkComplete() {
@Override
public void onNetWorkSuccess(M data) {
if (view != null) {
- if (data instanceof List && view instanceof BaseListView && ((List) data).isEmpty()) {
- ((BaseListView) view).noMore();
+ if (data instanceof List) {
+ if (view instanceof BaseListView) {
+ if (((List) data).isEmpty()) {
+ KLog.i("data isEmpty == true, view instanceof BaseListView");
+ ((BaseListView) view).noMore();
+ } else {
+ KLog.i("view instanceof BaseListView,Success");
+ view.netWorkSuccess(data);
+ }
+ return;
+ }
+ if (((List) data).isEmpty()) {
+ KLog.i("data isEmpty == true, view instanceof BaseView");
+ view.netWorkError();
+ } else {
+ KLog.i("view instanceof BaseView,Success");
+ view.netWorkSuccess(data);
+ }
} else {
view.netWorkSuccess(data);
}
diff --git a/fiction/src/main/res/drawable/ic_bookmark.xml b/commonLibrary/src/main/res/drawable/ic_bookmark.xml
similarity index 100%
rename from fiction/src/main/res/drawable/ic_bookmark.xml
rename to commonLibrary/src/main/res/drawable/ic_bookmark.xml
diff --git a/fiction/src/main/res/drawable/ic_delete.xml b/commonLibrary/src/main/res/drawable/ic_delete.xml
similarity index 100%
rename from fiction/src/main/res/drawable/ic_delete.xml
rename to commonLibrary/src/main/res/drawable/ic_delete.xml
diff --git a/fiction/src/main/res/layout/item_mark.xml b/commonLibrary/src/main/res/layout/item_mark.xml
similarity index 100%
rename from fiction/src/main/res/layout/item_mark.xml
rename to commonLibrary/src/main/res/layout/item_mark.xml
diff --git a/commonLibrary/src/main/res/values/dimens.xml b/commonLibrary/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..6ab6a4d
--- /dev/null
+++ b/commonLibrary/src/main/res/values/dimens.xml
@@ -0,0 +1,14 @@
+
+
+ 6dp
+ 5dp
+ 5dp
+ 5dp
+ 100dp
+ 100dp
+
+
+ 3dp
+
+ 3dp
+
\ No newline at end of file
diff --git a/commonLibrary/src/main/res/values/strings.xml b/commonLibrary/src/main/res/values/strings.xml
index 47e20a7..118692a 100755
--- a/commonLibrary/src/main/res/values/strings.xml
+++ b/commonLibrary/src/main/res/values/strings.xml
@@ -6,4 +6,6 @@
没有数据了
没有数据,点击重试
网络错误,点击重试
+ 记录
+ 没有搜索记录
diff --git a/fiction/src/main/java/com/fiction/ui/activity/FictionDetailActivity.java b/fiction/src/main/java/com/fiction/ui/activity/FictionDetailActivity.java
index bd09871..d3817ea 100755
--- a/fiction/src/main/java/com/fiction/ui/activity/FictionDetailActivity.java
+++ b/fiction/src/main/java/com/fiction/ui/activity/FictionDetailActivity.java
@@ -123,14 +123,14 @@ public void onClick(View v) {
if (!TextUtils.isEmpty(nextUrl)) {
startNetWork(nextUrl, type);
} else {
- UIUtils.toast(UIUtils.getString(R.string.on_empty));
+ UIUtils.toast(UIUtils.getString(R.string.data_empty));
}
break;
case R.id.btn_on:
if (!TextUtils.isEmpty(onUrl)) {
startNetWork(onUrl, type);
} else {
- UIUtils.toast(UIUtils.getString(R.string.on_empty));
+ UIUtils.toast(UIUtils.getString(R.string.data_empty));
}
break;
}
diff --git a/fiction/src/main/java/com/fiction/ui/activity/MainActivity.java b/fiction/src/main/java/com/fiction/ui/activity/MainActivity.java
index 11d2652..2ec43fa 100755
--- a/fiction/src/main/java/com/fiction/ui/activity/MainActivity.java
+++ b/fiction/src/main/java/com/fiction/ui/activity/MainActivity.java
@@ -118,7 +118,10 @@ public void switchMark() {
.initXData(fictionMarkAll)
.setLayoutId(R.layout.item_mark)
.onXBind(this)
- .setOnItemClickListener((view, position, info) -> SearchActivity.getInstance(String.valueOf(info.getFictionName())))
+ .setOnItemClickListener((view, position, info) -> {
+ markDialog.dismiss();
+ SearchActivity.getInstance(String.valueOf(info.getFictionName()));
+ })
, null)
.show();
}
diff --git a/fiction/src/main/res/layout/activity_fiction_list_detail.xml b/fiction/src/main/res/layout/activity_fiction_list_detail.xml
index e48cc9c..2264aee 100755
--- a/fiction/src/main/res/layout/activity_fiction_list_detail.xml
+++ b/fiction/src/main/res/layout/activity_fiction_list_detail.xml
@@ -30,22 +30,22 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/btn_rootView"
- android:layout_marginLeft="@dimen/margin"
- android:layout_marginRight="@dimen/margin" />
+ android:layout_marginLeft="@dimen/fiction_margin"
+ android:layout_marginRight="@dimen/fiction_margin" />
+ android:layout_margin="@dimen/fiction_margin">