Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

张旭
2 parents cc39e471 fd7c9a33
Showing 9 changed files with 36 additions and 26 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveCommonBaseModel.swift
metaCode/Classes/Config/Database/CNLiveFileManager.swift → metaCode/Classes/Config/Database/CNLiveSaveSearchDB.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderDetailViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderSearchListViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderSearchViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderViewController.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyListView.swift
@@ -81,7 +81,7 @@
 		794BC1652AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794BC1642AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift */; };
 		794FF1052B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FF1042B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift */; };
 		794FF1072B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FF1062B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift */; };
-		794FF1092B02131300385E85 /* CNLiveFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FF1082B02131300385E85 /* CNLiveFileManager.swift */; };
+		794FF1092B02131300385E85 /* CNLiveSaveSearchDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FF1082B02131300385E85 /* CNLiveSaveSearchDB.swift */; };
 		796398942A260C0100D045EB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963988D2A260C0100D045EB /* AppDelegate.swift */; };
 		7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */; };
 		79656E382AAEBA8E00119A61 /* CNLiveMineInputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79656E372AAEBA8E00119A61 /* CNLiveMineInputViewController.swift */; };
@@ -251,7 +251,7 @@
 		794BC1642AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderSendViewController.swift; sourceTree = "<group>"; };
 		794FF1042B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderSearchViewController.swift; sourceTree = "<group>"; };
 		794FF1062B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderSearchListViewController.swift; sourceTree = "<group>"; };
-		794FF1082B02131300385E85 /* CNLiveFileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveFileManager.swift; sourceTree = "<group>"; };
+		794FF1082B02131300385E85 /* CNLiveSaveSearchDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSaveSearchDB.swift; sourceTree = "<group>"; };
 		7963988D2A260C0100D045EB /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveBaseViewController.swift; sourceTree = "<group>"; };
 		79656E372AAEBA8E00119A61 /* CNLiveMineInputViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInputViewController.swift; sourceTree = "<group>"; };
@@ -549,7 +549,7 @@
 				7C7C62F52A4D72E9007A912E /* CNLiveIdentityDB.swift */,
 				79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */,
 				79EABB882AB4497700F3A4E2 /* CNLiveSaveStandDB.swift */,
-				794FF1082B02131300385E85 /* CNLiveFileManager.swift */,
+				794FF1082B02131300385E85 /* CNLiveSaveSearchDB.swift */,
 			);
 			path = Database;
 			sourceTree = "<group>";
@@ -1240,7 +1240,7 @@
 				798A44F92A30835400815935 /* CNLiveHelpFeedBackViewController.swift in Sources */,
 				79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
-				794FF1092B02131300385E85 /* CNLiveFileManager.swift in Sources */,
+				794FF1092B02131300385E85 /* CNLiveSaveSearchDB.swift in Sources */,
 				79396EED2A319F220053E1AF /* NSObject+CNLiveExtensions.swift in Sources */,
 				19FA201B2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift in Sources */,
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
@@ -13,11 +13,7 @@ class BaseModel: HandyJSON {
     required init() {}
-    func mapping(mapper: HelpingMapper) {
-        
-    }
+    func mapping(mapper: HelpingMapper) {}
-    func didFinishMapping() {
-        
-    }
+    func didFinishMapping() {}
 }
@@ -7,9 +7,9 @@
 import Foundation
