use huobi test env

wufeiafei · May 3, 2018 · 30ab75b · 30ab75b
1 parent 598d053
commit 30ab75b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 24 deletions.
diff --git a/KWBTC.xcworkspace/xcuserdata/kevin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/KWBTC.xcworkspace/xcuserdata/kevin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -10,23 +10,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "KWBTC/WSManager/BFWSManager.m"
-            timestampString = "546962763.6509711"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "119"
-            endingLineNumber = "119"
-            landmarkName = "-parseWithData:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KWBTC/WSManager/BFWSManager.m"
-            timestampString = "546962763.651491"
+            timestampString = "547043007.872344"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "63"
@@ -74,12 +58,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "KWBTC/WSManager/BFWSManager.m"
-            timestampString = "546962763.651979"
+            timestampString = "547043007.872762"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "156"
-            endingLineNumber = "156"
-            landmarkName = "-websocketDidDisconnect:error:"
+            startingLineNumber = "185"
+            endingLineNumber = "185"
+            landmarkName = "-websocket:didReceiveMessage:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

diff --git a/KWBTC/Common/Constants.h b/KWBTC/Common/Constants.h
@@ -29,7 +29,9 @@
 //#define wsURL  @"wss://api.bitfinex.com/ws"
 //火币
 //#define wsURL  @"wss://api.huobipro.com/ws"
-#define wsURL    @"wss://api.hadax.com/ws"
+//#define wsURL    @"wss://api.hadax.com/ws"
+//h火币测试环境
+#define  wsURL @"wss://api.huobi.br.com/ws"
 
 
 

diff --git a/KWBTC/WSManager/BFWSManager.m b/KWBTC/WSManager/BFWSManager.m
@@ -68,6 +68,12 @@ -(void)disConnect
 -(void)sendBTC
 {
 
+//   NSDictionary *dic = @{
+//                         @"event": @"subscribe",
+//                         @"channel": @"ticker",
+//                         @"symbol": @"tBTCUSD"
+//                         };
+
 //    NSDictionary *dic = @{
 //                          @"event": @"subscribe",
 //                          @"channel": @"candles",
@@ -81,7 +87,8 @@ -(void)sendBTC
 //                        };
 
        NSDictionary *dic = @{
-                             @"sub": @"market.ethbtc.kline.1min",
+
+                             @"sub": @"market.btcusdt.kline.1min",
                              @"id": @"id1"
                             };
 
@@ -115,7 +122,23 @@ -(void)pongServerWithPongSting:(NSString*)pongString
 #pragma mark -- parse
 -(void)parseWithData:(id)data
 {
+
+    if ([data isKindOfClass:[NSDictionary class]]&&data) {
+        NSDictionary *dic =  data;
+
+        NSString *BTCPrice = dic[@"close"];
+        _btcPrice = BTCPrice;
+        if (_btcBlock) {
+            _btcBlock(BTCPrice);
+        }
+    }
+
+}
 
+/*
+-(void)parseWithData:(id)data
+{
+   
     if ([data isKindOfClass:[NSArray class]]&&data) {
         NSArray *array =  data;
         
@@ -139,6 +162,7 @@ -(void)parseWithData:(id)data
 
 
 }
+ */
 
 
 #pragma mark -- delegate
@@ -192,8 +216,13 @@ -(void)websocket:(JFRWebSocket*)socket didReceiveData:(NSData*)data {
         [self pongServerWithPongSting:dic[@"ping"]];
 
     }
+
+    if (dic[@"tick"]) {
+
+        [self parseWithData:dic[@"tick"]];
+
+    }
 
-
 
 
 }