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 1fea403..e17027d 100644
--- a/zhuike/src/main/java/com/novelbook/android/Fragments/BasicFragment.java
+++ b/zhuike/src/main/java/com/novelbook/android/Fragments/BasicFragment.java
@@ -242,10 +242,10 @@ void initTabs(){
int novelId = novel.getNovelId();
long id = novel.getId();
Log.d(TAG, String.format("prepare book %s ,start to loading book info from host ",novel.getName()));
- // showProgressDialog(false,"正在加载...");
+ showProgressDialog(false,"正在加载...");
PageFactory pageFactory =PageFactory.getInstance(activity ) ;
pageFactory.initBookUtil();
- ReadActivity.openBook(novel ,activity);
+ // ReadActivity.openBook(novel ,activity);
BookSubscribe.getNovel(novel.getNovelId(),new OnSuccessAndFaultSub(new OnSuccessAndFaultListener() {
@@ -272,13 +272,25 @@ void initTabs(){
}
}.start();*/
- // ReadActivity.openBook(nv ,activity);
+
// PageFactory.getInstance(activity.getApplicationContext()).prepareBook(nv ); //打开本地小说内容
//PageFactory.getInstance(activity ).prepareBook(nv ); //打开本地小说内容
pageFactory.prepareBook(nv );
Log.d(TAG, String.format("prepare book %s 开始open book.",nv.getName()) );
+ ReadActivity.openBook(nv ,activity);
+ new Thread(){
+ @Override
+ public void run() {
+ super.run();
+ try {
+ sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ handler.sendEmptyMessage(99);
+ }
+ }.start();
- handler.sendEmptyMessage(99);
}
@Override
@@ -306,6 +318,7 @@ void initTabs(){
if(NetUtil.isNetworkConnected())
if(mSwipeRefresh ==null || !mSwipeRefresh.isRefreshing()) {
((Activity_base) getActivity()).showProgressDialog(flag,msg);
+ Log.d(TAG, "progress: progress shown");
}
@@ -318,6 +331,13 @@ void initTabs(){
mSwipeRefresh.setRefreshing(false);
}
((Activity_base) getActivity()).hideProgress();
+ Log.d(TAG, "progress: progress hided");
+ /*try{
+ throw new Exception("who hide");
+ }catch (Exception e){
+ Log.e(TAG, "progress: ",e );
+ }*/
+
}
void initSwipeRefreshLayout(){
@@ -484,7 +504,7 @@ void initTabs(){
@Override
public void onPause(){
super.onPause();
- hideProgress();
+// hideProgress();
// MobclickAgent.onPageEnd(TAG);
}
diff --git a/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_Shelf.java b/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_Shelf.java
index dfe54a5..501deb6 100644
--- a/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_Shelf.java
+++ b/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_Shelf.java
@@ -122,7 +122,8 @@ public class Fragment_Shelf extends BasicFragment {
noveIds = "";
int i=0;
for (Novel novel : bookLists) {
- if (novel.isFinished() || novel.isLocalBook() || (novel.isUpdated() && (new Date().getTime() - novel.getLastVisit() > 1*3600*1000 ))) {
+ if (novel.isFinished() || novel.isLocalBook() || novel.isUpdated() && (new Date().getTime() - novel.getLastVisit() > 1*3600*1000 ) ) {
+ // if(!novel.getName().equals("暗月纪元"))
continue;
}
if(i>Constants.MAX_SHELF_CNT){
diff --git a/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_bangdans.java b/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_bangdans.java
index 28ec57b..3dc4951 100644
--- a/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_bangdans.java
+++ b/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_bangdans.java
@@ -147,7 +147,12 @@ public class Fragment_bangdans extends BasicFragment {
mViewpager.setAdapter(mAdapter);
tabLayout.setupWithViewPager(mViewpager);
// tabLayout.setViewPager(mViewpager, mTitle, activity, mFragments);
- // mViewpager.setCurrentItem(0);
+ // mViewpager.setCurrentItem(0);
+ if(mFragments.size()>0) {
+ tabLayout.setTabSelected(0);
+ // mViewpager.setCurrentItem(0);
+
+ }
}
diff --git a/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_bookStore.java b/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_bookStore.java
index 85dfc39..021c6e0 100644
--- a/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_bookStore.java
+++ b/zhuike/src/main/java/com/novelbook/android/Fragments/Fragment_bookStore.java
@@ -92,6 +92,7 @@ public class Fragment_bookStore extends BasicFragment {
mAdapter.notifyDataSetChanged();*/
}
+ Log.d(TAG, "setSexOption: to reload 3 fragment data" );
fragment_jingxuan.initData();
fragmentCates.initData();
fragment_bangdans.initData() ;
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 cc03b68..f5132b9 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
@@ -234,6 +234,7 @@ public class Fragment_booklist extends BasicFragment {
e.printStackTrace();
Log.e(TAG, "onSuccess: 解析失败",e );
}
+ Log.d(TAG, "progress: progress to hide");
handler.sendEmptyMessage(1);
}
diff --git a/zhuike/src/main/java/com/novelbook/android/Main2Activity.java b/zhuike/src/main/java/com/novelbook/android/Main2Activity.java
index 8f92644..df740d1 100644
--- a/zhuike/src/main/java/com/novelbook/android/Main2Activity.java
+++ b/zhuike/src/main/java/com/novelbook/android/Main2Activity.java
@@ -479,7 +479,6 @@ private int bottomSelectedIndex;
// Log.d(TAG, "onResume: set botoomNav selection to 0");
}
-
}
@@ -492,18 +491,28 @@ private int bottomSelectedIndex;
private void setSexOption(){
int s = rgSex.getCheckedRadioButtonId() == R.id.radioButtonBoy ?1:2;
+ Log.d(TAG, "setSexOption: new sex option:" +s);
if(s!= Constants.SEX){
TTAdManagerHolder.initOnSexChange(MyApp.applicationContext);
Constants.SEX=s;
config.setSexOption(s);
Fragment current = getSupportFragmentManager().findFragmentById(R.id.realtabcontent);
+
+ Log.e(TAG, "setSexOption: current fragment is null ?" + (current == null ) );
if (current != null && current instanceof BasicFragment){
((Fragment_bookStore)current).onSexSwitch();
+ }else if(current ==null ){
+ Log.e(TAG, "setSexOption: current fragment is null , recreate 3 fragments" );
+ Fragment_bookStore fragment =new Fragment_bookStore();
+ showFragment(fragment , Fragment_bookStore.TAG);
+ swithToolbarItems();
}
+
}
+
}
@OnClick({R.id.radioButtonBoy,R.id.radioButtonGirl})
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 101a222..f4e2425 100644
--- a/zhuike/src/main/java/com/novelbook/android/adapter/BookListAdapter.java
+++ b/zhuike/src/main/java/com/novelbook/android/adapter/BookListAdapter.java
@@ -300,7 +300,7 @@ public class BookListAdapter extends RecyclerView.Adapter< RecyclerView.ViewHol
if (holder.tvLastRead != null) holder.tvLastRead.setText(CommonUtil.getDateString( novel.getLastVisit() ));
// if (holder.tvProgress != null) holder.tvProgress.setText( String.format("上次看到第 %s 章,共%s章",mDatas.get(position).getLastReadChapt(),mDatas.get(position).getChaptCnt()) );
- if (holder.tvProgress != null) holder.tvProgress.setText( String.format("上次看到第 %s 章",novel.getLastReadChapt(),novel.getChaptCnt()) );
+ if (holder.tvProgress != null) holder.tvProgress.setText( String.format("%s",novel.getLastReadChaptName()) );
if (holder.tvReadtime != null) holder.tvReadtime.setText( "总计阅读了 "+CommonUtil.getTimeCnt4Read( novel.getReadtime() ,true) );
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 eeec0cc..1218733 100644
--- a/zhuike/src/main/java/com/novelbook/android/db/Novel.java
+++ b/zhuike/src/main/java/com/novelbook/android/db/Novel.java
@@ -330,25 +330,40 @@ public void testUpdate(){
}
public int checkAndUpdate(){
Novel nv = getNovelBySvrId(novelId);
+ if(nv==null){
+ return 0;
+ }
/* if(lastUpdateTime > nv.lastVisit && lastUpdateTime > nv.lastUpdateTime){
isUpdated =true;
}*/
- isUpdated = lastUpdateTime > nv.lastVisit || lastUpdateTime > nv.lastUpdateTime;
- Log.d("Novel", String.format("book %s server lastUpdateTime %s, local lastupdatetime %s, local lastvist %s" +
+ // isUpdated = lastUpdateTime > nv.lastVisit && lastUpdateTime > nv.lastUpdateTime;
+ isUpdated = lastUpdateTime > nv.lastUpdateTime;
+ Log.d("Novel", String.format("book %s server lastUpdateTime %s, local lastupdatetime %s, local lastvist %s," +
"is updated %s, lastUpdateTime - nv.lastVisit %s,lastUpdateTime - nv.lastUpdateTime %s "
- ,name ,lastUpdateTime,nv.lastUpdateTime,nv.lastVisit,isUpdated,
+ ,name ,CommonUtil.getDateString(lastUpdateTime) ,CommonUtil.getDateString(nv.lastUpdateTime) ,CommonUtil.getDateString(nv.lastVisit) ,isUpdated,
lastUpdateTime - nv.lastVisit,
lastUpdateTime - nv.lastUpdateTime
) );
- /* boolean isLastReadchaptUpdated = TextUtils.isEmpty(nv.lastReadChaptName) || !(chapterName.equals(nv.lastReadChaptName)); //没看过最新章节
- boolean isLastChaptUpdated = !TextUtils.isEmpty(chapterName) && !TextUtils.isEmpty(nv.chapterName) && !(chapterName.equals(nv.chapterName));
- Log.d("Novel", String.format( " server lastUpdateTime ,server chaptername %s,chaptername %s,lastreadchapt %s" , chapterName,nv.chapterName,nv.lastReadChaptName ) );
+
+ boolean isLastReadchaptUpdated = TextUtils.isEmpty(nv.lastReadChaptName) || !(chapterName.equals(nv.lastReadChaptName)); //没看过最新章节
+ boolean isLastChaptUpdated = !TextUtils.isEmpty(chapterName) && !TextUtils.isEmpty(nv.chapterName) && !(chapterName.equals(nv.chapterName));
+ Log.d("Novel", String.format( " server lastUpdateTime ,server chaptername %s,chaptername %s,lastreadchapt %s" , chapterName,nv.chapterName,nv.lastReadChaptName ) );
+/*
isUpdated = isUpdated && isLastReadchaptUpdated || isLastChaptUpdated ;
+ boolean isLastChaptUpdated = !TextUtils.isEmpty(chapterName) && !TextUtils.isEmpty(nv.chapterName) && !(chapterName.equals(nv.chapterName));
+ */
Log.d("Novel", String.format( " isupdated %s, server lastUpdateTime isLastReadchaptUpdated %s,isLastChaptUpdated %s" ,isUpdated,isLastReadchaptUpdated,isLastChaptUpdated ) );
- */
+
+ Log.d("Novel", String.format( " server lastUpdateTime ,server chaptername %s,chaptername %s,lastreadchapt %s" , chapterName,nv.chapterName,nv.lastReadChaptName ) );
+
+ isUpdated = isUpdated && isLastChaptUpdated || lastUpdateTime > nv.lastVisit;
+
+ isUpdated = isUpdated && isLastReadchaptUpdated;
+
+
if(!isUpdated){
setToDefault("isUpdated");
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 94f0ea2..17a7a68 100644
--- a/zhuike/src/main/java/com/novelbook/android/utils/BookUtil.java
+++ b/zhuike/src/main/java/com/novelbook/android/utils/BookUtil.java
@@ -464,17 +464,17 @@ public class BookUtil {
String msg = String.format("{\"type\":%s, \"id\":%s ,\"name\":\"%s\",\"site\":\"%s\",\"url\":\"%s\",\"content\":\"%s\",\"requestHeader\":\"%s\",\"httpStatus\":\"%s\"}," ,
reportType ,mNovel.getId(),mNovel.getName(),mSite.getDomain(),url ,content,headers,httpStatus);
- msg = String.format("{\"type\":%s, \"novelId\":%s ,\"site\":\"%s\",\"url\":\"%s\",\"httpStatus\":\"%s\",\"content\":\"%s\"}," ,
+ msg = String.format("{\"type\":\"%s\", \"novelId\":%s ,\"site\":\"%s\",\"url\":\"%s\",\"httpStatus\":\"%s\",\"content\":\"%s\"}" ,
reportType ,mNovel.getNovelId(),mSite.getDomain(),url ,httpStatus,content);
BookSubscribe.reportMsg(reportType ,msg);
}
private void checkLastUpdatedChapter() {
- if(BuildConfig.LOG_DEBUG) {
+ /* if(BuildConfig.LOG_DEBUG) {
if(mChapters.size()>1) {
- reportMsg(Constants.REPORT_NEW_UPDATE, mChapters.get(mChapters.size() - 1).getChapterUrl(), mNovel.getChapterName(), "", "");
+ reportMsg(Constants.REPORT_NEW_UPDATE,"", mNovel.getChapterName()+" 测试用例", "", "");
}
- }
+ }*/
for (int i=mChapters.size()-1;i>0;i--) {
if(mChapters.get(i).getChapterName().equals(mNovel.getChapterName())){
if(i
+
@@ -114,8 +115,11 @@
+
+
+
@@ -124,6 +128,7 @@
+