Browse Source

移除index/banner、index/notice、index/getini 三个被废弃的接口请求。

culturetown 10 months ago
parent
commit
b023514783

+ 2 - 2
Koala/Koala.xcodeproj/project.pbxproj

@@ -5127,7 +5127,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiduclient.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -5160,7 +5160,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiduclient.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

BIN
Koala/Koala.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 2
Koala/Koala.xcworkspace/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -32,7 +32,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "227"
             endingLineNumber = "227"
-            landmarkName = "netOpenSubscribeAction()"
+            landmarkName = "loadLiveChat()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -48,7 +48,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "229"
             endingLineNumber = "229"
-            landmarkName = "netOpenSubscribeAction()"
+            landmarkName = "loadLiveChat()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

+ 11 - 11
Koala/Koala/FX/OpretationalDataClass/OperationalNetworkData.swift

@@ -55,17 +55,17 @@ public class OperationalNetworkData: NSObject
     
     
     class func getApiIndexGetiniComplete(complete:@escaping ()->()) -> Void {
-        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetini , success: { (code, result) in
-            if let list:[NSDictionary] = result as? [NSDictionary] {
-                SaveData.shared().updateGetini(list: list as NSArray)
-                complete()
-            }else{
-                ProgressHUD.showError(status:DataTypeErrorPrompt)
-            }
-            
-        }) { (code, result) in
-           // ProgressHUD.showError(status: result as! String)
-        }
+//        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetini , success: { (code, result) in
+//            if let list:[NSDictionary] = result as? [NSDictionary] {
+//                SaveData.shared().updateGetini(list: list as NSArray)
+//                complete()
+//            }else{
+//                ProgressHUD.showError(status:DataTypeErrorPrompt)
+//            }
+//            
+//        }) { (code, result) in
+//           // ProgressHUD.showError(status: result as! String)
+//        }
         
     }
     

+ 1 - 1
Koala/Koala/Modular/Home/VC/HomeViewController.swift

@@ -47,7 +47,7 @@ class HomeViewController: BaseViewController  {
         }
         
         OperationalNetworkData.getApiIndexGetiniComplete {
-            self.loadLiveChat()
+//            self.loadLiveChat()
         }
         
         self.viewModel.netOptionProductList()

+ 52 - 41
Koala/Koala/Modular/Home/VM/HomeViewModel.swift

@@ -114,24 +114,28 @@ extension HomeViewModel {
     //轮播图数据
     func requestHomeBanner(observer: Signal< Bool, Never>.Observer) -> Void {
         
-        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForHomeBanner, success: { (code, result) in
-            self.bannerList.removeAll()
-            if let list:[NSDictionary] = result as? [NSDictionary] {
-                for dic in list {
-                    let model = HomeBannerModel.deserialize(from: dic)
-                    self.bannerList.append(model!)
-                }
-                observer.send(value: true)
-            }else{
-                observer.send(value: false)
-                ProgressHUD.showError(status:DataTypeErrorPrompt)
-            }
-            observer.sendCompleted()
-        }) { (code, result) in
-            ProgressHUD.showError(status: result as! String)
-            observer.send(value: false)
-            observer.sendCompleted()
-        }
+        self.bannerList.removeAll()
+        
+        observer.send(value: true)
+        
+//        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForHomeBanner, success: { (code, result) in
+//            self.bannerList.removeAll()
+//            if let list:[NSDictionary] = result as? [NSDictionary] {
+//                for dic in list {
+//                    let model = HomeBannerModel.deserialize(from: dic)
+//                    self.bannerList.append(model!)
+//                }
+//                observer.send(value: true)
+//            }else{
+//                observer.send(value: false)
+//                ProgressHUD.showError(status:DataTypeErrorPrompt)
+//            }
+//            observer.sendCompleted()
+//        }) { (code, result) in
+//            ProgressHUD.showError(status: result as! String)
+//            observer.send(value: false)
+//            observer.sendCompleted()
+//        }
     }
     
     //公告数据
@@ -140,30 +144,37 @@ extension HomeViewModel {
     }
 
     func requestHomeNotice(observer: Signal< Bool, Never>.Observer) -> Void {
-        let parame:[String:Any] = [
-            "lang":"zh-CN",
-            "limit":"10",
-            "page":"1"
-        ];
         
-        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForHomeNotice,parameters: parame, success: { (code, result) in
-            self.noticeList.removeAll()
-            if let list:[NSDictionary] = result as? [NSDictionary] {
-                for dic in list {
-                    let model = HomeNoticeModel.deserialize(from: dic)
-                    self.noticeList.append(model!)
-                }
-                observer.send(value: true)
-            }else{
-                observer.send(value: false)
-                ProgressHUD.showError(status:DataTypeErrorPrompt)
-            }
-            observer.sendCompleted()
-        }) { (code, result) in
-            ProgressHUD.showError(status: result as! String)
-            observer.send(value: false)
-            observer.sendCompleted()
-        }
+        observer.send(value: false)
+          
+          
+        observer.sendCompleted()
+
+        
+//        let parame:[String:Any] = [
+//            "lang":"zh-CN",
+//            "limit":"10",
+//            "page":"1"
+//        ];
+//
+//        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForHomeNotice,parameters: parame, success: { (code, result) in
+//            self.noticeList.removeAll()
+//            if let list:[NSDictionary] = result as? [NSDictionary] {
+//                for dic in list {
+//                    let model = HomeNoticeModel.deserialize(from: dic)
+//                    self.noticeList.append(model!)
+//                }
+//                observer.send(value: true)
+//            }else{
+//                observer.send(value: false)
+//                ProgressHUD.showError(status:DataTypeErrorPrompt)
+//            }
+//            observer.sendCompleted()
+//        }) { (code, result) in
+//            ProgressHUD.showError(status: result as! String)
+//            observer.send(value: false)
+//            observer.sendCompleted()
+//        }
     }
     
     //获取交易对

+ 4 - 4
Koala/Koala/Modular/JDTrade/VC/JDTradeAccountHoldViewController.swift

@@ -312,10 +312,10 @@ extension JDTradeAccountHoldViewController: UITableViewDelegate,UITableViewDataS
                 }
                 
             }else if index == 3 {
-                let vc = JDDealViewController()
-                
-                currentVc()?.navigationController?.pushViewController(vc, animated: true)
-                pop.dismissAlert()
+//                let vc = JDDealViewController()
+//                
+//                currentVc()?.navigationController?.pushViewController(vc, animated: true)
+//                pop.dismissAlert()
                 
             }else{
                 let vc = MarketDetailViewController()

+ 1 - 1
Koala/Koala/Other/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>