设备发消息给app

tapd: http://tapd.oa.com/20393192/prong/stories/view/1020393192869350657
Change-Id: I764988307afd8511409dd61b7f47fbd1aab28cc7

Author: tonychanchen

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h

@@ -23,6 +23,15 @@ extern NSNotificationName const TIoTCoreXP2PBridgeNotificationStreamEnd;
  * 客户端拉取到的裸流数据对应 data 参数
  */
 - (void)getVideoPacket:(uint8_t *)data len:(size_t)len;
+
+
+/*
+ * 设备主动发消息给app:
+ * dev_name 和所有接口的dev_name参数是保持一致，表示给那个哪个设备发的流
+ * data是设备主动发过来的内容
+ * 需注意使用场景：只能在直播，回看或对讲期间设备才可以主动发
+ */
+- (void)reviceDeviceMsgWithID:(NSString *)dev_name data:(NSData *)data;
 @end
 
 

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm

@@ -61,10 +61,10 @@
         });
     }
     else if (type == XP2PTypeDeviceMsgArrived) {
-        // 设备端向App发消息
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [[NSNotificationCenter defaultCenter] postNotificationName:TIoTCoreXP2PBridgeNotificationDeviceMsg object:nil userInfo:@{@"id": DeviceName, @"msg": message}];
-        });
+        // 设备端向App发消息,
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//            [[NSNotificationCenter defaultCenter] postNotificationName:TIoTCoreXP2PBridgeNotificationDeviceMsg object:nil userInfo:@{@"id": DeviceName, @"msg": message}];
+//        });
     }
     else if (type == XP2PTypeCmdNOReturn) {
         //设备自定义信令未回复内容
@@ -88,12 +88,18 @@ void XP2PDataMsgHandle(const char *idd, uint8_t* recv_buf, size_t recv_len) {
 }
 
 char* XP2PReviceDeviceCustomMsgHandle(const char *idd, uint8_t* recv_buf, size_t recv_len) {
-//    id<TIoTCoreXP2PBridgeDelegate> delegate = [TIoTCoreXP2PBridge sharedInstance].delegate;
-//    if ([delegate respondsToSelector:@selector(getVideoPacket:len:)]) {
-//        [delegate getVideoPacket:recv_buf len:recv_len];
-//    }
     char *msg = (char *)recv_buf;
-    printf("device feedback ==> %s",msg);
+    printf("device feedback ==> %s\n",msg);
+
+    NSString *DeviceName = [NSString stringWithCString:idd encoding:[NSString defaultCStringEncoding]]?:@"";
+    NSData *DeviceData = [NSData dataWithBytes:recv_buf length:recv_len];
+
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        id<TIoTCoreXP2PBridgeDelegate> delegate = [TIoTCoreXP2PBridge sharedInstance].delegate;
+        if ([delegate respondsToSelector:@selector(reviceDeviceMsgWithID:data:)]) {
+            [delegate reviceDeviceMsgWithID:DeviceName data:DeviceData];
+        }
+    });
     return "";
 }