diff --git a/Alibili.xcodeproj/project.pbxproj b/Alibili.xcodeproj/project.pbxproj index 11c18bd..cb0eb48 100644 --- a/Alibili.xcodeproj/project.pbxproj +++ b/Alibili.xcodeproj/project.pbxproj @@ -18,6 +18,8 @@ CA00ACD322D2F0B7005ECFFE /* RootViewNavigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA00ACD222D2F0B7005ECFFE /* RootViewNavigator.swift */; }; CA05132422D933BA008B4B48 /* CellDateComposer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA05132222D933BA008B4B48 /* CellDateComposer.swift */; }; CA05132622D933E8008B4B48 /* CellDataItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA05132522D933E8008B4B48 /* CellDataItem.swift */; }; + CA46D4DD250ADF6300DD38CA /* RankingCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA46D4C7250ADF6300DD38CA /* RankingCollectionViewController.swift */; }; + CA46D57F250C5B4E00DD38CA /* OwnerCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA46D57E250C5B4E00DD38CA /* OwnerCollectionViewController.swift */; }; CA4C66E02507A62C0049B522 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA4C66CA2507A62C0049B522 /* Metal.framework */; }; CA4C66E22507A64D0049B522 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA4C66E12507A64D0049B522 /* CoreServices.framework */; }; CA4C66EC250859290049B522 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA4C66EB250859290049B522 /* Utilities.swift */; }; @@ -261,6 +263,8 @@ CA00ACD222D2F0B7005ECFFE /* RootViewNavigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootViewNavigator.swift; sourceTree = ""; }; CA05132222D933BA008B4B48 /* CellDateComposer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CellDateComposer.swift; sourceTree = ""; }; CA05132522D933E8008B4B48 /* CellDataItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CellDataItem.swift; sourceTree = ""; }; + CA46D4C7250ADF6300DD38CA /* RankingCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RankingCollectionViewController.swift; sourceTree = ""; }; + CA46D57E250C5B4E00DD38CA /* OwnerCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OwnerCollectionViewController.swift; sourceTree = ""; }; CA4C66CA2507A62C0049B522 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; }; CA4C66E12507A64D0049B522 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; CA4C66EB250859290049B522 /* Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = ""; }; @@ -369,6 +373,8 @@ CA00ACD222D2F0B7005ECFFE /* RootViewNavigator.swift */, CA73155C22D33E100046A75B /* CollectionViewCell.swift */, CA73156022D3420D0046A75B /* SubscriptionsCollectionViewController.swift */, + CA46D57E250C5B4E00DD38CA /* OwnerCollectionViewController.swift */, + CA46D4C7250ADF6300DD38CA /* RankingCollectionViewController.swift */, CA4C67022509ADCC0049B522 /* HistoryCollectionViewController.swift */, CA4C670C250A4E550049B522 /* VideoRelationCollectionViewController.swift */, CA705E5622DADA1200615664 /* VideoPlayViewController.swift */, @@ -377,8 +383,8 @@ CA8A12A622DB89AB00D344C9 /* Alibili-Bridging-Header.h */, CA8A12B122DC00FF00D344C9 /* MenuTableViewController.swift */, CAF4F2ED22E349D000CCE549 /* DanmuData.swift */, - CA4C66EB250859290049B522 /* Utilities.swift */, CABF08D9250A7BBF00F6F153 /* TabBarViewController.swift */, + CA4C66EB250859290049B522 /* Utilities.swift */, ); path = Alibili; sourceTree = ""; @@ -485,7 +491,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1020; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = "Xiaonan Zhang"; TargetAttributes = { CA00AC5422D1DE82005ECFFE = { @@ -732,6 +738,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + CA46D57F250C5B4E00DD38CA /* OwnerCollectionViewController.swift in Sources */, CA05132622D933E8008B4B48 /* CellDataItem.swift in Sources */, CA00ACC622D25D0B005ECFFE /* CookieManager.swift in Sources */, CA00AC6B22D1DEAF005ECFFE /* LoginViewController.swift in Sources */, @@ -740,6 +747,7 @@ CA4C6707250A14040049B522 /* VideoDetailViewController.swift in Sources */, CAF4F2EE22E349D000CCE549 /* DanmuData.swift in Sources */, CA00AC5B22D1DE82005ECFFE /* ProfileViewController.swift in Sources */, + CA46D4DD250ADF6300DD38CA /* RankingCollectionViewController.swift in Sources */, CA00AC5922D1DE82005ECFFE /* AppDelegate.swift in Sources */, CA73156122D3420D0046A75B /* SubscriptionsCollectionViewController.swift in Sources */, CA705E5722DADA1200615664 /* VideoPlayViewController.swift in Sources */, @@ -814,6 +822,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -876,6 +885,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -924,7 +934,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.zephyr1989.Alibili; + PRODUCT_BUNDLE_IDENTIFIER = com.zephyr.Alibili; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Alibili/Alibili-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -953,7 +963,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.zephyr1989.Alibili; + PRODUCT_BUNDLE_IDENTIFIER = com.zephyr.Alibili; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Alibili/Alibili-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/Alibili.xcodeproj/xcshareddata/xcschemes/Alibili.xcscheme b/Alibili.xcodeproj/xcshareddata/xcschemes/Alibili.xcscheme index b4dfcbb..d0e49d6 100644 --- a/Alibili.xcodeproj/xcshareddata/xcschemes/Alibili.xcscheme +++ b/Alibili.xcodeproj/xcshareddata/xcschemes/Alibili.xcscheme @@ -1,6 +1,6 @@ Bool { // Override point for customization after application launch. RootViewNavigator().updateRootViewController() + +// let audioSession = AVAudioSession.sharedInstance() +// +// do { +// try audioSession.setCategory(.playback, mode: .default, policy: .default) +//// try audioSession.overrideOutputAudioPort(AVAudioSession.Port.airPlay) +// try audioSession.setActive(true, options: .notifyOthersOnDeactivation) +// +// for outputPort in audioSession.currentRoute.outputs { +//// if outputPort.portType == AVAudioSession.Port.airPlay { +//// return true +//// } +// print(outputPort.portName) +// print(outputPort.portType) +// } +// +// } catch { +// print("fail to set audio session route sharing policy: \(error)") +// } + return true } @@ -35,6 +56,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func applicationDidBecomeActive(_ application: UIApplication) { // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. + +// let session = AVAudioSession.sharedInstance() +// do { +// try session.setCategory(.playback, mode: .moviePlayback, policy: .longFormAudio) +// try session.overrideOutputAudioPort(.none) +// try session.setActive(true) +// print("outputs: \(session.currentRoute.outputs)") +//// session.setOutputDataSource(AVAudioSessionDataSourceDescription?) +// } catch { +// print("error: \(error)") +// } } func applicationWillTerminate(_ application: UIApplication) { diff --git a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json index f98e90f..a01ccc4 100644 --- a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json +++ b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json @@ -1,12 +1,12 @@ { "images" : [ { - "filename" : "Icon.png", + "filename" : "logo1.jpg", "idiom" : "tv", "scale" : "1x" }, { - "filename" : "icon2.png", + "filename" : "logo2.jpg", "idiom" : "tv", "scale" : "2x" } diff --git a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Icon.png b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Icon.png deleted file mode 100644 index 8d50591..0000000 Binary files a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Icon.png and /dev/null differ diff --git a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/icon2.png b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/icon2.png deleted file mode 100644 index 1007362..0000000 Binary files a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/icon2.png and /dev/null differ diff --git a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/logo1.jpg b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/logo1.jpg new file mode 100644 index 0000000..a49f41e Binary files /dev/null and b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/logo1.jpg differ diff --git a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/logo2.jpg b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/logo2.jpg new file mode 100644 index 0000000..0b42cd8 Binary files /dev/null and b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/logo2.jpg differ diff --git a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json index 0043404..a01ccc4 100644 --- a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json +++ b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json @@ -1,18 +1,18 @@ { "images" : [ { + "filename" : "logo1.jpg", "idiom" : "tv", - "filename" : "Icon.png", "scale" : "1x" }, { + "filename" : "logo2.jpg", "idiom" : "tv", - "filename" : "icon2.png", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Icon.png b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Icon.png deleted file mode 100644 index 8d50591..0000000 Binary files a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Icon.png and /dev/null differ diff --git a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/icon2.png b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/icon2.png deleted file mode 100644 index 1007362..0000000 Binary files a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/icon2.png and /dev/null differ diff --git a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/logo1.jpg b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/logo1.jpg new file mode 100644 index 0000000..a49f41e Binary files /dev/null and b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/logo1.jpg differ diff --git a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/logo2.jpg b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/logo2.jpg new file mode 100644 index 0000000..0b42cd8 Binary files /dev/null and b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/logo2.jpg differ diff --git a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json index da4a164..73c0059 100644 --- a/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json +++ b/Alibili/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Alibili/Base.lproj/Main.storyboard b/Alibili/Base.lproj/Main.storyboard index 2d41b73..af58723 100644 --- a/Alibili/Base.lproj/Main.storyboard +++ b/Alibili/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -23,7 +23,7 @@ - + @@ -77,8 +77,8 @@ - + @@ -102,34 +102,28 @@ - - + + - - - - - - - - + + - + - + - + - + - + + + + + + + + + + - + + @@ -163,7 +175,7 @@ - + @@ -176,6 +188,7 @@ + @@ -196,21 +209,21 @@ - + - + - + - + - + - + - + @@ -392,7 +405,7 @@ - + @@ -439,10 +452,123 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + diff --git a/Alibili/CellDataItem.swift b/Alibili/CellDataItem.swift index 6f2050b..f618666 100644 --- a/Alibili/CellDataItem.swift +++ b/Alibili/CellDataItem.swift @@ -13,38 +13,48 @@ struct CellDataItem: Codable, Equatable { var cid:String var bvid:String var pic: String - var owner:Owner + var title :String + var aid :String + var videoDetail: VideoDetail + var bangumi: Bangumi + + init(jsonData:JSON) { + self.cid = jsonData["cid"].stringValue + self.bvid = jsonData["bvid"].stringValue + self.pic = jsonData["pic"].stringValue + self.aid = jsonData["aid"].stringValue + self.title = jsonData["title"].stringValue + self.videoDetail = VideoDetail(jsonData: jsonData) + self.bangumi = Bangumi(jsonData: jsonData["bangumi"]) + } +} + +struct VideoDetail: Codable { var videos:Int + var owner:Owner var tid :String var ctime:String var duration:String var desc:String - var title :String var pubdate:String var state:Int var attribute:String var tname:String var copyright:Int - var aid :String var dynamic:String init(jsonData:JSON) { - self.cid = jsonData["cid"].stringValue - self.bvid = jsonData["bvid"].stringValue - self.pic = jsonData["pic"].stringValue - self.owner = Owner(jsonData: jsonData["role"]) - self.videos = jsonData["videos"].int! + self.videos = jsonData["videos"].int ?? -1 + self.owner = Owner(jsonData: jsonData["owner"]) self.tid = jsonData["tid"].stringValue self.ctime = jsonData["ctime"].stringValue self.duration = jsonData["duration"].stringValue self.desc = jsonData["desc"].stringValue - self.title = jsonData["title"].stringValue self.pubdate = jsonData["pubdate"].stringValue - self.state = jsonData["state"].int! + self.state = jsonData["state"].int ?? -1 self.attribute = jsonData["attribute"].stringValue self.tname = jsonData["tname"].stringValue - self.copyright = jsonData["copyright"].int! - self.aid = jsonData["aid"].stringValue + self.copyright = jsonData["copyright"].int ?? -1 self.dynamic = jsonData["dynamic"].stringValue } } @@ -55,7 +65,7 @@ struct OfficialVerify: Codable { var desc :String init(jsonData:JSON) { - self.role = jsonData["role"].int! + self.role = jsonData["role"].int ?? -1 self.title = jsonData["title"].stringValue self.desc = jsonData["desc"].stringValue } @@ -72,6 +82,47 @@ struct Owner : Codable{ self.face = jsonData["face"].stringValue } } +struct Season : Codable{ + var season_id:Int + var title:String + var season_status:String + var is_finish:String + var total_count:String + var newest_ep_id:String + var newest_ep_index:String + var season_type:String + + init(jsonData:JSON) { + self.season_id = jsonData["season_id"].int ?? -1 + self.title = jsonData["title"].stringValue + self.season_status = jsonData["season_status"].stringValue + self.is_finish = jsonData["is_finish"].stringValue + self.total_count = jsonData["total_count"].stringValue + self.newest_ep_id = jsonData["newest_ep_id"].stringValue + self.newest_ep_index = jsonData["newest_ep_index"].stringValue + self.season_type = jsonData["season_type"].stringValue + } +} + +struct Bangumi: Codable{ + var ep_id:Int + var title:String + var long_title:String + var episode_status:String + var season:Season + var cover:String + + init(jsonData:JSON) { + self.ep_id = jsonData["ep_id"].int ?? -1 + self.title = jsonData["title"].stringValue + self.long_title = jsonData["long_title"].stringValue + self.episode_status = jsonData["episode_status"].stringValue + self.season = Season(jsonData: jsonData["season"]) + self.cover = jsonData["cover"].stringValue + } +} + + // MARK: Equatable diff --git a/Alibili/CellDateComposer.swift b/Alibili/CellDateComposer.swift index fcbe66c..2c1af38 100644 --- a/Alibili/CellDateComposer.swift +++ b/Alibili/CellDateComposer.swift @@ -24,10 +24,13 @@ class CellDataComposer { // MARK: Implementation func compose(_ cell: CollectionViewCell, cellStyle:CGSize ,withDataItem dataItem: CellDataItem) { + var pic = dataItem.pic // Cancel any queued operations to process images for the cell. let queue = operationQueue(forCell: cell) queue.cancelAllOperations() - + if !pic.contains("http:") { + pic = "http:" + dataItem.pic + } // Set the cell's properties. cell.representedDataItem = dataItem @@ -64,7 +67,7 @@ class CellDataComposer { guard !processImageOperation.isCancelled else { return } // Load and process the image. - guard let image = self.processImage(named: dataItem.pic) else { return } + guard let image = self.processImage(named: pic) else { return } // Store the processed image in the cache. CellDataComposer.processedImageCache.setObject(image, forKey: dataItem.aid as NSString) diff --git a/Alibili/CookieManager.swift b/Alibili/CookieManager.swift index ff43bb9..50063d5 100644 --- a/Alibili/CookieManager.swift +++ b/Alibili/CookieManager.swift @@ -68,7 +68,6 @@ class CookieManager { if let cookies = HTTPCookieStorage.shared.cookies(for: url) { for cookie in cookies { if (cookie.name == name) { - print(cookie) return cookie.value } } diff --git a/Alibili/HistoryCollectionViewController.swift b/Alibili/HistoryCollectionViewController.swift index 822258c..d66bf1e 100644 --- a/Alibili/HistoryCollectionViewController.swift +++ b/Alibili/HistoryCollectionViewController.swift @@ -22,7 +22,7 @@ class HistoryCollectionViewController: UICollectionViewController { private var targetSize = CGSize.zero - private let recentTotal = 100 + private let recentTotal = 150 private let recentPerPage = 10 var recentCurrentPage = 1 var dataItemGourp:[JSON] = [] diff --git a/Alibili/LoginViewController.swift b/Alibili/LoginViewController.swift index 9ddbd75..5a1a550 100644 --- a/Alibili/LoginViewController.swift +++ b/Alibili/LoginViewController.swift @@ -91,7 +91,6 @@ class LoginViewController: UIViewController { } }else{ if let data = dictionary["data"] as? Int { - print(data) if data == -2{ self.startValidation() } diff --git a/Alibili/MainNavigationController.swift b/Alibili/MainNavigationController.swift deleted file mode 100644 index 4501251..0000000 --- a/Alibili/MainNavigationController.swift +++ /dev/null @@ -1,31 +0,0 @@ -// -// MainNavigationController.swift -// Alibili -// -// Created by Xiaonan Zhang on 2019/07/08. -// Copyright © 2019 Xiaonan Zhang. All rights reserved. -// - -import UIKit -import Foundation - -class MainNavigationController: UINavigationController { - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. - } - */ - -} diff --git a/Alibili/OwnerCollectionViewController.swift b/Alibili/OwnerCollectionViewController.swift new file mode 100644 index 0000000..a9fb1b7 --- /dev/null +++ b/Alibili/OwnerCollectionViewController.swift @@ -0,0 +1,162 @@ +// +// OwnerCollectionViewController.swift +// Alibili +// +// Created by xnzhang on 2020/09/12. +// Copyright © 2020 Xiaonan Zhang. All rights reserved. +// + +import Foundation +import UIKit +import Alamofire +import SwiftyJSON +import AVKit + +private let reuseIdentifier = CollectionViewCell.reuseIdentifier + +class OwnerCollectionViewController: UICollectionViewController { + + private let cookieManager:CookieManager = CookieManager() + private let cellComposer = CellDataComposer() + private var targetSize = CGSize.zero + + + private let recentPerPage = 10 + private var recentCurrentPage = 1 + private var recentTotal = 10 + var dataItemGourp:[JSON] = [] + var owner:Owner! + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + + let kColumnCnt: Int = 3 + let kCellSpacing: CGFloat = 40 + + let imgWidth = (collectionView.frame.width - (kCellSpacing * (CGFloat(kColumnCnt) - 1))) / CGFloat(kColumnCnt) + targetSize = CGSize(width: imgWidth, height: imgWidth * 9 / 16) + + let layout = UICollectionViewFlowLayout() + layout.itemSize = targetSize + layout.minimumInteritemSpacing = kCellSpacing + layout.minimumLineSpacing = kCellSpacing + collectionView.collectionViewLayout = layout + + if(cookieManager.isUserCookieSet(forKey: "User-Cookie")){ + loadMoreOwnerData(currentPage:1) + } + } + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. + } + */ + + func loadMoreOwnerData(currentPage:Int) -> Void { + if (currentPage < recentCurrentPage || recentCurrentPage * recentPerPage > recentTotal) {return} + let headers: HTTPHeaders = [ + "Set-Cookie":cookieManager.getUserCookie(forKey: "User-Cookie")!, + "Accept": "application/json" + ] + AF.request(Urls.getOwnerVideos(mid: owner.mid, recentPerPage: recentPerPage, currentPage: currentPage), headers: headers).responseJSON { response in + switch(response.result) { + case .success(let data): + let json = JSON(data)["data"] +// print(json) + let count = json["page"]["count"].intValue + if (self.recentTotal != count) { + self.recentTotal = count + } + self.dataItemGourp.append(contentsOf: json["list"]["vlist"].array ?? []) + self.recentCurrentPage+=1 + DispatchQueue.main.async{ + self.collectionView.reloadData() + } + case .failure(let error): + print(error) + break + } + } + } + + // MARK: UICollectionViewDataSource + + override func numberOfSections(in collectionView: UICollectionView) -> Int { + // #warning Incomplete implementation, return the number of sections + return 1 + } + + + override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + // #warning Incomplete implementation, return the number of items + return self.dataItemGourp.count + } + + override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + let cell = collectionView.dequeueReusableCell(withReuseIdentifier: CollectionViewCell.reuseIdentifier, for: indexPath) + + // Configure the cell + + return cell + } + + override func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) { + guard let cell = cell as? CollectionViewCell else { fatalError("Expected to display a `CollectionViewCell`.") } + // cell.backgroundColor = randomColor() + let item = dataItemGourp[indexPath.item] + // Configure the cell. + cellComposer.compose(cell, cellStyle: targetSize ,withDataItem: CellDataItem(jsonData: item)) + + if dataItemGourp.count - 1 == indexPath.item { + loadMoreOwnerData(currentPage: recentCurrentPage) + } + } + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if let destination = segue.destination as? + VideoDetailViewController, let index = + collectionView.indexPathsForSelectedItems?.first { + let item = dataItemGourp[index.item] + destination.videoJson = CellDataItem(jsonData: item) + } + } + + // MARK: UICollectionViewDelegate + + /* + // Uncomment this method to specify if the specified item should be highlighted during tracking + override func collectionView(_ collectionView: UICollectionView, shouldHighlightItemAt indexPath: IndexPath) -> Bool { + return true + } + */ + + /* + // Uncomment this method to specify if the specified item should be selected + override func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool { + return true + } + */ + + /* + // Uncomment these methods to specify if an action menu should be displayed for the specified item, and react to actions performed on the item + override func collectionView(_ collectionView: UICollectionView, shouldShowMenuForItemAt indexPath: IndexPath) -> Bool { + return false + } + + override func collectionView(_ collectionView: UICollectionView, canPerformAction action: Selector, forItemAt indexPath: IndexPath, withSender sender: Any?) -> Bool { + return false + } + + override func collectionView(_ collectionView: UICollectionView, performAction action: Selector, forItemAt indexPath: IndexPath, withSender sender: Any?) { + + } + */ + +} diff --git a/Alibili/RankingCollectionViewController.swift b/Alibili/RankingCollectionViewController.swift new file mode 100644 index 0000000..2f323ff --- /dev/null +++ b/Alibili/RankingCollectionViewController.swift @@ -0,0 +1,112 @@ +// +// HistoryCollectionViewController.swift +// Alibili +// +// Created by xnzhang on 2020/09/10. +// Copyright © 2020 Xiaonan Zhang. All rights reserved. +// + +import Foundation +import UIKit +import Alamofire +import SwiftyJSON +import AVKit + +private let reuseIdentifier = CollectionViewCell.reuseIdentifier + +class RankingCollectionViewController: UICollectionViewController { + + private let cookieManager:CookieManager = CookieManager() + + private let cellComposer = CellDataComposer() + + private var targetSize = CGSize.zero + + var dataItemGourp:[JSON] = [] + + override func viewDidLoad() { + super.viewDidLoad() + // Do any additional setup after loading the view. + + let kColumnCnt: Int = 3 + let kCellSpacing: CGFloat = 40 + + let imgWidth = (collectionView.frame.width - (kCellSpacing * (CGFloat(kColumnCnt) - 1))) / CGFloat(kColumnCnt) + targetSize = CGSize(width: imgWidth, height: imgWidth * 9 / 16) + + let layout = UICollectionViewFlowLayout() + layout.itemSize = targetSize + layout.minimumInteritemSpacing = kCellSpacing + layout.minimumLineSpacing = kCellSpacing + collectionView.collectionViewLayout = layout + + if(cookieManager.isUserCookieSet(forKey: "User-Cookie")){ + loadRankingData() + } + } + + func loadRankingData() -> Void { + let headers: HTTPHeaders = [ + "Set-Cookie":cookieManager.getUserCookie(forKey: "User-Cookie")!, + "Accept": "application/json" + ] + AF.request(Urls.getRanking(day: "3"), headers: headers).responseJSON { response in + switch(response.result) { + case .success(let data): + let json = JSON(data) + self.dataItemGourp.append(contentsOf: json["data"]["list"].array ?? []) + DispatchQueue.main.async{ + self.collectionView.reloadData() + } + case .failure(let error): + print(error) + break + } + } + } + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. + } + */ + + // MARK: UICollectionViewDataSource + + override func numberOfSections(in collectionView: UICollectionView) -> Int { + // #warning Incomplete implementation, return the number of sections + return 1 + } + + + override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + // #warning Incomplete implementation, return the number of items + return self.dataItemGourp.count + } + + override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + let cell = collectionView.dequeueReusableCell(withReuseIdentifier: CollectionViewCell.reuseIdentifier, for: indexPath) + return cell + } + + override func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) { + guard let cell = cell as? CollectionViewCell else { fatalError("Expected to display a `CollectionViewCell`.") } +// cell.backgroundColor = randomColor() + let item = dataItemGourp[indexPath.item] + // Configure the cell. + cellComposer.compose(cell, cellStyle: targetSize ,withDataItem: CellDataItem(jsonData: item)) + } + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if let destination = segue.destination as? + VideoDetailViewController, let index = + collectionView.indexPathsForSelectedItems?.first { + let item = dataItemGourp[index.item] + destination.videoJson = CellDataItem(jsonData: item) + } + } +} diff --git a/Alibili/TabBarViewController.swift b/Alibili/TabBarViewController.swift index e50ffc5..c1ec5a3 100644 --- a/Alibili/TabBarViewController.swift +++ b/Alibili/TabBarViewController.swift @@ -10,6 +10,8 @@ import UIKit class TabBarViewController: UITabBarController, UITabBarControllerDelegate { + var oldselectedIndex: Int = -1 + override func viewDidLoad() { super.viewDidLoad() self.delegate = self @@ -32,23 +34,27 @@ class TabBarViewController: UITabBarController, UITabBarControllerDelegate { } func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) { - if let destination = viewController as? - SubscriptionsCollectionViewController { - destination.dataItemGourp=[] - destination.recentCurrentPage = 1 - destination.loadMoreData(currentPage: 1) - } - - if let destination = viewController as? - HistoryCollectionViewController { - destination.dataItemGourp=[] - destination.recentCurrentPage = 1 - destination.loadMoreData(currentPage: 1) + + if(oldselectedIndex != tabBarController.selectedIndex) { + if let destination = viewController as? + SubscriptionsCollectionViewController { + if destination.recentCurrentPage != 1{ + destination.dataItemGourp=[] + destination.recentCurrentPage = 1 + destination.loadMoreData(currentPage: 1) + } + } + + if let destination = viewController as? + HistoryCollectionViewController { + if destination.recentCurrentPage != 1 { + destination.dataItemGourp=[] + destination.recentCurrentPage = 1 + destination.loadMoreData(currentPage: 1) + } + } + oldselectedIndex = tabBarController.selectedIndex } } - - - - } diff --git a/Alibili/TableViewController.swift b/Alibili/TableViewController.swift deleted file mode 100644 index 8901e9f..0000000 --- a/Alibili/TableViewController.swift +++ /dev/null @@ -1,93 +0,0 @@ -// -// TableViewController.swift -// Alibili -// -// Created by Xiaonan Zhang on 2019/07/07. -// Copyright © 2019 Xiaonan Zhang. All rights reserved. -// - -import UIKit - -class TableViewController: UITableViewController { - - let contents = Array(1...100) - - override func viewDidLoad() { - super.viewDidLoad() - - // Uncomment the following line to preserve selection between presentations - // self.clearsSelectionOnViewWillAppear = false - - // Uncomment the following line to display an Edit button in the navigation bar for this view controller. - // self.navigationItem.rightBarButtonItem = self.editButtonItem - } - - // MARK: - Table view data source - - override func numberOfSections(in tableView: UITableView) -> Int { - // #warning Incomplete implementation, return the number of sections - return 1 - } - - override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - // #warning Incomplete implementation, return the number of rows - return contents.count - } - - override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { -// let cell = tableView.dequeueReusableCell(withIdentifier: "reuseIdentifier", for: indexPath) - -// Configure the cell... - let cell = UITableViewCell() - cell.textLabel?.text = String(contents[indexPath.row]) - - - return cell - } - - /* - // Override to support conditional editing of the table view. - override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool { - // Return false if you do not want the specified item to be editable. - return true - } - */ - - /* - // Override to support editing the table view. - override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) { - if editingStyle == .delete { - // Delete the row from the data source - tableView.deleteRows(at: [indexPath], with: .fade) - } else if editingStyle == .insert { - // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view - } - } - */ - - /* - // Override to support rearranging the table view. - override func tableView(_ tableView: UITableView, moveRowAt fromIndexPath: IndexPath, to: IndexPath) { - - } - */ - - /* - // Override to support conditional rearranging of the table view. - override func tableView(_ tableView: UITableView, canMoveRowAt indexPath: IndexPath) -> Bool { - // Return false if you do not want the item to be re-orderable. - return true - } - */ - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. - } - */ - -} diff --git a/Alibili/UploaderCollectionViewController copy.swift b/Alibili/UploaderCollectionViewController copy.swift new file mode 100644 index 0000000..2f323ff --- /dev/null +++ b/Alibili/UploaderCollectionViewController copy.swift @@ -0,0 +1,112 @@ +// +// HistoryCollectionViewController.swift +// Alibili +// +// Created by xnzhang on 2020/09/10. +// Copyright © 2020 Xiaonan Zhang. All rights reserved. +// + +import Foundation +import UIKit +import Alamofire +import SwiftyJSON +import AVKit + +private let reuseIdentifier = CollectionViewCell.reuseIdentifier + +class RankingCollectionViewController: UICollectionViewController { + + private let cookieManager:CookieManager = CookieManager() + + private let cellComposer = CellDataComposer() + + private var targetSize = CGSize.zero + + var dataItemGourp:[JSON] = [] + + override func viewDidLoad() { + super.viewDidLoad() + // Do any additional setup after loading the view. + + let kColumnCnt: Int = 3 + let kCellSpacing: CGFloat = 40 + + let imgWidth = (collectionView.frame.width - (kCellSpacing * (CGFloat(kColumnCnt) - 1))) / CGFloat(kColumnCnt) + targetSize = CGSize(width: imgWidth, height: imgWidth * 9 / 16) + + let layout = UICollectionViewFlowLayout() + layout.itemSize = targetSize + layout.minimumInteritemSpacing = kCellSpacing + layout.minimumLineSpacing = kCellSpacing + collectionView.collectionViewLayout = layout + + if(cookieManager.isUserCookieSet(forKey: "User-Cookie")){ + loadRankingData() + } + } + + func loadRankingData() -> Void { + let headers: HTTPHeaders = [ + "Set-Cookie":cookieManager.getUserCookie(forKey: "User-Cookie")!, + "Accept": "application/json" + ] + AF.request(Urls.getRanking(day: "3"), headers: headers).responseJSON { response in + switch(response.result) { + case .success(let data): + let json = JSON(data) + self.dataItemGourp.append(contentsOf: json["data"]["list"].array ?? []) + DispatchQueue.main.async{ + self.collectionView.reloadData() + } + case .failure(let error): + print(error) + break + } + } + } + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. + } + */ + + // MARK: UICollectionViewDataSource + + override func numberOfSections(in collectionView: UICollectionView) -> Int { + // #warning Incomplete implementation, return the number of sections + return 1 + } + + + override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + // #warning Incomplete implementation, return the number of items + return self.dataItemGourp.count + } + + override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + let cell = collectionView.dequeueReusableCell(withReuseIdentifier: CollectionViewCell.reuseIdentifier, for: indexPath) + return cell + } + + override func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) { + guard let cell = cell as? CollectionViewCell else { fatalError("Expected to display a `CollectionViewCell`.") } +// cell.backgroundColor = randomColor() + let item = dataItemGourp[indexPath.item] + // Configure the cell. + cellComposer.compose(cell, cellStyle: targetSize ,withDataItem: CellDataItem(jsonData: item)) + } + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + if let destination = segue.destination as? + VideoDetailViewController, let index = + collectionView.indexPathsForSelectedItems?.first { + let item = dataItemGourp[index.item] + destination.videoJson = CellDataItem(jsonData: item) + } + } +} diff --git a/Alibili/Utilities.swift b/Alibili/Utilities.swift index 431d3e1..7b4e278 100644 --- a/Alibili/Utilities.swift +++ b/Alibili/Utilities.swift @@ -18,7 +18,7 @@ struct Urls { return "https://api.bilibili.com/x/web-feed/feed?ps=\(recentPerPage)&pn=\(currentPage)" } static func getHistory(recentPerPage: Int, currentPage: Int) -> String{ - return "https://api.bilibili.com/x/v2/history?pn=\(currentPage)&\(recentPerPage)&jsonp=jsonp" + return "https://api.bilibili.com/x/v2/history?pn=\(currentPage)&ps=\(recentPerPage)&jsonp=jsonp" } static func getVideo(avId: String, pageNum: String) -> String{ return "https://www.bilibili.com/video/av\(avId)/?p=\(pageNum)" @@ -51,4 +51,12 @@ struct Urls { static func postClickH5() -> String{ return "https://api.bilibili.com/x/click-interface/click/web/h5" } + + static func getOwnerVideos(mid: String, recentPerPage: Int, currentPage: Int) -> String{ + return "https://api.bilibili.com/x/space/arc/search?mid=\(mid)&ps=\(recentPerPage)&tid=0&pn=\(currentPage)&keyword=&order=pubdate&jsonp=jsonp" + } + + static func getBangumiInfo(seasonId: String) -> String{ + return "https://api.bilibili.com/pgc/web/season/section?season_id=\(seasonId)" + } } diff --git a/Alibili/VideoDetailViewController.swift b/Alibili/VideoDetailViewController.swift index 500195d..4555316 100644 --- a/Alibili/VideoDetailViewController.swift +++ b/Alibili/VideoDetailViewController.swift @@ -7,18 +7,21 @@ // import UIKit +import Alamofire +import SwiftyJSON class VideoDetailViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { private let cookieManager:CookieManager = CookieManager() var videoJson:CellDataItem! + var videoInfo:JSON = JSON({}) + var parts:[Int] = [] + @IBOutlet weak var Owner: UIButton! @IBOutlet weak var VideoTitle: UITextView! @IBOutlet weak var VideoDescription: UITextView! @IBOutlet weak var PartTableView: UITableView! - var parts:[Int] = [] - override func viewDidLoad() { super.viewDidLoad() @@ -27,20 +30,20 @@ class VideoDetailViewController: UIViewController, UITableViewDelegate, UITableV // Do any additional setup after loading the view. VideoTitle.text = videoJson.title - parts = Array(1...videoJson.videos) - - VideoDescription.text = videoJson.desc -// print(VideoDescription.text.count) -// let range = NSMakeRange(VideoDescription.text.count - 1, 1) -// VideoDescription.scrollRangeToVisible(range) - -// let blurEffect = UIBlurEffect(style: UIBlurEffect.Style.dark) -// let blurEffectView = UIVisualEffectView(effect: blurEffect) -// blurEffectView.frame = view.bounds -// blurEffectView.autoresizingMask = [.flexibleWidth, .flexibleHeight] -// self.view.addSubview(blurEffectView) + + if videoJson.videoDetail.videos == -1 { + loadData(aid: videoJson.aid) + } else { + parts = Array(1...videoJson.videoDetail.videos) + VideoDescription.text = videoJson.videoDetail.desc + Owner.setTitle(videoJson.videoDetail.owner.name, for: .normal) + } + var pic = videoJson.pic + if !pic.contains("http:") { + pic = "http:" + pic + } - guard let image = self.processImage(named: videoJson.pic) else { return } + guard let image = self.processImage(named: pic) else { return } let backgroundImage = UIImageView(frame: UIScreen.main.bounds) backgroundImage.image = image backgroundImage.alpha = 0.5 @@ -100,14 +103,42 @@ class VideoDetailViewController: UIViewController, UITableViewDelegate, UITableV if let destination = segue.destination as? VideoPlayerViewController, let index = PartTableView.indexPathsForSelectedRows?.first { + destination.videoInfo = self.videoInfo destination.pageNum = index.row destination.videoJson = self.videoJson } - if let destination = segue.destination as? + else if let destination = segue.destination as? VideoRelationCollectionViewController { - destination.aid = videoJson.aid - + destination.aid = self.videoJson.aid + } + + else if let destination = segue.destination as? + OwnerCollectionViewController { + destination.owner = self.videoJson.videoDetail.owner + } + } + + func loadData(aid:String) -> Void { + if(cookieManager.isUserCookieSet(forKey: "User-Cookie")){ + let headers: HTTPHeaders = [ + "Set-Cookie":cookieManager.getUserCookie(forKey: "User-Cookie")!, + "Accept": "application/json" + ] + AF.request(Urls.getVideoInfo(avId: aid),headers:headers).responseJSON { response in + switch(response.result) { + case .success(let data): + self.videoInfo = JSON(data)["data"] + self.videoJson.videoDetail = VideoDetail(jsonData: self.videoInfo) + self.parts = Array(1...self.videoJson.videoDetail.videos) + self.VideoDescription.text = self.videoJson.videoDetail.desc + self.Owner.setTitle(self.videoJson.videoDetail.owner.name, for: .normal) + self.PartTableView.reloadData() + case .failure(let error): + print(error) + break + } + } } } diff --git a/Alibili/VideoPlayViewController.swift b/Alibili/VideoPlayViewController.swift index 0311bbd..ea3f742 100644 --- a/Alibili/VideoPlayViewController.swift +++ b/Alibili/VideoPlayViewController.swift @@ -27,7 +27,7 @@ class VideoPlayerViewController: UIViewController, BarrageRendererDelegate, VLCM var observation: NSKeyValueObservation? private let cookieManager:CookieManager = CookieManager() - var videoJson:CellDataItem! + var pageNum:Int = 0 let player:VLCMediaPlayer = VLCMediaPlayer() var videoLength:CUnsignedLongLong = 0 @@ -37,12 +37,20 @@ class VideoPlayerViewController: UIViewController, BarrageRendererDelegate, VLCM var barrageRenderer:BarrageRenderer! var danmuList:[CUnsignedLongLong : [DanmuData]] = [:] + var videoJson:CellDataItem! + var videoInfo: JSON = JSON({}) + override func viewDidLoad() { super.viewDidLoad() playerView.addSubview(activityIndicatiorView) activityIndicatiorView.centerXAnchor.constraint(equalTo: self.view.centerXAnchor).isActive = true activityIndicatiorView.centerYAnchor.constraint(equalTo: self.view.centerYAnchor).isActive = true - loadData(avId: videoJson.aid, pageNum: pageNum) + if videoJson.bangumi.ep_id != -1 && videoJson.videoDetail.videos != 1{ + loadData(avId: videoJson.aid, seasonId: String(videoJson.bangumi.season.season_id), pageNum: pageNum) + } else { + loadData(avId: videoJson.aid, pageNum: pageNum) + } + } func walkTextSpriteDescriptorWithDirection(direction:UInt, text:String) -> BarrageDescriptor{ @@ -86,11 +94,12 @@ class VideoPlayerViewController: UIViewController, BarrageRendererDelegate, VLCM } override func viewWillDisappear(_ animated: Bool) { - barrageRenderer.stop() + if barrageRenderer != nil { + barrageRenderer.stop() + } } func loadDanmuData(cid:String) -> Void { - print(Urls.getDanmu(cid: cid)) if(cookieManager.isUserCookieSet(forKey: "User-Cookie")){ let headers: HTTPHeaders = [ "Set-Cookie":cookieManager.getUserCookie(forKey: "User-Cookie")!, @@ -99,32 +108,32 @@ class VideoPlayerViewController: UIViewController, BarrageRendererDelegate, VLCM AF.request(Urls.getDanmu(cid: cid), headers: headers).responseString(encoding: String.Encoding.utf8) { response in var statusCode = response.response?.statusCode switch response.result { - case .success: - print("status code is: \(String(describing: statusCode))") - if let string = response.value { - let xml = SWXMLHash.parse(string) - for elem in xml["i"]["d"].all { - let danmu = DanmuData(elem: elem) - if var dictValue = self.danmuList[danmu.timing] { - dictValue.append(danmu) - self.danmuList[danmu.timing] = dictValue - } else { - self.danmuList[danmu.timing] = [danmu] - } - + case .success: + print("status code is: \(String(describing: statusCode))") + if let string = response.value { + let xml = SWXMLHash.parse(string) + for elem in xml["i"]["d"].all { + let danmu = DanmuData(elem: elem) + if var dictValue = self.danmuList[danmu.timing] { + dictValue.append(danmu) + self.danmuList[danmu.timing] = dictValue + } else { + self.danmuList[danmu.timing] = [danmu] } - self.configDanMu() + } - case .failure(let error): - statusCode = error._code // statusCode private - print("status code is: \(String(describing: statusCode))") - print(error) + self.configDanMu() + } + case .failure(let error): + statusCode = error._code // statusCode private + print("status code is: \(String(describing: statusCode))") + print(error) } } } } - func loadMediaData(avId:String,cid:String) -> Void { + func loadMediaData(avId:String,cid:String) throws -> Void { if(cookieManager.isUserCookieSet(forKey: "User-Cookie")){ let headers: HTTPHeaders = [ "Set-Cookie":cookieManager.getUserCookie(forKey: "User-Cookie")!, @@ -134,53 +143,68 @@ class VideoPlayerViewController: UIViewController, BarrageRendererDelegate, VLCM .responseJSON { response in switch(response.result) { case .success(let data): - let json = JSON(data) - var max = 0 - for data in json["data"]["dash"]["video"].arrayValue { - if data["id"].intValue > max && data["id"].intValue <= 80 { - max = data["id"].intValue + do { + try self.playmedia(json: JSON(data), avId: avId, cid: cid) + } catch let error { + print("Can not play. Error: \(error)") + if let nav = self.navigationController { + nav.popViewController(animated: true) + } else { + self.dismiss(animated: true, completion: nil) } } - let videoArray = json["data"]["dash"]["video"].arrayValue.filter {$0["id"].intValue == max } - let video = videoArray[0]["base_url"].stringValue - let audio = json["data"]["dash"]["audio"][0]["baseUrl"].stringValue - self.videoLength = CUnsignedLongLong(json["data"]["timelength"].rawString()!)!/1000 - let videoMedia = VLCMedia(url: URL(string: video)!) - videoMedia.addOptions([ - "http-user-agent": "Bilibili Freedoooooom/MarkII", - "http-referrer": Urls.getHttpReferrer(avId: avId) - ]) - self.player.media = videoMedia - self.player.delegate = self - self.player.addPlaybackSlave(URL(string: audio)!, type: VLCMediaPlaybackSlaveType.audio, enforce: true) - self.player.drawable = self.mediaView - - self.loadDanmuData(cid:cid) - // self.observation = self.player.observe(\.self.isPlaying, options: [.old, .new]){ object, change in - // print("myDate changed from: \(change.oldValue!), updated to: \(change.newValue!)") - // } - self.player.play() return case .failure(let error): print(error) break } - } + } } } + + func playmedia(json: JSON, avId:String, cid:String) throws -> Void { + var max = 0 + for data in json["data"]["dash"]["video"].arrayValue { + if data["id"].intValue > max && data["id"].intValue <= 80 { + max = data["id"].intValue + } + } + let videoArray = json["data"]["dash"]["video"].arrayValue.filter {$0["id"].intValue == max } + if videoArray.isEmpty { + throw NSError(domain: "no data", code: -1, userInfo: nil) + } + let video = videoArray[0]["base_url"].stringValue + let audio = json["data"]["dash"]["audio"][0]["baseUrl"].stringValue + self.videoLength = CUnsignedLongLong(json["data"]["timelength"].rawString()!)!/1000 + let videoMedia = VLCMedia(url: URL(string: video)!) + videoMedia.addOptions([ + "http-user-agent": "Bilibili Freedoooooom/MarkII", + "http-referrer": Urls.getHttpReferrer(avId: avId) + ]) + self.player.media = videoMedia + self.player.delegate = self + self.player.addPlaybackSlave(URL(string: audio)!, type: VLCMediaPlaybackSlaveType.audio, enforce: true) + self.player.drawable = self.mediaView + self.loadDanmuData(cid:cid) + // self.observation = self.player.observe(\.self.isPlaying, options: [.old, .new]){ object, change in + // print("myDate changed from: \(change.oldValue!), updated to: \(change.newValue!)") + // } + self.player.play() + } + func mediaPlayerStateChanged(_ aNotification: Notification) { let state : VLCMediaPlayerState = player.state -// print("mediaPlayerStateChanged \(aNotification) \(state.rawValue)") + // print("mediaPlayerStateChanged \(aNotification) \(state.rawValue)") switch state { case VLCMediaPlayerState.stopped: print("Player has stopped") - if let nav = self.navigationController { - nav.popViewController(animated: true) - } else { - self.dismiss(animated: true, completion: nil) - } +// if let nav = self.navigationController { +// nav.popViewController(animated: true) +// } else { +// self.dismiss(animated: true, completion: nil) +// } case VLCMediaPlayerState.opening: print("Stream is opening") case VLCMediaPlayerState.buffering: @@ -202,86 +226,57 @@ class VideoPlayerViewController: UIViewController, BarrageRendererDelegate, VLCM } } - - func loadData(avId:String,pageNum:Int) -> Void { - if(cookieManager.isUserCookieSet(forKey: "User-Cookie")){ - let headers: HTTPHeaders = [ - "Set-Cookie":cookieManager.getUserCookie(forKey: "User-Cookie")!, - "Accept": "application/json" - ] - AF.request(Urls.getVideoInfo(avId: avId),headers:headers).responseJSON { response in - switch(response.result) { - case .success(let data): - let json = JSON(data) - var cid = json["data"]["cid"].stringValue - if pageNum != 0 { - cid = json["data"]["pages"][pageNum]["cid"].stringValue - } - print(avId) - print(pageNum) - print(cid) - self.loadMediaData(avId: avId, cid: cid) - case .failure(let error): - print(error) - break - } + func prepareVideoInfo (avId: String, cid: String) -> Void { + do { + try self.loadMediaData(avId: avId, cid: cid) + } catch let error { + print("Can not play. Error: \(error)") + if let nav = self.navigationController { + nav.popViewController(animated: true) + } else { + self.dismiss(animated: true, completion: nil) } } } - func startWarching(json: JSON) -> Void { - let date = Date() - let parameters = [ - "aid":json["data"]["aid"], - "cid": json["data"]["cid"], - "bvid": json["data"]["bvid"], - "part": "1", - "mid": json["data"]["owner"]["mid"], - "lv": "5", - "ftime": "1586299767", - "stime": String((date.timeIntervalSince1970).rounded()), - "jsonp": "jsonp", - "type": "3", - "sub_type": "0" - ] as [String : Any] - - AF.request(Urls.postClickH5(), method: .post, parameters: parameters, encoding: URLEncoding.default).responseJSON { response in - switch response.result { - case .success: - if let string = response.value { - print(string) - } + func loadData(avId: String, seasonId:String, pageNum:Int) -> Void { + AF.request(Urls.getBangumiInfo(seasonId: seasonId)).responseJSON { response in + switch(response.result) { + case .success(let data): + self.videoInfo = JSON(data)["result"]["main_section"] + let cid = self.videoInfo["episodes"][pageNum]["cid"].stringValue + self.prepareVideoInfo(avId: avId, cid: cid) case .failure(let error): print(error) + break } } } - func heartbeat(json: JSON) -> Void { - let date = Date() - let parameters = [ - "aid":json["data"]["aid"], - "cid": json["data"]["cid"], - "bvid": json["data"]["bvid"], - "part": "1", - "mid": json["data"]["owner"]["mid"], - "lv": "5", - "ftime": "1586299767", - "stime": String((date.timeIntervalSince1970).rounded()), - "jsonp": "jsonp", - "type": "3", - "sub_type": "0" - ] as [String : Any] - - AF.request(Urls.postClickH5(), method: .post, parameters: parameters, encoding: URLEncoding.default).responseJSON { response in - switch response.result { - case .success: - if let string = response.value { - print(string) + func loadData(avId:String, pageNum:Int) -> Void { + if self.videoInfo.isEmpty { + AF.request(Urls.getVideoInfo(avId: avId)).responseJSON { response in + switch(response.result) { + case .success(let data): + self.videoInfo = JSON(data)["data"] + var cid = self.videoInfo["cid"].stringValue + if pageNum != 0 { + cid = self.videoInfo["pages"][pageNum]["cid"].stringValue + } + self.prepareVideoInfo(avId: avId, cid: cid) + + case .failure(let error): + print(error) + break } - case .failure(let error): - print(error) } + } else { + var cid = self.videoInfo["cid"].stringValue + if pageNum != 0 { + cid = self.videoInfo["pages"][pageNum]["cid"].stringValue + } + self.prepareVideoInfo(avId: avId, cid: cid) } + } } diff --git a/BarrageRenderer/BarrageRenderer.xcodeproj/project.pbxproj b/BarrageRenderer/BarrageRenderer.xcodeproj/project.pbxproj index 1f2a0b0..2c8b2bb 100644 --- a/BarrageRenderer/BarrageRenderer.xcodeproj/project.pbxproj +++ b/BarrageRenderer/BarrageRenderer.xcodeproj/project.pbxproj @@ -241,7 +241,7 @@ CAF4F26022E32DB000CCE549 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = "Xiaonan Zhang"; TargetAttributes = { CAF4F26822E32DB000CCE549 = { @@ -335,6 +335,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -396,6 +397,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index d95309b..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 xnzhang - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index ceaf2bb..ccaadc2 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ TBD ## License -This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details +This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details ## Acknowledgments