diff --git a/zhuike/build.gradle b/zhuike/build.gradle index b3a754d..9a8cac6 100644 --- a/zhuike/build.gradle +++ b/zhuike/build.gradle @@ -31,7 +31,7 @@ android { multiDexEnabled true //突破65535 manifestPlaceholders = [UMENG_CHANNEL_CALUE: "umeng"] //默认为uMeng - // flavorDimensions "default" //debug时注销 + // flavorDimensions "default" //debug时注销 } buildTypes { debug { @@ -56,11 +56,11 @@ android { // 移除无用的resource文件 shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' -/* applicationVariants.all { variant -> + /* applicationVariants.all { variant -> variant.outputs.all { output -> def outFile = output.outputFile if (outFile != null && outFile.name.endsWith(".apk")) { - def fileName = "${defaultConfig.versionName}-" + "${releaseTime()}" + "-${variant.productFlavors[0].name}" +".apk" + def fileName = "${defaultConfig.versionName}-" + "${releaseTime()}" + "-${variant.productFlavors[0].name}" + ".apk" outputFileName = fileName; } @@ -71,36 +71,36 @@ android { } } //渠道 - /*productFlavors { + /* productFlavors { // googleplay {} - qxs { + qxs { applicationId "com.novelbook.android.qxs" - versionName "vn-qxs-5.0" + versionName "v-qxs-5.0" buildConfigField "String", "MAIN_HOST", '"http://chqxs.xiaoshuofenxiang.com/api/"' buildConfigField "String", "API_HOST", '"{\\"master\\":[\\"http:\\\\/\\\\/qxs.xiaoshuofenxiang.com\\"],\\"page\\":[\\"http:\\\\/\\\\/p.xiaoshuofenxiang.com\\"],\\"report\\":[\\"http:\\\\/\\\\/r.xiaoshuofenxiang.com\\"],\\"search\\":[\\"http:\\\\/\\\\/s.xiaoshuofenxiang.com\\"],\\"novel\\":[\\"http:\\\\/\\\\/n.xiaoshuofenxiang.com\\"],\\"novelsbydot\\":[\\"http:\\\\/\\\\/nbd.xiaoshuofenxiang.com\\"],\\"user\\":[\\"http:\\\\/\\\\/u.xiaoshuofenxiang.com\\"]}"' - //buildConfigField "String", "API_HOST", '""' + //buildConfigField "String", "API_HOST", '""' } - wzzw { + wzzw { applicationId "com.novelbook.android.wzzw" - versionName "vn-wzzw-5.0" + versionName "v-wzzw-5.0" buildConfigField "String", "MAIN_HOST", '"http://chwzzw.xiaoshuofenxiang.com/api/"' - buildConfigField "String", "API_HOST", '"{\\"master\\":[\\"http:\\\\/\\\\/wzzw.xiaoshuofenxiang.com\\"],\\"page\\":[\\"http:\\\\/\\\\/p.xiaoshuofenxiang.com\\"],\\"report\\":[\\"http:\\\\/\\\\/r.xiaoshuofenxiang.com\\"],\\"search\\":[\\"http:\\\\/\\\\/s.xiaoshuofenxiang.com\\"],\\"novel\\":[\\"http:\\\\/\\\\/n.xiaoshuofenxiang.com\\"],\\"novelsbydot\\":[\\"http:\\\\/\\\\/nbd.xiaoshuofenxiang.com\\"],\\"user\\":[\\"http:\\\\/\\\\/u.xiaoshuofenxiang.com\\"]}"' - // buildConfigField "String", "API_HOST", '""' + buildConfigField "String", "API_HOST", '"{\\"master\\":[\\"http:\\\\/\\\\/wzzw.xiaoshuofenxiang.com\\"],\\"page\\":[\\"http:\\\\/\\\\/p.xiaoshuofenxiang.com\\"],\\"report\\":[\\"http:\\\\/\\\\/r.xiaoshuofenxiang.com\\"],\\"search\\":[\\"http:\\\\/\\\\/s.xiaoshuofenxiang.com\\"],\\"novel\\":[\\"http:\\\\/\\\\/n.xiaoshuofenxiang.com\\"],\\"novelsbydot\\":[\\"http:\\\\/\\\\/nbd.xiaoshuofenxiang.com\\"],\\"user\\":[\\"http:\\\\/\\\\/u.xiaoshuofenxiang.com\\"]}"' + // buildConfigField "String", "API_HOST", '""' } bo { applicationId "com.novelbook.android.bo" - versionName "vn-bo-5.0" + versionName "v-bo-5.0" buildConfigField "String", "MAIN_HOST", '"http://chbo.xiaoshuofenxiang.com/api/"' buildConfigField "String", "API_HOST", '"{\\"master\\":[\\"http:\\\\/\\\\/bo.xiaoshuofenxiang.com\\"],\\"page\\":[\\"http:\\\\/\\\\/p.xiaoshuofenxiang.com\\"],\\"report\\":[\\"http:\\\\/\\\\/r.xiaoshuofenxiang.com\\"],\\"search\\":[\\"http:\\\\/\\\\/s.xiaoshuofenxiang.com\\"],\\"novel\\":[\\"http:\\\\/\\\\/n.xiaoshuofenxiang.com\\"],\\"novelsbydot\\":[\\"http:\\\\/\\\\/nbd.xiaoshuofenxiang.com\\"],\\"user\\":[\\"http:\\\\/\\\\/u.xiaoshuofenxiang.com\\"]}"' - // buildConfigField "String", "API_HOST", '""' + // buildConfigField "String", "API_HOST", '""' } g { applicationId "com.novelbook.android.g" - versionName "vn-g-5.0" + versionName "v-g-5.0" buildConfigField "String", "MAIN_HOST", '"http://chg.xiaoshuofenxiang.com/api/"' buildConfigField "String", "API_HOST", '"{\\"master\\":[\\"http:\\\\/\\\\/g.xiaoshuofenxiang.com\\"],\\"page\\":[\\"http:\\\\/\\\\/p.xiaoshuofenxiang.com\\"],\\"report\\":[\\"http:\\\\/\\\\/r.xiaoshuofenxiang.com\\"],\\"search\\":[\\"http:\\\\/\\\\/s.xiaoshuofenxiang.com\\"],\\"novel\\":[\\"http:\\\\/\\\\/n.xiaoshuofenxiang.com\\"],\\"novelsbydot\\":[\\"http:\\\\/\\\\/nbd.xiaoshuofenxiang.com\\"],\\"user\\":[\\"http:\\\\/\\\\/u.xiaoshuofenxiang.com\\"]}"' - // buildConfigField "String", "API_HOST", '""' + // buildConfigField "String", "API_HOST", '""' } //批量配置 productFlavors.all { flavor -> diff --git a/zhuike/libs/com.baidu.tts_2.2.9.20161020_154fa02_release.jar b/zhuike/libs/com.baidu.tts_2.2.9.20161020_154fa02_release.jar deleted file mode 100644 index 90cd440..0000000 Binary files a/zhuike/libs/com.baidu.tts_2.2.9.20161020_154fa02_release.jar and /dev/null differ diff --git a/zhuike/proguard-rules.pro b/zhuike/proguard-rules.pro index c9384e3..0b71362 100644 --- a/zhuike/proguard-rules.pro +++ b/zhuike/proguard-rules.pro @@ -271,3 +271,7 @@ # } +# 嵌入广点通sdk时必须添加 +-keep class com.qq.e.** { + public protected *; +} diff --git a/zhuike/src/main/AndroidManifest.xml b/zhuike/src/main/AndroidManifest.xml index 94c9376..6ab22c4 100644 --- a/zhuike/src/main/AndroidManifest.xml +++ b/zhuike/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ package="com.novelbook.android"> - - + @@ -17,11 +16,11 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:launchMode="singleInstance" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/ToolBarTheme" android:usesCleartextTraffic="true"> - + + + + + + + + + + + + + + --> + - + + \ No newline at end of file diff --git a/zhuike/src/main/java/com/novelbook/android/ActivityAnounce.java b/zhuike/src/main/java/com/novelbook/android/ActivityAnounce.java new file mode 100644 index 0000000..e10b622 --- /dev/null +++ b/zhuike/src/main/java/com/novelbook/android/ActivityAnounce.java @@ -0,0 +1,34 @@ +package com.novelbook.android; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class ActivityAnounce extends Activity_base { + + @Override + public int getLayoutRes() { + return R.layout.activity_anounce; + } + + @Override + protected void initViews() { + + } + + + + @Override + protected void setTitle() { + + } + + @Override + protected void initData() { + + } + + @Override + public void fillData() { + + } +} diff --git a/zhuike/src/main/java/com/novelbook/android/ActivitySetup.java b/zhuike/src/main/java/com/novelbook/android/ActivitySetup.java index 9de6363..08d10bb 100644 --- a/zhuike/src/main/java/com/novelbook/android/ActivitySetup.java +++ b/zhuike/src/main/java/com/novelbook/android/ActivitySetup.java @@ -72,7 +72,8 @@ static final String TAG = ActivitySetup.class.getSimpleName(); switch (view.getId()) { case R.id.llAnouncement: - + Intent intent = new Intent(ActivitySetup.this, ActivityAnounce.class); + startActivity(intent); break; case R.id.llCache: final AlertDialog.Builder normalDialog = 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 74ead72..7181e61 100644 --- a/zhuike/src/main/java/com/novelbook/android/Activity_base.java +++ b/zhuike/src/main/java/com/novelbook/android/Activity_base.java @@ -43,7 +43,8 @@ import butterknife.ButterKnife; public abstract class Activity_base extends AppCompatActivity { private ProgressDialog mProgressDialog; - + private MyApp application; + private Activity_base oContext; protected Gson gson = new Gson(); @Nullable @BindView(R.id.toolbar) @@ -67,6 +68,13 @@ public abstract class Activity_base extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + if (application == null) { + // 得到Application对象 + application = (MyApp) getApplication(); + } + oContext = this;// 把当前的上下文对象赋值给BaseActivity + addActivity();// 调用添加方法 + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); setContentView(getLayoutRes()); ButterKnife.bind(this); @@ -100,7 +108,7 @@ public abstract class Activity_base extends AppCompatActivity { } protected void closeCurrentActitivty(){ if( this instanceof BookActivity ) { - // return; + return; } finish(); } @@ -262,109 +270,27 @@ public abstract class Activity_base extends AppCompatActivity { else manager.checkUpdate(); } -/* - class BookListAdapter extends RecyclerView.Adapter { - private final int EMPTY_VIEW = 1; - private final int PROGRESS_VIEW = 2; - private final int IMAGE_VIEW = 3; - - private Context context; - private List mDatas = new ArrayList(); - private OnItemClickListener mOnItemClickListener; - private int listItemID; - - public BookListAdapter(Context context, List mDatas, int listItemID, OnItemClickListener clicklistener) { - this.context = context; - this.mDatas = mDatas; - this.mOnItemClickListener = clicklistener; - this.listItemID = listItemID; - } - - public BookListAdapter(Context context, OnItemClickListener clickLitener) { - this.context = context; - this.mOnItemClickListener = clickLitener; - - } - - @Override - public int getItemViewType(int position) { - if (mDatas.size() == 0) { - return EMPTY_VIEW; - } else if (mDatas.get(position) == null) { - return PROGRESS_VIEW; - } else { - 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 void setParameters(List mDatas, int listItemID) { - this.mDatas = mDatas; - this.listItemID = listItemID; - } - - public void setOnItemClickLitener(OnItemClickListener mOnItemClickListener) { - this.mOnItemClickListener = mOnItemClickListener; - } - - @Override - public void onBindViewHolder(MyViewHolder holder, int position) { - - holder.tvTitle.setText(mDatas.get(position)); - holder.tvAuthor.setText("金庸" + position); - holder.tvCate.setText("cate" + position); - holder.tvDesc.setText("this is desc " + position); - - - // 如果设置了回调，则设置点击事件 - if (mOnItemClickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() //show more cate paihang - { - @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; - } - }); - - - } - } - - @Override - public int getItemCount() { - return mDatas.size(); - } - - public void addData(int position) { - mDatas.add(position, "Insert One"); - notifyItemInserted(position); - } - - public void removeData(int position) { - mDatas.remove(position); - notifyItemRemoved(position); - notifyDataSetChanged(); - } - + // 添加Activity方法 + public void addActivity() { + application.addActivity_(oContext);// 调用myApplication的添加Activity方法 } - */ + + //销毁当个Activity方法 + public void removeActivity() { + application.removeActivity_(oContext);// 调用myApplication的销毁单个Activity方法 + } + + //销毁所有Activity方法 + public void removeALLActivity() { + application.removeALLActivity_();// 调用myApplication的销毁所有Activity方法 + } + + @Override + public void finish() { + removeActivity(); + super.finish(); + } + + } diff --git a/zhuike/src/main/java/com/novelbook/android/BookActivity.java b/zhuike/src/main/java/com/novelbook/android/BookActivity.java index 86a2dbc..ad9e417 100644 --- a/zhuike/src/main/java/com/novelbook/android/BookActivity.java +++ b/zhuike/src/main/java/com/novelbook/android/BookActivity.java @@ -158,6 +158,7 @@ public class BookActivity extends Activity_base { rvBooklistAuthor.setVisibility(View.GONE); tvTonglei.setVisibility(View.GONE); tvAuthorMore.setText( ""); + initiDownloadReceiver(); } @Override @@ -183,15 +184,13 @@ public class BookActivity extends Activity_base { @Override protected void setTitle() { - mNovel = (Novel) getIntent().getSerializableExtra(EXTRA_BOOK); - novelId = mNovel.getNovelId(); - this.setTitle(mNovel.getName()); + } @Override protected void initData() { - initiDownloadReceiver(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { checkPermission(BookActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE, EXTERNAL_STORAGE_REQ_CODE, "添加图书需要此权限，请允许"); @@ -209,9 +208,18 @@ public class BookActivity extends Activity_base { * 设置book list 传过来的基本信息 */ private void setBookInfo() { - + mNovel = (Novel) getIntent().getSerializableExtra(EXTRA_BOOK); + novelId = mNovel.getNovelId(); + this.setTitle(mNovel.getName()); + btnCach.setText(R.string.cache_novel); + } + @Override + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + Log.e("tag", "onNewINtent执行了"); + setIntent(intent); + initData(); } - private void setNovelsSameAuthor(){ @@ -747,9 +755,11 @@ void onResponseProcess( String content ,String url){ private IntentFilter filter; DownloadProcessReceiver receiver; void initiDownloadReceiver(){ - filter = new IntentFilter("ServiceDownload.ChapterContent.finished"); - filter.addCategory(Intent.CATEGORY_DEFAULT); - receiver = new DownloadProcessReceiver(); + if(filter==null) { + filter = new IntentFilter("ServiceDownload.ChapterContent.finished"); + filter.addCategory(Intent.CATEGORY_DEFAULT); + receiver = new DownloadProcessReceiver(); + } } class DownloadProcessReceiver extends BroadcastReceiver { @@ -766,7 +776,8 @@ void onResponseProcess( String content ,String url){ if(novelId == mNovel.getId()){ try { - btnCach.setText(progress + "/" + pageFactory.getChapters().size()); + String cpsize = pageFactory.getChapters().size() >0 ? pageFactory.getChapters().size() +"":"--"; + btnCach.setText(progress + "/" + cpsize); }catch (Exception e){ Log.e(TAG, "onReceive: ", e); } 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 2448dfc..ddc8400 100644 --- a/zhuike/src/main/java/com/novelbook/android/Fragments/BasicFragment.java +++ b/zhuike/src/main/java/com/novelbook/android/Fragments/BasicFragment.java @@ -249,7 +249,7 @@ void initTabs(){ @Override public void onFault(String errorMsg) { //失败 - Toast.makeText(getActivity(),"Novel 请求失败："+errorMsg,Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(),novel.getName() +" 信息请求失败" ,Toast.LENGTH_SHORT).show(); // PageFactory.getInstance(activity ).prepareBook(novel ); //打开本地小说内容 pageFactory.prepareBook(novel ); // ReadActivity.openBook(novel ,activity); 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 fb60d24..83ad2a4 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 @@ -136,6 +136,7 @@ public class Fragment_booklist extends BasicFragment { } } + int lastPageNo =0; @Override protected void fillData() { @@ -154,7 +155,7 @@ public class Fragment_booklist extends BasicFragment { // mAdapter.setPercent(pageNo/pageCount); mAdapter.AddFooterItem(mMoreData); mAdapter.changeMoreStatus(status); - + mMoreData.clear(); } } @@ -167,8 +168,13 @@ public class Fragment_booklist extends BasicFragment { @Override public void initData() { - - int pn = pageNo; + if(pageNo>1){ + if(lastPageNo ==pageNo){ + return; + } + } + lastPageNo = pageNo; + // int pn = pageNo; if(pageNo==1) { diff --git a/zhuike/src/main/java/com/novelbook/android/MyApp.java b/zhuike/src/main/java/com/novelbook/android/MyApp.java index 05b0b7e..7a1d62e 100644 --- a/zhuike/src/main/java/com/novelbook/android/MyApp.java +++ b/zhuike/src/main/java/com/novelbook/android/MyApp.java @@ -1,7 +1,9 @@ package com.novelbook.android; +import android.app.Activity; import android.app.Application; import android.content.Context; +import android.util.Log; import com.novelbook.android.netutils.HttpMethods; import com.novelbook.android.netutils.NetUtil; @@ -14,12 +16,17 @@ import com.umeng.commonsdk.UMConfigure; import org.litepal.LitePal; +import java.util.ArrayList; +import java.util.List; + public class MyApp extends Application { public static volatile Context applicationContext = null; SplashAdManager splashAdManager; + private List oList;//用于存放所有启动的Activity的集合 @Override public void onCreate() { super.onCreate(); + oList = new ArrayList(); applicationContext = getApplicationContext(); HttpMethods.USERAGENT = NetUtil.getUserAgent(); HttpMethods.LOCALUSERAGENT = NetUtil.getUserAgent(applicationContext); @@ -38,7 +45,41 @@ public class MyApp extends Application { MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO); } public boolean exit() { - System.exit(0); + + System.exit(-1); + removeALLActivity_(); + return true; } + /** + * 添加Activity + */ + public void addActivity_(Activity activity) { +// 判断当前集合中不存在该Activity + if (!oList.contains(activity)) { + oList.add(activity);//把当前Activity添加到集合中 + } + } + /** + * 销毁单个Activity + */ + public void removeActivity_(Activity activity) { +//判断当前集合中存在该Activity + if (oList.contains(activity)) { + oList.remove(activity);//从集合中移除 + activity.finish();//销毁当前Activity + } + } + /** + * 销毁所有的Activity + */ + public void removeALLActivity_() { + //通过循环，把集合中的所有Activity销毁 + Log.d("MyApp", "removeALLActivity_: total activities to finish: " + oList.size()); + for (Activity activity : oList) { + Log.d("MyApp", "removeALLActivity_: " + activity.getLocalClassName()); + activity.finish(); + } + } + } diff --git a/zhuike/src/main/java/com/novelbook/android/ReadActivity.java b/zhuike/src/main/java/com/novelbook/android/ReadActivity.java index 9e4f669..64c42b3 100644 --- a/zhuike/src/main/java/com/novelbook/android/ReadActivity.java +++ b/zhuike/src/main/java/com/novelbook/android/ReadActivity.java @@ -472,7 +472,7 @@ public class ReadActivity extends Activity_base implements AdInterface { mSpeechSynthesizer.resume(); }*/ startTime = (int) new Date().getTime(); - if (book != null) { + /* if (book != null) { Intent intent = getIntent(); if (intent.hasExtra(EXTRA_BOOK)) { Novel novel = (Novel) intent.getSerializableExtra(EXTRA_BOOK); @@ -486,9 +486,9 @@ public class ReadActivity extends Activity_base implements AdInterface { } hideReadSetting(); } - } - + }*/ + hideReadSetting(); } @@ -694,7 +694,7 @@ public class ReadActivity extends Activity_base implements AdInterface { }else if(id == R.id.action_bookdetail){ showBookDetail(this.book); - //finish(); + finish(); } return super.onOptionsItemSelected(item); @@ -710,7 +710,7 @@ public class ReadActivity extends Activity_base implements AdInterface { super.onNewIntent(intent); Log.e("tag", "onNewINtent执行了"); setIntent(intent); - + initData(); } public static boolean openBook(final Novel book, Activity context) { @@ -916,7 +916,8 @@ public class ReadActivity extends Activity_base implements AdInterface { case R.id.tv_directory: Intent intent = new Intent(ReadActivity.this, MarkActivity.class); startActivity(intent); - // finish(); + + // finish(); break; case R.id.tv_dayornight: changeDayOrNight(); diff --git a/zhuike/src/main/java/com/novelbook/android/upgrade/UpdateManager.java b/zhuike/src/main/java/com/novelbook/android/upgrade/UpdateManager.java index f66bad5..4a1ca5e 100644 --- a/zhuike/src/main/java/com/novelbook/android/upgrade/UpdateManager.java +++ b/zhuike/src/main/java/com/novelbook/android/upgrade/UpdateManager.java @@ -204,7 +204,7 @@ public class UpdateManager { if(mHashMap.containsKey("minVersion")) Constants.minVersion = Integer.valueOf(mHashMap.get("minVersion")); // need update or not - isUpdate = serviceCode > versionCode; + isUpdate = serviceCode > versionCode; isForceRefresh = versionCode 0) { + chaptMap.put(chaptId, chaptPages); + mBookUtil.setChapterLen(chaptPages.get(chaptPages.size() - 1).getEnd()); + mBookUtil.setChapterNo(chaptId); + Log.d(TAG, String.format("prepare book to load chapt %s, cost %s ",chaptId ,new Date().getTime() -starttime) ); mStatus = Status.FINISH; Log.d(TAG, String.format("changing Source prepare book to draw chapter %s, currentChapter %s ",chaptId ,currentChapter ) ); // drawStatus(); + }else{ + + mStatus = Status.FAIL; + + if(getNovle().isLocalBook()){ + mStatus=Status.LOCALFAIL; + } + drawStatus(); + } return chaptPages; } @@ -567,7 +578,8 @@ public class PageFactory implements ChangeSource{ FAIL, NETWORKFAILE, SERVERERROR, - CHANGESOURCE ; + CHANGESOURCE , + LOCALFAIL; } private void hideSysUI(){ if(mAd!=null){ @@ -740,6 +752,11 @@ private void hideSysUI(){ status = statusChangeSource; mAd.showRefresh(View.GONE); break; + + case LOCALFAIL: + status = "本地缓存加载错误"; + mAd.showRefresh(View.GONE); + break; } Canvas c = new Canvas(bitmap); @@ -1116,17 +1133,20 @@ private void hideSysUI(){ Log.d(TAG, "prepare book: start prepare book " + book.getName()); - - if(getNovel()!=null &&getNovel().getNovelId() !=book.getNovelId()){ //取消未上本书完成的web请求，待验证效果 - try { - NetUtil.cancelRequest(getNovel().getNovelId() ); - }catch (Exception e) - { - Log.e(TAG, "prepare book: error on canceling request "+e.getMessage()); - e.printStackTrace(); + if(getNovel()!=null) { + if (getNovel().getNovelId() != book.getNovelId()) { //取消未上本书完成的web请求，待验证效果 + try { + NetUtil.cancelRequest(getNovel().getNovelId()); + } catch (Exception e) { + Log.e(TAG, "prepare book: error on canceling request " + e.getMessage()); + e.printStackTrace(); + } + }else{ + Log.d(TAG, "prepare book: has been prepared, return.... " + book.getName()); + return; } - } + } mBookUtil = new BookUtil(); mBookUtil.pagefactory=this; //this.mBookUtil.setContext(context); @@ -1149,7 +1169,8 @@ private void hideSysUI(){ mBookUtil = new BookUtil(); mBookUtil.setNovel(book); }else if(mBookUtil==null){ - mBookUtil = new BookUtil(); + Log.d(TAG, "prepare book: preparing in openBook method" + book.getName()); + prepareBook(book); } mBookUtil.setContext(context); mContext =context; @@ -1234,6 +1255,9 @@ private void hideSysUI(){ // Log.d(TAG, "prepare book:waiting for bookutil book:" + getNovel()); Thread.sleep(10); slept++; + if(slept>500){ + return false; + } } Log.d(TAG, "prepare book:waiting for bookutil book slept "+slept*10); @@ -1310,10 +1334,13 @@ private void hideSysUI(){ trPage.setEnd(mBookUtil.getPosition()); return trPage; */ + if(currentChaptPages.size()==0){ + return new TRPage(); + } Log.d(TAG, String.format("prepare book getPageForBegin: currentChaptPages count %s, chaptid %s, begin %s ",currentChaptPages.size(),currentChapter,begin)); for(TRPage page : currentChaptPages) { - if(page.getEnd() >begin){ + if(page.getEnd() >=begin){ return page; } } @@ -1607,6 +1634,15 @@ private void hideSysUI(){ position =currentPage.getBegin(); Log.d(TAG, "prepare book changeChapter: to position " + position); } + + } + if(position==0){ + if( !getNovle().isLocalBook() + && getNovle().getDomain()!=null && getSite().getDomain()!=null + && getNovle().getDomain().equals(getSite().getDomain()) + && getNovle().getLastReadChapt() == chapNum ){ + position =getNovel().getLastReadPos(); + } } preChaptPages =currentChaptPages; currentChapter = chapNum; diff --git a/zhuike/src/main/res/layout/activity_anounce.xml b/zhuike/src/main/res/layout/activity_anounce.xml new file mode 100644 index 0000000..815b4e6 --- /dev/null +++ b/zhuike/src/main/res/layout/activity_anounce.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/zhuike/src/main/res/layout/content_scrolling.xml b/zhuike/src/main/res/layout/content_scrolling.xml index 74a90f5..b79e196 100644 --- a/zhuike/src/main/res/layout/content_scrolling.xml +++ b/zhuike/src/main/res/layout/content_scrolling.xml @@ -12,6 +12,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/text_margin" - android:text="@string/large_text" /> + android:text="" /> \ No newline at end of file diff --git a/zhuike/src/main/res/layout/nav_header_main2.xml b/zhuike/src/main/res/layout/nav_header_main2.xml index 004fe3b..dcd7520 100644 --- a/zhuike/src/main/res/layout/nav_header_main2.xml +++ b/zhuike/src/main/res/layout/nav_header_main2.xml @@ -17,15 +17,16 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/nav_header_desc" - android:paddingTop="@dimen/nav_header_vertical_spacing" - app:srcCompat="@mipmap/ic_launcher_round" /> + android:paddingTop="@dimen/nav_header_vertical_spacing" android:visibility="gone" + app:srcCompat="@mipmap/ic_launcher" /> diff --git a/zhuike/src/main/res/layout/nav_header_main4.xml b/zhuike/src/main/res/layout/nav_header_main4.xml index 4c3439a..c227984 100644 --- a/zhuike/src/main/res/layout/nav_header_main4.xml +++ b/zhuike/src/main/res/layout/nav_header_main4.xml @@ -18,19 +18,21 @@ android:layout_height="wrap_content" android:contentDescription="@string/nav_header_desc" android:paddingTop="@dimen/nav_header_vertical_spacing" - app:srcCompat="@mipmap/ic_launcher_round" /> + app:srcCompat="@mipmap/ic_launcher" + android:visibility="gone" + /> diff --git a/zhuike/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/zhuike/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/zhuike/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/zhuike/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/zhuike/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/zhuike/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/zhuike/src/main/res/mipmap-hdpi/ic_launcher.png b/zhuike/src/main/res/mipmap-hdpi/ic_launcher.png index 898f3ed..4b8ca1e 100644 Binary files a/zhuike/src/main/res/mipmap-hdpi/ic_launcher.png and b/zhuike/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/zhuike/src/main/res/mipmap-hdpi/ic_launcher_round.png b/zhuike/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index dffca36..0000000 Binary files a/zhuike/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/zhuike/src/main/res/mipmap-hdpi/loading.gif b/zhuike/src/main/res/mipmap-hdpi/loading.gif deleted file mode 100644 index d9ef65e..0000000 Binary files a/zhuike/src/main/res/mipmap-hdpi/loading.gif and /dev/null differ diff --git a/zhuike/src/main/res/mipmap-mdpi/ic_launcher.png b/zhuike/src/main/res/mipmap-mdpi/ic_launcher.png index 64ba76f..d6e07b3 100644 Binary files a/zhuike/src/main/res/mipmap-mdpi/ic_launcher.png and b/zhuike/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/zhuike/src/main/res/mipmap-mdpi/ic_launcher_round.png b/zhuike/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index dae5e08..0000000 Binary files a/zhuike/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/zhuike/src/main/res/mipmap-xhdpi/ic_launcher.png b/zhuike/src/main/res/mipmap-xhdpi/ic_launcher.png index e5ed465..35ee17e 100644 Binary files a/zhuike/src/main/res/mipmap-xhdpi/ic_launcher.png and b/zhuike/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/zhuike/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/zhuike/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 14ed0af..0000000 Binary files a/zhuike/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/zhuike/src/main/res/mipmap-xxhdpi/ic_launcher.png b/zhuike/src/main/res/mipmap-xxhdpi/ic_launcher.png index b0907ca..2aeef7e 100644 Binary files a/zhuike/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/zhuike/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/zhuike/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/zhuike/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index d8ae031..0000000 Binary files a/zhuike/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/zhuike/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/zhuike/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 2c18de9..02f5967 100644 Binary files a/zhuike/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/zhuike/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/zhuike/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/zhuike/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index beed3cd..0000000 Binary files a/zhuike/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/zhuike/src/main/res/values/strings.xml b/zhuike/src/main/res/values/strings.xml index 30b122c..80dea29 100644 --- a/zhuike/src/main/res/values/strings.xml +++ b/zhuike/src/main/res/values/strings.xml @@ -10,8 +10,8 @@ Main2Activity Open navigation drawer Close navigation drawer - Android Studio - android.studio@android.com + 欢迎您的光临 + Navigation header Settings Main3Activity @@ -20,94 +20,24 @@ BookActivity Dummy Button DUMMY\nCONTENT - - "Material is the metaphor.\n\n" + + " 鉴于本服务以非人工检索方式提供无线搜索、根据您输入的关键字自动生成到第三方网页的链接，本服务会提供与其他任何互联网网站或资源的链接。由于本软件无法控制这些网站或资源的内容，您了解并同意：无论此类网站或资源是否可供利用，本软件不予负责；本软件亦对存在或源于此类网站或资源之任何内容、广告、产品或其他资料不予保证或负责。因您使用或依赖任何此类网站或资源发布的或经由此类网站或资源获得的任何内容、商品或服务所产生的任何损害或损失，本软件不负任何直接或间接责任。 - "A material metaphor is the unifying theory of a rationalized space and a system of motion." - "The material is grounded in tactile reality, inspired by the study of paper and ink, yet " - "technologically advanced and open to imagination and magic.\n" - "Surfaces and edges of the material provide visual cues that are grounded in reality. The " - "use of familiar tactile attributes helps users quickly understand affordances. Yet the " - "flexibility of the material creates new affordances that supercede those in the physical " - "world, without breaking the rules of physics.\n" - "The fundamentals of light, surface, and movement are key to conveying how objects move, " - "interact, and exist in space and in relation to each other. Realistic lighting shows " - "seams, divides space, and indicates moving parts.\n\n" +因本服务搜索结果根据您键入的关键字自动搜索获得并生成，不代表本软件赞成被搜索链接到的第三方网页上的内容或立场。 - "Bold, graphic, intentional.\n\n" + 任何通过使用本服务而搜索链接到的第三方网页均系第三方提供或制作，您可能从该第三方网页上获得资讯及享用服务，本软件无法对其合法性负责，亦不承担任何法律责任。 - "The foundational elements of print based design typography, grids, space, scale, color, " - "and use of imagery guide visual treatments. These elements do far more than please the " - "eye. They create hierarchy, meaning, and focus. Deliberate color choices, edge to edge " - "imagery, large scale typography, and intentional white space create a bold and graphic " - "interface that immerse the user in the experience.\n" - "An emphasis on user actions makes core functionality immediately apparent and provides " - "waypoints for the user.\n\n" + 您应对使用无线搜索引擎的结果自行承担风险。本软件不做任何形式的保证：不保证搜索结果满足您的要求，不保证搜索服务不中断，不保证搜索结果的安全性、准确性、及时性、合法性。因网络状况、通讯故障、第三方网站等任何原因而导致您不能正常使用本服务的，本软件不承担任何法律责任。 - "Motion provides meaning.\n\n" + 您应该了解并知晓，本软件作为移动互联网的先行者，拥有先进的无线数据应用技术和智能搜索系统，为手机等无线端用户提供了移动互联网的最佳搜索体验。本软件使用行业内成熟的搜索引擎技术，同时充分考虑用户手机端上网特征，由于电脑端网页的复杂、多样与标准的不同，用户无法通过手机正常浏览电脑端网页，为了提供更好的用户体验，用户在搜索点击后，我们网页会提供转码，这就是网页实时转换技术，将页面转换为适于手机用户访问的页面，从而为用户提供可用、高效的搜索服务。由于搜索引擎对数据即时性和客观性的要求，和复杂的数据变更以及本身的技术问题，在转码的过程中可能会出现原网站的部门数据异常而导致部分数据错误，若您想获取完整的原网站完整有效的内容，您应选择去原网站浏览，介于此类技术问题，本软件一直在不断的完善搜索技术，以提高数据的准确性。 - "Motion respects and reinforces the user as the prime mover. Primary user actions are " - "inflection points that initiate motion, transforming the whole design.\n" - "All action takes place in a single environment. Objects are presented to the user without " - "breaking the continuity of experience even as they transform and reorganize.\n" - "Motion is meaningful and appropriate, serving to focus attention and maintain continuity. " - "Feedback is subtle yet clear. Transitions are efficient yet coherent.\n\n" + 您使用本服务即视为您已阅读并同意受本声明内容的相关约束。本软件有权在根据具体情况进行修改本声明条款。对此，我们不会有专门通知，但，您可以在相关页面中查阅最新的条款。条款变更后，如果您继续使用本服务，即视为您已接受修改后的条款。如果您不接受，应当停止使用本服务。 - "3D world.\n\n" + 本声明内容同时包括《本软件软件服务协议》，《版权保护投诉指引》及本软件可能不断发布本服务的相关声明、协议、业务规则等内容。上述内容一经正式发布，即为本声明不可分割的组成部分，您同样应当遵守。上述内容与本声明内容存在冲突的，以本声明为准。您对前述任何业务规则、声明内容的接受，即视为您对本声明内容全部的接受。 - "The material environment is a 3D space, which means all objects have x, y, and z " - "dimensions. The z-axis is perpendicularly aligned to the plane of the display, with the " - "positive z-axis extending towards the viewer. Every sheet of material occupies a single " - "position along the z-axis and has a standard 1dp thickness.\n" - "On the web, the z-axis is used for layering and not for perspective. The 3D world is " - "emulated by manipulating the y-axis.\n\n" + 本声明的成立、生效、履行、解释及纠纷解决，适用中华人民共和国大陆地区法律（不包括冲突法）。 - "Light and shadow.\n\n" - - "Within the material environment, virtual lights illuminate the scene. Key lights create " - "directional shadows, while ambient light creates soft shadows from all angles.\n" - "Shadows in the material environment are cast by these two light sources. In Android " - "development, shadows occur when light sources are blocked by sheets of material at " - "various positions along the z-axis. On the web, shadows are depicted by manipulating the " - "y-axis only. The following example shows the card with a height of 6dp.\n\n" - - "Resting elevation.\n\n" - - "All material objects, regardless of size, have a resting elevation, or default elevation " - "that does not change. If an object changes elevation, it should return to its resting " - "elevation as soon as possible.\n\n" - - "Component elevations.\n\n" - - "The resting elevation for a component type is consistent across apps (e.g., FAB elevation " - "does not vary from 6dp in one app to 16dp in another app).\n" - "Components may have different resting elevations across platforms, depending on the depth " - "of the environment (e.g., TV has a greater depth than mobile or desktop).\n\n" - - "Responsive elevation and dynamic elevation offsets.\n\n" - - "Some component types have responsive elevation, meaning they change elevation in response " - "to user input (e.g., normal, focused, and pressed) or system events. These elevation " - "changes are consistently implemented using dynamic elevation offsets.\n" - "Dynamic elevation offsets are the goal elevation that a component moves towards, relative " - "to the component’s resting state. They ensure that elevation changes are consistent " - "across actions and component types. For example, all components that lift on press have " - "the same elevation change relative to their resting elevation.\n" - "Once the input event is completed or cancelled, the component will return to its resting " - "elevation.\n\n" - - "Avoiding elevation interference.\n\n" - - "Components with responsive elevations may encounter other components as they move between " - "their resting elevations and dynamic elevation offsets. Because material cannot pass " - "through other material, components avoid interfering with one another any number of ways, " - "whether on a per component basis or using the entire app layout.\n" - "On a component level, components can move or be removed before they cause interference. " - "For example, a floating action button (FAB) can disappear or move off screen before a " - "user picks up a card, or it can move if a snackbar appears.\n" - "On the layout level, design your app layout to minimize opportunities for interference. " - "For example, position the FAB to one side of stream of a cards so the FAB won’t interfere " - "when a user tries to pick up one of cards.\n\n" + 若您和本软件之间发生任何纠纷或争议，首先应友好协商解决；协商不成的，您同意将纠纷或争议提交本软件所在地的人民法院处理。" Main5Activity 加入书架 @@ -204,6 +134,8 @@ 检查更新 清除缓存 设置 + 免责声明 + 全本缓存 小燕—女青、中英、普通话 diff --git a/zhuike/src/main/res/xml/gdt_file_path.xml b/zhuike/src/main/res/xml/gdt_file_path.xml new file mode 100644 index 0000000..7157739 --- /dev/null +++ b/zhuike/src/main/res/xml/gdt_file_path.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/zhuike/zhuike.iml b/zhuike/zhuike.iml index 8e47f24..fb9a1d5 100644 --- a/zhuike/zhuike.iml +++ b/zhuike/zhuike.iml @@ -173,6 +173,7 @@ + @@ -219,7 +220,6 @@ -