-class CNLiveFileManager: NSObject {
+class CNLiveSaveSearchDB: NSObject {
-    static let shared = CNLiveFileManager.init()
+    static let shared = CNLiveSaveSearchDB.init()
     open func save(object: Any, key: String) {
         var temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist")
@@ -71,7 +71,7 @@ class CNLiveFileManager: NSObject {
     }()
     private lazy var fileDir: String = {
-        let path = "\(NSHomeDirectory())/Documents/metaCode"
+        let path = "\(NSHomeDirectory())/Documents/metaCode/saveSearch"
         let fileManager = FileManager.default
         var isDir: ObjCBool = false
         let exist: Bool = fileManager.fileExists(atPath: path, isDirectory: &isDir)
@@ -46,7 +46,7 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         dataArray.add(array03)
-        dataArray.add([["name":"订单列表","icon":"mine_list_icon_help_feedback"]])
+//        dataArray.add([["name":"订单列表","icon":"mine_list_icon_help_feedback"]])
         return dataArray
@@ -159,16 +159,20 @@ extension CNLiveShopOrderDetailViewController {
         case "快递发货":
             self.navigationController?.pushViewController(CNLiveShopOrderSendViewController.init(orderId: detailModel.id! as NSString, show_type: .splite), animated: true)
         case "查看进度":
-            print("查看进度")
+            var YBYProgress:CNLiveShopOrderExpressDetailYBYProgress = CNLiveShopOrderExpressDetailYBYProgress.Zero
+            if detailModel.state == "3" {
+                YBYProgress = .Zero
+            } else {
+                YBYProgress = .Complete
+            }
+            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: detailModel.id! as NSString, expId: "", express_num: "", show_type: .byYourself, progress: YBYProgress), animated: true)
         case "物流详情":
-            print("物流详情")
             pushExpressVC(detailModel: detailModel)
         case "退款详情":
-            print("退款详情")
             let vc = CNLiveShopOrderDetailViewController(orderId: detailModel.id!, show_type: .sale, form_type: .order)
             self.navigationController?.pushViewController(vc, animated: true)
         case "订单详情":
-            self.navigationController?.pushViewController(CNLiveShopOrderDetailViewController(orderId: refuundModel.id!, show_type: .order, form_type: .afterSale), animated: true)
+            self.navigationController?.pushViewController(CNLiveShopOrderDetailViewController(orderId: refuundModel.orderid!, show_type: .order, form_type: .afterSale), animated: true)
         case "确认退款":
             ConfigAlertManager.shared.presentAlert(title: "提示", message: "确认给用户退款?", actionTitles: ["取消","确认"]) { [weak self] index in
                 if index == 1 {
@@ -203,13 +203,13 @@ extension CNLiveShopOrderSearchListViewController {
             textField.text = "\(textField.text?.prefix(29) ?? "")"
         }
-        let historyDataArr = CNLiveFileManager.shared.take(key: kShopOrderListSearchHistroyDatas) as! NSMutableArray
+        let historyDataArr = CNLiveSaveSearchDB.shared.take(key: kShopOrderListSearchHistroyDatas) as! NSMutableArray
         if historyDataArr.contains(textField.text! as String) {
             historyDataArr.remove(textField.text! as String)
         }
         historyDataArr.insert(textField.text! as String, at: 0)
-        CNLiveFileManager.shared.save(object: historyDataArr, key: kShopOrderListSearchHistroyDatas)
+        CNLiveSaveSearchDB.shared.save(object: historyDataArr, key: kShopOrderListSearchHistroyDatas)
         loadDataSourceAction(page: 1)
@@ -306,10 +306,8 @@ extension CNLiveShopOrderSearchListViewController {
     private func pushExpressVC(listModel: ShopOrderListModel) {
         if listModel.send_num > 1 || listModel.is_send == "0" {
             self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: listModel.id! as NSString), animated: true)
-//            self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: "1000073435"), animated: true)
         } else {
             self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: listModel.id! as NSString, expId: "", express_num: listModel.express_num! as NSString, show_type: .orderExpress, progress: .Zero), animated: true)
-//            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: "1000021749", expId: "0", express_num: "1234556789012345", show_type: .orderExpress, progress: .Zero), animated: true)
         }
     }
@@ -137,11 +137,11 @@ class CNLiveShopOrderSearchViewController: CNLiveBaseViewController, UITextField
         historyArr.insert(title, at: 0)
         tableView.reloadData()
-        CNLiveFileManager.shared.save(object: historyArr, key: kShopOrderListSearchHistroyDatas)
+        CNLiveSaveSearchDB.shared.save(object: historyArr, key: kShopOrderListSearchHistroyDatas)
     }
     func take() {
-        let takeArr = CNLiveFileManager.shared.take(key: kShopOrderListSearchHistroyDatas)
+        let takeArr = CNLiveSaveSearchDB.shared.take(key: kShopOrderListSearchHistroyDatas)
         if (takeArr as AnyObject).count > 0 {
             historyArr = NSMutableArray.init(array: takeArr as! [Any])
             tableView.reloadData()
@@ -161,7 +161,7 @@ class CNLiveShopOrderSearchViewController: CNLiveBaseViewController, UITextField
     func deleteAll() {
         historyArr.removeAllObjects()
-        CNLiveFileManager.shared.delete(key: kShopOrderListSearchHistroyDatas)
+        CNLiveSaveSearchDB.shared.delete(key: kShopOrderListSearchHistroyDatas)
         tableView.reloadData()
     }
@@ -169,7 +169,7 @@ class CNLiveShopOrderSearchViewController: CNLiveBaseViewController, UITextField
     func delete(index: NSInteger) {
         historyArr.removeObject(at: index)
-        CNLiveFileManager.shared.save(object: historyArr, key: kShopOrderListSearchHistroyDatas)
+        CNLiveSaveSearchDB.shared.save(object: historyArr, key: kShopOrderListSearchHistroyDatas)
         tableView.reloadData()
     }
@@ -38,6 +38,7 @@ class CNLiveShopOrderViewController: CNLiveBaseViewController {
     lazy var categoryView: JXSegmentedView = {
         let categoryView = JXSegmentedView.init(frame: CGRectMake(0, KNavigationHeight, KSreenWidth, CGFloat(kCNLiveShopOrderListSectionTitleHeight)))
         categoryView.dataSource = dataSource
+        categoryView.delegate = self
         categoryView.collectionView.backgroundColor = HexColor("fafbfd")
         categoryView.backgroundColor = .white
@@ -67,6 +68,16 @@ class CNLiveShopOrderViewController: CNLiveBaseViewController {
         return JXSegmentedListContainerView(dataSource: self)
     }()
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        self.navigationController?.interactivePopGestureRecognizer?.isEnabled = (categoryView.selectedIndex == 0)
+    }
+    
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        self.navigationController?.interactivePopGestureRecognizer?.isEnabled = true
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = .white
@@ -370,6 +370,7 @@ class ShopBodyOrderListViewCell: UITableViewCell {
         iconView.backgroundColor = .white
         iconView.layer.cornerRadius = 5
         iconView.layer.masksToBounds = true
+        iconView.contentMode = .scaleAspectFit
         iconView.image = UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 90, height: 90))
         return iconView
     }()