fix: 高级软卧的价格和预定

Author: fancymax

12306ForMac/Model/TicketConstants.swift

@@ -13,9 +13,8 @@ import Foundation
 let SEAT_TYPE_ARRAY = ["商务座", "特等座", "一等座", "二等座", "高级软卧", "软卧", "硬卧", "软座", "硬座", "无座"]
 
 //动车
-let D_SEAT_TYPE_NAME_DIC = ["商务座": "9", "特等座": "P", "一等座": "M", "二等座": "O","软卧": "F", "无座": "O"]
-
-let D_SEAT_TYPE_KEYPATH_DIC = ["商务座": "Swz_Num", "特等座": "Tz_Num", "一等座": "Zy_Num", "二等座": "Ze_Num","软卧": "Rw_Num", "无座": "Wz_Num"]
+let D_SEAT_TYPE_NAME_DIC = ["高级软卧":"A","商务座": "9", "特等座": "P", "一等座": "M", "二等座": "O","软卧": "F", "无座": "O"]
+let D_SEAT_TYPE_KEYPATH_DIC = ["高级软卧": "Gr_Num","商务座": "Swz_Num", "特等座": "Tz_Num", "一等座": "Zy_Num", "二等座": "Ze_Num","软卧": "Rw_Num", "无座": "Wz_Num"]
 
 //普通车
 let K_SEAT_TYPE_NAME_DIC = ["高级软卧": "6","软卧": "4", "硬卧": "3", "软座": "2", "硬座": "1", "无座": "1"]

12306ForMac/Model/TrainCodeDetail.swift

@@ -66,25 +66,18 @@ class TrainCodeDetails: NSObject {
 
 class TrainPrice: NSObject {
     //动车
-    let SEAT_TYPE_NAME_DIC = ["9":"商务座", "P":"特等座", "M":"一等座",  "O":"二等座", "F":"动车软卧", "6":"高级软卧", "4":"软卧",  "3":"硬卧",  "2":"软座",  "1":"硬座"]
+    let SEAT_TYPE_NAME_DIC = ["A9":"商务座", "P":"特等座", "M":"一等座",  "O":"二等座", "F":"动车软卧", "A6":"高级软卧", "A4":"软卧",  "A3":"硬卧",  "A2":"软座",  "A1":"硬座"]
     var train_no: String!
     var trainPriceStr = ""
     init(json:JSON) {
         train_no = json["train_no"].string
 
         for key in SEAT_TYPE_NAME_DIC.keys {
-            var onePriceStr = ""
             let price = json[key].string
             if price == nil || price == "" {
                 continue
             }
-            if price!.contains("¥") {
-                onePriceStr = "\(SEAT_TYPE_NAME_DIC[key]!):\(price!)    "
-            }
-            else {
-                let priceNum = Double(price!)!/10.0
-                onePriceStr = "\(SEAT_TYPE_NAME_DIC[key]!):¥\(priceNum)    "
-            }
+            let onePriceStr = "\(SEAT_TYPE_NAME_DIC[key]!):\(price!)    "
             trainPriceStr += onePriceStr
         }
     }