Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fancymax/12306ForMac
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.6.8
Choose a base ref
...
head repository: fancymax/12306ForMac
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Jan 24, 2018

  1. 开发前需要先安装Carthage命令

    QiYifei committed Jan 24, 2018
    Copy the full SHA
    5e37cc0 View commit details

  2. update SwiftyJSON version

    QiYifei committed Jan 24, 2018
    Copy the full SHA
    4915451 View commit details

  3. Merge pull request #210 from qyf404/master 

    开发前需要先安装Carthage命令
    @fancymax
    fancymax authored Jan 24, 2018
    Copy the full SHA
    972c002 View commit details

Commits on Jan 19, 2019

  1. update README

    @fancymax
    fancymax committed Jan 19, 2019
    Copy the full SHA
    ff69af8 View commit details
Showing with 9 additions and 16 deletions.
  1. +1 −1 12306ForMac/TicketViewControllers/TicketTaskManagerWindowController.swift
  2. +1 −1 Cartfile.resolved
  3. +7 −14 README.md
2 changes: 1 addition & 1 deletion 12306ForMac/TicketViewControllers/TicketTaskManagerWindowController.swift
View file
Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@ class TicketTasksManager: NSObject {
func decodeJsonFrom(_ jsonString:String) {
ticketTasks = [TicketTask]()
if let dataFromString = jsonString.data(using: .utf8, allowLossyConversion: false) {
let json = JSON(data: dataFromString)
let json = try!JSON(data: dataFromString)
if json.array == nil {
return
}
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github "Alamofire/Alamofire" "4.0.0"
github "DaveWoodCom/XCGLogger" "5.0.5"
github "SwiftyJSON/SwiftyJSON" "3.1.4"
github "SwiftyJSON/SwiftyJSON" "4.0.0"
github "ccgus/fmdb" "2.6.2"
github "mxcl/OMGHTTPURLRQ" "3.2.2"
github "mxcl/PromiseKit" "4.1.0"
21 changes: 7 additions & 14 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
# 12306ForMac

仅做学习参考，随着12306接口的变更可能无法正常使用。

Mac版12306 订票/捡票 助手。

以前要么开Windows虚拟机，要么使用官方Web，现在可以使用12306ForMac订票助手。

注意系统要求 **OS X10.11** 以上

# 下载

[Mac App Store](https://itunes.apple.com/cn/app/ding-piao-zhu-shou/id1163682213?l=zh&ls=1&mt=12)


![demo](screenshot/12306ForMac.jpg)

# 开发

1. OS X 10.13/Xcode 9.0/Swift 3.2
2. $ git clone --recursive https://github.com/fancymax/12306ForMac.git
3. $ carthage update --platform macOS

# 捐赠
如果你愿意支持这个项目，可以考虑进行捐赠

![demo](screenshot/donate.png)

1. OS X 10.13/Xcode 9.0/Swift 3.2/brew
2. $ brew install carthage
3. $ git clone --recursive https://github.com/fancymax/12306ForMac.git
5. $ cd 12306ForMac
4. $ carthage update --platform macOS

# 感谢