yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move from local favorites to cloud favorites

Browse Source
This commit is contained in:
seven332 committed 2016-03-03 14:18:13 +08:00
1 parent 997ee15c4d
commit fc32252772
11 files changed
+384 -59
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/EhDB.java
+52
View File
@@ -44,6 +44,7 @@ import com.hippo.ehviewer.dao.QuickSearchDao;
import com.hippo.ehviewer.dao.QuickSearchRaw;
import com.hippo.ehviewer.download.DownloadInfo;
import java.util.ArrayList;
import java.util.List;
import de.greenrobot.dao.query.LazyList;
@@ -452,4 +453,55 @@ public class EhDB {
DownloadLabelDao dao = sDaoSession.getDownloadLabelDao();
dao.delete(raw);
}
public static synchronized List<GalleryInfo> getAllLocalFavorites() {
LocalFavoritesDao dao = sDaoSession.getLocalFavoritesDao();
List<LocalFavoritesRaw> list = dao.queryBuilder().orderAsc(LocalFavoritesDao.Properties.Date).list();
List<GalleryInfo> result = new ArrayList<>(list.size());
for (LocalFavoritesRaw raw: list) {
GalleryInfo gi = getGalleryInfo((int) (long) raw.getGid());
if (null == gi) {
continue;
}
result.add(gi);
}
return result;
}
public static synchronized List<GalleryInfo> searchLocalFavorites(String query) {
LocalFavoritesDao dao = sDaoSession.getLocalFavoritesDao();
List<LocalFavoritesRaw> list = dao.queryBuilder().orderAsc(LocalFavoritesDao.Properties.Date).list();
List<GalleryInfo> result = new ArrayList<>(list.size());
for (LocalFavoritesRaw raw: list) {
GalleryInfo gi = getGalleryInfo((int) (long) raw.getGid());
if (null == gi || !gi.title.toLowerCase().contains(query.toLowerCase())) {
continue;
}
result.add(gi);
}
return result;
}
public static synchronized void removeLocalFavorites(int[] gidArray) {
LocalFavoritesDao dao = sDaoSession.getLocalFavoritesDao();
for (int gid: gidArray) {
dao.deleteByKey((long) gid);
}
}
public static synchronized void addLocalFavorites(List<GalleryInfo> galleryInfoList) {
LocalFavoritesDao dao = sDaoSession.getLocalFavoritesDao();
for (GalleryInfo gi: galleryInfoList) {
if (null != dao.load((long) gi.gid)) {
// Contained
continue;
}
addGalleryInfo(gi);
LocalFavoritesRaw raw = new LocalFavoritesRaw();
raw.setGid((long) gi.gid);
raw.setDate(System.currentTimeMillis());
dao.insert(raw);
}
}
}
app/src/main/java/com/hippo/ehviewer/client/EhClient.java
+8 -3
View File
@@ -22,7 +22,6 @@ import android.os.AsyncTask;
import com.hippo.ehviewer.EhApplication;
import com.hippo.ehviewer.client.data.GalleryInfo;
import com.hippo.ehviewer.client.exception.CancelledException;
import com.hippo.yorozuya.IntList;
import com.hippo.yorozuya.PriorityThreadFactory;
import com.hippo.yorozuya.SimpleHandler;
@@ -51,7 +50,9 @@ public class EhClient {
public static final int METHOD_GET_COMMENT_GALLERY = 6;
public static final int METHOD_GET_GALLERY_TOKEN = 7;
public static final int METHOD_GET_FAVORITES = 8;
public static final int METHOD_MODIFY_FAVORITES = 9;
public static final int METHOD_ADD_FAVORITES = 9;
public static final int METHOD_ADD_FAVORITES_RANGE = 10;
public static final int METHOD_MODIFY_FAVORITES = 11;
private final ThreadPoolExecutor mRequestThreadPool;
private final OkHttpClient mOkHttpClient;
@@ -161,8 +162,12 @@ public class EhClient {
return EhEngine.getGalleryToken(this, mOkHttpClient, (Integer) params[0], (String) params[1], (Integer) params[2]);
case METHOD_GET_FAVORITES:
return EhEngine.getFavorites(this, mOkHttpClient, (String) params[0], (Boolean) params[1]);
case METHOD_ADD_FAVORITES:
return EhEngine.addFavorites(this, mOkHttpClient, (Integer) params[0], (String) params[1], (Integer) params[2], (String) params[3]);
case METHOD_ADD_FAVORITES_RANGE:
return EhEngine.addFavoritesRange(this, mOkHttpClient, (int[]) params[0], (String[]) params[1], (Integer) params[2]);
case METHOD_MODIFY_FAVORITES:
return EhEngine.modifyFavorites(this, mOkHttpClient, (String) params[0], (IntList) params[1], (Integer) params[2], (Boolean) params[3]);
return EhEngine.modifyFavorites(this, mOkHttpClient, (String) params[0], (int[]) params[1], (Integer) params[2], (Boolean) params[3]);
default:
return new IllegalStateException("Can't detect method " + mMethod);
}
app/src/main/java/com/hippo/ehviewer/client/EhEngine.java
+60 -6
View File
@@ -37,7 +37,7 @@ import com.hippo.ehviewer.client.parser.GalleryTokenApiParser;
import com.hippo.ehviewer.client.parser.RateGalleryParser;
import com.hippo.ehviewer.client.parser.SignInParser;
import com.hippo.network.StatusCodeException;
import com.hippo.yorozuya.IntList;
import com.hippo.yorozuya.AssertUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -389,21 +389,75 @@ public class EhEngine {
return result;
}
/**
* @param dstCat -1 for delete, 0 - 9 for cloud favorite, others throw Exception
* @param note max 250 characters
*/
public static Void addFavorites(EhClient.Task task, OkHttpClient okHttpClient,
int gid, String token, int dstCat, String note) throws Exception {
String catStr;
if (dstCat == -1) {
catStr = "favdel";
} else if (dstCat >= 0 && dstCat <= 9) {
catStr = String.valueOf(dstCat);
} else {
throw new EhException("Invalid dstCat: " + dstCat);
}
FormBody.Builder builder = new FormBody.Builder();
builder.add("favcat", catStr);
builder.add("favnote", note != null ? note : "");
// submit=Add+to+Favorites is not necessary, just use submit=Apply+Changes all the time
builder.add("submit", "Apply Changes");
String url = EhUrl.getAddFavorites(gid, token);
Log.d(TAG, url);
Request request = new EhRequestBuilder(url, task.getEhConfig())
.post(builder.build())
.build();
Call call = okHttpClient.newCall(request);
// Put call
task.setCall(call);
String body = null;
Headers headers = null;
int code = -1;
try {
Response response = call.execute();
code = response.code();
headers = response.headers();
body = response.body().string();
throwException(call, code, headers, body, null);
} catch (Exception e) {
throwException(call, code, headers, body, e);
throw e;
}
return null;
}
public static Void addFavoritesRange(EhClient.Task task, OkHttpClient okHttpClient,
int[] gidArray, String[] tokenArray, int dstCat) throws Exception {
AssertUtils.assertEqualsEx(gidArray.length, tokenArray.length);
for (int i = 0, n = gidArray.length; i < n; i++) {
addFavorites(task, okHttpClient, gidArray[i], tokenArray[i], dstCat, null);
}
return null;
}
public static FavoritesParser.Result modifyFavorites(EhClient.Task task, OkHttpClient okHttpClient,
String url, IntList gidList, int dstCat, boolean callApi) throws Exception {
String url, int[] gidArray, int dstCat, boolean callApi) throws Exception {
String catStr;
if (dstCat == -1) {
catStr = "delete";
} else if (dstCat >= 0 && dstCat <= 9) {
catStr = "fav" + dstCat;
} else {
Log.w(TAG, "Invalid dstCat: " + dstCat);
return null;
throw new EhException("Invalid dstCat: " + dstCat);
}
FormBody.Builder builder = new FormBody.Builder();
builder.add("ddact", catStr);
for (int i = 0, n = gidList.size(); i < n; i++) {
builder.add("modifygids[]", Integer.toString(gidList.get(i)));
for (int gid : gidArray) {
builder.add("modifygids[]", Integer.toString(gid));
}
builder.add("apply", "Apply");
Log.d(TAG, url);
app/src/main/java/com/hippo/ehviewer/client/EhUrl.java
+4
View File
@@ -52,4 +52,8 @@ public class EhUrl {
public static String getPageUrl(int gid, int index, String pToken) {
return HOST_EX + "s/" + pToken + '/' + gid + '-' + (index + 1);
}
public static String getAddFavorites(int gid, String token) {
return HOST_EX + "gallerypopups.php?gid=" + gid + "&t=" + token + "&act=addfav";
}
}
app/src/main/java/com/hippo/ehviewer/client/data/FavListUrlBuilder.java
+5
View File
@@ -31,6 +31,7 @@ public class FavListUrlBuilder implements Parcelable {
private static final String TAG = FavListUrlBuilder.class.getSimpleName();
public static final int FAV_CAT_ALL = -1;
public static final int FAV_CAT_LOCAL = -2;
private int mIndex;
private String mKeyword;
@@ -60,6 +61,10 @@ public class FavListUrlBuilder implements Parcelable {
return favCat >= 0 && favCat <= 9;
}
public boolean isLocalFavCat() {
return mFavCat == FAV_CAT_LOCAL;
}
public String build() {
UrlBuilder ub = new UrlBuilder(EhUrl.URL_FAVORITES);
if (isValidFavCat(mFavCat)) {
app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+223 -41
View File
@@ -44,20 +44,24 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import com.hippo.annotation.Implemented;
import com.hippo.drawable.DrawerArrowDrawable;
import com.hippo.easyrecyclerview.EasyRecyclerView;
import com.hippo.easyrecyclerview.FastScroller;
import com.hippo.ehviewer.EhApplication;
import com.hippo.ehviewer.EhDB;
import com.hippo.ehviewer.R;
import com.hippo.ehviewer.Settings;
import com.hippo.ehviewer.client.EhCacheKeyFactory;
import com.hippo.ehviewer.client.EhClient;
import com.hippo.ehviewer.client.EhRequest;
import com.hippo.ehviewer.client.EhUrl;
import com.hippo.ehviewer.client.EhUtils;
import com.hippo.ehviewer.client.data.FavListUrlBuilder;
import com.hippo.ehviewer.client.data.GalleryInfo;
import com.hippo.ehviewer.client.exception.NotFoundException;
import com.hippo.ehviewer.client.parser.FavoritesParser;
import com.hippo.ehviewer.ui.annotation.DrawerLifeCircle;
import com.hippo.ehviewer.ui.annotation.ViewLifeCircle;
@@ -76,13 +80,13 @@ import com.hippo.widget.FabLayout;
import com.hippo.widget.LoadImageView;
import com.hippo.widget.SearchBarMover;
import com.hippo.yorozuya.AssertUtils;
import com.hippo.yorozuya.IntList;
import com.hippo.yorozuya.ObjectUtils;
import com.hippo.yorozuya.SimpleHandler;
import java.util.ArrayList;
import java.util.List;
// TODO Get favorite, modify favorite, add favorite, what a mess!
public class FavoritesScene extends BaseScene implements
EasyRecyclerView.OnItemClickListener, EasyRecyclerView.OnItemLongClickListener,
FastScroller.OnDragHandlerListener, SearchBarMover.Helper, SearchBar.Helper,
@@ -143,9 +147,11 @@ public class FavoritesScene extends BaseScene implements
// For modify action
private int mModifyFavCat;
// For modify action
private final IntList mModifyGidList = new IntList();
private final List<GalleryInfo> mModifyGiList = new ArrayList<>();
// For modify action
private boolean mModifyAdd;
private final Runnable mReturnSearchBarRunnabel = new Runnable() {
private final Runnable mReturnSearchBarRunnable = new Runnable() {
@Override
public void run() {
if (mSearchBarMover != null) {
@@ -217,7 +223,6 @@ public class FavoritesScene extends BaseScene implements
AssertUtils.assertNotNull(mFabLayout);
mHelper = new FavoritesHelper();
mHelper.setEmptyString(getString(R.string.gallery_list_empty_hit)); // TODO wrong string
contentLayout.setHelper(mHelper);
contentLayout.getFastScroller().setOnDragHandlerListener(this);
@@ -270,8 +275,10 @@ public class FavoritesScene extends BaseScene implements
String favCatName;
if (favCat >= 0 && favCat < 10) {
favCatName = mFavCat[favCat];
} else if (favCat == FavListUrlBuilder.FAV_CAT_LOCAL) {
favCatName = getString(R.string.local_favorites);
} else {
favCatName = getString(R.string.all_favorites);
favCatName = getString(R.string.cloud_favorites);
}
String keyword = mUrlBuilder.getKeyword();
if (TextUtils.isEmpty(keyword)) {
@@ -334,8 +341,9 @@ public class FavoritesScene extends BaseScene implements
View view = inflater.inflate(R.layout.drawer_list, container, false);
ListView listView = (ListView) view.findViewById(R.id.list_view);
mDrawerList = new ArrayList<>(11);
mDrawerList.add(getString(R.string.all_favorites));
mDrawerList = new ArrayList<>(12);
mDrawerList.add(getString(R.string.local_favorites));
mDrawerList.add(getString(R.string.cloud_favorites));
if (mFavCat != null) {
for (String favCat: mFavCat) {
mDrawerList.add(favCat);
@@ -526,27 +534,35 @@ public class FavoritesScene extends BaseScene implements
return;
}
mModifyGidList.clear();
mModifyGiList.clear();
SparseBooleanArray stateArray = mRecyclerView.getCheckedItemPositions();
for (int i = 0, n = stateArray.size(); i < n; i++) {
if (stateArray.valueAt(i)) {
mModifyGidList.add(mHelper.getDataAt(stateArray.keyAt(i)).gid);
mModifyGiList.add(mHelper.getDataAt(stateArray.keyAt(i)));
}
}
switch (position) {
case 0: { // Delete
DeleteDialogHelper helper = new DeleteDialogHelper();
new AlertDialog.Builder(getContext())
.setTitle(R.string.delete_favorites_dialog_title)
.setMessage(getString(R.string.delete_favorites_dialog_message, mModifyGidList.size()))
.setPositiveButton(android.R.string.ok, new DeleteDialogHelper())
.setMessage(getString(R.string.delete_favorites_dialog_message, mModifyGiList.size()))
.setPositiveButton(android.R.string.ok, helper)
.setOnCancelListener(helper)
.show();
break;
}
case 1: { // Move
MoveDialogHelper helper = new MoveDialogHelper();
// First is local favorite, the other 10 is cloud favorite
String[] array = new String[11];
array[0] = getString(R.string.local_favorites);
System.arraycopy(Settings.getFavCat(), 0, array, 1, 10);
new AlertDialog.Builder(getContext())
.setTitle(R.string.move_favorites_dialog_title)
.setItems(Settings.getFavCat(), new MoveDialogHelper())
.setItems(array, helper)
.setOnCancelListener(helper)
.show();
break;
}
@@ -599,13 +615,11 @@ public class FavoritesScene extends BaseScene implements
return;
}
// All favorite position is 0, so position - 1 is OK
int newFavCat = position - 1;
// Local favorite position is 0, All favorite position is 1, so position - 2 is OK
int newFavCat = position - 2;
// Check is the same
if (mUrlBuilder.getFavCat() == newFavCat ||
(!FavListUrlBuilder.isValidFavCat(mUrlBuilder.getFavCat()) &&
!FavListUrlBuilder.isValidFavCat(newFavCat))) {
if (mUrlBuilder.getFavCat() == newFavCat) {
return;
}
@@ -651,7 +665,7 @@ public class FavoritesScene extends BaseScene implements
if (mFavCat != null && mDrawerList != null) {
for (int i = 0; i < 10; i++) {
mFavCat[i] = result.catArray[i];
mDrawerList.set(i + 1, result.catArray[i]);
mDrawerList.set(i + 2, result.catArray[i]);
}
if (mDrawerAdapter != null) {
@@ -662,7 +676,7 @@ public class FavoritesScene extends BaseScene implements
updateSearchBar();
mHelper.setPages(taskId, result.pages);
mHelper.onGetPageData(taskId, result.galleryInfoList);
SimpleHandler.getInstance().post(mReturnSearchBarRunnabel);
SimpleHandler.getInstance().post(mReturnSearchBarRunnable);
}
}
@@ -673,38 +687,109 @@ public class FavoritesScene extends BaseScene implements
}
}
private class DeleteDialogHelper implements DialogInterface.OnClickListener {
private void onGetFavoritesLocal(String keyword, int taskId) {
if (mHelper != null && mHelper.isCurrentTask(taskId)) {
List<GalleryInfo> list;
if (TextUtils.isEmpty(keyword)) {
list = EhDB.getAllLocalFavorites();
} else {
list = EhDB.searchLocalFavorites(keyword);
}
if (list.size() == 0) {
mHelper.onGetExpection(taskId, new NotFoundException());
} else {
mHelper.setPages(taskId, 1);
mHelper.onGetPageData(taskId, list);
}
SimpleHandler.getInstance().post(mReturnSearchBarRunnable);
}
}
private class DeleteDialogHelper implements DialogInterface.OnClickListener,
DialogInterface.OnCancelListener {
@Override
public void onClick(DialogInterface dialog, int which) {
if (which != DialogInterface.BUTTON_POSITIVE) {
return;
}
if (mRecyclerView == null || mHelper == null) {
if (mRecyclerView == null || mHelper == null || mUrlBuilder == null) {
return;
}
mRecyclerView.outOfCustomChoiceMode();
mEnableModify = true;
mModifyFavCat = -1;
mHelper.justRefresh();
if (mUrlBuilder.getFavCat() == FavListUrlBuilder.FAV_CAT_LOCAL) { // Delete local fav
int[] gidArray = new int[mModifyGiList.size()];
for (int i = 0, n = mModifyGiList.size(); i < n; i++) {
gidArray[i] = mModifyGiList.get(i).gid;
}
EhDB.removeLocalFavorites(gidArray);
mModifyGiList.clear();
mHelper.refresh();
} else { // Delete cloud fav
mEnableModify = true;
mModifyFavCat = -1;
mModifyAdd = false;
mHelper.refresh();
}
}
@Override
public void onCancel(DialogInterface dialog) {
mModifyGiList.clear();
}
}
private class MoveDialogHelper implements DialogInterface.OnClickListener {
private class MoveDialogHelper implements DialogInterface.OnClickListener,
DialogInterface.OnCancelListener {
@Override
public void onClick(DialogInterface dialog, int which) {
if (mRecyclerView == null || mHelper == null) {
if (mRecyclerView == null || mHelper == null || mUrlBuilder == null) {
return;
}
int srcCat = mUrlBuilder.getFavCat();
int dstCat;
if (which == 0) {
dstCat = FavListUrlBuilder.FAV_CAT_LOCAL;
} else {
dstCat = which - 1;
}
if (srcCat == dstCat) {
Toast.makeText(getContext(), "src and dst in the same", Toast.LENGTH_SHORT).show();
return;
}
mRecyclerView.outOfCustomChoiceMode();
mEnableModify = true;
mModifyFavCat = which;
mHelper.justRefresh();
if (srcCat == FavListUrlBuilder.FAV_CAT_LOCAL) { // Move from local to cloud
int[] gidArray = new int[mModifyGiList.size()];
for (int i = 0, n = mModifyGiList.size(); i < n; i++) {
gidArray[i] = mModifyGiList.get(i).gid;
}
EhDB.removeLocalFavorites(gidArray);
mEnableModify = true;
mModifyFavCat = dstCat;
mModifyAdd = true;
mHelper.refresh();
} else if (dstCat == FavListUrlBuilder.FAV_CAT_LOCAL) { // Move from cloud to local
EhDB.addLocalFavorites(mModifyGiList);
mEnableModify = true;
mModifyFavCat = -1;
mModifyAdd = false;
mHelper.refresh();
} else {
mEnableModify = true;
mModifyFavCat = dstCat;
mModifyAdd = false;
mHelper.refresh();
}
}
@Override
public void onCancel(DialogInterface dialog) {
mModifyGiList.clear();
}
}
@@ -818,21 +903,66 @@ public class FavoritesScene extends BaseScene implements
if (mEnableModify) {
mEnableModify = false;
mUrlBuilder.setIndex(page);
String url = mUrlBuilder.build();
EhRequest request = new EhRequest();
request.setMethod(EhClient.METHOD_MODIFY_FAVORITES);
request.setCallback(new GetFavoritesListener(getContext(),
((StageActivity) getActivity()).getStageId(), getTag(), taskId));
request.setArgs(url, mModifyGidList, mModifyFavCat, Settings.getShowJpnTitle());
mClient.execute(request);
boolean local = mUrlBuilder.getFavCat() == FavListUrlBuilder.FAV_CAT_LOCAL;
if (mModifyAdd) {
int[] gidArray = new int[mModifyGiList.size()];
String[] tokenArray = new String[mModifyGiList.size()];
for (int i = 0, n = mModifyGiList.size(); i < n; i++) {
GalleryInfo gi = mModifyGiList.get(i);
gidArray[i] = gi.gid;
tokenArray[i] = gi.token;
}
mModifyGiList.clear();
EhRequest request = new EhRequest();
request.setMethod(EhClient.METHOD_ADD_FAVORITES_RANGE);
request.setCallback(new AddFavoritesListener(getContext(),
((StageActivity) getActivity()).getStageId(), getTag(),
taskId, mUrlBuilder.getKeyword()));
request.setArgs(gidArray, tokenArray, mModifyFavCat);
mClient.execute(request);
} else {
int[] gidArray = new int[mModifyGiList.size()];
for (int i = 0, n = mModifyGiList.size(); i < n; i++) {
gidArray[i] = mModifyGiList.get(i).gid;
}
mModifyGiList.clear();
String url;
if (local) {
// Local fav is shown now, but operation need be done for cloud fav
url = EhUrl.URL_FAVORITES;
} else {
url = mUrlBuilder.build();
}
mUrlBuilder.setIndex(page);
EhRequest request = new EhRequest();
request.setMethod(EhClient.METHOD_MODIFY_FAVORITES);
request.setCallback(new GetFavoritesListener(getContext(),
((StageActivity) getActivity()).getStageId(), getTag(),
taskId, local, mUrlBuilder.getKeyword()));
request.setArgs(url, gidArray, mModifyFavCat, Settings.getShowJpnTitle());
mClient.execute(request);
}
} else if (mUrlBuilder.getFavCat() == FavListUrlBuilder.FAV_CAT_LOCAL) {
final String keyword = mUrlBuilder.getKeyword();
SimpleHandler.getInstance().post(new Runnable() {
@Override
public void run() {
onGetFavoritesLocal(keyword, taskId);
}
});
} else {
mUrlBuilder.setIndex(page);
String url = mUrlBuilder.build();
EhRequest request = new EhRequest();
request.setMethod(EhClient.METHOD_GET_FAVORITES);
request.setCallback(new GetFavoritesListener(getContext(),
((StageActivity) getActivity()).getStageId(), getTag(), taskId));
((StageActivity) getActivity()).getStageId(), getTag(),
taskId, false, mUrlBuilder.getKeyword()));
request.setArgs(url, Settings.getShowJpnTitle());
mClient.execute(request);
}
@@ -878,13 +1008,56 @@ public class FavoritesScene extends BaseScene implements
}
}
private static class AddFavoritesListener extends EhCallback<FavoritesScene, Void> {
private final int mTaskId;
private final String mKeyword;
public AddFavoritesListener(Context context, int stageId,
String sceneTag, int taskId, String keyword) {
super(context, stageId, sceneTag);
mTaskId = taskId;
mKeyword = keyword;
}
@Override
public void onSuccess(Void result) {
FavoritesScene scene = getScene();
if (scene != null) {
scene.onGetFavoritesLocal(mKeyword, mTaskId);
}
}
@Override
public void onFailure(Exception e) {
FavoritesScene scene = getScene();
if (scene != null) {
scene.onGetFavoritesLocal(mKeyword, mTaskId);
}
}
@Override
public void onCancel() {}
@Override
public boolean isInstance(SceneFragment scene) {
return scene instanceof FavoritesScene;
}
}
private static class GetFavoritesListener extends EhCallback<FavoritesScene, FavoritesParser.Result> {
private final int mTaskId;
// Local fav is shown now, but operation need be done for cloud fav
private final boolean mLocal;
private final String mKeyword;
public GetFavoritesListener(Context context, int stageId, String sceneTag, int taskId) {
public GetFavoritesListener(Context context, int stageId,
String sceneTag, int taskId, boolean local, String keyword) {
super(context, stageId, sceneTag);
mTaskId = taskId;
mLocal = local;
mKeyword = keyword;
}
@Override
@@ -893,7 +1066,11 @@ public class FavoritesScene extends BaseScene implements
Settings.putFavCat(result.catArray);
FavoritesScene scene = getScene();
if (scene != null) {
scene.onGetFavoritesSuccess(result, mTaskId);
if (mLocal) {
scene.onGetFavoritesLocal(mKeyword, mTaskId);
} else {
scene.onGetFavoritesSuccess(result, mTaskId);
}
}
}
@@ -901,7 +1078,12 @@ public class FavoritesScene extends BaseScene implements
public void onFailure(Exception e) {
FavoritesScene scene = getScene();
if (scene != null) {
scene.onGetFavoritesFailure(e, mTaskId);
if (mLocal) {
e.printStackTrace();
scene.onGetFavoritesLocal(mKeyword, mTaskId);
} else {
scene.onGetFavoritesFailure(e, mTaskId);
}
}
}
app/src/main/java/com/hippo/widget/ContentLayout.java
-8
View File
@@ -642,14 +642,6 @@ public class ContentLayout extends FrameLayout {
doRefresh();
}
/**
* Refresh header and refresh
*/
public void justRefresh() {
mRefreshLayout.setHeaderRefreshing(true);
doRefresh();
}
private void cancelCurrentTask() {
mCurrentTaskId = mIdGenerator.nextId();
mRefreshLayout.setHeaderRefreshing(false);