resource为null时不设置标题

pull/981/head
ag2s20150909 4 years ago
parent fbe010a3bc
commit f7ab4b7140
  1. 18
      epublib/src/main/java/me/ag2s/epublib/domain/FileResourceProvider.java
  2. 4
      epublib/src/main/java/me/ag2s/epublib/domain/TitledResourceReference.java

@ -16,21 +16,27 @@ public class FileResourceProvider implements LazyResourceProvider {
/** /**
* 创建一个文件夹里面文件夹的LazyResourceProvider用于LazyResource * 创建一个文件夹里面文件夹的LazyResourceProvider用于LazyResource
* @param dir 文件的目录 * @param parentDir 文件的目录
*/ */
public FileResourceProvider(String dir) { public FileResourceProvider(String parentDir) {
this.dir = dir; this.dir = parentDir;
} }
/** /**
* 创建一个文件夹里面文件夹的LazyResourceProvider用于LazyResource * 创建一个文件夹里面文件夹的LazyResourceProvider用于LazyResource
* @param dirfile 文件夹 * @param parentFile 文件夹
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
public FileResourceProvider(File dirfile) { public FileResourceProvider(File parentFile) {
this.dir = dirfile.getPath(); this.dir = parentFile.getPath();
} }
/**
* 根据子文件名href,再父目录下读取文件获取FileInputStream
* @param href 子文件名href
* @return 对应href的FileInputStream
* @throws IOException 抛出IOException
*/
@Override @Override
public InputStream getResourceStream(String href) throws IOException { public InputStream getResourceStream(String href) throws IOException {
return new FileInputStream(new File(dir, href)); return new FileInputStream(new File(dir, href));

@ -1,5 +1,7 @@
package me.ag2s.epublib.domain; package me.ag2s.epublib.domain;
import android.util.Log;
import me.ag2s.epublib.Constants; import me.ag2s.epublib.Constants;
import me.ag2s.epublib.util.StringUtil; import me.ag2s.epublib.util.StringUtil;
@ -72,6 +74,8 @@ public class TitledResourceReference extends ResourceReference
//resource为null时不设置标题 //resource为null时不设置标题
if(this.resource!=null&&this.title!=null){ if(this.resource!=null&&this.title!=null){
resource.setTitle(title); resource.setTitle(title);
}else {
Log.e(TitledResourceReference.class.getSimpleName(),"警告:resource 为null,忽略设置标题。");
} }
return resource; return resource;

Loading…
Cancel
Save