diff --git a/zhuike/src/main/java/com/novelbook/android/Activity_base.java b/zhuike/src/main/java/com/novelbook/android/Activity_base.java index a0107e6..d68a4ed 100644 --- a/zhuike/src/main/java/com/novelbook/android/Activity_base.java +++ b/zhuike/src/main/java/com/novelbook/android/Activity_base.java @@ -39,6 +39,9 @@ public abstract class Activity_base extends AppCompatActivity { protected Gson gson = new Gson(); @Nullable + @BindView(R.id.toolbar) + Toolbar toolbar; + @Nullable @BindView(R.id.recycleViewBookList) RecyclerView rvshudan; void showBook(String bookName) { //show paihangbang activity @@ -66,8 +69,7 @@ public abstract class Activity_base extends AppCompatActivity { initData(); initViews(); } - @BindView(R.id.toolbar) - Toolbar toolbar; + protected void setupToolbar(){ // Toolbar toolbar = findViewById(R.id.toolbar); // setSupportActionBar(toolbar); diff --git a/zhuike/src/main/java/com/novelbook/android/Activity_cate_books.java b/zhuike/src/main/java/com/novelbook/android/Activity_cate_books.java index f3b5e59..8e0976b 100644 --- a/zhuike/src/main/java/com/novelbook/android/Activity_cate_books.java +++ b/zhuike/src/main/java/com/novelbook/android/Activity_cate_books.java @@ -1,9 +1,13 @@ package com.novelbook.android; +import android.content.Intent; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.view.ViewPager; +import android.support.v7.widget.Toolbar; import android.util.Log; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import com.novelbook.android.Fragments.Fragment_booklist; @@ -34,6 +38,7 @@ public class Activity_cate_books extends Activity_base { @Override protected void initViews() { + creatToolbar(); initTabs(); } @@ -90,5 +95,29 @@ public class Activity_cate_books extends Activity_base { } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.booksearch, menu); + return true; + } + private void creatToolbar() { + + setSupportActionBar(toolbar); + + + toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + int menuItemId = item.getItemId(); + if(menuItemId==R.id.menuSearch){ + Intent intent = new Intent(Activity_cate_books.this, Activity_Search.class); + startActivity(intent); + + } + return true; + } + }); + } } diff --git a/zhuike/src/main/java/com/novelbook/android/Activity_paihangbang.java b/zhuike/src/main/java/com/novelbook/android/Activity_paihangbang.java index 956b1fb..95c38e9 100644 --- a/zhuike/src/main/java/com/novelbook/android/Activity_paihangbang.java +++ b/zhuike/src/main/java/com/novelbook/android/Activity_paihangbang.java @@ -2,11 +2,13 @@ package com.novelbook.android; import android.app.SearchManager; import android.content.Context; +import android.content.Intent; import android.os.Build; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.view.ViewPager; import android.support.v7.widget.SearchView; +import android.support.v7.widget.Toolbar; import android.text.TextUtils; import android.util.Log; import android.view.Menu; @@ -69,7 +71,7 @@ public static String TAG ="com.novelbook.android.paihangbang"; @Override protected void initData() { - + creatToolbar(); } @@ -115,8 +117,31 @@ public static String TAG ="com.novelbook.android.paihangbang"; // tabLayout.setViewPager(mViewpager, mTitle, activity, mFragments); mViewpager.setCurrentItem(0); } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.booksearch, menu); + + return true; + } + private void creatToolbar() { + + setSupportActionBar(toolbar); + toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + int menuItemId = item.getItemId(); + if(menuItemId==R.id.menuSearch){ + Intent intent = new Intent(Activity_paihangbang.this, Activity_Search.class); + startActivity(intent); + + } + return true; + } + }); + } } diff --git a/zhuike/src/main/java/com/novelbook/android/BookActivity.java b/zhuike/src/main/java/com/novelbook/android/BookActivity.java index b2414bd..c9af8ba 100644 --- a/zhuike/src/main/java/com/novelbook/android/BookActivity.java +++ b/zhuike/src/main/java/com/novelbook/android/BookActivity.java @@ -132,6 +132,11 @@ public class BookActivity extends Activity_base { TextView tvTonglei; @BindView(R.id.txtLatestUpdate) TextView tvLastUpdate; + @BindView(R.id.progress) + TextView tvProgress; + @BindView(R.id.smallCate) + TextView tvSmallcate; + public Intent getSvrIntent(){ @@ -216,6 +221,7 @@ public class BookActivity extends Activity_base { } rvBooklistAuthor.setVisibility(View.VISIBLE); mAdapterAuthor = getBookListAdapter(mDataAuthor,R.layout.recycle_list_item_horizon); + rvBooklistAuthor.setLayoutManager(new LinearLayoutManager(this)); rvBooklistAuthor.setAdapter(mAdapterAuthor); @@ -231,6 +237,7 @@ public class BookActivity extends Activity_base { } rvBooklistRelated.setVisibility(View.VISIBLE); mAdapterRelated = getBookListAdapter(mDataRelated,R.layout.recycle_list_item); + rvBooklistRelated.setLayoutManager(new GridLayoutManager(this, Constants.NOVEL_SPAN_CNT)); rvBooklistRelated.setAdapter(mAdapterRelated); @@ -243,9 +250,11 @@ public class BookActivity extends Activity_base { //this.setTitle(mNovel.getName());//why not apply this.txtAuth.setText(mNovel.getAuthor()); this.txtCategory.setText(mNovel.getNovelType()); - this.txtDesc.setText(mNovel.getDesc ()); + // this.txtDesc.setText(mNovel.getDesc ()); this.txtTitle.setText(mNovel.getName()); this.txtDesc2.setFullString(mNovel.getDesc ()); + this.tvSmallcate.setText(mNovel.getSmallNovelType()); + this.tvProgress.setText(mNovel.getProgress()); // txtDesc2.setCollapsedLines(2); // txtDesc2.setSuffixColor(R.color.colorPrimary); diff --git a/zhuike/src/main/java/com/novelbook/android/Fragments/BasicFragment.java b/zhuike/src/main/java/com/novelbook/android/Fragments/BasicFragment.java index 4809203..b50eb8b 100644 --- a/zhuike/src/main/java/com/novelbook/android/Fragments/BasicFragment.java +++ b/zhuike/src/main/java/com/novelbook/android/Fragments/BasicFragment.java @@ -17,6 +17,7 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; +import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; @@ -72,7 +73,7 @@ import butterknife.ButterKnife; public abstract class BasicFragment extends Fragment { public static String TAG = "need to be replaced"; - private View rootView; + protected View rootView; protected abstract int getLayoutRes(); protected abstract void initData(); protected abstract void fillData(); @@ -82,7 +83,9 @@ public abstract class BasicFragment extends Fragment { // protected MyImageLoader imgloader = new MyImageLoader(); // Main2Activity activity; FragmentActivity activity; - + @Nullable + @BindView(R.id.swipeLayout) + SwipeRefreshLayout mSwipeRefresh; public BasicFragment() { // Required empty public constructor } @@ -114,6 +117,7 @@ public abstract class BasicFragment extends Fragment { initListener(); initData(); initViews(); + initSwipeRefreshLayout(); return view; // Inflate the layout for this fragment @@ -202,7 +206,8 @@ public abstract class BasicFragment extends Fragment { }else { nv.save(); } - Log.d(TAG, String.format("prepare book %s 开始prepare.",nv.getName()) ); + + Log.d(TAG, String.format("prepare book %s ,lastchapt %s, last pos %s ,开始prepare.",nv.getName(),nv.getLastReadChapt(),nv.getLastReadPos()) ); // final Novel novel = nv; /* new Thread(){ @Override @@ -230,11 +235,37 @@ public abstract class BasicFragment extends Fragment { } void showProgressDialog(boolean flag,String msg){ - ((Activity_base) getActivity()).showProgressDialog(flag,msg); + if(mSwipeRefresh!=null && !mSwipeRefresh.isRefreshing()) { + ((Activity_base) getActivity()).showProgressDialog(flag,msg); + } + } void hideProgress(){ + if(mSwipeRefresh!=null && mSwipeRefresh.isRefreshing()) { + mSwipeRefresh.setRefreshing(false); + } ((Activity_base) getActivity()).hideProgress(); + } + void initSwipeRefreshLayout(){ + if(mSwipeRefresh==null){return;} + mSwipeRefresh.setColorSchemeResources(R.color.colorPrimary,R.color.colorPrimaryDark); + mSwipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { + @Override + public void onRefresh() { + + // 开始刷新，设置当前为刷新状态 + //swipeRefreshLayout.setRefreshing(true); + + // 这里是主线程 + // 一些比较耗时的操作，比如联网获取数据，需要放到子线程去执行 + initData(); + // TODO 获取数据 + + } + }); + } + void openBook(Novel book, BookListAdapter mAdapter) { //从新从数据库抓取该书的最新阅读进度 diff --git a/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_booklist.java b/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_booklist.java index ade4c8e..9dd95b2 100644 --- a/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_booklist.java +++ b/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_booklist.java @@ -1,10 +1,13 @@ package com.novelbook.android.Fragments; +import android.content.Intent; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.Toolbar; import android.text.TextUtils; import android.util.Log; +import android.view.MenuItem; import android.view.View; import android.widget.Toast; @@ -12,7 +15,10 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import com.novelbook.android.Activity_Search; +import com.novelbook.android.Main2Activity; import com.novelbook.android.R; +import com.novelbook.android.activity_cates; import com.novelbook.android.bean.NovelBlock; import com.novelbook.android.db.Novel; import com.novelbook.android.netsubscribe.BookSubscribe; @@ -42,6 +48,7 @@ public class Fragment_booklist extends BasicFragment { private BookListAdapter mAdapter; // private BookListAdapter mAdapter; private List mData;; + private List mMoreData; private String cate; private int progress; private String keyWord; @@ -52,7 +59,7 @@ public class Fragment_booklist extends BasicFragment { private int totalCount; private int pageCount; @BindView(R.id.rvBooklist) - RecyclerView rvBooklist; + RecyclerView mRecyclerView; public Fragment_booklist() { // Required empty public constructor @@ -101,30 +108,40 @@ public class Fragment_booklist extends BasicFragment { @Override protected void fillData() { - if(mData==null){ - return; + if(mData==null) { + mData = new ArrayList(); + mAdapter = new BookListAdapter(activity, mData, R.layout.recycle_list_item_horizon, new OnItemClickListener() { + + @Override + public void onItemClick(View view, int position) { + showBookDetail(mData.get(position)); + // openBook(mData.get(position),mAdapter); + } + + @Override + public void onItemLongClick(View view, int position) { + // initDialog(position); + // mAdapter.removeData(position); + } + + @Override + public void onLinearOutClick(View view, int position, int llId) { + Toast.makeText(activity, "book " + position + " clicked", + Toast.LENGTH_SHORT).show(); + } + }); + mRecyclerView.setLayoutManager(new LinearLayoutManager(activity)); + mRecyclerView.setAdapter(mAdapter); + } - mAdapter = new BookListAdapter(activity, mData, R.layout.recycle_list_item_horizon, new OnItemClickListener() { - - @Override - public void onItemClick(View view, int position) { - showBookDetail(mData.get(position) ); - // openBook(mData.get(position),mAdapter); + if(mMoreData!=null) { + if(mMoreData.size()>0) { + pageNo++; } - - @Override - public void onItemLongClick(View view, int position) { - // initDialog(position); - // mAdapter.removeData(position); - } - - @Override - public void onLinearOutClick(View view, int position ,int llId) { - Toast.makeText(activity, "book " + position + " clicked", - Toast.LENGTH_SHORT).show(); - } - }); - initialBookList(); + int status = pageCount > pageNo ? BookListAdapter.PULLUP_LOAD_MORE : BookListAdapter.NO_LOAD_MORE; + mAdapter.AddFooterItem(mMoreData); + mAdapter.changeMoreStatus(status); + } } @Override @@ -137,14 +154,21 @@ public class Fragment_booklist extends BasicFragment { @Override public void initData() { + /* if(mAdapter!=null){ + mAdapter.changeMoreStatus(BookListAdapter.LOADING_MORE); + }*/ + mMoreData =null; OnSuccessAndFaultListener successAndFaultListener = new OnSuccessAndFaultListener() { @Override public void onSuccess(String result) { // mFirstPage= gson.fromJson(result, FirstPage.class); try { + JSONObject jsonObject = new JSONObject(result); + pageCount = jsonObject.getInt("pageCount"); + + mMoreData = GsonUtil. parserJsonArray(jsonObject,Constants.BLOCK_TITLE_NOVELS); - mData = GsonUtil. parserJsonArray(result,Constants.BLOCK_TITLE_NOVELS); } catch (Exception e) { e.printStackTrace(); } @@ -173,8 +197,9 @@ public class Fragment_booklist extends BasicFragment { try { JSONObject jsonObject = new JSONObject(result); String resultstr = jsonObject.getString("rank") ; + pageCount = jsonObject.getJSONObject("rank").getInt("pageCount"); + mMoreData = GsonUtil. parserJsonArray(resultstr,Constants.BLOCK_TITLE_NOVELS); - mData = GsonUtil. parserJsonArray(resultstr,Constants.BLOCK_TITLE_NOVELS); } catch (Exception e) { e.printStackTrace(); } @@ -209,22 +234,51 @@ public class Fragment_booklist extends BasicFragment { } @Override public void initViews(){ - + initLoadMoreListener(); } //----------------绑定列表 void initialBookList() { - rvBooklist.setLayoutManager(new LinearLayoutManager(activity)); - rvBooklist.setAdapter(mAdapter); } @Override public void setFTag() { } + private void initLoadMoreListener() { + mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() { + int lastVisibleItem ; + @Override + public void onScrollStateChanged(RecyclerView recyclerView, int newState) { + super.onScrollStateChanged(recyclerView, newState); + + //判断RecyclerView的状态 是空闲时，同时，是最后一个可见的ITEM时才加载 + if(newState==RecyclerView.SCROLL_STATE_IDLE&&lastVisibleItem+1==mAdapter.getItemCount()){ + + //设置正在加载更多 + mAdapter.changeMoreStatus(mAdapter.LOADING_MORE); + + //改为网络请求 + initData(); + + } + + } + + @Override + public void onScrolled(RecyclerView recyclerView, int dx, int dy) { + super.onScrolled(recyclerView, dx, dy); + + LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager(); + //最后一个可见的ITEM + lastVisibleItem=layoutManager.findLastVisibleItemPosition(); + } + }); + + } } diff --git a/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_jingxuan.java b/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_jingxuan.java index a7e8e1e..1b0b904 100644 --- a/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_jingxuan.java +++ b/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_jingxuan.java @@ -6,6 +6,7 @@ import android.os.Handler; import android.os.Message; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentPagerAdapter; +import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -104,6 +105,8 @@ public class Fragment_jingxuan extends BasicFragment implements OnBannerListener @BindView(R.id.llBlock4) LinearLayout ll4; + + private List mFragments; private ArrayList mList; // String[] mTitle; @@ -144,7 +147,9 @@ public class Fragment_jingxuan extends BasicFragment implements OnBannerListener @Override public void initData() { + showProgressDialog(true, "正在加载"); + BookSubscribe.getFirstPage(Constants.SEX,new OnSuccessAndFaultSub(new OnSuccessAndFaultListener() { @Override public void onSuccess(String result) { @@ -165,6 +170,7 @@ public class Fragment_jingxuan extends BasicFragment implements OnBannerListener //失败 Log.d(TAG, "error on get firstpage: " + errorMsg); handler.sendEmptyMessage(1); + } }, getActivity())); @@ -268,11 +274,11 @@ public class Fragment_jingxuan extends BasicFragment implements OnBannerListener @Override public void initViews() { - - - } + + + @Override public void setFTag() { TAG = "com.novelbook.android.Fragments.Fragment_jingxuan"; @@ -382,7 +388,8 @@ public class Fragment_jingxuan extends BasicFragment implements OnBannerListener void initTuijianPagers() { - if (mFragments == null || mFragments.size() == 0) { + // mViewpagerTuijian =( MyViewPager) rootView.findViewById(R.id.viewpager_tuijian); + // if (mFragments == null || mFragments.size() == 0) { // mTitle = new String[]{"精选", "榜单", "书单"}; mFragments = new ArrayList<>(); NovelBlock block = mBlocks.get(1); @@ -399,7 +406,7 @@ public class Fragment_jingxuan extends BasicFragment implements OnBannerListener } Log.d(TAG, "initial fragments in tabs "); - } + // } Log.d(TAG, "set viewPager adapter "); // FragmentPagerAdapter mAdapter = new FragmentPagerAdapter(activity.getSupportFragmentManager()) { 第一次进入没问题，再次进入ViewPager的fragment时里面内容就没了,数据丢失 https://blog.csdn.net/allan_bst/article/details/64920076 @@ -420,7 +427,10 @@ public class Fragment_jingxuan extends BasicFragment implements OnBannerListener // return mTitle[position]; // } }; + cyclell.removeAllViews(); mViewpagerTuijian.setAdapter(mAdapter); + mViewpagerTuijian.clearOnPageChangeListeners(); + // mViewpagerTuijian.setOnPageChangeListener(new CyclePageIndicator(getContext(), cyclell, mFragments.size())); mViewpagerTuijian.addOnPageChangeListener(new CyclePageIndicator(getContext(), cyclell, mFragments.size())); } diff --git a/zhuike/src/main/java/com/novelbook/android/Main2Activity.java b/zhuike/src/main/java/com/novelbook/android/Main2Activity.java index 6a9d9e8..efaf399 100644 --- a/zhuike/src/main/java/com/novelbook/android/Main2Activity.java +++ b/zhuike/src/main/java/com/novelbook/android/Main2Activity.java @@ -45,8 +45,7 @@ public class Main2Activity extends Activity_base implements NavigationView.OnNavigationItemSelectedListener{//} , BasicFragment.OnFragmentInteractionListener { public MyApp app ; public static String TAG ="com.novelbook.android.Main2Activity"; - @BindView(R.id.toolbar) - Toolbar toolbar; + // @BindView(R.id.fab) // FloatingActionButton fab ; @BindView(R.id.nav_view ) @@ -145,7 +144,7 @@ public class Main2Activity extends Activity_base // toolbar.setTitle("Title");//设置主标题 // setTitle("titleaa"); // toolbar.setSubtitle("Subtitle");//设置子标题 - toolbar.inflateMenu(R.menu.main);//设置右上角的填充菜单 + toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { @@ -170,7 +169,13 @@ public class Main2Activity extends Activity_base } }); } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main, menu); + return true; + } private void udateShelfZhengli() { switchShelfZhengli(true); } @@ -215,16 +220,7 @@ public class Main2Activity extends Activity_base } } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - // SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE); - // SearchView searchView = (SearchView) menu.findItem(R.id.menuSearch).getActionView(); - // Assumes current activity is the searchable activity - // searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName())); - return true; - } + /* @Override public boolean onOptionsItemSelected(MenuItem item) { diff --git a/zhuike/src/main/java/com/novelbook/android/ReadActivity.java b/zhuike/src/main/java/com/novelbook/android/ReadActivity.java index cdc6289..8785a2e 100644 --- a/zhuike/src/main/java/com/novelbook/android/ReadActivity.java +++ b/zhuike/src/main/java/com/novelbook/android/ReadActivity.java @@ -216,12 +216,12 @@ public class ReadActivity extends Activity_base implements SpeechSynthesizerLis // mChapter = ( Chapter ) intent.getSerializableExtra(EXTRA_CHAPTER); bookpage.setPageMode(config.getPageMode()); pageFactory.setPageWidget(bookpage); - + Log.d(TAG, String .format("prepare Book: set pagewidget %s" , book.getName())); try { - + hideSystemUI(); pageFactory.openBook(book,this); - + hideSystemUI(); } catch (IOException e) { e.printStackTrace(); @@ -594,7 +594,7 @@ public class ReadActivity extends Activity_base implements SpeechSynthesizerLis /** * 隐藏菜单。沉浸式阅读 */ - private void hideSystemUI() { + public void hideSystemUI() { // Set the IMMERSIVE flag. // Set the content to appear under the system bars so that the content // doesn't resize when the system bars hide and show. @@ -933,4 +933,8 @@ public class ReadActivity extends Activity_base implements SpeechSynthesizerLis llTopAd.setVisibility(View.VISIBLE); } } + + + + } diff --git a/zhuike/src/main/java/com/novelbook/android/activity_cates.java b/zhuike/src/main/java/com/novelbook/android/activity_cates.java index 59699bc..1979fdb 100644 --- a/zhuike/src/main/java/com/novelbook/android/activity_cates.java +++ b/zhuike/src/main/java/com/novelbook/android/activity_cates.java @@ -12,6 +12,8 @@ import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.Window; @@ -56,7 +58,7 @@ public class activity_cates extends Activity_base { private List mCataloges; @Override protected void initViews() { - + creatToolbar(); } @@ -184,10 +186,32 @@ public class activity_cates extends Activity_base { }, this)); - - - } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.booksearch, menu); + + return true; + } + private void creatToolbar() { + + setSupportActionBar(toolbar); + + + toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + int menuItemId = item.getItemId(); + if(menuItemId==R.id.menuSearch){ + Intent intent = new Intent(activity_cates.this, Activity_Search.class); + startActivity(intent); + + } + return true; + } + }); + } void initReceyleView() { diff --git a/zhuike/src/main/java/com/novelbook/android/adapter/BookListAdapter.java b/zhuike/src/main/java/com/novelbook/android/adapter/BookListAdapter.java index f0e1b89..d346c0e 100644 --- a/zhuike/src/main/java/com/novelbook/android/adapter/BookListAdapter.java +++ b/zhuike/src/main/java/com/novelbook/android/adapter/BookListAdapter.java @@ -1,13 +1,18 @@ package com.novelbook.android.adapter; import android.content.Context; +import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.LinearLayout; +import android.widget.ProgressBar; +import android.widget.TextView; import com.novelbook.android.BookActivity; +import com.novelbook.android.R; import com.novelbook.android.db.Novel; import com.novelbook.android.netutils.NetUtil; @@ -18,23 +23,46 @@ import com.novelbook.android.utils.OnItemClickListener; import java.util.ArrayList; import java.util.List; -public class BookListAdapter extends RecyclerView.Adapter< MyViewHolder> { +import butterknife.BindView; +import butterknife.ButterKnife; + +public class BookListAdapter extends RecyclerView.Adapter< RecyclerView.ViewHolder> { private final int EMPTY_VIEW = 1; private final int PROGRESS_VIEW = 2; private final int IMAGE_VIEW = 3; + private static final int TYPE_ITEM = 4; + private static final int TYPE_FOOTER = 5; // private MyImageLoader loader = new MyImageLoader(); private Context context; private List mDatas ; private OnItemClickListener mOnItemClickListener; private int listItemID; + //private List mBooks; + private LayoutInflater mInflater; - private List mBooks; + //上拉加载更多 + public static final int PULLUP_LOAD_MORE = 0; + //正在加载中 + public static final int LOADING_MORE = 1; + //没有加载更多 隐藏 + public static final int NO_LOAD_MORE = 2; + + //上拉加载更多状态-默认为0 + private int mLoadMoreStatus = 0; + + + public BookListAdapter(Context context, List datas) { + context = context; + mInflater = LayoutInflater.from(context); + mDatas = datas; + } public BookListAdapter(Context context, List mBooks, int listItemID, OnItemClickListener clickLitener) { this.context = context; this.mDatas = mBooks; this.mOnItemClickListener = clickLitener; this.listItemID = listItemID; + mInflater = LayoutInflater.from(context); } @@ -57,19 +85,40 @@ public class BookListAdapter extends RecyclerView.Adapter< MyViewHolder> { return EMPTY_VIEW; } else if (mDatas.get(position) == null) { return PROGRESS_VIEW; + } else if ( position + 1 == getItemCount()) { + //最后一个item设置为footerView + return TYPE_FOOTER; } else { - return super.getItemViewType(position); + return TYPE_ITEM; } + + + + // return super.getItemViewType(position); + + + + } @Override - public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - MyViewHolder holder = new MyViewHolder(LayoutInflater.from( - context).inflate(listItemID, parent, - false)); - return holder; + public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + if (viewType == TYPE_FOOTER) { + View itemView = mInflater.inflate(R.layout.load_more_footview_layout, parent, false); + + return new FooterViewHolder(itemView); + }else if(viewType == EMPTY_VIEW){ + EmptyViewHolder holder = new EmptyViewHolder (LayoutInflater.from(context).inflate(R.layout.recycle_list_empty_item, parent, false)); + return holder; + } + + View itemView = mInflater.inflate(listItemID, parent, false); + + return new MyViewHolder(itemView); } + + public void setBookList(List bookLists){ this.mDatas = bookLists; notifyDataSetChanged(); @@ -84,33 +133,58 @@ public class BookListAdapter extends RecyclerView.Adapter< MyViewHolder> { } @Override - public void onBindViewHolder(MyViewHolder holder, int position) { - holder.tvTitle.setText(mDatas.get(position).getName()); - if (holder.tvAuthor != null) holder.tvAuthor.setText(mDatas.get(position).getAuthor()); - if (holder.tvCate != null) holder.tvCate.setText(mDatas.get(position).getNovelType()); - if (holder.tvDesc != null) holder.tvDesc.setText(mDatas.get(position).getDesc()); - if (holder.imageView != null && !TextUtils.isEmpty(mDatas.get(position).getCover())) { - ImageUtil.loadImage( context, mDatas.get(position).getCover() ,holder. imageView); - } - if(holder.tvNum!=null)holder.tvNum.setText("999"); - // 如果设置了回调，则设置点击事件 - if (mOnItemClickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - int pos = holder.getLayoutPosition(); - mOnItemClickListener.onItemClick(holder.itemView, pos); - } - }); + public void onBindViewHolder(RecyclerView.ViewHolder hd, int position) { - holder.itemView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - int pos = holder.getLayoutPosition(); - mOnItemClickListener.onItemLongClick(holder.itemView, pos); - return false; - } - }); + + if (hd instanceof FooterViewHolder) { + + + FooterViewHolder footerViewHolder = (FooterViewHolder) hd; + + + switch (mLoadMoreStatus) { + case PULLUP_LOAD_MORE: + footerViewHolder.mTvLoadText.setText("上拉加载更多..."); + break; + case LOADING_MORE: + footerViewHolder.mTvLoadText.setText("正加载更多..."); + break; + case NO_LOAD_MORE: + //隐藏加载更多 + footerViewHolder.mLoadLayout.setVisibility(View.GONE); + break; + + } + }else if (hd instanceof MyViewHolder) { + + MyViewHolder holder = (MyViewHolder)hd; + holder.tvTitle.setText(mDatas.get(position).getName()); + if (holder.tvAuthor != null) holder.tvAuthor.setText(mDatas.get(position).getAuthor()); + if (holder.tvCate != null) holder.tvCate.setText(mDatas.get(position).getNovelType()); + if (holder.tvDesc != null) holder.tvDesc.setText(mDatas.get(position).getDesc()); + if (holder.imageView != null && !TextUtils.isEmpty(mDatas.get(position).getCover())) { + ImageUtil.loadImage(context, mDatas.get(position).getCover(), holder.imageView); + } + if (holder.tvNum != null) holder.tvNum.setText("999"); + // 如果设置了回调，则设置点击事件 + if (mOnItemClickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + int pos = holder.getLayoutPosition(); + mOnItemClickListener.onItemClick(holder.itemView, pos); + } + }); + + holder.itemView.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + int pos = holder.getLayoutPosition(); + mOnItemClickListener.onItemLongClick(holder.itemView, pos); + return false; + } + }); + } } } @@ -129,5 +203,40 @@ public class BookListAdapter extends RecyclerView.Adapter< MyViewHolder> { notifyItemRemoved(position); } + public class FooterViewHolder extends RecyclerView.ViewHolder { + @BindView(R.id.pbLoad) + ProgressBar mPbLoad; + @BindView(R.id.tvLoadText) + TextView mTvLoadText; + @BindView(R.id.loadLayout) + LinearLayout mLoadLayout; + public FooterViewHolder(View itemView) { + super(itemView); + ButterKnife.bind(this,itemView); + } + } + public class EmptyViewHolder extends RecyclerView.ViewHolder { + public EmptyViewHolder(View itemView) { + super(itemView); + ButterKnife.bind(this,itemView); + } + } + public void AddHeaderItem(List items) { + mDatas.addAll(0, items); + notifyDataSetChanged(); + } + + public void AddFooterItem(List items) { + mDatas.addAll(items); + notifyDataSetChanged(); + } + /** + * 更新加载更多状态 + * @param status + */ + public void changeMoreStatus(int status){ + mLoadMoreStatus=status; + notifyDataSetChanged(); + } } diff --git a/zhuike/src/main/java/com/novelbook/android/adapter/CatalogueAdapter.java b/zhuike/src/main/java/com/novelbook/android/adapter/CatalogueAdapter.java index 51e5965..aba2c70 100644 --- a/zhuike/src/main/java/com/novelbook/android/adapter/CatalogueAdapter.java +++ b/zhuike/src/main/java/com/novelbook/android/adapter/CatalogueAdapter.java @@ -65,7 +65,7 @@ public class CatalogueAdapter extends BaseAdapter { if (currentCharter == position){ viewHolder.catalogue_tv.setTextColor(mContext.getResources().getColor(R.color.colorPrimaryDark)); }else{ - viewHolder.catalogue_tv.setTextColor(mContext.getResources().getColor(R.color.colorPrimaryDark)); + viewHolder.catalogue_tv.setTextColor(mContext.getResources().getColor(R.color.dark_gray)); } viewHolder.catalogue_tv.setText(bookCatalogueList.get(position).getChapterName()); //Log.d("catalogue",bookCatalogueList.get(position).getBookCatalogue()); diff --git a/zhuike/src/main/java/com/novelbook/android/db/Novel.java b/zhuike/src/main/java/com/novelbook/android/db/Novel.java index 99de693..0bda50e 100644 --- a/zhuike/src/main/java/com/novelbook/android/db/Novel.java +++ b/zhuike/src/main/java/com/novelbook/android/db/Novel.java @@ -142,14 +142,12 @@ public class Novel extends LitePalSupport implements Serializable{ } public int getLastReadChapt() { - if(lastReadChapt<=0){ - lastReadChapt=1; - } + // if(lastReadChapt<=0){lastReadChapt=1;} return lastReadChapt; } public void setLastReadChapt(int lastReadChapt) { - lastReadChapt = lastReadChapt >0 ? lastReadChapt :1; + // lastReadChapt = lastReadChapt >0 ? lastReadChapt :1; this.lastReadChapt = lastReadChapt; } diff --git a/zhuike/src/main/java/com/novelbook/android/netutils/HttpMethods.java b/zhuike/src/main/java/com/novelbook/android/netutils/HttpMethods.java index 9a94bc6..3ca472e 100644 --- a/zhuike/src/main/java/com/novelbook/android/netutils/HttpMethods.java +++ b/zhuike/src/main/java/com/novelbook/android/netutils/HttpMethods.java @@ -245,7 +245,7 @@ public class HttpMethods { public Response intercept(Chain chain) throws IOException { Response originalResponse = chain.proceed(chain.request()); String cacheControl = originalResponse.header("Cache-Control"); - int maxAge =60*60; //一小时 + int maxAge =0;//60*60; //一小时 if (cacheControl == null || cacheControl.contains("no-store") || cacheControl.contains("no-cache") || cacheControl.contains("must-revalidate") || cacheControl.contains("max-age=0")) { //目标网站禁用cache则设置为1小时 return originalResponse.newBuilder() @@ -253,6 +253,10 @@ public class HttpMethods { .header("Cache-Control", "public, max-age=" + maxAge) .build(); } else { + /* return originalResponse.newBuilder() + .removeHeader("Pragma") + .header("Cache-Control", "public, max-age=" + maxAge) + .build();*/ return originalResponse; } } diff --git a/zhuike/src/main/java/com/novelbook/android/utils/AdInterface.java b/zhuike/src/main/java/com/novelbook/android/utils/AdInterface.java index 318f78c..845fdd0 100644 --- a/zhuike/src/main/java/com/novelbook/android/utils/AdInterface.java +++ b/zhuike/src/main/java/com/novelbook/android/utils/AdInterface.java @@ -7,4 +7,5 @@ public interface AdInterface { * @param adY */ public void showAd(boolean showAd,int height,int adY); + public void hideSystemUI(); } diff --git a/zhuike/src/main/java/com/novelbook/android/utils/BookUtil.java b/zhuike/src/main/java/com/novelbook/android/utils/BookUtil.java index 5eeaa45..1b064b9 100644 --- a/zhuike/src/main/java/com/novelbook/android/utils/BookUtil.java +++ b/zhuike/src/main/java/com/novelbook/android/utils/BookUtil.java @@ -114,11 +114,60 @@ public class BookUtil { //当前目录网站 private Site mSite; private SiteRule mSiteRule; + + public synchronized void openBook(Novel novel) throws IOException, InterruptedException { + this.mNovel = novel; + //如果当前缓存不是要打开的书本就缓存书本同时删除缓存 + + //TODO 构建新的缓存策略，几个选项，1：每本书一个缓存 2：控制缓存总大小，超过限制删除旧缓存 3：网络小说的缓存 + + boolean isLocalImport = novel.isLocalBook(); + boolean isOnShelf = isLocalImport || novel.isOnShelf(); + boolean isLoadChaptsFromRemote = !isLocalImport ;// && !novel.isFinished() ; //是否从目标网站下载目录 + // showProgressDialog(); + if(isLocalImport) { + + mChapters = LitePal.where("novelId=?", mNovel.getId() + "").find(Chapter.class); + + for (Chapter c : mChapters) { + Log.d(TAG, String.format("bookchapter :%s,fileName :%s, chapter Size %s", c.getChapterName(), c.getChapterPath(), c.getLength())); + } + + chaptCache = new HashMap(); + if (mChapters.isEmpty()) { //1. 首次打开 本地导入的书 + + if (bookPath == null || !bookPath.equals(mNovel.getNovelPath())) { + cleanCacheFile(); + this.bookPath = mNovel.getNovelPath(); + bookName = FileUtils.getFileName(bookPath); + cacheBook(); + } + } + }else{ //读取目录列表 + MuluStatus m = mMuluStatus; + + // Log.d(TAG,String.format("mulu on Site %s download status %s",mSite.getDomain(),mMuluStatus)); + Log.d(TAG, String.format("prepare book %s open book in background.... mMuluStatus %s，mSiteRule %s,thread %s",mNovel.getName(),mMuluStatus,mSiteRule,Thread.currentThread().getName()) ); + while( mSiteRule ==null || mMuluStatus==null || mMuluStatus == MuluStatus.isDownloading){ + + Thread.sleep(50); + Log.d(TAG,String.format("prepare book %s waiting for mulu downloading ,mMuluStatus %s,msiteRule %s" ,mNovel.getName(),mMuluStatus,mSiteRule)); + if(mMuluStatus == MuluStatus.failed){ + dismissProgressDialog(); + throw new RuntimeException("读取资源失败，请检查网络"); + } + } + + } + // dismissProgressDialog(); + } + + public void setNovelSites(NovelSites nvs) { this.mNovelSites = nvs; - Log.d(TAG, String.format("prepare book %s get novel sites count .",nvs.getSites().length) ); + Log.d(TAG, String.format("prepare book %s get novel sites count %s .",mNovel.getName(), nvs.getSites().length) ); if(nvs.getSites().length ==0){ throw new RuntimeException("书本错误 code 001"); //无目标网站 // return; @@ -151,7 +200,7 @@ public class BookUtil { public void onSuccess(String result) { //成功 try { - Log.d(TAG, String.format("prepare book %s get target sites done.",mNovel.getName()) ); + Log.d(TAG, String.format("prepare book %s get target sites done.thread %s",mNovel.getName(),Thread.currentThread().getName()) ); NovelSites nvs = (NovelSites) gson.fromJson(result,NovelSites.class); //pageFactory.prepareBook(mNovel,nvs, BookActivity.this); @@ -159,6 +208,8 @@ public class BookUtil { } catch ( Exception e) { + Log.d(TAG, String.format("prepare book %s get target sites fail.thread %s ,msg %s",mNovel.getName(),Thread.currentThread().getName(),e.getMessage()) ); + Log.e(TAG, "prepare book fail", e); e.printStackTrace(); } @@ -191,7 +242,7 @@ public class BookUtil { } mSiteRule =sr; setSiteInfo(); - Log.d(TAG, String.format("prepare book %s 目录正则表达式下载完成,开始读章节信息.",mNovel.getName()) ); + Log.d(TAG, String.format("prepare book %s 目录正则表达式下载完成,开始读章节信息. thread %s ",mNovel.getName(),Thread.currentThread().getName()) ); Log.d(TAG, String.format("目录正则表达式下载完成，开始读取章节信息") ); @@ -282,50 +333,7 @@ public class BookUtil { } } - public synchronized void openBook(Novel novel) throws IOException, InterruptedException { - this.mNovel = novel; - //如果当前缓存不是要打开的书本就缓存书本同时删除缓存 - //TODO 构建新的缓存策略，几个选项，1：每本书一个缓存 2：控制缓存总大小，超过限制删除旧缓存 3：网络小说的缓存 - - boolean isLocalImport = novel.isLocalBook(); - boolean isOnShelf = isLocalImport || novel.isOnShelf(); - boolean isLoadChaptsFromRemote = !isLocalImport ;// && !novel.isFinished() ; //是否从目标网站下载目录 - // showProgressDialog(); - if(isLocalImport) { - - mChapters = LitePal.where("novelId=?", mNovel.getId() + "").find(Chapter.class); - - for (Chapter c : mChapters) { - Log.d(TAG, String.format("bookchapter :%s,fileName :%s, chapter Size %s", c.getChapterName(), c.getChapterPath(), c.getLength())); - } - - chaptCache = new HashMap(); - if (mChapters.isEmpty()) { //1. 首次打开 本地导入的书 - - if (bookPath == null || !bookPath.equals(mNovel.getNovelPath())) { - cleanCacheFile(); - this.bookPath = mNovel.getNovelPath(); - bookName = FileUtils.getFileName(bookPath); - cacheBook(); - } - } - }else{ //读取目录列表 - MuluStatus m = mMuluStatus; - // Log.d(TAG,String.format("mulu on Site %s download status %s",mSite.getDomain(),mMuluStatus)); - Log.d(TAG, String.format("prepare book %s open book in background.... mMuluStatus %s，mSiteRule %s",mNovel.getName(),mMuluStatus,mSiteRule) ); - while(mSiteRule ==null || mMuluStatus == MuluStatus.isDownloading){ - Thread.sleep(50); - Log.d(TAG,String.format("prepare book waiting for mulu downloading ,mMuluStatus %s,msiteRule %s" ,mMuluStatus,mSiteRule)); - if(mMuluStatus == MuluStatus.failed){ - dismissProgressDialog(); - throw new RuntimeException("读取资源失败，请检查网络"); - } - } - - } - // dismissProgressDialog(); - } // String getMuluUrl() { // return "https://www.qu.la/book/390/"; @@ -371,9 +379,12 @@ public class BookUtil { HttpMethods.getOkClient().newCall(request).enqueue(new Callback() { @Override public void onFailure(Call call, IOException e) { - Log.d(TAG, "onFailure: " + e.getMessage()); + // Log.d(TAG, "onFailure: " + e.getMessage()); + Log.e(TAG, "loadChapts---- failed: ",e ); Log.d(TAG,String.format("loadChapts---- failed %s 目录 from %s", mNovel.getName() ,url )); + + //TODO 如果是取消了访问，则返回 if( mNovelSites.getSites().length ==1){ //仅有一个rule,且失败了 mMuluStatus = MuluStatus.failed; return; @@ -400,7 +411,7 @@ public class BookUtil { return; } if (body != null) { - Log.d(TAG, String.format("prepare book %s 章节信息读取成功.",mNovel.getName()) ); + Log.d(TAG, String.format("prepare book %s 章节信息读取成功.thread %s",mNovel.getName(),Thread.currentThread().getName()) ); try { String bodyStr = body.string(); // Log.d(TAG, "onResponse: " +bodyStr); @@ -535,7 +546,7 @@ public class BookUtil { return line.toCharArray(); } public char chaptCurrent(){ - chapterNo = mChapters.size() <= chapterNo ? 1 : chapterNo; + chapterNo = mChapters.size() < chapterNo ? 1 : chapterNo; char[] charArray = chaptChars(chapterNo); @@ -890,8 +901,8 @@ public class BookUtil { if(!file.exists()) { if(mMuluStatus ==null){ - Log.d(TAG,String.format("prepare book loadChapts---- 还未有目录信息，出错了 %s 目录, 目录数量 %s, MuluStatus %s", mNovel.getName() , mChapters.size(), mMuluStatus )); - getTargetSites(); + Log.d(TAG,String.format("prepare book loadChapts---- 还未有目录信息，出错了 %s 目录, 目录数量 %s, MuluStatus %s ,thread %s", mNovel.getName() , mChapters.size(), mMuluStatus,Thread.currentThread().getName() )); + // getTargetSites(); } int slept = 0; while(slept <100 && mMuluStatus ==MuluStatus.isDownloading){ @@ -906,8 +917,8 @@ public class BookUtil { } if( mChapters ==null || mChapters.size() ==0){ - Log.d(TAG,String.format("loadChapts----超时。。。或出错了 %s 目录, 目录数量 %s, slept %s, MuluStatus %s", mNovel.getName() , mChapters.size(),slept ,mMuluStatus )); - String error = "获取目录失败，网络错误，请重试. " +mMuluStatus; + Log.d(TAG,String.format("loadChapts----超时。。。或出错了 %s 目录, 目录数量 %s, slept %s, MuluStatus %s,thread %s", mNovel.getName() , mChapters.size(),slept ,mMuluStatus,Thread.currentThread().getName() )); + String error = " "; return error.toCharArray(); } @@ -932,7 +943,7 @@ public class BookUtil { while( !getDownloadStatus() && chaptDownStatus.get(Integer.valueOf(index)) == DownloadStatus.downloading && slepttime parserJsonArray(String restult,String blockName ) throws JSONException { JSONObject jsonObject = new JSONObject(restult); + return parserJsonArray(jsonObject,blockName); + } + public static List parserJsonArray( JSONObject jsonObject,String blockName ) throws JSONException { + String resultstr = jsonObject.getString(blockName); List list = new ArrayList(); diff --git a/zhuike/src/main/java/com/novelbook/android/utils/PageFactory.java b/zhuike/src/main/java/com/novelbook/android/utils/PageFactory.java index 51188e4..6ea37fa 100644 --- a/zhuike/src/main/java/com/novelbook/android/utils/PageFactory.java +++ b/zhuike/src/main/java/com/novelbook/android/utils/PageFactory.java @@ -15,6 +15,7 @@ import android.graphics.Typeface; import android.os.AsyncTask; import android.util.DisplayMetrics; import android.util.Log; +import android.view.View; import android.view.WindowManager; import android.widget.Toast; @@ -25,6 +26,8 @@ import com.novelbook.android.db.Novel; import com.novelbook.android.netutils.NetUtil; import com.novelbook.android.view.PageWidget; +import org.litepal.LitePal; + import java.io.IOException; import java.text.DecimalFormat; import java.text.SimpleDateFormat; @@ -168,9 +171,10 @@ public class PageFactory { chaptId = mChapters!=null && mChapters.size() <= chaptId ? 1 : chaptId; - Log.d(TAG, String.format("prepare book to open chapter %s ",chaptId ) ); + // Log.d(TAG, String.format("prepare book to open chapter %s ",chaptId ) ); char[] chars = mBookUtil.chaptChars(chaptId); - + String s = new String(chars); + // Log.d(TAG, String.format("prepare book to open chapter %s,chars %s ",chaptId ,s ) ); mBookUtil.setBookLen(chars.length); mBookUtil.setChapterNo(chaptId); // TRPage page = new TRPage(); @@ -179,7 +183,7 @@ public class PageFactory { while(length m_lines,Boolean updateChapter) { @@ -366,9 +372,25 @@ public class PageFactory { public void run() { super.run(); if(mBook.getLastReadChapt() !=currentChapter || mBook.getLastReadPos()!=currentPage.getBegin()) { - mBook.setLastReadChapt(currentChapter); + if(currentChapter >1) { + mBook.setLastReadChapt(currentChapter); + }else{ + mBook.setToDefault("lastReadChapt"); + } mBook.setLastReadPos(currentPage.getBegin()); - mBook.update(mBook.getId()); + mBook.update(mBook.getId()); //If you set a default value to a field, the corresponding + // * column won't be updated. + // mBook.save(); + + + + Novel nv = LitePal.find(Novel.class,mBook.getId()); + + Log.d(TAG,String.format("prepare book saved lastchapt %s,lastpos %s, db lastchapt %s last pos %s", + currentChapter,currentPage.getBegin(),nv.getLastReadChapt(),nv.getLastReadPos())); + + + } /* values.put("lastReadPos",currentPage.getBegin()); @@ -477,7 +499,7 @@ public class PageFactory { c.drawText(chapterName, mWidth - marginWidth - nChaterWidth, statusMarginBottom + mBatterryFontSize, mBatterryPaint); } - mBookPageWidget.postInvalidate(); + mBookPageWidget.postInvalidate(); } private void showAd(int adHeight,int adY) { @@ -606,6 +628,7 @@ public class PageFactory { mStatus = Status.OPENING; drawStatus(mBookPageWidget.getCurPage()); drawStatus(mBookPageWidget.getNextPage()); + if (bookTask != null && bookTask.getStatus() != AsyncTask.Status.FINISHED){ bookTask.cancel(true); } @@ -635,7 +658,7 @@ public class PageFactory { if (mBookPageWidget != null) { currentPage(true); } - + Log.d(TAG, String.format("prepare book set PageFactory.mStatus %s .",PageFactory.Status.FINISH ) ); PageFactory.mStatus = PageFactory.Status.FINISH; }else{ PageFactory.mStatus = PageFactory.Status.FAIL; @@ -743,7 +766,8 @@ public class PageFactory { return page; } } - return new TRPage(); + //return new TRPage();// currentChaptPages.get(currentChaptPages.size()-1); + return currentChaptPages.get(currentChaptPages.size()-1); } boolean showChapTitleOnTopWhenNextPage =false; @@ -1110,7 +1134,7 @@ public class PageFactory { } public void clear(){ - Log.d(TAG, String .format("prepareBook: clearing book info %s" , getNovle().getName())); + Log.d(TAG, String .format("prepare Book: clearing book info %s" , getNovle().getName())); //mBookUtil=null; currentChapter = 0; bookPath = ""; diff --git a/zhuike/src/main/res/layout/activity_book.xml b/zhuike/src/main/res/layout/activity_book.xml index 45a23c3..68ea51d 100644 --- a/zhuike/src/main/res/layout/activity_book.xml +++ b/zhuike/src/main/res/layout/activity_book.xml @@ -94,6 +94,13 @@ android:id="@+id/desc" style="@style/TextViewNovelDesc.head" android:text=" " + android:visibility="gone" + /> + + - + /> + + diff --git a/zhuike/src/main/res/layout/fragment_fragment_booklist.xml b/zhuike/src/main/res/layout/fragment_fragment_booklist.xml index b4e9b00..d410aaa 100644 --- a/zhuike/src/main/res/layout/fragment_fragment_booklist.xml +++ b/zhuike/src/main/res/layout/fragment_fragment_booklist.xml @@ -3,14 +3,19 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".Fragments.Fragment_booklist"> - + + diff --git a/zhuike/src/main/res/layout/load_more_footview_layout.xml b/zhuike/src/main/res/layout/load_more_footview_layout.xml new file mode 100644 index 0000000..80c464f --- /dev/null +++ b/zhuike/src/main/res/layout/load_more_footview_layout.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/zhuike/src/main/res/layout/recycle_list_empty_item.xml b/zhuike/src/main/res/layout/recycle_list_empty_item.xml new file mode 100644 index 0000000..3557de8 --- /dev/null +++ b/zhuike/src/main/res/layout/recycle_list_empty_item.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/zhuike/src/main/res/layout/zcataloguelistview_item.xml b/zhuike/src/main/res/layout/zcataloguelistview_item.xml index b335f07..e9427b7 100644 --- a/zhuike/src/main/res/layout/zcataloguelistview_item.xml +++ b/zhuike/src/main/res/layout/zcataloguelistview_item.xml @@ -10,6 +10,6 @@ android:singleLine="true" android:gravity="center_vertical" android:layout_marginLeft="10dp" - android:textColor="@color/colorAccent"/> + /> diff --git a/zhuike/src/main/res/menu/booksearch.xml b/zhuike/src/main/res/menu/booksearch.xml new file mode 100644 index 0000000..188a25d --- /dev/null +++ b/zhuike/src/main/res/menu/booksearch.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/zhuike/src/main/res/menu/main.xml b/zhuike/src/main/res/menu/main.xml index 7c7701c..4329a11 100644 --- a/zhuike/src/main/res/menu/main.xml +++ b/zhuike/src/main/res/menu/main.xml @@ -13,22 +13,7 @@ android:icon="@drawable/ic_search_white_24dp" app:showAsAction="ifRoom" /> - - - - - - - - - - - + #00000000 #aa000000 #eeeeee - #cccccc + #F5F5F5 #9c9c9c #000000 #ffffff