improve trainCodeDetail

Author: fancymax

12306ForMac/Model/QueryByTrainCodeParam.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-struct QueryByTrainCodeParam {
+struct QueryTrainCodeParam {
     let train_no:String //6i000D232806"
     let from_station_telecode:String // "IOQ"
     let to_station_telecode:String //"FYS"

12306ForMac/Service/Service+QueryTicket.swift

@@ -33,7 +33,7 @@ extension Service {
         }
     }
 
-    func queryTrainDetailFlowWith(_ params:QueryByTrainCodeParam,success:@escaping (TrainCodeDetails)->Void,failure:@escaping (NSError)->Void) {
+    func queryTrainDetailFlowWith(_ params:QueryTrainCodeParam,success:@escaping (TrainCodeDetails)->Void,failure:@escaping (NSError)->Void) {
         self.queryByTrainNo(params).then{trainCodeDetails in
             success(trainCodeDetails)
         }.catch {error in
@@ -155,7 +155,7 @@ extension Service {
     }
 
     //https://kyfw.12306.cn/otn/czxx/queryByTrainNo?train_no=6i000D232806&from_station_telecode=IOQ&to_station_telecode=FYS&depart_date=2016-06-12
-    func queryByTrainNo(_ params: QueryByTrainCodeParam)->Promise<TrainCodeDetails>{
+    func queryByTrainNo(_ params: QueryTrainCodeParam)->Promise<TrainCodeDetails>{
         return Promise{ fulfill, reject in
             let url = "https://kyfw.12306.cn/otn/czxx/queryByTrainNo?" + params.ToGetParams()
             let headers = ["refer": "https://kyfw.12306.cn/otn/leftTicket/init",

12306ForMac/TicketViewControllers/TicketQueryViewController.swift

@@ -210,8 +210,6 @@ class TicketQueryViewController: BaseViewController {
         return popover
     }()
 
-
-    
     func passengerSelected(_ passenger:PassengerDTO) -> Bool{
         for controller in passengerViewControllerList where controller.passenger == passenger{
             return true
@@ -225,7 +223,6 @@ class TicketQueryViewController: BaseViewController {
         }
     }
 
-    
 // MARK: - TicketTableView
     @IBOutlet weak var leftTicketTable: NSTableView!
 
@@ -250,14 +247,6 @@ class TicketQueryViewController: BaseViewController {
     lazy var trainFilterWindowController:TrainFilterWindowController = TrainFilterWindowController()
     lazy var submitWindowController:SubmitWindowController = SubmitWindowController()
 
-    lazy var trainCodeDetailViewController:TrainCodeDetailViewController = TrainCodeDetailViewController()
-    lazy var trainCodeDetailPopover: NSPopover = {
-        let popover = NSPopover()
-        popover.behavior = .semitransient
-        popover.contentViewController = self.trainCodeDetailViewController
-        return popover
-    }()
-    
     func ticketOrderedBy(_ tickets:[QueryLeftNewDTO], orderedBy:TicketOrder, ascending:Bool) -> [QueryLeftNewDTO] {
         let sortedTickets:[QueryLeftNewDTO] = tickets.sorted{
             var isOriginAscending = true
@@ -709,14 +698,14 @@ class TicketQueryViewController: BaseViewController {
     }
 
     func clickShowTrainDetail(_ sender:NSButton) {
-        let positioningView = sender
-        let positioningRect = NSZeroRect
-        let preferredEdge = NSRectEdge.maxX
-        trainCodeDetailPopover.show(relativeTo: positioningRect, of: positioningView, preferredEdge: preferredEdge)
+        let selectedRow = leftTicketTable.row(for: sender)
+        let ticket = filterQueryResult[selectedRow]
+        let trainCodeDetailViewController = TrainCodeDetailViewController(trainDetailParams: QueryTrainCodeParam(ticket), trainPriceParams: QueryTrainPriceParam(ticket))
 
-        for queryTicket in ticketQueryResult where queryTicket.TrainCode == sender.title {
-            self.trainCodeDetailViewController.ticket = queryTicket
-        }
+        let trainCodeDetailpopover = NSPopover()
+        trainCodeDetailpopover.behavior = .semitransient
+        trainCodeDetailpopover.contentViewController = trainCodeDetailViewController
+        trainCodeDetailpopover.show(relativeTo: NSZeroRect, of: sender, preferredEdge: NSRectEdge.maxX)
     }
 
 // MARK: - Menu Action

12306ForMac/TicketViewControllers/TrainCodeDetailViewController.swift

@@ -10,32 +10,21 @@ import Cocoa
 
 class TrainCodeDetailViewController: NSViewController {
     @IBOutlet weak var priceLbl: NSTextField!
+    @IBOutlet weak var trainCodeDetailTable: NSTableView!
+    
+    private let _trainDetailParam: QueryTrainCodeParam
+    private let _trainPriceParam: QueryTrainPriceParam
     var trainCodeDetails: TrainCodeDetails?
-    var ticket:QueryLeftNewDTO? {
-        didSet {
-            
-            let queryByTrainCodeParam = QueryByTrainCodeParam(ticket!)
-            if self.trainCodeDetails != nil {
-                self.trainCodeDetails!.trainNos!.removeAll()
-                self.trainCodeDetailTable.reloadData()
-            }
-            let successHandler = { (trainDetails:TrainCodeDetails)->()  in
-                self.trainCodeDetails = trainDetails
-                self.trainCodeDetailTable.reloadData()
-            }
-            let failureHandler = {(error:NSError)->() in }
-            Service.sharedInstance.queryTrainDetailFlowWith(queryByTrainCodeParam, success: successHandler, failure: failureHandler)
-            
-            let queryTrainPriceParam = QueryTrainPriceParam(ticket!)
-            let priceSuccessHandler = { (trainPrice:TrainPrice)->()  in
-                self.priceLbl.stringValue = trainPrice.trainPriceStr
-               
-            }
-            Service.sharedInstance.queryTrainPriceFlowWith(queryTrainPriceParam, success: priceSuccessHandler, failure: failureHandler)
-        }
+    
+    init(trainDetailParams:QueryTrainCodeParam,trainPriceParams:QueryTrainPriceParam) {
+        _trainDetailParam = trainDetailParams
+        _trainPriceParam = trainPriceParams
+        super.init(nibName: nil, bundle: nil)!
     }
 
-    @IBOutlet weak var trainCodeDetailTable: NSTableView!
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -45,10 +34,24 @@ class TrainCodeDetailViewController: NSViewController {
             col.headerCell = TrainCodeDetailHeaderCell(textCell: col.headerCell.stringValue)
             col.headerCell.alignment = .center
         }
+        
+        let successHandler = { (trainDetails:TrainCodeDetails)->()  in
+            self.trainCodeDetails = trainDetails
+            self.trainCodeDetailTable.reloadData()
+        }
+        let failureHandler = {(error:NSError)->() in }
+        Service.sharedInstance.queryTrainDetailFlowWith(_trainDetailParam, success: successHandler, failure: failureHandler)
+        
+        let priceSuccessHandler = { (trainPrice:TrainPrice)->()  in
+            self.priceLbl.stringValue = trainPrice.trainPriceStr
+            
+        }
+        Service.sharedInstance.queryTrainPriceFlowWith(_trainPriceParam, success: priceSuccessHandler, failure: failureHandler)
     }
+    
 }
 
-// MARK: - NSTableViewDataSource 
+// MARK: - NSTableViewDataSource
 extension TrainCodeDetailViewController: NSTableViewDataSource{
     func numberOfRows(in tableView: NSTableView) -> Int {
         if trainCodeDetails == nil {