diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 796dd9910..5b6b44378 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,7 +16,7 @@ --> @@ -212,6 +212,7 @@ android:background="@color/divider" android:visibility="gone" /> + previewLists = new ArrayList(); public ApiGalleryDetail() {} @@ -41,4 +45,57 @@ public class ApiGalleryDetail extends ApiGalleryInfo { torrentcount = apiGalleryInfo.torrentcount; apiTags = apiGalleryInfo.apiTags; } + + @Override + public int getGid() { + return gid; + } + + @Override + public String getToken() { + return token; + } + + @Override + public String getTitle() { + return title; + } + + @Override + public int getPreviewPageNum() { + return previewPageNum; + } + + @Override + public void setPreviewPageNum(int pageNum) { + previewPageNum = pageNum; + } + + @Override + public int getPreviewPerPage() { + return previewPerPage; + } + + @Override + public PreviewList getPreview(int page) { + if (page >= 0 && page < previewLists.size()) + return previewLists.get(page); + else + return null; + } + + @Override + public void setPreview(int page, PreviewList previewList) { + if (page >= 0 && page < previewLists.size()) + previewLists.set(page, previewList); + else if (page == previewLists.size()) + previewLists.add(previewList); + else + ; // Do nothing + } + + @Override + public String[] getTags() { + return apiTags; + } } diff --git a/src/com/hippo/ehviewer/data/GalleryDetail.java b/src/com/hippo/ehviewer/data/GalleryDetail.java index d88e7a841..f7d009f98 100644 --- a/src/com/hippo/ehviewer/data/GalleryDetail.java +++ b/src/com/hippo/ehviewer/data/GalleryDetail.java @@ -32,6 +32,9 @@ public class GalleryDetail extends GalleryInfo public String language; public int people; public String firstPage; + /** + * Can't be null, just can be empty + */ public LinkedHashMap> tags; // For Preview @@ -55,7 +58,22 @@ public class GalleryDetail extends GalleryInfo } @Override - public int getPreviewSum() { + public int getGid() { + return gid; + } + + @Override + public String getToken() { + return token; + } + + @Override + public String getTitle() { + return title; + } + + @Override + public int getPreviewPageNum() { return previewSum; } @@ -65,7 +83,16 @@ public class GalleryDetail extends GalleryInfo } @Override - public PreviewList[] getPreview() { - return previewLists; + public PreviewList getPreview(int page) { + if (page >= 0 && page < previewLists.length) + return previewLists[page]; + else + return null; + } + + @Override + public void setPreview(int page, PreviewList previewList) { + if (page >= 0 && page < previewLists.length) + previewLists[page] = previewList; } } diff --git a/src/com/hippo/ehviewer/data/LargePreviewList.java b/src/com/hippo/ehviewer/data/LargePreviewList.java index 3f319398f..6750577f6 100644 --- a/src/com/hippo/ehviewer/data/LargePreviewList.java +++ b/src/com/hippo/ehviewer/data/LargePreviewList.java @@ -70,7 +70,7 @@ public class LargePreviewList extends PreviewList { viewGroup.removeAllViews(); LayoutInflater inflater = LayoutInflater.from(mActivity); - int startIndex = mTargetPage * mGi.previewPerPage; + int startIndex = mTargetPage * mPi.getPreviewPerPage(); int index = startIndex; for (Item item : mItemList) { @@ -85,16 +85,16 @@ public class LargePreviewList extends PreviewList { Intent intent = new Intent(mActivity, GalleryActivity.class); intent.putExtra("url", url); - intent.putExtra("gid", mGi.gid); - intent.putExtra("title", mGi.title); + intent.putExtra("gid", mPi.getGid()); + intent.putExtra("title", mPi.getTitle()); intent.putExtra("firstPage", finalIndex); - intent.putExtra("pageSum", mGi.pages); + //intent.putExtra("pageSum", mPi.pages); mActivity.startActivity(intent); } }); viewGroup.addView(view); // TODO I need a better key - ImageLoader.getInstance(mActivity).add(item.mImageUrl, mGi.gid + + ImageLoader.getInstance(mActivity).add(item.mImageUrl, mPi.getGid() + "-preview-" + index, new PreviewImageGetListener(viewGroup, index - startIndex)); diff --git a/src/com/hippo/ehviewer/data/LofiDetailImpl.java b/src/com/hippo/ehviewer/data/LofiDetailImpl.java new file mode 100644 index 000000000..f18780596 --- /dev/null +++ b/src/com/hippo/ehviewer/data/LofiDetailImpl.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2014 Hippo Seven + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.hippo.ehviewer.data; + +public interface LofiDetailImpl extends PreviewImpl { + + public void setPreviewPageNum(int pageNum); + + /** + * Check null and empty before use + * + * @return + */ + public String[] getTags(); + +} diff --git a/src/com/hippo/ehviewer/data/LofiGalleryDetail.java b/src/com/hippo/ehviewer/data/LofiGalleryDetail.java index def3f434f..3ae09a580 100644 --- a/src/com/hippo/ehviewer/data/LofiGalleryDetail.java +++ b/src/com/hippo/ehviewer/data/LofiGalleryDetail.java @@ -16,11 +16,18 @@ package com.hippo.ehviewer.data; +import java.util.ArrayList; +import java.util.List; + public class LofiGalleryDetail extends LofiGalleryInfo - implements PreviewImpl { - public int previewSum; + implements LofiDetailImpl { + public int previewPageNum; public int previewPerPage; - public PreviewList[] previewLists; + private final List previewLists = new ArrayList(); + + public LofiGalleryDetail(GalleryInfo galleryInfo) { + this(new LofiGalleryInfo(galleryInfo)); + } public LofiGalleryDetail(LofiGalleryInfo lofiGalleryInfo) { gid = lofiGalleryInfo.gid; @@ -34,12 +41,32 @@ public class LofiGalleryDetail extends LofiGalleryInfo simpleLanguage = lofiGalleryInfo.simpleLanguage; lofiTags = lofiGalleryInfo.lofiTags; - previewSum = Integer.MAX_VALUE; + previewPageNum = Integer.MAX_VALUE; } @Override - public int getPreviewSum() { - return previewSum; + public int getGid() { + return gid; + } + + @Override + public String getToken() { + return token; + } + + @Override + public String getTitle() { + return title; + } + + @Override + public int getPreviewPageNum() { + return previewPageNum; + } + + @Override + public void setPreviewPageNum(int pageNum) { + previewPageNum = pageNum; } @Override @@ -48,7 +75,25 @@ public class LofiGalleryDetail extends LofiGalleryInfo } @Override - public PreviewList[] getPreview() { - return previewLists; + public PreviewList getPreview(int page) { + if (page >= 0 && page < previewLists.size()) + return previewLists.get(page); + else + return null; + } + + @Override + public void setPreview(int page, PreviewList previewList) { + if (page >= 0 && page < previewLists.size()) + previewLists.set(page, previewList); + else if (page == previewLists.size()) + previewLists.add(previewList); + else + ; // Do nothing + } + + @Override + public String[] getTags() { + return lofiTags; } } diff --git a/src/com/hippo/ehviewer/data/LofiGalleryInfo.java b/src/com/hippo/ehviewer/data/LofiGalleryInfo.java index d6a58e2b6..99b7cc295 100644 --- a/src/com/hippo/ehviewer/data/LofiGalleryInfo.java +++ b/src/com/hippo/ehviewer/data/LofiGalleryInfo.java @@ -59,6 +59,21 @@ public class LofiGalleryInfo extends GalleryInfo { } }; + public LofiGalleryInfo() {} + + public LofiGalleryInfo(GalleryInfo galleryInfo) { + gid = galleryInfo.gid; + token = galleryInfo.token; + title = galleryInfo.title; + posted = galleryInfo.posted; + category = galleryInfo.category; + thumb = galleryInfo.thumb; + uploader = galleryInfo.uploader; + rating = galleryInfo.rating; + simpleLanguage = galleryInfo.simpleLanguage; + lofiTags = null; + } + @Override public void writeToParcel(Parcel dest, int flags) { super.writeToParcel(dest, flags); diff --git a/src/com/hippo/ehviewer/data/NormalPreviewList.java b/src/com/hippo/ehviewer/data/NormalPreviewList.java index c8e00af10..3bfd6f76d 100644 --- a/src/com/hippo/ehviewer/data/NormalPreviewList.java +++ b/src/com/hippo/ehviewer/data/NormalPreviewList.java @@ -110,7 +110,7 @@ public class NormalPreviewList extends PreviewList{ viewGroup.removeAllViews(); LayoutInflater inflater = LayoutInflater.from(mActivity); - int index = mTargetPage * mGi.previewPerPage; // it is display index + int index = mTargetPage * mPi.getPreviewPerPage(); // it is display index int rowIndex = 0; for (NormalPreviewList.Row row : rowArray) { for (NormalPreviewList.Item item : row.itemArray) { @@ -127,10 +127,10 @@ public class NormalPreviewList extends PreviewList{ Intent intent = new Intent(mActivity, GalleryActivity.class); intent.putExtra("url", url); - intent.putExtra("gid", mGi.gid); - intent.putExtra("title", mGi.title); + intent.putExtra("gid", mPi.getGid()); + intent.putExtra("title", mPi.getTitle()); intent.putExtra("firstPage", finalIndex); - intent.putExtra("pageSum", mGi.pages); + //intent.putExtra("pageSum", mGi.pages); mActivity.startActivity(intent); } }); @@ -139,7 +139,7 @@ public class NormalPreviewList extends PreviewList{ index++; } // TODO I need a better key - ImageLoader.getInstance(mActivity).add(row.imageUrl, mGi.gid + + ImageLoader.getInstance(mActivity).add(row.imageUrl, mPi.getGid() + "-preview-" + mTargetPage + "-" + rowIndex, new PreviewImageGetListener(viewGroup, rowIndex)); rowIndex++; diff --git a/src/com/hippo/ehviewer/data/PreviewImpl.java b/src/com/hippo/ehviewer/data/PreviewImpl.java index 059f56ad1..48493dddd 100644 --- a/src/com/hippo/ehviewer/data/PreviewImpl.java +++ b/src/com/hippo/ehviewer/data/PreviewImpl.java @@ -18,10 +18,33 @@ package com.hippo.ehviewer.data; public interface PreviewImpl { - public int getPreviewSum(); + public int getGid(); + + public String getToken(); + + public String getTitle(); + + /** + * If it is unkonwn, return Integer.MAX_VALUE + * + * @return + */ + public int getPreviewPageNum(); public int getPreviewPerPage(); - public PreviewList[] getPreview(); + /** + * If page is error, return null + * + * @param page + * @return + */ + public PreviewList getPreview(int page); + + /** + * + * @param previewList + */ + public void setPreview(int page, PreviewList previewList); } diff --git a/src/com/hippo/ehviewer/data/PreviewList.java b/src/com/hippo/ehviewer/data/PreviewList.java index 3cc2c6c88..ae33f88d8 100644 --- a/src/com/hippo/ehviewer/data/PreviewList.java +++ b/src/com/hippo/ehviewer/data/PreviewList.java @@ -32,7 +32,7 @@ public abstract class PreviewList { protected PreviewHolder mHolder; protected Activity mActivity; - protected GalleryDetail mGi; + protected PreviewImpl mPi; protected int mTargetPage; /** @@ -44,10 +44,10 @@ public abstract class PreviewList { public abstract int size(); - public void setData(PreviewHolder holder, Activity activity, GalleryDetail gi, int targetPage) { + public void setData(PreviewHolder holder, Activity activity, PreviewImpl pi, int targetPage) { mHolder = holder; mActivity = activity; - mGi = gi; + mPi = pi; mTargetPage = targetPage; } diff --git a/src/com/hippo/ehviewer/ehclient/EhClient.java b/src/com/hippo/ehviewer/ehclient/EhClient.java index 7fca35c88..6f1f64baf 100644 --- a/src/com/hippo/ehviewer/ehclient/EhClient.java +++ b/src/com/hippo/ehviewer/ehclient/EhClient.java @@ -42,6 +42,7 @@ import com.hippo.ehviewer.data.GalleryDetail; import com.hippo.ehviewer.data.GalleryInfo; import com.hippo.ehviewer.data.GalleryPopular; import com.hippo.ehviewer.data.ListUrls; +import com.hippo.ehviewer.data.LofiGalleryDetail; import com.hippo.ehviewer.data.PreviewList; import com.hippo.ehviewer.gallery.data.ImageSet; import com.hippo.ehviewer.network.Downloader; @@ -739,38 +740,148 @@ public class EhClient { thread.start(); } + // Get lofi gallery Detail + public interface OnGetLGDetailListener { + public void onSuccess(LofiGalleryDetail md, boolean isLastPage); + public void onFailure(String eMsg); + } + + private class GetLGDetaiResponder implements Runnable { + private final boolean isOk; + private final OnGetLGDetailListener listener; + private final LofiGalleryDetail gd; + private final boolean isLastPage; + private final String eMesg; + + public GetLGDetaiResponder(OnGetLGDetailListener listener, LofiGalleryDetail gd, boolean isLastPage) { + this.isOk = true; + this.listener = listener; + this.gd = gd; + this.isLastPage = isLastPage; + this.eMesg = null; + } + + public GetLGDetaiResponder(OnGetLGDetailListener listener, String eMsg) { + this.isOk = false; + this.listener = listener; + this.gd = null; + this.isLastPage = false; + this.eMesg = eMsg; + } + + @Override + public void run() { + if (isOk) + listener.onSuccess(gd, isLastPage); + else + listener.onFailure(eMesg); + } + } + + public void getLGDetail(final String url, final LofiGalleryDetail lgd, + final OnGetLGDetailListener listener) { + Thread thread = new Thread(new Runnable() { + @Override + public void run() { + HttpHelper hh = new HttpHelper(mAppContext); + String body = hh.get(url); + GetLGDetaiResponder responder; + if (body != null) { + LofiDetailParser parser = new LofiDetailParser(); + if (parser.parser(body)) { + lgd.setPreview(0, parser.preview); + lgd.previewPerPage = parser.preview.size(); + responder = new GetLGDetaiResponder(listener, lgd, parser.isLastPage); + } else { + responder = new GetLGDetaiResponder(listener, + mAppContext.getString(R.string.em_parser_error)); + } + } else { + responder = new GetLGDetaiResponder(listener, hh.getEMsg()); + } + + mHandler.post(responder); + } + }); + thread.setPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND); + thread.start(); + } + + // Get preview list public interface OnGetPreviewListListener { - public void onSuccess(Object checkFlag, PreviewList pageList); + public void onSuccess(Object checkFlag, PreviewList pageList, boolean isLastPage); public void onFailure(Object checkFlag, String eMsg); } - public void getPreviewList(final String url, final Object checkFlag, + private class GetPreviewListResponder implements Runnable { + private final boolean isOk; + private final OnGetPreviewListListener listener; + private final Object checkFlag; + private final PreviewList pageList; + private final boolean isLastPage; + private final String eMesg; + + public GetPreviewListResponder(OnGetPreviewListListener listener, + Object checkFlag, PreviewList pageList, boolean isLastPage) { + this.isOk = true; + this.listener = listener; + this.checkFlag = checkFlag; + this.pageList = pageList; + this.isLastPage = isLastPage; + this.eMesg = null; + } + + public GetPreviewListResponder(OnGetPreviewListListener listener, + Object checkFlag, String eMsg) { + this.isOk = false; + this.listener = listener; + this.checkFlag = null; + this.pageList = null; + this.isLastPage = false; + this.eMesg = eMsg; + } + + @Override + public void run() { + if (isOk) + listener.onSuccess(checkFlag, pageList, isLastPage); + else + listener.onFailure(checkFlag, eMesg); + } + } + + public void getPreviewList(final String url, final int mode, final Object checkFlag, final OnGetPreviewListListener listener) { - new Thread(new Runnable() { + Thread thread = new Thread(new Runnable() { @Override public void run() { - HttpHelper hp = new HttpHelper(mAppContext); - hp.setOnRespondListener(new HttpHelper.OnRespondListener() { - @Override - public void onSuccess(Object obj) { - String body = (String)obj; + HttpHelper hh = new HttpHelper(mAppContext); + String body = hh.get(url); + GetPreviewListResponder responder; + if (body != null) { + if (mode != EhClient.MODE_LOFI) { DetailParser parser = new DetailParser(); if (parser.parser(body, DetailParser.PREVIEW) == - DetailParser.PREVIEW) { - listener.onSuccess(checkFlag, parser.previewList); - } else { - listener.onFailure(checkFlag, "Parser error"); - } + DetailParser.PREVIEW) + responder = new GetPreviewListResponder(listener, checkFlag, parser.previewList, false); + else + responder = new GetPreviewListResponder(listener, checkFlag, "Parser error"); + } else { + LofiDetailParser parser = new LofiDetailParser(); + if (parser.parser(body)) + responder = new GetPreviewListResponder(listener, checkFlag, parser.preview, parser.isLastPage); + else + responder = new GetPreviewListResponder(listener, checkFlag, "Parser error"); } - @Override - public void onFailure(String eMsg) { - listener.onFailure(checkFlag, eMsg); - } - }); - hp.get(url); + } else { + responder = new GetPreviewListResponder(listener, checkFlag, hh.getEMsg()); + } + mHandler.post(responder); } - }).start(); + }); + thread.setPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND); + thread.start(); } // Get Manga url and next page diff --git a/src/com/hippo/ehviewer/ehclient/EhInfo.java b/src/com/hippo/ehviewer/ehclient/EhInfo.java index 6e46c8b6e..a42c1e378 100644 --- a/src/com/hippo/ehviewer/ehclient/EhInfo.java +++ b/src/com/hippo/ehviewer/ehclient/EhInfo.java @@ -51,7 +51,7 @@ public class EhInfo { public static final String EX_HOST = "exhentai.org"; public static final String[] COOKIABLE_HOSTS = {"exhentai.org", "g.e-hentai.org", "forums.e-hentai.org", "ul.exhentai.org", - "ul.e-hentai.org"}; + "ul.e-hentai.org", "lofi.e-hentai.org"}; private static final String KEY_LOGIN = "login"; private static final boolean DEFAULT_LOGIN = false; diff --git a/src/com/hippo/ehviewer/ehclient/LofiDetailParser.java b/src/com/hippo/ehviewer/ehclient/LofiDetailParser.java new file mode 100644 index 000000000..d93659a14 --- /dev/null +++ b/src/com/hippo/ehviewer/ehclient/LofiDetailParser.java @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2014 Hippo Seven + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.hippo.ehviewer.ehclient; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import com.hippo.ehviewer.data.LargePreviewList; + + +public class LofiDetailParser { + + public boolean isLastPage; + public LargePreviewList preview; + + public boolean parser(String body) { + Pattern p; + Matcher m; + + // Get preview + p = Pattern.compile("
]+>]+href=\"([^>\"]+)\"[^>]+>]+src=\"([^>\"]+)\"[^>]+>"); + m = p.matcher(body); + while (m.find()) { + if (preview == null) + preview = new LargePreviewList(); + preview.addItem(m.group(2), m.group(1)); + } + // Check is last page + p = Pattern.compile("]+>Next Page >"); + m = p.matcher(body); + if (m.find()) + isLastPage = false; + else + isLastPage = true; + + return preview != null; + } +} diff --git a/src/com/hippo/ehviewer/ui/GalleryDetailActivity.java b/src/com/hippo/ehviewer/ui/GalleryDetailActivity.java index 74b5eaad7..927175d4a 100644 --- a/src/com/hippo/ehviewer/ui/GalleryDetailActivity.java +++ b/src/com/hippo/ehviewer/ui/GalleryDetailActivity.java @@ -16,6 +16,7 @@ package com.hippo.ehviewer.ui; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; @@ -66,6 +67,7 @@ import com.hippo.ehviewer.data.Comment; import com.hippo.ehviewer.data.GalleryDetail; import com.hippo.ehviewer.data.GalleryInfo; import com.hippo.ehviewer.data.ListUrls; +import com.hippo.ehviewer.data.LofiDetailImpl; import com.hippo.ehviewer.data.LofiGalleryDetail; import com.hippo.ehviewer.data.LofiGalleryInfo; import com.hippo.ehviewer.data.PreviewImpl; @@ -73,6 +75,8 @@ import com.hippo.ehviewer.data.PreviewList; import com.hippo.ehviewer.drawable.OvalDrawable; import com.hippo.ehviewer.ehclient.DetailUrlParser; import com.hippo.ehviewer.ehclient.EhClient; +import com.hippo.ehviewer.service.DownloadService; +import com.hippo.ehviewer.service.DownloadServiceConnection; import com.hippo.ehviewer.util.Config; import com.hippo.ehviewer.util.Constants; import com.hippo.ehviewer.util.Favorite; @@ -110,6 +114,8 @@ public class GalleryDetailActivity extends AbstractActivity private EhClient mClient; private WindowsAnimate mWindowsAnimate; private GalleryInfo mGalleryInfo; + private final DownloadServiceConnection mServiceConn = + new DownloadServiceConnection(); private int mRunningAnimateNum = 0; private boolean isCheckmark = false; @@ -168,15 +174,16 @@ public class GalleryDetailActivity extends AbstractActivity private CommentAdapter mCommentAdapter; private int mThemeColor; - private int mCurPreviewPage; + private int mCurPreviewPage = 0; private boolean mShowPreview = false; + private boolean mGetPreview = false; private AlertDialog createGoToDialog() { return new DialogBuilder(this, mThemeColor).setTitle(R.string.jump) .setAdapter(new BaseAdapter() { @Override public int getCount() { - return ((PreviewImpl)mGalleryInfo).getPreviewSum(); + return ((PreviewImpl)mGalleryInfo).getPreviewPageNum(); } @Override public Object getItem(int position) { @@ -234,12 +241,22 @@ public class GalleryDetailActivity extends AbstractActivity // If can not parser url, just keep it null } } else { + // gi = (GalleryInfo)(intent.getParcelableExtra(KEY_G_INFO)); if (gi != null) { - if (gi instanceof LofiGalleryInfo) - gi = new LofiGalleryDetail((LofiGalleryInfo)gi); - else - gi = new GalleryDetail(gi); + if (gi instanceof LofiGalleryInfo) { + if (Config.getMode() == EhClient.MODE_LOFI) { + gi = new LofiGalleryDetail((LofiGalleryInfo)gi); + } else { + gi = new GalleryDetail(gi); + } + } else { + if (Config.getMode() == EhClient.MODE_LOFI) { + gi = new LofiGalleryDetail(gi); // TAG is null + } else { + gi = new GalleryDetail(gi); + } + } } } return gi; @@ -268,6 +285,7 @@ public class GalleryDetailActivity extends AbstractActivity protected void onDestroy() { super.onDestroy(); mWindowsAnimate.free(); + unbindService(mServiceConn); } @Override @@ -356,6 +374,10 @@ public class GalleryDetailActivity extends AbstractActivity // Init mRatingText.setFactory(this); + mPreview.setColumnCountPortrait( + Config.getPreviewColumnsPortrait()); + mPreview.setColumnCountLandscape( + Config.getPreviewColumnsLandscape()); // Set random color mThemeColor = Config.getRandomThemeColor() ? Theme.getRandomDarkColor() : Config.getThemeColor(); @@ -385,6 +407,7 @@ public class GalleryDetailActivity extends AbstractActivity mWindowsAnimate.addRippleEffect(mDownloadButton, true); mWindowsAnimate.addRippleEffect(mFavorite, false); mWindowsAnimate.addRippleEffect(mRate, false); + mWindowsAnimate.addRippleEffect(mPreviewPage, true); mWindowsAnimate.addRippleEffect(mPreviewBack, true); mWindowsAnimate.addRippleEffect(mPreviewFront, true); @@ -410,6 +433,10 @@ public class GalleryDetailActivity extends AbstractActivity mReply.setOnClickListener(this); doPreLayout(); + + // Download service + Intent it = new Intent(GalleryDetailActivity.this, DownloadService.class); + bindService(it, mServiceConn, BIND_AUTO_CREATE); } @Override @@ -429,26 +456,24 @@ public class GalleryDetailActivity extends AbstractActivity mRefreshText.setRefreshing(true); - if (mGalleryInfo instanceof GalleryDetail) { - GalleryDetail galleryDetail = (GalleryDetail)mGalleryInfo; - if (galleryDetail.title == null) { - // We should get info from detail page - mClient.getGDetail(detailUrl, galleryDetail, new GDetailGetListener()); - } else { - mDetailScroll.setVisibility(View.VISIBLE); - mDetailHeader.setVisibility(View.VISIBLE); - - mThumb.setLoadInfo(galleryDetail.thumb, String.valueOf(galleryDetail.gid)); - ImageLoader.getInstance(this).add(galleryDetail.thumb, String.valueOf(galleryDetail.gid), - new LoadImageView.SimpleImageGetListener(mThumb).setTransitabled(false)); - mTitle.setText(galleryDetail.title); - mUploader.setText(galleryDetail.uploader); - - mClient.getGDetail(detailUrl, galleryDetail, new GDetailGetListener()); - } - } else { + if (mGalleryInfo.title != null) { + // Not from url + mDetailScroll.setVisibility(View.VISIBLE); + mDetailHeader.setVisibility(View.VISIBLE); + mThumb.setLoadInfo(mGalleryInfo.thumb, String.valueOf(mGalleryInfo.gid)); + ImageLoader.getInstance(this).add(mGalleryInfo.thumb, String.valueOf(mGalleryInfo.gid), + new LoadImageView.SimpleImageGetListener(mThumb).setTransitabled(false)); + mTitle.setText(mGalleryInfo.title); + mUploader.setText(mGalleryInfo.uploader); } + + if (mGalleryInfo instanceof GalleryDetail) + mClient.getGDetail(detailUrl, (GalleryDetail)mGalleryInfo, new GDetailGetListener()); + else if (mGalleryInfo instanceof LofiGalleryDetail) + mClient.getLGDetail(detailUrl, (LofiGalleryDetail)mGalleryInfo, new GLDetailGetListener()); + else if (mGalleryInfo instanceof ApiGalleryDetail) + ; // TODO } private String getRatingText(float rating) { @@ -488,9 +513,81 @@ public class GalleryDetailActivity extends AbstractActivity } private String getAllRatingText(float rating, int people) { - return new StringBuilder().append("大家觉得").append(" ") // TODO + StringBuilder sb = new StringBuilder().append("大家觉得").append(" ") // TODO .append(getRatingText(rating)) - .append(" (").append(rating).append(", ").append(people).append(")").toString(); + .append(" (").append(rating); + if (people != -1) + sb.append(", ").append(people).append(")").toString(); + else + sb.append(")"); + return sb.toString(); + } + + private void addTag(LinkedHashMap> tags) { + int x = Ui.dp2pix(2); + int y = Ui.dp2pix(4); + ContextThemeWrapper ctw = new ContextThemeWrapper(this, R.style.TextTag); + for (Entry> tagGroup : tags.entrySet()) { + + LinearLayout tagGroupLayout = new LinearLayout(this); + tagGroupLayout.setOrientation(LinearLayout.HORIZONTAL); + AutoWrapLayout tagLayout = new AutoWrapLayout(this); + + + // Group name + final String groupName = tagGroup.getKey(); + TextView groupNameView = new TextView(ctw); + groupNameView.setText(groupName); + LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.WRAP_CONTENT, + LinearLayout.LayoutParams.WRAP_CONTENT); + lp.setMargins(x, y, x, y); + tagGroupLayout.addView(groupNameView, lp); + + for (final String tag : tagGroup.getValue()) { + TextView tagView = new TextView(ctw); + tagView.setText(tag); + tagView.setBackgroundColor(mThemeColor); + tagView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + Intent intent = new Intent(GalleryDetailActivity.this, + GalleryListActivity.class); + intent.setAction(GalleryListActivity.ACTION_GALLERY_LIST); + intent.putExtra(GalleryListActivity.KEY_MODE, + ListUrls.MODE_TAG); + intent.putExtra(GalleryListActivity.KEY_TAG, groupName + ":" + tag); + startActivity(intent); + } + }); + AutoWrapLayout.LayoutParams alp = new AutoWrapLayout.LayoutParams(); + alp.setMargins(x, y, x, y); + tagLayout.addView(tagView, alp); + } + tagGroupLayout.addView(tagLayout); + mDetailTag.addView(tagGroupLayout); + } + } + + private void addLofiTag(String[] tags) { + int x = Ui.dp2pix(2); + int y = Ui.dp2pix(4); + ContextThemeWrapper ctw = new ContextThemeWrapper(this, R.style.TextTag); + AutoWrapLayout tagLayout = new AutoWrapLayout(this); + for (String tag : tags) { + TextView tagView = new TextView(ctw); + tagView.setText(tag); + tagView.setBackgroundColor(mThemeColor); + AutoWrapLayout.LayoutParams alp = new AutoWrapLayout.LayoutParams(); + alp.setMargins(x, y, x, y); + tagLayout.addView(tagView, alp); + } + mDetailTag.addView(tagLayout); + } + + private String getPreviewPageNum(int pageNum) { + return pageNum == Integer.MAX_VALUE ? "??" : String.valueOf(pageNum); } /** @@ -510,24 +607,22 @@ public class GalleryDetailActivity extends AbstractActivity mUploader.setText(mGalleryInfo.uploader); } + // Button mDetailButtons.setVisibility(View.VISIBLE); - mWarning.setVisibility(View.VISIBLE); - mDetailActions.setVisibility(View.VISIBLE); - mDividerAM.setVisibility(View.VISIBLE); - mDetailMore.setVisibility(View.VISIBLE); - mDividerMR.setVisibility(View.VISIBLE); - mDetailRate.setVisibility(View.VISIBLE); - mDividerRT.setVisibility(View.VISIBLE); - mDetailTag.setVisibility(View.VISIBLE); - mDividerTC.setVisibility(View.VISIBLE); - mDetailComment.setVisibility(View.VISIBLE); + // waring + mWarning.setVisibility(View.VISIBLE); + + // Action + mDetailActions.setVisibility(View.VISIBLE); mCategory.setText(Ui.getCategoryText(mGalleryInfo.category)); mCategoryDrawable.setColor(Ui.getCategoryColor(mGalleryInfo.category)); + // Detail + mDividerAM.setVisibility(View.VISIBLE); + mDetailMore.setVisibility(View.VISIBLE); if (mGalleryInfo instanceof GalleryDetail) { GalleryDetail galleryDetail = (GalleryDetail)mGalleryInfo; - ((TextView)mDetailMore.findViewById(R.id.language)).setText("语言: " + galleryDetail.language); // TODO ((TextView)mDetailMore.findViewById(R.id.posted)).setText(galleryDetail.posted); ((TextView)mDetailMore.findViewById(R.id.pages)).setText("页面: " + String.valueOf(galleryDetail.pages)); @@ -550,55 +645,59 @@ public class GalleryDetailActivity extends AbstractActivity .append("people: ").append(galleryDetail.people).append("\n\n") .append("rating: ").append(galleryDetail.rating); ((TextView)mMoreDetailScroll.findViewById(R.id.more_detail)).setText(sb.toString()); - mRatingText.setCurrentText(getAllRatingText(galleryDetail.rating, galleryDetail.people)); - mRating.setRating(galleryDetail.rating); - mRating.setEnableRate(false); + } else if (mGalleryInfo instanceof LofiGalleryDetail) { + LofiGalleryDetail lofiGalleryDetail = (LofiGalleryDetail)mGalleryInfo; + ((TextView)mDetailMore.findViewById(R.id.language)).setVisibility(View.GONE); + ((TextView)mDetailMore.findViewById(R.id.posted)).setText(lofiGalleryDetail.posted); + ((TextView)mDetailMore.findViewById(R.id.pages)).setVisibility(View.GONE); + ((TextView)mDetailMore.findViewById(R.id.size)).setVisibility(View.GONE); + StringBuilder sb = new StringBuilder(); + sb.append("gid: ").append(lofiGalleryDetail.gid).append("\n\n") + .append("token: ").append(lofiGalleryDetail.token).append("\n\n") + .append("title: ").append(lofiGalleryDetail.title).append("\n\n") + .append("thumb: ").append(lofiGalleryDetail.thumb).append("\n\n") + .append("category: ").append(Ui.getCategoryText(lofiGalleryDetail.category)).append("\n\n") + .append("uploader: ").append(lofiGalleryDetail.uploader).append("\n\n") + .append("posted: ").append(lofiGalleryDetail.posted).append("\n\n") + .append("simpleLanguage: ").append(lofiGalleryDetail.simpleLanguage).append("\n\n") + .append("rating: ").append(lofiGalleryDetail.rating).append("\n\n"); + ((TextView)mMoreDetailScroll.findViewById(R.id.more_detail)).setText(sb.toString()); + } else if (mGalleryInfo instanceof ApiGalleryDetail) { + // TODO + } - // Add tags - for (Entry> tagGroup : galleryDetail.tags.entrySet()) { - ContextThemeWrapper ctw = new ContextThemeWrapper(this, R.style.TextTag); - LinearLayout tagGroupLayout = new LinearLayout(this); - tagGroupLayout.setOrientation(LinearLayout.HORIZONTAL); - AutoWrapLayout tagLayout = new AutoWrapLayout(this); - int x = Ui.dp2pix(2); - int y = Ui.dp2pix(4); + // Rate + mDividerMR.setVisibility(View.VISIBLE); + mDetailRate.setVisibility(View.VISIBLE); + int people = mGalleryInfo instanceof GalleryDetail ? ((GalleryDetail)mGalleryInfo).people : -1; + mRatingText.setCurrentText(getAllRatingText(mGalleryInfo.rating, people)); + mRating.setRating(mGalleryInfo.rating); + mRating.setEnableRate(false); - // Group name - final String groupName = tagGroup.getKey(); - TextView groupNameView = new TextView(ctw); - groupNameView.setText(groupName); - LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.WRAP_CONTENT, - LinearLayout.LayoutParams.WRAP_CONTENT); - lp.setMargins(x, y, x, y); - tagGroupLayout.addView(groupNameView, lp); - - for (final String tag : tagGroup.getValue()) { - TextView tagView = new TextView(ctw); - tagView.setText(tag); - tagView.setBackgroundColor(mThemeColor); - tagView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - Intent intent = new Intent(GalleryDetailActivity.this, - GalleryListActivity.class); - intent.setAction(GalleryListActivity.ACTION_GALLERY_LIST); - intent.putExtra(GalleryListActivity.KEY_MODE, - ListUrls.MODE_TAG); - intent.putExtra(GalleryListActivity.KEY_TAG, groupName + ":" + tag); - startActivity(intent); - } - }); - AutoWrapLayout.LayoutParams alp = new AutoWrapLayout.LayoutParams(); - alp.setMargins(x, y, x, y); - tagLayout.addView(tagView, alp); - } - tagGroupLayout.addView(tagLayout); - mDetailTag.addView(tagGroupLayout); + // Tag + if (mGalleryInfo instanceof GalleryDetail) { + GalleryDetail galleryDetail = (GalleryDetail)mGalleryInfo; + if (galleryDetail.tags != null && galleryDetail.tags.size() > 0) { + mDividerRT.setVisibility(View.VISIBLE); + mDetailTag.setVisibility(View.VISIBLE); + addTag(galleryDetail.tags); } + } else if (mGalleryInfo instanceof LofiDetailImpl) { + LofiDetailImpl lofiDetailImpl = (LofiDetailImpl)mGalleryInfo; + String[] tags = lofiDetailImpl.getTags(); + if (tags != null && tags.length > 0) { + mDividerRT.setVisibility(View.VISIBLE); + mDetailTag.setVisibility(View.VISIBLE); + addLofiTag(tags); + } + } + + // Comment + if (mGalleryInfo instanceof GalleryDetail) { + GalleryDetail galleryDetail = (GalleryDetail)mGalleryInfo; + mDividerTC.setVisibility(View.VISIBLE); + mDetailComment.setVisibility(View.VISIBLE); - // Add comments int commentNum = galleryDetail.comments.size(); if (commentNum == 0) mCommentMoreText.setText("暂无评论，就等你了"); @@ -616,24 +715,21 @@ public class GalleryDetailActivity extends AbstractActivity mCommentList.setAdapter(mCommentAdapter); mCommentList.setOnItemClickListener(this); mCommentList.setOnItemLongClickListener(this); + } - // Add preview - if (galleryDetail.previewLists[0] != null) { + // Add preview + if (mGalleryInfo instanceof PreviewImpl) { + PreviewImpl previewImpl = (PreviewImpl)mGalleryInfo; + PreviewList pl = previewImpl.getPreview(0); + if (pl != null) { mDividerCP.setVisibility(View.VISIBLE); mDetailPreview.setVisibility(View.VISIBLE); - mCurPreviewPage = 0; - mPreviewPage.setText((mCurPreviewPage + 1) + "/" + galleryDetail.previewSum); - galleryDetail.previewLists[0].setData(this, this, - galleryDetail, mCurPreviewPage); - - System.out.println("previewLists"); - galleryDetail.previewLists[0].addPreview(mPreview); + mPreviewPage.setText((mCurPreviewPage + 1) + "/" + + getPreviewPageNum(previewImpl.getPreviewPageNum())); + pl.setData(this, this, previewImpl, mCurPreviewPage); + pl.addPreview(mPreview); } - } else if (mGalleryInfo instanceof LofiGalleryDetail) { - - } else if (mGalleryInfo instanceof ApiGalleryDetail) { - } } @@ -643,22 +739,23 @@ public class GalleryDetailActivity extends AbstractActivity PreviewImpl previewImpl = (PreviewImpl)mGalleryInfo; mPreview.removeAllViews(); - mPreviewPage.setText((mCurPreviewPage + 1) + "/" + previewImpl.getPreviewSum()); + mPreviewPage.setText((mCurPreviewPage + 1) + "/" + getPreviewPageNum(previewImpl.getPreviewPageNum())); - PreviewList[] previewLists = previewImpl.getPreview(); - PreviewList pageList = previewLists[mCurPreviewPage]; - if (pageList == null) { + PreviewList previewList = previewImpl.getPreview(mCurPreviewPage); + if (previewList == null) { mPreviewWait.setVisibility(View.VISIBLE); mPreviewRefresh.setVisibility(View.GONE); String url = mClient.getDetailUrl( mGalleryInfo.gid, mGalleryInfo.token, mCurPreviewPage); - mClient.getPreviewList(url, mCurPreviewPage, + mClient.getPreviewList(url, Config.getMode(), mCurPreviewPage, new PListGetListener()); + + mGetPreview = true; } else { mPreviewWait.setVisibility(View.GONE); mPreviewRefresh.setVisibility(View.GONE); - previewLists[mCurPreviewPage].addPreview(mPreview); + previewList.addPreview(mPreview); mShowPreview = true; } @@ -707,6 +804,12 @@ public class GalleryDetailActivity extends AbstractActivity return; if (v == mDownloadButton) { + Intent it = new Intent(GalleryDetailActivity.this, DownloadService.class); + startService(it); + mServiceConn.getService().add(String.valueOf(mGalleryInfo.gid), mGalleryInfo.thumb, + EhClient.getDetailUrl(mGalleryInfo.gid, mGalleryInfo.token, 0, Config.getMode()), + mGalleryInfo.title); + new SuperToast(R.string.toast_add_download).show(); } else if (v == mReadButton) { //mData.addRead(mGalleryInfo); if (mGalleryInfo instanceof GalleryDetail) { @@ -757,7 +860,6 @@ public class GalleryDetailActivity extends AbstractActivity @Override public void onSuccess(float ratingAvg, int ratingCnt) { mGalleryInfo.rating = ratingAvg; - // TODO mGalleryInfo.people = ratingCnt; mRatingText.setText(getAllRatingText(mGalleryInfo.rating, ratingCnt)); mRating.setRating(mGalleryInfo.rating); } @@ -835,11 +937,12 @@ public class GalleryDetailActivity extends AbstractActivity }).create().show(); } else if (v == mPreviewPage) { if (mGalleryInfo instanceof PreviewImpl && - ((PreviewImpl)mGalleryInfo).getPreviewSum() != Integer.MAX_VALUE && - ((PreviewImpl)mGalleryInfo).getPreviewSum() > 1) + ((PreviewImpl)mGalleryInfo).getPreviewPageNum() != Integer.MAX_VALUE && + ((PreviewImpl)mGalleryInfo).getPreviewPageNum() > 1) mGoToDialog.show(); } else if (v == mPreviewBack) { - if (!(mGalleryInfo instanceof PreviewImpl)) + if (!(mGalleryInfo instanceof PreviewImpl) || + (mGalleryInfo instanceof LofiGalleryDetail && mGetPreview)) return; if (mCurPreviewPage <= 0) @@ -847,10 +950,11 @@ public class GalleryDetailActivity extends AbstractActivity mCurPreviewPage--; refreshPreview(); } else if (v == mPreviewFront) { - if (!(mGalleryInfo instanceof PreviewImpl)) + if (!(mGalleryInfo instanceof PreviewImpl) || + (mGalleryInfo instanceof LofiGalleryDetail && mGetPreview)) return; - if (mCurPreviewPage >= ((PreviewImpl)mGalleryInfo).getPreviewSum() - 1) + if (mCurPreviewPage >= ((PreviewImpl)mGalleryInfo).getPreviewPageNum() - 1) return; mCurPreviewPage++; refreshPreview(); @@ -1030,10 +1134,27 @@ public class GalleryDetailActivity extends AbstractActivity } } + private class GLDetailGetListener + implements EhClient.OnGetLGDetailListener { + @Override + public void onSuccess(LofiGalleryDetail md, boolean isLastPage) { + if (isLastPage) + ((LofiDetailImpl)mGalleryInfo).setPreviewPageNum(mCurPreviewPage + 1); + mRefreshText.setRefreshing(false); + doLayout(); + } + + @Override + public void onFailure(String eMsg) { + // TODO + new SuperToast(eMsg, SuperToast.ERROR).show(); + } + } + private class PListGetListener implements EhClient.OnGetPreviewListListener { @Override - public void onSuccess(Object checkFlag, PreviewList pageList) { + public void onSuccess(Object checkFlag, PreviewList pageList, boolean isLastPage) { if (isFinishing()) return; if (!(mGalleryInfo instanceof PreviewImpl)) @@ -1042,14 +1163,20 @@ public class GalleryDetailActivity extends AbstractActivity mPreviewWait.setVisibility(View.GONE); mPreviewRefresh.setVisibility(View.GONE); - PreviewImpl previewImpl = (PreviewImpl)mGalleryInfo; - PreviewList[] previewLists = previewImpl.getPreview(); int page = (Integer)checkFlag; - previewLists[page] = pageList; - previewLists[page].setData(GalleryDetailActivity.this, - GalleryDetailActivity.this, (GalleryDetail)mGalleryInfo, page); // TODO how about LofiGalleryDetail - previewLists[page].addPreview(mPreview); + PreviewImpl previewImpl = (PreviewImpl)mGalleryInfo; + previewImpl.setPreview(page, pageList); + pageList.setData(GalleryDetailActivity.this, + GalleryDetailActivity.this, previewImpl, page); // TODO how about LofiGalleryDetail + pageList.addPreview(mPreview); + if (isLastPage && mGalleryInfo instanceof LofiDetailImpl) { + ((LofiDetailImpl)mGalleryInfo).setPreviewPageNum(mCurPreviewPage + 1); + mPreviewPage.setText((mCurPreviewPage + 1) + "/" + + getPreviewPageNum(previewImpl.getPreviewPageNum())); + } + + mGetPreview = false; mShowPreview = true; } @@ -1066,6 +1193,8 @@ public class GalleryDetailActivity extends AbstractActivity mPreviewWait.setVisibility(View.GONE); mPreviewRefresh.setVisibility(View.VISIBLE); } + + // TODO what to do with mGetPreview } }