Skip to content

Commit 3641af6

Browse files
tonychanchenSundoggyNew
authored andcommitted
优化版本号匹配UI提示
Change-Id: I6af2bbc8cb8fdd50b0705402481b5b43214459d3
1 parent 054fbd8 commit 3641af6

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,17 @@ - (void)viewDidLoad {
113113
//云存事件列表
114114
[self requestCloudStoreVideoList];
115115

116-
[[TIoTCoreXP2PBridge sharedInstance] startAppWith:[TIoTCoreAppEnvironment shareEnvironment].cloudSecretId
116+
int errorcode = [[TIoTCoreXP2PBridge sharedInstance] startAppWith:[TIoTCoreAppEnvironment shareEnvironment].cloudSecretId
117117
sec_key:[TIoTCoreAppEnvironment shareEnvironment].cloudSecretKey
118118
pro_id:[TIoTCoreAppEnvironment shareEnvironment].cloudProductId
119119
dev_name:self.deviceName?:@""];
120+
if (errorcode == XP2P_ERR_VERSION) {
121+
UIAlertController *alertC = [UIAlertController alertControllerWithTitle:@"APP SDK 版本与设备端 SDK 版本号不匹配,版本号需前两位保持一致" message:nil preferredStyle:(UIAlertControllerStyleAlert)];
122+
UIAlertAction *alertA = [UIAlertAction actionWithTitle:@"确定" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) {
123+
}];
124+
[alertC addAction:alertA];
125+
[self presentViewController:alertC animated:YES completion:nil];
126+
}
120127

121128
//计算IPC打洞开始时间
122129
self.startIpcP2P = CACurrentMediaTime();

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
//
66

77
#import <Foundation/Foundation.h>
8+
#include "AppWrapper.h"
89

910
NS_ASSUME_NONNULL_BEGIN
1011

@@ -41,12 +42,12 @@ NS_ASSUME_NONNULL_BEGIN
4142
/*
4243
* 调试SDK功能可以使用此接口,OEM请使用下面的start xp2pinfo, 以防止sec_id ,sec_key泄露
4344
*/
44-
- (void)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name ;
45+
- (XP2PErrCode)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name ;
4546

4647
/*
4748
* OEM 版本推荐使用此接口,sec_id, sec_key 传@""即可。 此接口需传从自建服务获取到的 xp2pinfo
4849
*/
49-
- (void)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name xp2pinfo:(NSString *)xp2pinfo;
50+
- (XP2PErrCode)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name xp2pinfo:(NSString *)xp2pinfo;
5051

5152
/*
5253
* 使用播放器播放时,需先等待 SDK 初始化完成,ready事件(xp2preconnect 通知)之后,即可获取到 http-url

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#import "TIoTCoreXP2PBridge.h"
88
#include <string.h>
9-
#include "AppWrapper.h"
109
#import "AWSystemAVCapture.h"
1110
#import <CocoaLumberjack/CocoaLumberjack.h>
1211

@@ -117,19 +116,19 @@ + (void)redirectNSLog {
117116
}
118117

119118

120-
- (void)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name {
119+
- (XP2PErrCode)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name {
121120
// setStunServerToXp2p("11.11.11.11", 111);
122-
[self startAppWith:sec_id sec_key:sec_key pro_id:pro_id dev_name:dev_name xp2pinfo:@""];
121+
return [self startAppWith:sec_id sec_key:sec_key pro_id:pro_id dev_name:dev_name xp2pinfo:@""];
123122
}
124123

125-
- (void)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name xp2pinfo:(NSString *)xp2pinfo {
124+
- (XP2PErrCode)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name xp2pinfo:(NSString *)xp2pinfo {
126125
//注册回调
127126
setUserCallbackToXp2p(XP2PDataMsgHandle, XP2PMsgHandle);
128127

129128
//1.配置IOT_P2P SDK
130129
self.dev_name = dev_name;
131130
setQcloudApiCred([sec_id UTF8String], [sec_key UTF8String]); //正式版app发布时候需要去掉,避免泄露secretid和secretkey,此处仅为演示
132-
startServiceWithXp2pInfo(dev_name.UTF8String, [pro_id UTF8String], [dev_name UTF8String], [xp2pinfo UTF8String]);
131+
return (XP2PErrCode)startServiceWithXp2pInfo(dev_name.UTF8String, [pro_id UTF8String], [dev_name UTF8String], [xp2pinfo UTF8String]);
133132
}
134133

135134
- (NSString *)getUrlForHttpFlv:(NSString *)dev_name {

0 commit comments

Comments
 (0)