Skip to content

pidan / FuSiLive

Go to a project
Commit c71fe6f8 by suolong
Options

提交下bug

parent 5b07e070
Inline Side-by-side
Showing with 38 additions and 19 deletions
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
......@@ -1154,6 +1154,7 @@
00F7FF852FB1000100AAAA06 /* FUSLiveShowTimeMVPConfirmPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 00F7FF812FB1000100AAAA02 /* FUSLiveShowTimeMVPConfirmPopView.m */; };
00F7FF862FB1000100AAAA07 /* FUSLiveShowTimeFrostCardPopView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00F7FF822FB1000100AAAA03 /* FUSLiveShowTimeFrostCardPopView.h */; };
00F7FF872FB1000100AAAA08 /* FUSLiveShowTimeFrostCardPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 00F7FF832FB1000100AAAA04 /* FUSLiveShowTimeFrostCardPopView.m */; };
3E1B45BB2FF551EB00DE63E3 /* TTVideoLisenceFile.lic in Resources */ = {isa = PBXBuildFile; fileRef = 3E1B45BA2FF551EB00DE63E3 /* TTVideoLisenceFile.lic */; };
3E261EA32F2C5F680008C0C0 /* FUSByteHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E261EA12F2C5F680008C0C0 /* FUSByteHelper.h */; };
3E261EA42F2C5F680008C0C0 /* FUSByteHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E261EA22F2C5F680008C0C0 /* FUSByteHelper.m */; };
3E261EA72F2C5FAB0008C0C0 /* FUSLinkMicMediator.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E261EA52F2C5FAB0008C0C0 /* FUSLinkMicMediator.h */; };
......@@ -3567,6 +3568,7 @@
00F7FF812FB1000100AAAA02 /* FUSLiveShowTimeMVPConfirmPopView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSLiveShowTimeMVPConfirmPopView.m; sourceTree = "<group>"; };
00F7FF822FB1000100AAAA03 /* FUSLiveShowTimeFrostCardPopView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSLiveShowTimeFrostCardPopView.h; sourceTree = "<group>"; };
00F7FF832FB1000100AAAA04 /* FUSLiveShowTimeFrostCardPopView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSLiveShowTimeFrostCardPopView.m; sourceTree = "<group>"; };
3E1B45BA2FF551EB00DE63E3 /* TTVideoLisenceFile.lic */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TTVideoLisenceFile.lic; sourceTree = "<group>"; };
3E261EA12F2C5F680008C0C0 /* FUSByteHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSByteHelper.h; sourceTree = "<group>"; };
3E261EA22F2C5F680008C0C0 /* FUSByteHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSByteHelper.m; sourceTree = "<group>"; };
3E261EA52F2C5FAB0008C0C0 /* FUSLinkMicMediator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSLinkMicMediator.h; sourceTree = "<group>"; };
......@@ -6701,6 +6703,7 @@
BEF675F02C6B156500A670FB /* Resources */,
BE4096BE2C7C37EF00CE2FE8 /* Info.plist */,
3E84E8612FD9103200815647 /* TTSDKLisenceFile */,
3E1B45BA2FF551EB00DE63E3 /* TTVideoLisenceFile.lic */,
BED65CFD2C62148700668116 /* TTSDKLisenceFileForTest */,
BED65C712C60C61C00668116 /* FUSShowRoomAssets.xcassets */,
);
......@@ -10684,6 +10687,7 @@
00CD24182F58453F00A07432 /* live_pk_start_anim_type1_32@2x.png in Resources */,
00CD24192F58453F00A07432 /* live_pk_start_anim_type1_56@2x.png in Resources */,
00CD241A2F58453F00A07432 /* live_pk_start_anim_type1_50@2x.png in Resources */,
3E1B45BB2FF551EB00DE63E3 /* TTVideoLisenceFile.lic in Resources */,
00CD241B2F58453F00A07432 /* live_pk_start_anim_type1_37@2x.png in Resources */,
00CD241C2F58453F00A07432 /* live_pk_start_anim_type1_39@2x.png in Resources */,
00CD241D2F58453F00A07432 /* live_pk_start_anim_type1_26@2x.png in Resources */,
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/TTSDKLisenceFile
{
"Signature": "CwmrbzrrtSXlnT8WVJkjC3/Di3YZWBlcpvQSHjMR43BsE9BsM3zRFBCs/p7vN2lE0yr+tzs8OeicMcnHOdTxQTVXc9FBKx/bxSiOC8G/Itw0+spQmOXVYq0TcQtHmakdMw1coS3ZlyY5VSkBJSlfPPLZ1ROGf1BjY6B6rsyiY9k67FTvzMmX6kseJrFIJL97uPrf0/CdPIuPLjyO3u7rKcL6VOXx1jzAAAUQotLKgZaS9Yiadu4gfy4tnaas6mD1PnT5PYM9lGQTuRkAM5GNvndq9RK4GODu2Q0eSHLAlaGnF1VN0bQHbQzK3qhwiZajjhnbpcGv3wSKG3/ftd1LqA==",
"Content": "eyJJZCI6IjMyNDAxNDQzODYiLCJWZXJzaW9uIjoyLCJDaGFubmVsIjoidm9kIiwiVHlwZSI6MiwiQnVuZGxlSWQiOiJjb20uZnVzaS5tZWV0LmxpdmUuY2hhdC52aWRlby5hbW9uZy5mcmllbmRzIiwiTW9kdWxlcyI6W3siTmFtZSI6InZvZF9wbGF5IiwiRWRpdGlvbiI6InN0YW5kYXJkX2VkaXRpb24iLCJTdGFydFRpbWUiOjE3ODEwNjEzNzgwODgsIkV4cGlyZVRpbWUiOjE4MTI1OTczNzgwODgsIkV4cGlyZUJ1ZmZlciI6MTU1NTIwMDAwMDB9XSwiRmlsZVZlcnNpb24iOiIxNzgxMDYxNTg4NTUyNTIwMzY5In0=",
"MainURL": "https://vod-license-m.volccdn.com/vod-license/l-3240144386-ch-vod-a-642642.lic?lk3s=0d9f7a7d&x-expires=4934661588&x-signature=XdmGcmW9k4uENmCJqVN8sP5n8%2Bg%3D",
"BackupURL": "https://vod-license-b.volccdn.com/vod-license/l-3240144386-ch-vod-a-642642.lic?lk3s=0d9f7a7d&x-expires=4934661588&x-signature=iK3jUKi9UiZoAPQZAeKTC5trH5Q%3D",
"Id": "3240144386"
"Signature": "uEdniqEXaqUfQl+3lCZxyGgsKmWZTSJIQe11EvcgYLvdFW3ICs7uwWJ4IdWM7X8aIxJwbZZ+PZnXQ394zw7FVgK1HAuDvJsjOlA677WYbWW5h/p40HBTJ4fxEo0SJsYdzsnBYVmzq4t6jRv9FyTEu5gTrGwyQgC49EqFrp14m5L0zR+1B8OVMlKY0Diq7z6xt3NjZrUQz/yFAC0DNvtQWNQ72i8AvfOyRcznx3h/jqiatQK2EnwVg/XGPOo1e9jVYVzoaheH94kLHq483WstMPMFFwRokrzcFTdG30Bzv0Z1rv+i0bqC+NVK7jQTe8ylPNMtSuNf/9YIy90VLwHNoQ==",
"Content": "eyJJZCI6Ijk4MDMwMjMzOCIsICJWZXJzaW9uIjoyLCAiQ2hhbm5lbCI6ImxpdmUiLCAiVHlwZSI6MiwgIkJ1bmRsZUlkIjoiY29tLmZ1c2kubWVldC5saXZlLmNoYXQudmlkZW8uYW1vbmcuZnJpZW5kcyIsICJNb2R1bGVzIjpbeyJOYW1lIjoibGl2ZV9wdXNoIiwgIkVkaXRpb24iOiJwcmVtaXVtX2VkaXRpb24iLCAiU3RhcnRUaW1lIjoxNzI0NDAzMDg2MjI2LCAiRXhwaXJlVGltZSI6MTc1NTkzOTA4NjIyNiwgIkV4cGlyZUJ1ZmZlciI6MTU1NTIwMDAwMDB9LCB7Ik5hbWUiOiJsaXZlX3B1bGwiLCAiRWRpdGlvbiI6InByZW1pdW1fZWRpdGlvbiIsICJTdGFydFRpbWUiOjE3MjQ0MDMwODYyMjYsICJFeHBpcmVUaW1lIjoxNzU1OTM5MDg2MjI2LCAiRXhwaXJlQnVmZmVyIjoxNTU1MjAwMDAwMH1dLCAiRmlsZVZlcnNpb24iOiIxNzI0NDAzMDg2MjM5Mjg5NTc1In0=",
"MainURL": "https://vod-license-m.volccdn.com/vod-license/l-980302338-ch-live-a-642006.lic?lk3s=0d9f7a7d&x-expires=4878003086&x-signature=OuyhczqZaNon1D4P7Xd9Wp7FuiA%3D",
"BackupURL": "https://vod-license-b.volccdn.com/vod-license/l-980302338-ch-live-a-642006.lic?lk3s=0d9f7a7d&x-expires=4878003086&x-signature=As%2FM9U1MevQNKT%2B%2F3%2B9Lxz87YSw%3D",
"Id": "980302338"
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/TTVideoLisenceFile.lic 0 → 100644
{
"Signature": "CwmrbzrrtSXlnT8WVJkjC3/Di3YZWBlcpvQSHjMR43BsE9BsM3zRFBCs/p7vN2lE0yr+tzs8OeicMcnHOdTxQTVXc9FBKx/bxSiOC8G/Itw0+spQmOXVYq0TcQtHmakdMw1coS3ZlyY5VSkBJSlfPPLZ1ROGf1BjY6B6rsyiY9k67FTvzMmX6kseJrFIJL97uPrf0/CdPIuPLjyO3u7rKcL6VOXx1jzAAAUQotLKgZaS9Yiadu4gfy4tnaas6mD1PnT5PYM9lGQTuRkAM5GNvndq9RK4GODu2Q0eSHLAlaGnF1VN0bQHbQzK3qhwiZajjhnbpcGv3wSKG3/ftd1LqA==",
"Content": "eyJJZCI6IjMyNDAxNDQzODYiLCJWZXJzaW9uIjoyLCJDaGFubmVsIjoidm9kIiwiVHlwZSI6MiwiQnVuZGxlSWQiOiJjb20uZnVzaS5tZWV0LmxpdmUuY2hhdC52aWRlby5hbW9uZy5mcmllbmRzIiwiTW9kdWxlcyI6W3siTmFtZSI6InZvZF9wbGF5IiwiRWRpdGlvbiI6InN0YW5kYXJkX2VkaXRpb24iLCJTdGFydFRpbWUiOjE3ODEwNjEzNzgwODgsIkV4cGlyZVRpbWUiOjE4MTI1OTczNzgwODgsIkV4cGlyZUJ1ZmZlciI6MTU1NTIwMDAwMDB9XSwiRmlsZVZlcnNpb24iOiIxNzgxMDYxNTg4NTUyNTIwMzY5In0=",
"MainURL": "https://vod-license-m.volccdn.com/vod-license/l-3240144386-ch-vod-a-642642.lic?lk3s=0d9f7a7d&x-expires=4934661588&x-signature=XdmGcmW9k4uENmCJqVN8sP5n8%2Bg%3D",
"BackupURL": "https://vod-license-b.volccdn.com/vod-license/l-3240144386-ch-vod-a-642642.lic?lk3s=0d9f7a7d&x-expires=4934661588&x-signature=iK3jUKi9UiZoAPQZAeKTC5trH5Q%3D",
"Id": "3240144386"
}
\ No newline at end of file
Modules/FUSShowRoomModule/FUSShowRoomModule/Router/FUSShowRoomRouter.m
......@@ -892,25 +892,32 @@
- (void)initTTSDK {
NSString *currentBundleIdentifier = NSBundle.mainBundle.bundleIdentifier ?: @"";
NSString *formalBundleIdentifier = @"com.fusi.meet.live.chat.video.among.friends";
// 根据系统当前包名判断播放器配置，正式包走正式 license 与 appid。
BOOL useFormalTTSDKConfig = [currentBundleIdentifier isEqualToString:formalBundleIdentifier];
NSInteger appId = useFormalTTSDKConfig ? 642642 : 100667;
// 直播始终使用固定授权配置，TTVideo 单独走独立 license。
NSInteger liveAppId = 100667;
NSInteger videoAppId = 642642;
NSString *appname = FUSConfig.sharedInstanced.appConfigs.appName;
NSString *channel = [FUSDeviceHelper fus_getChannelId];
NSString *bundleID = currentBundleIdentifier;
NSString *lisenceFilePath = useFormalTTSDKConfig ? @"TTSDKLisenceFile" : @"TTSDKLisenceFileForTest";
TTSDKConfiguration *configuration = [TTSDKConfiguration defaultConfigurationWithAppID:@(appId).description];
configuration.appName = appname;
configuration.channel = channel;
configuration.bundleID = bundleID;
configuration.licenseFilePath = [[FUSShowRoomCenterBunble bundle] pathForResource:lisenceFilePath ofType:nil];
[TTSDKManager startWithConfiguration:configuration];
NSString *liveLisenceFilePath = @"TTSDKLisenceFileForTest";
TTSDKConfiguration *liveConfiguration = [TTSDKConfiguration defaultConfigurationWithAppID:@(liveAppId).description];
liveConfiguration.appName = appname;
liveConfiguration.channel = channel;
liveConfiguration.bundleID = bundleID;
liveConfiguration.licenseFilePath = [[FUSShowRoomCenterBunble bundle] pathForResource:liveLisenceFilePath ofType:nil];
[TTSDKManager startWithConfiguration:liveConfiguration];
// TTVideo 使用独立的点播 license，避免和直播授权配置串用。
TTSDKConfiguration *videoConfiguration = [TTSDKConfiguration defaultConfigurationWithAppID:@(videoAppId).description];
videoConfiguration.appName = appname;
videoConfiguration.channel = channel;
videoConfiguration.bundleID = bundleID;
videoConfiguration.licenseFilePath = [[FUSShowRoomCenterBunble bundle] pathForResource:@"TTVideoLisenceFile.lic" ofType:nil];
[TTSDKManager updateLicenseWithConfiguration:videoConfiguration];
[TTVideoEngine setLogFlag:TTVideoEngineLogFlagNone];
NSDictionary *appInfo = @{
TTVideoEngineAID : @(appId), /// appid
TTVideoEngineAID : @(videoAppId), /// appid
TTVideoEngineAppName : appname,/// appName
TTVideoEngineChannel : channel,
TTVideoEngineServiceVendor : @(TTVideoEngineServiceVendorCN),
......@@ -927,7 +934,7 @@
TTVideoEngine.ls_localServerConfigure.cachDirectory = FUSConfig.sharedInstanced.pathConfigs.onlineStreamVideoCachePath;
[TTVideoEngine ls_start];
BDAutoTrackConfig *config = [BDAutoTrackConfig configWithAppID:[NSString stringWithFormat:@"%ld",appId]];
BDAutoTrackConfig *config = [BDAutoTrackConfig configWithAppID:[NSString stringWithFormat:@"%ld",liveAppId]];
config.channel = channel;
config.appName = appname;
config.serviceVendor = BDAutoTrackServiceVendorCN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment