save reading progress

thom802311 · Apr 25, 2017 · 876a9ee · 876a9ee
1 parent e142d1c
commit 876a9ee
Show file tree

Hide file tree

Showing 264 changed files with 9,213 additions and 521 deletions.
diff --git a/zhuishushenqi.xcodeproj/project.pbxproj b/zhuishushenqi.xcodeproj/project.pbxproj
diff --git a/zhuishushenqi/AppDelegate.swift b/zhuishushenqi/AppDelegate.swift
@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 16/9/16.
+//  Created by Nory Cao on 16/9/16.
 //  Copyright © 2016年 QS. All rights reserved.
 //
 
@@ -27,11 +27,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window?.rootViewController = sideNavVC
         window?.makeKeyAndVisible()
         UIApplication.shared.setStatusBarHidden(false, with: .fade)
-        #if DEBUG
+//        #if DEBUG
             let fpsLabel = V2FPSLabel(frame: CGRect(x:15, y:ScreenHeight-40, width:55,height: 20));
             self.window?.addSubview(fpsLabel);
-        #else
-        #endif
+//        #else
+//        #endif
 
         configureDataBase()
 //        [application setStatusBarHidden:NO withAnimation:UIStatusBarAnimationFade];

diff --git a/zhuishushenqi/Base/Controllers/BaseViewController.swift b/zhuishushenqi/Base/Controllers/BaseViewController.swift
@@ -2,7 +2,7 @@
 //  BaseViewController.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 16/9/20.
+//  Created by Nory Cao on 16/9/20.
 //  Copyright © 2016年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Base/Controllers/SideViewController.swift b/zhuishushenqi/Base/Controllers/SideViewController.swift
@@ -2,7 +2,7 @@
 //  SideViewController.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 16/9/30.
+//  Created by Nory Cao on 16/9/30.
 //  Copyright © 2016年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Base/Views/CommunityView.swift b/zhuishushenqi/Base/Views/CommunityView.swift
@@ -2,7 +2,7 @@
 //  CommunityView.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 16/10/22.
+//  Created by Nory Cao on 16/10/22.
 //  Copyright © 2016年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Base/Views/DarkStarView.swift b/zhuishushenqi/Base/Views/DarkStarView.swift
@@ -2,7 +2,7 @@
 //  DarkStarView.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 2017/3/9.
+//  Created by Nory Cao on 2017/3/9.
 //  Copyright © 2017年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Base/Views/DarkView.swift b/zhuishushenqi/Base/Views/DarkView.swift
@@ -2,7 +2,7 @@
 //  DarkView.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 2017/3/9.
+//  Created by Nory Cao on 2017/3/9.
 //  Copyright © 2017年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Base/Views/EmptyView.swift b/zhuishushenqi/Base/Views/EmptyView.swift
@@ -2,7 +2,7 @@
 //  EmptyView.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 2017/3/17.
+//  Created by Nory Cao on 2017/3/17.
 //  Copyright © 2017年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Base/Views/LightStarView.swift b/zhuishushenqi/Base/Views/LightStarView.swift
@@ -2,7 +2,7 @@
 //  LightStarView.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 2017/3/9.
+//  Created by Nory Cao on 2017/3/9.
 //  Copyright © 2017年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Base/Views/LightView.swift b/zhuishushenqi/Base/Views/LightView.swift
@@ -2,7 +2,7 @@
 //  LightView.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 2017/3/9.
+//  Created by Nory Cao on 2017/3/9.
 //  Copyright © 2017年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Base/Views/QSLoadingView.swift b/zhuishushenqi/Base/Views/QSLoadingView.swift
@@ -2,7 +2,7 @@
 //  QSLoadingView.swift
 //  zhuishushenqi
 //
-//  Created by caonongyun on 2017/4/13.
+//  Created by Nory Cao on 2017/4/13.
 //  Copyright © 2017年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Base/Views/RateView.swift b/zhuishushenqi/Base/Views/RateView.swift
@@ -2,7 +2,7 @@
 //  RateView.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 2017/3/14.
+//  Created by Nory Cao on 2017/3/14.
 //  Copyright © 2017年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Base/Views/XYCActionSheet.swift b/zhuishushenqi/Base/Views/XYCActionSheet.swift
@@ -2,7 +2,7 @@
 //  XYCActionSheet.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 16/10/6.
+//  Created by Nory Cao on 16/10/6.
 //  Copyright © 2016年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Client/QSNetworkManager.swift b/zhuishushenqi/Client/QSNetworkManager.swift
@@ -2,7 +2,7 @@
 //  QSNetworkManager.swift
 //  zhuishushenqi
 //
-//  Created by caonongyun on 2017/3/20.
+//  Created by Nory Cao on 2017/3/20.
 //  Copyright © 2017年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Config.swift b/zhuishushenqi/Config.swift
@@ -2,7 +2,7 @@
 //  Config.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 16/9/17.
+//  Created by Nory Cao on 16/9/17.
 //  Copyright © 2016年 QS. All rights reserved.
 //
 
