Merge branch 'develop'

GGGHub · Jul 4, 2017 · 594d089 · 594d089
2 parents 29c628f + be59d87
commit 594d089
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/LSYReader/.DS_Store b/LSYReader/.DS_Store
diff --git a/...deproj/project.xcworkspace/xcuserdata/LiSiYuan.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/LiSiYuan.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/LSYReader/LSYReader/.DS_Store b/LSYReader/LSYReader/.DS_Store
diff --git a/LSYReader/LSYReader/Reader/.DS_Store b/LSYReader/LSYReader/Reader/.DS_Store
diff --git a/LSYReader/LSYReader/Reader/Core/LSYReadUtilites.m b/LSYReader/LSYReader/Reader/Core/LSYReadUtilites.m
@@ -234,9 +234,9 @@ +(NSMutableArray *)parseOPF:(NSString *)opfPath
     NSArray* itemRefsArray = [document nodesForXPath:@"//opf:itemref" namespaceMappings:[NSDictionary dictionaryWithObject:@"http://www.idpf.org/2007/opf" forKey:@"opf"] error:nil];
     NSMutableArray *chapters = [NSMutableArray array];
     for (CXMLElement* element in itemRefsArray){
-        NSString* chapHref = [itemDictionary valueForKey:[[element attributeForName:@"idref"] stringValue]];
+        NSString* chapHref = [itemDictionary objectForKey:[[element attributeForName:@"idref"] stringValue]];
 //        LSYChapterModel *model = [LSYChapterModel chapterWithEpub:[NSString stringWithFormat:@"%@/%@",absolutePath,chapHref] title:[titleDictionary valueForKey:chapHref] imagePath:[opfPath stringByDeletingLastPathComponent]];
-        LSYChapterModel *model = [LSYChapterModel chapterWithEpub:[NSString stringWithFormat:@"%@/%@",absolutePath,chapHref] title:[titleDictionary valueForKey:chapHref] imagePath:[[[opfPath stringByDeletingLastPathComponent]stringByAppendingPathComponent:chapHref] stringByDeletingLastPathComponent]];
+        LSYChapterModel *model = [LSYChapterModel chapterWithEpub:[NSString stringWithFormat:@"%@/%@",absolutePath,chapHref] title:[titleDictionary objectForKey:chapHref] imagePath:[[[opfPath stringByDeletingLastPathComponent]stringByAppendingPathComponent:chapHref] stringByDeletingLastPathComponent]];
         [chapters addObject:model];
 
     }