功能新增 >> 完善收藏流程,添加搜索,修复部分bug

EHenTaiViewer/AppDelegate.h

@@ -12,6 +12,5 @@
 
 @property (strong, nonatomic) UIWindow *window;
 
-
 @end
 

EHenTaiViewer/Assets.xcassets/Bookmarks.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Bookmarks.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Bookmarks@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Bookmarks@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

EHenTaiViewer/Assets.xcassets/mutSelect.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "mutSelect.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mutSelect@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mutSelect@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

EHenTaiViewer/Assets.xcassets/toplist.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "toplist.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "toplist@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "toplist@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

EHenTaiViewer/Base.lproj/Main.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="rsu-H3-Gff">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="rsu-H3-Gff">
     <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>

EHenTaiViewer/Info.plist

@@ -15,13 +15,17 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>29</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>此 App 需要您的同意才能读取媒体资料库</string>
+	<key>UIAppFonts</key>
+	<array>
+		<string>iconfont.ttf</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

EHenTaiViewer/QJAllCommentController.m

@@ -59,6 +59,8 @@ - (UITableView *)tableView {
         _tableView = [UITableView new];
         _tableView.delegate = self;
         _tableView.dataSource = self;
+        _tableView.rowHeight = UITableViewAutomaticDimension;
+        _tableView.estimatedRowHeight = 60;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _tableView.contentInset = UIEdgeInsetsMake(0, 0, 15, 0);
         _tableView.translatesAutoresizingMaskIntoConstraints = NO;

EHenTaiViewer/QJCollectionViewFlowLayout.m

@@ -43,18 +43,17 @@ - (CGPoint)targetContentOffsetForProposedContentOffset:(CGPoint)proposedContentO
     CGFloat minDetal = 0;
     for (UICollectionViewLayoutAttributes *attrs in array) {
         if (centerX == attrs.center.x) {
-            //这种可能是起始位置本身就是中心,这时候不需要调整
+            //这种可能是最终位置本身就是中心,这时候不需要调整
             minDetal = 0;
             break;
         }
-        if (isUp && centerX < attrs.center.x) {
-            CGFloat temp = attrs.center.x - centerX;
+        CGFloat temp = attrs.center.x - centerX;
+        if (isUp && temp > 0) {
             if (minDetal == 0 || minDetal > temp) {
                 minDetal = temp;
             }
         }
-        else if (!isUp && centerX > attrs.center.x){
-            CGFloat temp = attrs.center.x - centerX;
+        else if (!isUp && temp < 0){
             if (minDetal == 0 || minDetal < temp) {
                 minDetal = temp;
             }

EHenTaiViewer/QJFavoritesSelectController.m

@@ -61,7 +61,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     if (self.delegate != nil && [self.delegate respondsToSelector:@selector(didSelectFavFolderNameWithArr:index:)]) {
-        [self.delegate didSelectFavFolderNameWithArr:self.datas[indexPath.row] index:indexPath.row == self.datas.count - 1 ? -1 : indexPath.row];
+        [self.delegate didSelectFavFolderNameWithArr:self.datas[indexPath.row] index:self.isLikeVCJump && indexPath.row == self.datas.count - 1 ? -1 : indexPath.row];
         [self.navigationController popViewControllerAnimated:YES];
     }
 }

EHenTaiViewer/QJHenTaiParser.h

@@ -49,6 +49,8 @@ typedef void (^SettingHandler)(QJHenTaiParserStatus status ,NSDictionary<NSStrin
 - (void)updateHotListInfoComplete:(ListHandler)completion;
 - (void)updateLikeListInfoWithUrl:(NSString *)url complete:(ListHandler)completion;
 - (void)updateOtherListInfoWithUrl:(NSString *)url complete:(ListHandler)completion;
+//获取单个链接的画廊信息
+- (void)updateOneUrlInfoWithUrl:(NSString *)url complete:(ListHandler)completion;
 //详情
 - (void)updateGalleryInfoWithUrl:(NSString *)url complete:(GalleryHandler)completion;
 //大图
@@ -62,6 +64,7 @@ typedef void (^SettingHandler)(QJHenTaiParserStatus status ,NSDictionary<NSStrin
 //操作相关
 //收藏
 - (void)updateFavoriteStatus:(BOOL)isFavorite model:(QJListItem *)item index:(NSInteger)index content:(NSString *)content complete:(LoginHandler)completion;
+- (void)updateMutlitFavoriteWithUrl:(NSString *)url status:(NSString *)ddact modifygids:(NSArray *)modifygids complete:(LoginHandler)completion;
 //评论
 - (void)updateCommentWithContent:(NSString *)content url:(NSString *)url complete:(LoginHandler)completion;
 //评星