@@ -202,6 +202,7 @@ func isExistShelf(bookDetail:BookDetail?)->Bool{
 enum BookShelfUpdateType {
     case add
     case delete
+    case update
 }
 
 @discardableResult
@@ -217,51 +218,146 @@ func isExistBookShelf(bookDetail:BookDetail?)->Bool{
 }
 
 func updateReadingInfo(bookDetail:BookDetail?){
-    var mArr:[BookDetail] = BookShelfInfo.books.bookShelf
-    var index = 0
-    for item in mArr {
-        let model = item
-        if item._id == (bookDetail?._id ?? "") {
-            model.chapter = bookDetail?.chapter ?? 0
-            model.page = bookDetail?.page ?? 0
-            model.sourceIndex = bookDetail?.sourceIndex ?? 0
-            model.chapters = bookDetail?.chapters
-            model.resources = bookDetail?.resources
-            mArr[index] = model
-            BookShelfInfo.books.bookShelf = mArr
-            NotificationCenter.default.post(Notification(name: Notification.Name(rawValue: "BookShelfRefresh")))
+    DispatchQueue.global().async {
+        var mArr:[BookDetail] = BookShelfInfo.books.bookShelf
+        var index = 0
+        for item in mArr {
+            let model = item
+            if item._id == (bookDetail?._id ?? "") {
+                model.chapter = bookDetail?.chapter ?? 0
+                model.page = bookDetail?.page ?? 0
+                model.sourceIndex = bookDetail?.sourceIndex ?? 0
+                model.chapters = bookDetail?.chapters
+                model.resources = bookDetail?.resources
+                mArr[index] = model
+                BookShelfInfo.books.bookShelf = mArr
+                NotificationCenter.default.post(Notification(name: Notification.Name(rawValue: "BookShelfRefresh")))
+            }
+            index += 1
         }
-        index += 1
     }
 }
 
-@discardableResult
-func updateBookShelf(bookDetail:BookDetail?,type:BookShelfUpdateType)->Bool{
-    var mArr:[BookDetail] = BookShelfInfo.books.bookShelf
-    var exist = false
+func bookShelfRefresh(model:BookDetail,arr:[BookDetail])->[BookDetail]{
+    var models = arr
     var index = 0
-    for item in mArr {
-        if item._id == (bookDetail?._id ?? "") {
-            exist = true
+    for item in arr {
+        if item._id == model._id {
+            models.remove(at: index)
         }
         index += 1
     }
-    if !exist {
+    return models
+}
+
+//发通知删除时需要重新请求数据，反应慢，书架删除时应该直接删除而不重新请求
+@discardableResult
+func updateBookShelf(bookDetail:BookDetail?,type:BookShelfUpdateType,refresh:Bool){
+    DispatchQueue.global().async {
+
+        var mArr:[BookDetail] = BookShelfInfo.books.bookShelf
+        var index = 0
+        var existIndex = -1
+        for item in mArr {
+            if item._id == (bookDetail?._id ?? "") {
+                existIndex = index
+            }
+            index += 1
+        }
         if let model = bookDetail{
             if type == .add {
-                mArr.append(model)
-                BookShelfInfo.books.bookShelf = mArr
-                NotificationCenter.default.post(Notification(name: Notification.Name(rawValue: "BookShelfRefresh")))
+                if existIndex == -1 {
+                    mArr.append(model)
+                    BookShelfInfo.books.bookShelf = mArr
+                    if refresh {
+                        NotificationCenter.default.post(Notification(name: Notification.Name(rawValue: "BookShelfRefresh")))
+                    }
+                }
             }else if type == .delete {
-                mArr.remove(at: index - 1)
-                BookShelfInfo.books.bookShelf = mArr
-                NotificationCenter.default.post(Notification(name: Notification.Name(rawValue: "BookShelfRefresh")))
+                if  existIndex != -1 {
+                    mArr.remove(at: existIndex)
+                    BookShelfInfo.books.bookShelf = mArr
+                    if refresh {
+                        NotificationCenter.default.post(Notification(name: Notification.Name(rawValue: "BookShelfRefresh")))
+                    }
+                }
+            }else if type == .update {
+                if existIndex != -1 {
+                    mArr[existIndex] = model
+                    BookShelfInfo.books.bookShelf = mArr
+                    if refresh {
+                        NotificationCenter.default.post(Notification(name: Notification.Name(rawValue: "BookShelfRefresh")))
+                    }
+                }
             }
         }
     }
-    return exist
 }
 
+func getAttributes(with lineSpave:CGFloat,font:UIFont)->NSDictionary{
+    let paraStyle = NSMutableParagraphStyle()
+    paraStyle.lineBreakMode = .byCharWrapping
+    paraStyle.alignment = .left
+    paraStyle.lineSpacing = lineSpave
+    paraStyle.hyphenationFactor = 1.0
+    paraStyle.firstLineHeadIndent = 0.0
+    paraStyle.paragraphSpacingBefore = 0.0
+    paraStyle.headIndent = 0
+    paraStyle.tailIndent = 0
+    let dict = [NSFontAttributeName:font,NSKernAttributeName:1.5,NSParagraphStyleAttributeName:paraStyle] as [String : Any]
+    return dict as NSDictionary
+}
+
+func attributeText(with lineSpace:CGFloat,text:String,font:UIFont)->NSAttributedString{
+    let paraStyle = NSMutableParagraphStyle()
+    paraStyle.lineBreakMode = .byCharWrapping
+    paraStyle.alignment = .left
+    paraStyle.hyphenationFactor = 1.0
+    paraStyle.firstLineHeadIndent = 0.0
+    paraStyle.paragraphSpacingBefore = 0.0
+    paraStyle.headIndent = 0
+    paraStyle.tailIndent = 0
+    let dict = [NSFontAttributeName:font,NSKernAttributeName:1.5,NSParagraphStyleAttributeName:paraStyle] as [String : Any]
+    let attributeStr = NSAttributedString(string: text, attributes: dict)
+    return attributeStr
+}
+
+//-(void)setLabelSpace:(UILabel*)label withValue:(NSString*)str withFont:(UIFont*)font {
+//    NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init];
+//    paraStyle.lineBreakMode = NSLineBreakByCharWrapping;
+//    paraStyle.alignment = NSTextAlignmentLeft;
+//    paraStyle.lineSpacing = UILABEL_LINE_SPACE; //设置行间距
+//    paraStyle.hyphenationFactor = 1.0;
+//    paraStyle.firstLineHeadIndent = 0.0;
+//    paraStyle.paragraphSpacingBefore = 0.0;
+//    paraStyle.headIndent = 0;
+//    paraStyle.tailIndent = 0;
+//    //设置字间距 NSKernAttributeName:@1.5f
+//    NSDictionary *dic = @{NSFontAttributeName:font, NSParagraphStyleAttributeName:paraStyle, NSKernAttributeName:@1.5f
+//    };
+//    
+//    NSAttributedString *attributeStr = [[NSAttributedString alloc] initWithString:str attributes:dic];
+//    label.attributedText = attributeStr;
+//}
+//
+////计算UILabel的高度(带有行间距的情况)
+//-(CGFloat)getSpaceLabelHeight:(NSString*)str withFont:(UIFont*)font withWidth:(CGFloat)width {
+//    NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init];
+//    paraStyle.lineBreakMode = NSLineBreakByCharWrapping;
+//    paraStyle.alignment = NSTextAlignmentLeft;
+//    paraStyle.lineSpacing = UILABEL_LINE_SPACE;
+//    paraStyle.hyphenationFactor = 1.0;
+//    paraStyle.firstLineHeadIndent = 0.0;
+//    paraStyle.paragraphSpacingBefore = 0.0;
+//    paraStyle.headIndent = 0;
+//    paraStyle.tailIndent = 0;
+//    NSDictionary *dic = @{NSFontAttributeName:font, NSParagraphStyleAttributeName:paraStyle, NSKernAttributeName:@1.5f
+//    };
+//    
+//    CGSize size = [str boundingRectWithSize:CGSizeMake(width, HEIGHT) options:NSStringDrawingUsesLineFragmentOrigin attributes:dic context:nil].size;
+//    return size.height;
+//}
+
 
 
 func QSLog<T>(_ message:T,fileName:String = #file,lineName:Int = #line,funcName:String = #function){

diff --git a/zhuishushenqi/Extension/Date+Extension.swift b/zhuishushenqi/Extension/Date+Extension.swift
@@ -2,7 +2,7 @@
 //  Date+Extension.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 2017/3/15.
+//  Created by Nory Cao on 2017/3/15.
 //  Copyright © 2017年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Extension/DateIntervalFormatter+formatter.swift b/zhuishushenqi/Extension/DateIntervalFormatter+formatter.swift
@@ -2,7 +2,7 @@
 //  DateIntervalFormatter+formatter.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 2017/3/15.
+//  Created by Nory Cao on 2017/3/15.
 //  Copyright © 2017年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Extension/NSDate+Date.h b/zhuishushenqi/Extension/NSDate+Date.h
@@ -2,7 +2,7 @@
 //  NSDate+Date.h
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 2017/3/14.
+//  Created by Nory Cao on 2017/3/14.
 //  Copyright © 2017年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Extension/NSDate+Date.m b/zhuishushenqi/Extension/NSDate+Date.m
@@ -2,7 +2,7 @@
 //  NSDate+Date.m
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 2017/3/14.
+//  Created by Nory Cao on 2017/3/14.
 //  Copyright © 2017年 QS. All rights reserved.
 //
 

diff --git a/zhuishushenqi/Extension/String+crypto.swift b/zhuishushenqi/Extension/String+crypto.swift
@@ -2,7 +2,7 @@
 //  String+crypto.swift
 //  zhuishushenqi
 //
-//  Created by Nory Chao on 2017/3/6.
+//  Created by Nory Cao on 2017/3/6.
 //  Copyright © 2017年 QS. All rights reserved.
 //